Remove depends file

Instead of having a "depends" file with a list of packages, add a
"DEPENDS" variable to the build script.

Generate the rootfs dependencies from a config file stored in the
cfg directory.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

pkg/base-files/build

@@ -1,3 +1,5 @@
+DEPENDS=""
+
 build() {
 	return
 }

pkg/bash-completion/build

@@ -3,6 +3,7 @@ SRCDIR="bash-completion-${VERSION}"
 TARBALL="${SRCDIR}.tar.bz2"
 URL="https://bash-completion.alioth.debian.org/files/"
 SHA256SUM="2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f"
+DEPENDS="bash"
 
 prepare() {
 	return

pkg/bash-completion/depends

@@ -1 +0,0 @@
-bash

pkg/bash/build

@@ -3,6 +3,7 @@ SRCDIR="bash-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/bash/"
 SHA256SUM="57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331"
+DEPENDS="ncurses readline"
 
 prepare() {
 	return

pkg/bash/depends

@@ -1,2 +0,0 @@
-ncurses
-readline

pkg/bbstatic/build

@@ -3,6 +3,7 @@ SRCDIR="busybox-$VERSION"
 TARBALL="busybox-$VERSION.tar.bz2"
 URL="https://busybox.net/downloads"
 SHA256SUM="9d4be516b61e6480f156b11eb42577a13529f75d3383850bb75c50c285de63df"
+DEPENDS=""
 
 prepare() {
 	return

pkg/bdb/build

@@ -3,6 +3,7 @@ SRCDIR="db-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="http://download.oracle.com/berkeley-db/"
 SHA256SUM="a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb"
+DEPENDS=""
 
 prepare() {
 	return

pkg/boot-rpi3/build

@@ -1,5 +1,6 @@
 # inherit package details from kernel package
 source "$SCRIPTDIR/pkg/firmware-rpi3/build"
+DEPENDS=""
 
 build() {
 	return

pkg/bzip2/build

@@ -3,6 +3,7 @@ SRCDIR="bzip2-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="http://www.bzip.org/1.0.6/"
 SHA256SUM="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
+DEPENDS=""
 
 prepare() {
 	return

pkg/coreutils/build

@@ -3,6 +3,7 @@ SRCDIR="coreutils-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/coreutils/"
 SHA256SUM="1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65"
+DEPENDS=""
 
 prepare() {
 	local PKGSCRIPTDIR="$1"

pkg/diffutils/build

@@ -3,6 +3,7 @@ SRCDIR="diffutils-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/diffutils/"
 SHA256SUM="d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6"
+DEPENDS=""
 
 prepare() {
 	return

pkg/dnsmasq/build

@@ -3,6 +3,7 @@ SRCDIR="dnsmasq-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="http://www.thekelleys.org.uk/dnsmasq"
 SHA256SUM="89949f438c74b0c7543f06689c319484bd126cc4b1f8c745c742ab397681252b"
+DEPENDS=""
 
 prepare() {
 	return

pkg/ethtool/build

@@ -3,6 +3,7 @@ SRCDIR="ethtool-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/software/network/ethtool/"
 SHA256SUM="b7c1a380007d30eaf261a63b3cfc000f9d93f9eb7626dcd48b5d2a733af99cba"
+DEPENDS=""
 
 prepare() {
 	return

pkg/expat/build

@@ -3,6 +3,7 @@ SRCDIR="libexpat-${VERSION}/expat"
 TARBALL="${VERSION}.tar.gz"
 URL="https://github.com/libexpat/libexpat/archive"
 SHA256SUM="b3781742738611eaa737543ee94264dd511c52a3ba7e53111f7d705f6bff65a8"
+DEPENDS="libbsd"
 
 prepare() {
 	autoreconf --force --install --symlink

pkg/expat/depends

@@ -1 +0,0 @@
-libbsd

pkg/findutils/build

@@ -3,6 +3,7 @@ SRCDIR="findutils-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/findutils/"
 SHA256SUM="ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d"
+DEPENDS=""
 
 prepare() {
 	return

pkg/firmware-rpi3/build

@@ -3,6 +3,7 @@ SRCDIR="firmware-${VERSION}"
 TARBALL="${VERSION}"
 URL="https://codeload.github.com/raspberrypi/firmware/tar.gz"
 SHA256SUM="e253084463a0a3ba908396ac383169397d53bc55307d0d8471f2814f2458fa1b"
+DEPENDS=""
 
 #export BRCM43430FW_BUILD_DIR=$(BUILD_DIR)/brcm43430fw
 #export BRCM43430FW_SOURCE_DIR=$(SOURCE_DIR)/brcm43430fw

pkg/gawk/build

@@ -3,6 +3,7 @@ SRCDIR="gawk-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/gawk/"
 SHA256SUM="d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2"
+DEPENDS=""
 
 prepare() {
 	return

pkg/gmp/build

@@ -3,6 +3,7 @@ SRCDIR="gmp-$VERSION"
 TARBALL="gmp-$VERSION.tar.bz2"
 URL="http://ftp.gnu.org/gnu/gmp"
 SHA256SUM="5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2"
+DEPENDS=""
 
 prepare() {
 	return

pkg/grep/build

@@ -3,6 +3,7 @@ SRCDIR="grep-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/grep/"
 SHA256SUM="db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e"
+DEPENDS=""
 
 prepare() {
 	return

pkg/gzip/build

@@ -3,6 +3,7 @@ SRCDIR="gzip-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/gzip/"
 SHA256SUM="ae506144fc198bd8f81f1f4ad19ce63d5a2d65e42333255977cf1dcf1479089a"
+DEPENDS=""
 
 prepare() {
 	return

pkg/inetutils/build

@@ -3,6 +3,7 @@ SRCDIR="inetutils-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/inetutils/"
 SHA256SUM="849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37"
+DEPENDS="ncurses readline"
 
 prepare() {
 	return

pkg/inetutils/depends

@@ -1,2 +0,0 @@
-ncurses
-readline

pkg/initrd/build

@@ -1,3 +1,5 @@
+DEPENDS="bbstatic"
+
 filetype() {
 	local argv1="$1"
 

pkg/initrd/depends

@@ -1 +0,0 @@
-bbstatic

pkg/iproute2/build

@@ -3,6 +3,7 @@ SRCDIR="iproute2-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/net/iproute2/"
 SHA256SUM="d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067"
+DEPENDS="bdb libmnl"
 
 prepare() {
 	local PKGSCRIPTDIR="$1"

pkg/iproute2/depends

@@ -1,2 +0,0 @@
-bdb
-libmnl

pkg/kmod/build

@@ -3,6 +3,7 @@ SRCDIR="kmod-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/"
 SHA256SUM="7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd"
+DEPENDS="zlib xz"
 
 prepare() {
 	return

pkg/kmod/depends

@@ -1,2 +0,0 @@
-zlib
-xz

pkg/less/build

@@ -3,6 +3,7 @@ SRCDIR="less-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/less/"
 SHA256SUM="f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706"
+DEPENDS="ncurses"
 
 prepare() {
 	return

pkg/less/depends

@@ -1 +0,0 @@
-ncurses

pkg/libbsd/build

@@ -3,6 +3,7 @@ SRCDIR="libbsd-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://libbsd.freedesktop.org/releases"
 SHA256SUM="467fbf9df1f49af11f7f686691057c8c0a7613ae5a870577bef9155de39f9687"
+DEPENDS=""
 
 prepare() {
 	return

pkg/libevent/build

@@ -3,6 +3,7 @@ SRCDIR="libevent-${VERSION}-stable"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/"
 SHA256SUM="965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2"
+DEPENDS=""
 
 prepare() {
 	return

pkg/libiconv/build

@@ -3,6 +3,7 @@ SRCDIR="libiconv-$VERSION"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/libiconv/"
 SHA256SUM="ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178"
+DEPENDS=""
 
 prepare() {
 	return

pkg/libidn2/build

@@ -3,6 +3,7 @@ SRCDIR="libidn2-$VERSION"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/libidn"
 SHA256SUM="644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0"
+DEPENDS="libiconv libunistring"
 
 prepare() {
 	return

pkg/libidn2/depends

@@ -1,2 +0,0 @@
-libiconv
-libunistring

pkg/libmnl/build

@@ -3,6 +3,7 @@ SRCDIR="libmnl-${VERSION}"
 TARBALL="${SRCDIR}.tar.bz2"
 URL="https://www.netfilter.org/projects/libmnl/files/"
 SHA256SUM="171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81"
+DEPENDS=""
 
 prepare() {
 	return

pkg/libtasn1/build

@@ -3,6 +3,7 @@ SRCDIR="libtasn1-$VERSION"
 TARBALL="libtasn1-$VERSION.tar.gz"
 URL="https://ftp.gnu.org/gnu/libtasn1"
 SHA256SUM="7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca"
+DEPENDS=""
 
 prepare() {
 	return

pkg/libunistring/build

@@ -3,6 +3,7 @@ SRCDIR="libunistring-$VERSION"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/libunistring"
 SHA256SUM="7b9338cf52706facb2e18587dceda2fbc4a2a3519efa1e15a3f2a68193942f80"
+DEPENDS="libiconv"
 
 prepare() {
 	return

pkg/libunistring/depends

@@ -1 +0,0 @@
-libiconv

pkg/linux-rpi3/build

@@ -3,6 +3,7 @@ SRCDIR="linux-raspberrypi-kernel_${VERSION}"
 TARBALL="raspberrypi-kernel_${VERSION}"
 URL="https://codeload.github.com/raspberrypi/linux/tar.gz"
 SHA256SUM="c9b60483e901556a2fbab64c06be8a9eba884f3eaac98ba39347e82bb0a00f5b"
+DEPENDS="initrd"
 
 prepare() {
 	return

pkg/linux-rpi3/depends

@@ -1 +0,0 @@
-initrd

pkg/linux/build

@@ -7,6 +7,7 @@ SRCDIR="linux-$VERSION"
 TARBALL="linux-$VERSION.tar.xz"
 URL="https://www.kernel.org/pub/linux/kernel/v$MAJOR.x"
 SHA256SUM="6fb9f67002f986ce3905b35466e35c394e0fa3eb7c32df508514717955cb4de7"
+DEPENDS="initrd"
 
 prepare() {
 	return

pkg/linux/depends

@@ -1 +0,0 @@
-initrd

pkg/linux_modules/build

@@ -1,5 +1,6 @@
 # inherit package details from kernel package
 source "$SCRIPTDIR/pkg/$LINUXPKG/build"
+DEPENDS=""
 
 build() {
 	local INPUT="$1"

pkg/nano/build

@@ -3,6 +3,7 @@ SRCDIR="nano-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/nano/"
 SHA256SUM="4eccb7451b5729ce8abae8f9a5679f32e41ae58df73ea86b850ec45b10a83d55"
+DEPENDS="ncurses"
 
 prepare() {
 	return

pkg/nano/depends

@@ -1 +0,0 @@
-ncurses

pkg/ncurses/build

@@ -3,6 +3,7 @@ SRCDIR="ncurses-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/ncurses/"
 SHA256SUM="f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260"
+DEPENDS=""
 
 prepare() {
 	return

pkg/nettle/build

@@ -3,6 +3,7 @@ SRCDIR="nettle-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/nettle/"
 SHA256SUM="ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94"
+DEPENDS="gmp"
 
 prepare() {
 	return

pkg/nettle/depends

@@ -1 +0,0 @@
-gmp

pkg/openssl/build

@@ -3,6 +3,7 @@ SRCDIR="openssl-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.openssl.org/source"
 SHA256SUM="de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af"
+DEPENDS="zlib"
 
 source "$SCRIPTDIR/cfg/$CFG/OPENSSL"
 

pkg/openssl/depends

@@ -1 +0,0 @@
-zlib

pkg/readline/build

@@ -3,6 +3,7 @@ SRCDIR="readline-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/readline/"
 SHA256SUM="750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334"
+DEPENDS="ncurses"
 
 prepare() {
 	return

pkg/readline/depends

@@ -1 +0,0 @@
-ncurses

pkg/release-alix/build

@@ -1,14 +1,16 @@
+DEPENDS="rootfs-alix linux"
+
 build() {
 	local SOURCE="$1"
 	local BUILD="$2"
 	local DEPLOY="$3"
 
 	# copy output of immediate dependencies
-	while read pkgname; do
+	for pkgname in $DEPENDS; do
 		if [ -e "$PKGDEPLOYDIR/$pkgname" ]; then
 			cp -ru ${PKGDEPLOYDIR}/${pkgname}/* "$BUILD"
 		fi
-	done < "$SCRIPTDIR/pkg/release-${CFG}/depends"
+	done
 
 	# copy additional files from this package, subsitute filenames
 	local linux_image=$(basename $BUILD/vmlinuz*)

pkg/release-alix/depends

@@ -1,2 +0,0 @@
-rootfs-alix
-linux

pkg/release-rpi3/build

@@ -1,3 +1,5 @@
+DEPENDS="rootfs-rpi3 linux-rpi3 boot-rpi3"
+
 build() {
 	local SOURCE="$1"
 	local BUILD="$2"
@@ -6,11 +8,11 @@ build() {
 	# copy output of immediate dependencies
 	mkdir -p "$BUILD/boot"
 
-	while read pkgname; do
+	for pkgname in $DEPENDS; do
 		if [ -e "$PKGDEPLOYDIR/$pkgname" ]; then
 			cp -ru ${PKGDEPLOYDIR}/${pkgname}/* "$BUILD/boot"
 		fi
-	done < "$SCRIPTDIR/pkg/release-${CFG}/depends"
+	done
 
 	# copy files from this package
 	cp "$SCRIPTDIR/pkg/release-${CFG}/cmdline.txt" "$BUILD/boot"

pkg/release-rpi3/depends

@@ -1,3 +0,0 @@
-rootfs-rpi3
-linux-rpi3
-boot-rpi3

pkg/rootfs-alix/build

@@ -1,3 +1,5 @@
+DEPENDS=$(cat "$SCRIPTDIR/cfg/$CFG/ROOTFS")
+
 build() {
 	local SOURCE="$1"
 	local BUILD="$2"

pkg/rootfs-rpi3/build

@@ -1,3 +1,5 @@
+DEPENDS=$(cat "$SCRIPTDIR/cfg/$CFG/ROOTFS")
+
 build() {
 	local SOURCE="$1"
 	local BUILD="$2"

pkg/sed/build

@@ -3,6 +3,7 @@ SRCDIR="sed-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/sed/"
 SHA256SUM="cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b"
+DEPENDS=""
 
 prepare() {
 	return

pkg/sqlite3/build

@@ -3,6 +3,7 @@ SRCDIR="sqlite-autoconf-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://sqlite.org/2017/"
 SHA256SUM="d7dd516775005ad87a57f428b6f86afd206cb341722927f104d3f0cf65fbbbe3"
+DEPENDS="readline"
 
 prepare() {
 	return

pkg/sqlite3/depends

@@ -1 +0,0 @@
-readline

pkg/tar/build

@@ -3,6 +3,7 @@ SRCDIR="tar-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/tar/"
 SHA256SUM="f1bf92dbb1e1ab27911a861ea8dde8208ee774866c46c0bb6ead41f4d1f4d2d3"
+DEPENDS="xz gzip bzip2"
 
 prepare() {
 	return

pkg/tar/depends

@@ -1,3 +0,0 @@
-xz
-gzip
-bzip2

pkg/unbound/build

@@ -3,6 +3,7 @@ SRCDIR="unbound-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.unbound.net/downloads"
 SHA256SUM="e3b428e33f56a45417107448418865fe08d58e0e7fea199b855515f60884dd49"
+DEPENDS="libevent openssl expat"
 
 prepare() {
 	return

pkg/unbound/depends

@@ -1,3 +0,0 @@
-libevent
-openssl
-expat

pkg/util-linux/build

@@ -3,6 +3,7 @@ SRCDIR="util-linux-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/util-linux/v$VERSION/"
 SHA256SUM="f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a"
+DEPENDS="bash ncurses zlib"
 
 prepare() {
 	local PKGSCRIPTDIR="$1"

pkg/util-linux/depends

@@ -1,3 +0,0 @@
-bash
-ncurses
-zlib

pkg/xz/build

@@ -3,6 +3,7 @@ SRCDIR="xz-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://tukaani.org/xz/"
 SHA256SUM="7876096b053ad598c31f6df35f7de5cd9ff2ba3162e5a5554e4fc198447e0347"
+DEPENDS=""
 
 prepare() {
 	return

pkg/zlib/build

@@ -3,6 +3,7 @@ SRCDIR="zlib-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="http://www.zlib.net/"
 SHA256SUM="4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/binutils/build

@@ -3,6 +3,7 @@ SRCDIR="binutils-$VERSION"
 TARBALL="binutils-$VERSION.tar.bz2"
 URL="http://ftp.gnu.org/gnu/binutils"
 SHA256SUM="1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/cloog/build

@@ -3,6 +3,7 @@ SRCDIR="cloog-$VERSION"
 TARBALL="cloog-$VERSION.tar.gz"
 URL="ftp://gcc.gnu.org/pub/gcc/infrastructure"
 SHA256SUM="02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/gcc1/build

@@ -3,6 +3,7 @@ SRCDIR="gcc-$VERSION"
 TARBALL="gcc-$VERSION.tar.xz"
 URL="http://ftp.gnu.org/gnu/gcc/gcc-$VERSION"
 SHA256SUM="1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a"
+DEPENDS="binutils cloog gmp isl mpc mpfr linux_hdr"
 
 prepare() {
 	for child in cloog gmp isl mpc mpfr; do

tcpkg/gcc1/depends

@@ -1,7 +0,0 @@
-binutils
-cloog
-gmp
-isl
-mpc
-mpfr
-linux_hdr

tcpkg/gcc2/build

@@ -1,5 +1,6 @@
 # inherit package details from first stage GCC
 source "$SCRIPTDIR/tcpkg/gcc1/build"
+DEPENDS="gcc1 musl"
 
 build() {
 	local INPUT="$1"

tcpkg/gcc2/depends

@@ -1,2 +0,0 @@
-gcc1
-musl

tcpkg/gmp/build

@@ -3,6 +3,7 @@ SRCDIR="gmp-$VERSION"
 TARBALL="gmp-$VERSION.tar.bz2"
 URL="http://ftp.gnu.org/gnu/gmp"
 SHA256SUM="5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/isl/build

@@ -3,6 +3,7 @@ SRCDIR="isl-$VERSION"
 TARBALL="isl-$VERSION.tar.bz2"
 URL="ftp://gcc.gnu.org/pub/gcc/infrastructure"
 SHA256SUM="6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/libgcc/build

@@ -1,3 +1,5 @@
+DEPENDS="gcc2"
+
 build() {
 	return
 }

tcpkg/libgcc/depends

@@ -1 +0,0 @@
-gcc2

tcpkg/linux_hdr/build

@@ -1,5 +1,6 @@
 # inherit package details from kernel package
 source "$SCRIPTDIR/pkg/$LINUXPKG/build"
+DEPENDS=""
 
 build() {
 	local INPUT="$1"

tcpkg/mpc/build

@@ -3,6 +3,7 @@ SRCDIR="mpc-$VERSION"
 TARBALL="mpc-$VERSION.tar.gz"
 URL="http://ftp.gnu.org/gnu/mpc"
 SHA256SUM="617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/mpfr/build

@@ -3,6 +3,7 @@ SRCDIR="mpfr-$VERSION"
 TARBALL="mpfr-$VERSION.tar.bz2"
 URL="http://ftp.gnu.org/gnu/mpfr"
 SHA256SUM="d3103a80cdad2407ed581f3618c4bed04e0c92d1cf771a65ead662cc397f7775"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/musl/build

@@ -3,6 +3,7 @@ SRCDIR="musl-$VERSION"
 TARBALL="$SRCDIR.tar.gz"
 URL="http://www.musl-libc.org/releases"
 SHA256SUM="d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118"
+DEPENDS="gcc1"
 
 prepare() {
 	return

tcpkg/musl/depends

@@ -1 +0,0 @@
-gcc1

tcpkg/pkg-config/build

@@ -3,6 +3,7 @@ SRCDIR="pkg-config-$VERSION"
 TARBALL="$SRCDIR.tar.gz"
 URL="https://pkg-config.freedesktop.org/releases/"
 SHA256SUM="6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
+DEPENDS=""
 
 prepare() {
 	return

tcpkg/toolchain/build

@@ -1,3 +1,5 @@
+DEPENDS="gcc2 libgcc musl pkg-config"
+
 build() {
 	return
 }

tcpkg/toolchain/depends

@@ -1,4 +0,0 @@
-gcc2
-libgcc
-musl
-pkg-config

util/depends.sh

@@ -2,14 +2,20 @@ dependencies_recursive() {
 	local NAME="$1"
 	local PKGDIR="$2"
 
-	if [ -e "$SCRIPTDIR/$PKGDIR/$NAME/depends" ]; then
-		while read DEP; do
-			echo "$NAME $DEP"
-		done < "$SCRIPTDIR/$PKGDIR/$NAME/depends"
+	unset -f build deploy prepare
+	unset -v VERSION TARBALL URL SRCDIR SHA256SUM DEPENDS
+	source "$SCRIPTDIR/$PKGDIR/$NAME/build"
 
-		while read DEP; do
+	local depends="$DEPENDS"
+
+	if [ ! -z "$depends" ]; then
+		for DEP in $depends; do
+			echo "$NAME $DEP"
+		done
+
+		for DEP in $depends; do
 			dependencies_recursive "$DEP" "$PKGDIR"
-		done < "$SCRIPTDIR/$PKGDIR/$NAME/depends"
+		done
 	fi
 }
 

util/download.sh

@@ -4,7 +4,7 @@ fetch_package() {
 	echo "$NAME"
 
 	unset -f build deploy prepare
-	unset -v VERSION TARBALL URL SRCDIR SHA256SUM
+	unset -v VERSION TARBALL URL SRCDIR SHA256SUM DEPENDS
 	source "$SCRIPTDIR/$PKGDIR/$NAME/build"
 
 	if [ -z "$TARBALL" ]; then

util/pkgcmd.sh

@@ -13,7 +13,7 @@ run_pkg_command_common() {
 	fi
 
 	unset -f build deploy prepare
-	unset -v VERSION TARBALL URL SRCDIR SHA256SUM
+	unset -v VERSION TARBALL URL SRCDIR SHA256SUM DEPENDS
 	source "$SCRIPTDIR/$PKGDIR/$NAME/build"
 
 	local LOGFILE="$PKGLOGDIR/${7}-${FUNCTION}.log"

util/toolchain.sh

@@ -14,15 +14,17 @@ restore_toolchain() {
 }
 
 install_build_deps() {
-	local pkg="$1"
+	local NAME="$1"
 
-	if [ ! -e "$SCRIPTDIR/pkg/$pkg/depends" ]; then
+	unset -f build deploy prepare
+	unset -v VERSION TARBALL URL SRCDIR SHA256SUM DEPENDS
+	source "$SCRIPTDIR/pkg/$NAME/build"
+
+	if [ -z "$DEPENDS" ]; then
 		return
 	fi
 
-	dependencies "$pkg" "pkg" | grep -v "$pkg" > "$BUILDROOT/$CFG/deppkg"
-
-	while read deppkg; do
+	for deppkg in $DEPENDS; do
 		local devdir="$PKGDEPLOYDIR/${deppkg}-dev"
 
 		if [ -d "$devdir/include" ]; then
@@ -31,5 +33,5 @@ install_build_deps() {
 		if [ -d "$devdir/lib" ]; then
 			cp -R "$devdir/lib" "$TCDIR/$TARGET"
 		fi
-	done < "$BUILDROOT/$CFG/deppkg"
+	done
 }