Use pkgtool to resolve and manage dependencies, add sub package support

Been working on this for too long, don't remember the specifics, will add
documentation.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>

layer/pygos-cli/ROOTFS

@@ -18,4 +18,7 @@ procps-ng
 psmisc
 file
 init
+init-scripts
+gcron
+usyslog
 tzdata

mk.sh

@@ -28,6 +28,8 @@ PKGDEPLOYDIR="$BUILDROOT/$PRODUCT/deploy"
 PKGLOGDIR="$BUILDROOT/$PRODUCT/log"
 PACKAGELIST="$BUILDROOT/$PRODUCT/pkglist"
 REPODIR="$BUILDROOT/$PRODUCT/repo"
+DEPENDSLIST="$BUILDROOT/$PRODUCT/depends"
+PROVIDESLIST="$BUILDROOT/$PRODUCT/provides"
 
 mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR" "$PKGDEPLOYDIR"
 mkdir -p "$REPODIR"
@@ -38,10 +40,8 @@ OS_RELEASE=$(git describe --always --tags --dirty)
 popd > /dev/null
 
 ############################# include utilities ##############################
-source "$SCRIPTDIR/util/depends.sh"
 source "$SCRIPTDIR/util/download.sh"
 source "$SCRIPTDIR/util/pkgcmd.sh"
-source "$SCRIPTDIR/util/toolchain.sh"
 source "$SCRIPTDIR/util/misc.sh"
 source "$SCRIPTDIR/util/override.sh"
 source "$SCRIPTDIR/util/autotools.sh"
@@ -61,8 +61,22 @@ CMAKETCFILE="$TCDIR/toolchain.cmake"
 ############################### build packages ###############################
 echo "--- resolving package dependencies ---"
 
-include_pkg "$RELEASEPKG"
+g++ "$SCRIPTDIR/util/depgraph.cpp" -o "$TCDIR/bin/depgraph"
-dependencies | tsort | tac > "$PACKAGELIST"
+
+truncate -s 0 $DEPENDSLIST $PROVIDESLIST
+
+for pkg in $SCRIPTDIR/pkg/*; do
+	include_pkg $(basename $pkg)
+
+	for DEP in $SUBPKG; do
+		echo "$PKGNAME,$DEP" >> "$PROVIDESLIST"
+	done
+	for DEP in $DEPENDS; do
+		echo "$PKGNAME,$DEP" >> "$DEPENDSLIST"
+	done
+done
+
+depgraph "$PROVIDESLIST" "$DEPENDSLIST" "$RELEASEPKG" > "$PACKAGELIST"
 cat "$PACKAGELIST"
 
 echo "--- downloading package files ---"
@@ -77,22 +91,24 @@ echo "--- building packages ---"
 while read pkg; do
 	if [ ! -e "$PKGLOGDIR/.$pkg" ]; then
 		include_pkg "$pkg"
-		install_build_deps
+
+		rm -rf "$TCDIR/$TARGET"
+		mkdir -p "$TCDIR/$TARGET"
+
+		if [ ! -z "$DEPENDS" ]; then
+			pkg install -omD -r "$TCDIR/$TARGET" -R "$REPODIR" $DEPENDS
+		fi
+
 		run_pkg_command "build"
 		run_pkg_command "deploy"
 		deploy_dev_cleanup "$PKGDEPLOYDIR/$PKGNAME"
 		strip_files ${PKGDEPLOYDIR}/${PKGNAME}/{bin,lib}
-		restore_toolchain
 
-		if [ -d "$PKGDEPLOYDIR/$PKGNAME" ]; then
+		for f in $SUBPKG; do
-			for f in $PKGDEPLOYDIR/$PKGNAME/*.desc; do
+			pkg pack -r "$REPODIR" \
-				if [ ! -f "$f" ]; then
+			    -d "$PKGDEPLOYDIR/$PKGNAME/${f}.desc" \
-					continue
+			    -l "$PKGDEPLOYDIR/$PKGNAME/${f}.files"
-				fi
-
-				pkg pack -r "$REPODIR" -d "$f" -l $PKGDEPLOYDIR/$PKGNAME/$(basename "$f" .desc).files
 		done
-		fi
 
 		rm -rf "$PKGBUILDDIR"
 		touch "$PKGLOGDIR/.$pkg"

pkg/bash-completion/build

@@ -3,7 +3,8 @@ SRCDIR="bash-completion-upstream-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://salsa.debian.org/debian/bash-completion/-/archive/upstream/${VERSION}/"
 SHA256SUM="50985e7f1a1adc8e05cbea56f0f9753b5600f6ea176b42583184f300b1eed5ea"
-DEPENDS="bash"
+DEPENDS="bash bash-dev"
+SUBPKG="bash-completion bash-completion-dev"
 
 prepare() {
 	autoreconf --force --install --symlink

pkg/bash/bash-dev.desc

@@ -1,2 +1,2 @@
 name bash-dev
-requires bash libc-dev ncurses-dev readline-dev
+requires bash crt-dev ncurses-dev readline-dev

pkg/bash/bash.desc

@@ -1,2 +1,2 @@
 name bash
-requires ncurses readline libc
+requires ncurses readline crt

pkg/bash/bash.files

@@ -1,3 +1,6 @@
+dir bin 0755 0 0
+dir etc 0755 0 0
+dir etc/skel 0755 0 0
 file bin/bash 0755 0 0
 file etc/bashrc 0644 0 0
 file etc/profile 0644 0 0

pkg/bash/build

@@ -3,7 +3,8 @@ SRCDIR="bash-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/bash/"
 SHA256SUM="b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d"
-DEPENDS="ncurses readline"
+DEPENDS="ncurses-dev readline-dev crt-dev"
+SUBPKG="bash bash-dev"
 
 prepare() {
 	apply_patches

pkg/bbstatic/bbstatic.files

@@ -1,2 +1,3 @@
+dir bin 0755 0 0
 file bin/busybox 0755 0 0
 slink bin/sh 0777 0 0 /bin/busybox

pkg/boot-rpi3/build

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

pkg/btrfs-progs/btrfs-progs-dev.desc

@@ -1,2 +1,2 @@
 name btrfs-progs-dev
-requires btrfs-progs util-linux-dev zlib-dev lzo-dev libc-dev
+requires btrfs-progs util-linux-dev zlib-dev lzo-dev crt-dev

pkg/btrfs-progs/btrfs-progs.desc

@@ -1,2 +1,2 @@
 name btrfs-progs
-requires util-linux zlib lzo libc
+requires util-linux zlib lzo crt

pkg/btrfs-progs/build

@@ -3,7 +3,8 @@ SRCDIR="btrfs-progs-v${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs"
 SHA256SUM="04d82af5cf479d139299a8f13ec0921f9578ca444e81ec0202f01a20d2bcefb8"
-DEPENDS="util-linux zlib lzo"
+DEPENDS="util-linux-dev zlib-dev lzo-dev crt-dev"
+SUBPKG="btrfs-progs-dev btrfs-progs"
 
 prepare() {
 	return

pkg/bzip2/build

@@ -4,6 +4,7 @@ TARBALL="bzip2_${VERSION}.orig.tar.bz2"
 URL="https://snapshot.debian.org/archive/debian/20111204T160411Z/pool/main/b/bzip2"
 SHA256SUM="d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7"
 DEPENDS="toolchain"
+SUBPKG="bzip2-dev bzip2"
 
 prepare() {
 	return

pkg/bzip2/bzip2-dev.desc

@@ -1,2 +1,2 @@
 name bzip2-dev
-requires bzip2 libc-dev
+requires bzip2 crt-dev

pkg/bzip2/bzip2.desc

@@ -1,2 +1,2 @@
 name bzip2
-requires libc
+requires crt

pkg/coreutils/coreutils.desc

@@ -1,2 +1,2 @@
 name coreutils
-requires libc
+requires crt

pkg/dhcpcd/dhcpcd.desc

@@ -1,2 +1,2 @@
 name dhcpcd
-requires libc
+requires crt

pkg/diffutils/diffutils.desc

@@ -1,2 +1,2 @@
 name diffutils
-requires libc
+requires crt

pkg/dnsmasq/dnsmasq.desc

@@ -1,2 +1,2 @@
 name dnsmasq
-requires libc
+requires crt

pkg/dosfstools/dosfstools.desc

@@ -1,2 +1,2 @@
 name dosfstools
-requires libc
+requires crt

pkg/ethtool/ethtool.desc

@@ -1,2 +1,2 @@
 name ethtool
-requires libc
+requires crt

pkg/expat/build

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

pkg/expat/expat-dev.desc

@@ -1,2 +1,2 @@
 name expat-dev
-requires expat libbsd-dev libc-dev
+requires expat libbsd-dev crt-dev

pkg/expat/expat.desc

@@ -1,2 +1,2 @@
 name expat
-requires libbsd libc
+requires libbsd crt

pkg/file/build

@@ -3,7 +3,8 @@ SRCDIR="file-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="ftp://ftp.astron.com/pub/file"
 SHA256SUM="30c45e817440779be7aac523a905b123cba2a6ed0bf4f5439e1e99ba940b5546"
-DEPENDS="zlib"
+DEPENDS="zlib-dev crt-dev"
+SUBPKG="file file-dev"
 
 prepare() {
 	return

pkg/file/file-dev.desc

@@ -1,2 +1,2 @@
 name file-dev
-requires file zlib-dev libc-dev
+requires file zlib-dev crt-dev

pkg/file/file.desc

@@ -1,2 +1,2 @@
 name file
-requires zlib libc
+requires zlib crt

pkg/findutils/findutils.desc

@@ -1,2 +1,2 @@
 name findutils
-requires libc
+requires crt

pkg/findutils/findutils.files

@@ -5,4 +5,6 @@ file bin/updatedb 0755 0 0
 file lib/libexec/bigram 0755 0 0
 file lib/libexec/code 0755 0 0
 file lib/libexec/frcode 0755 0 0
+dir var 0755 0 0
+dir var/lib 0755 0 0
 dir var/lib/locate 0755 0 0

pkg/firmware-rpi3/build

@@ -3,7 +3,7 @@ SRCDIR="firmware-${VERSION}"
 TARBALL="${VERSION}.tar.gz"
 URL="https://github.com/raspberrypi/firmware/archive"
 SHA256SUM="eccb3221fe5fbf9e44e7d1a79b2f401eb7527a41fb8ea7fe7231bc188a8ff50b"
-DEPENDS=""
+DEPENDS="toolchain"
 
 prepare() {
 	return

pkg/fortify-headers/build

@@ -3,7 +3,7 @@ SRCDIR="fortify-headers-$VERSION"
 TARBALL="$SRCDIR.tar.xz"
 URL="http://infraroot.at/pygos"
 SHA256SUM="992af871941317b75b5520485111da14dd1b785dcb45de86244b1f6476182696"
-DEPENDS="linux_headers"
+DEPENDS="linux-dev"
 
 prepare() {
 	return
@@ -15,7 +15,7 @@ build() {
 
 deploy() {
 	make -C "$1" PREFIX="" DESTDIR="$2" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$2"
 }
 
 check_update() {

pkg/fortify-headers/fortify-headers-dev.desc

@@ -1 +0,0 @@
-name fortify-headers-dev

pkg/fortify-headers/fortify-headers.desc

@@ -0,0 +1 @@
+name fortify-headers

pkg/gawk/build

@@ -4,6 +4,7 @@ TARBALL="${SRCDIR}.tar.xz"
 URL="https://ftp.gnu.org/gnu/gawk/"
 SHA256SUM="d1119785e746d46a8209d28b2de404a57f983aa48670f4e225531d3bdc175551"
 DEPENDS="toolchain"
+SUBPKG="gawk gawk-dev"
 
 prepare() {
 	return

pkg/gawk/gawk-dev.desc

@@ -1,2 +1,2 @@
 name gawk-dev
-requires gawk libc-dev
+requires gawk crt-dev

pkg/gawk/gawk.desc

@@ -1,2 +1,2 @@
 name gawk
-requires libc
+requires crt

pkg/gawk/gawk.files

@@ -1,8 +1,14 @@
+dir lib 0755 0 0
 dir lib/gawk 0755 0 0
+dir share 0755 0 0
 dir share/awk 0755 0 0
+dir lib/libexec 0755 0 0
 dir lib/libexec/awk 0755 0 0
+dir bin 0755 0 0
 file bin/gawk 0755 0 0
 slink bin/awk 0777 0 0 gawk
+dir share 0755 0 0
+dir share/awk 0755 0 0
 file share/awk/passwd.awk 0644 0 0
 file share/awk/group.awk 0644 0 0
 file share/awk/assert.awk 0644 0 0
@@ -43,4 +49,6 @@ file lib/gawk/rwarray.so 0755 0 0
 file lib/gawk/time.so 0755 0 0
 file lib/libexec/awk/pwcat 0755 0 0
 file lib/libexec/awk/grcat 0755 0 0
+dir etc 0755 0 0
+dir etc/profile.d 0755 0 0
 file etc/profile.d/gawk.sh 0644 0 0

pkg/gcron/gcron.desc

@@ -1,2 +1,2 @@
 name gcron
-requires libc
+requires crt

pkg/gmp/build

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

pkg/gmp/gmp-dev.desc

@@ -1,2 +1,2 @@
 name gmp-dev
-requires gmp libc-dev
+requires gmp crt-dev

pkg/gmp/gmp.desc

@@ -1,2 +1,2 @@
 name gmp
-requires libc
+requires crt

pkg/grep/grep.desc

@@ -1,2 +1,2 @@
 name grep
-requires libc
+requires crt

pkg/gzip/gzip.desc

@@ -1,2 +1,2 @@
 name gzip
-requires libc
+requires crt

pkg/hostapd/build

@@ -3,7 +3,7 @@ SRCDIR="hostapd-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://w1.fi/releases/"
 SHA256SUM="21b0dda3cc3abe75849437f6b9746da461f88f0ea49dd621216936f87440a141"
-DEPENDS="libnl3 openssl"
+DEPENDS="libnl3-dev openssl-dev crt-dev"
 
 prepare() {
 	return

pkg/hostapd/hostapd.desc

@@ -1,2 +1,2 @@
 name hostapd
-requires libnl3 openssl libc
+requires libnl3 openssl crt

pkg/iana-etc/build

@@ -3,7 +3,7 @@ SRCDIR="iana-etc-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="http://infraroot.at/pygos"
 SHA256SUM="1d38d5d90fa04e6f2cca46aad575d1b1c63d9443150abf66fe4dfaf0409358c2"
-DEPENDS=""
+DEPENDS="toolchain"
 
 prepare() {
 	return

pkg/iana-etc/iana-etc.files

@@ -1,2 +1,3 @@
+dir etc 0644 0 0
 file etc/protocols 0644 0 0
 file etc/services 0644 0 0

pkg/inetutils/build

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

pkg/inetutils/inetutils.desc

@@ -1,2 +1,2 @@
 name inetutils
-requires libc ncurses readline
+requires crt ncurses readline

pkg/init-scripts/init-scripts.files

@@ -1,6 +1,9 @@
 dir etc/init.d 0755 0 0
 dir etc/netcfg 0755 0 0
+dir lib 0755 0 0
+dir lib/libexec 0755 0 0
 dir lib/libexec/init 0755 0 0
+dir share 0755 0 0
 dir share/init 0755 0 0
 slink etc/init.d/devfs 0777 0 0 /share/init/devfs
 slink etc/init.d/gcrond 0777 0 0 /share/init/gcrond

pkg/init/build

@@ -3,7 +3,7 @@ SRCDIR="init-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="http://infraroot.at/pygos"
 SHA256SUM="ede42eab34fc339af9e640b2ad0fbf509d567c900611b5866325ad48a44a5159"
-DEPENDS="init-scripts gcron usyslog"
+DEPENDS="toolchain"
 
 prepare() {
 	return

pkg/init/init.desc

@@ -1,2 +1,2 @@
 name init
-requires init-scripts gcron usyslog
+requires crt

pkg/iproute2/build

@@ -3,7 +3,8 @@ SRCDIR="iproute2-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://www.kernel.org/pub/linux/utils/net/iproute2/"
 SHA256SUM="c8adaa6a40f888476b23acb283cfa30c0dd55f07b5aa20663ed5ba2ef1f6fda8"
-DEPENDS="libmnl"
+DEPENDS="libmnl-dev crt-dev"
+SUBPKG="iproute2 iproute2-dev"
 
 prepare() {
 	apply_patches

pkg/iproute2/iproute2-dev.desc

@@ -1,2 +1,2 @@
 name iproute2-dev
-requires iproute2 libmnl-dev
+requires iproute2 libmnl-dev crt-dev

pkg/iproute2/iproute2.desc

@@ -1,2 +1,2 @@
 name iproute2
-requires libmnl libc
+requires libmnl crt

pkg/iw/build

@@ -3,7 +3,7 @@ SRCDIR="iw-${VERSION}"
 TARBALL="${SRCDIR}.tar.xz"
 URL="https://mirrors.edge.kernel.org/pub/software/network/iw"
 SHA256SUM="f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89"
-DEPENDS="libnl3"
+DEPENDS="libnl3-dev crt-dev"
 
 prepare() {
 	return

pkg/iw/iw.desc

@@ -1,2 +1,2 @@
 name iw
-requires libnl3 libc
+requires libnl3 crt

pkg/kbd/kbd.desc

@@ -1,2 +1,2 @@
 name kbd
-requires libc
+requires crt

pkg/kmod/build

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

pkg/kmod/kmod-dev.desc

@@ -1,2 +1,2 @@
 name kmod-dev
-requires kmod libc-dev zlib-dev xz-dev
+requires kmod crt-dev zlib-dev xz-dev

pkg/kmod/kmod.desc

@@ -1,2 +1,2 @@
 name kmod
-requires zlib xz libc
+requires zlib xz crt

pkg/ldns/build

@@ -3,7 +3,8 @@ SRCDIR="ldns-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.nlnetlabs.nl/downloads/ldns"
 SHA256SUM="c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc"
-DEPENDS="openssl"
+DEPENDS="openssl-dev crt-dev"
+SUBPKG="ldns ldns-dev"
 
 prepare() {
 	return

pkg/ldns/ldns-dev.desc

@@ -1,2 +1,2 @@
 name ldns-dev
-requires ldns openssl-dev
+requires ldns openssl-dev crt-dev

pkg/ldns/ldns.desc

@@ -1,2 +1,2 @@
 name ldns
-requires openssl libc
+requires openssl crt

pkg/less/build

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

pkg/less/less.desc

@@ -1,2 +1,2 @@
 name less
-requires ncurses libc
+requires ncurses crt

pkg/libbsd/build

@@ -4,6 +4,7 @@ TARBALL="${SRCDIR}.tar.xz"
 URL="https://libbsd.freedesktop.org/releases"
 SHA256SUM="56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4"
 DEPENDS="toolchain"
+SUBPKG="libbsd libbsd-dev"
 
 prepare() {
 	apply_patches

pkg/libbsd/libbsd-dev.desc

@@ -1,2 +1,2 @@
 name libbsd-dev
-requires libbsd libc-dev
+requires libbsd crt-dev

pkg/libbsd/libbsd.desc

@@ -1,2 +1,2 @@
 name libbsd
-requires libc
+requires crt

pkg/libbsd/libbsd.files

@@ -1,3 +1,3 @@
 file lib/libbsd.so.0.9.1 0755 0 0
-slink lib/libbsd.so.0 m 777 0 0 libbsd.so.0.9.1
+slink lib/libbsd.so.0 0777 0 0 libbsd.so.0.9.1
-slink lib/libbsd.so m 777 0 0 libbsd.so.0.9.1
+slink lib/libbsd.so 0777 0 0 libbsd.so.0.9.1

pkg/libmnl/build

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

pkg/libmnl/libmnl-dev.desc

@@ -1,2 +1,2 @@
 name libmnl-dev
-requires libmnl libc-dev
+requires libmnl crt-dev

pkg/libmnl/libmnl.desc

@@ -1,2 +1,2 @@
 name libmnl
-requires libc
+requires crt

pkg/libnftnl/build

@@ -3,7 +3,8 @@ SRCDIR="libnftnl-${VERSION}"
 TARBALL="${SRCDIR}.tar.bz2"
 URL="https://netfilter.org/projects/libnftnl/files"
 SHA256SUM="a5c7b7a6c13c9c5898b13fcb1126fefce2015d5a96d7c354b19aaa40b6aece5d"
-DEPENDS="libmnl"
+DEPENDS="libmnl-dev crt-dev"
+SUBPKG="libnftnl libnftnl-dev"
 
 prepare() {
 	return

pkg/libnftnl/libnftnl-dev.desc

@@ -1,2 +1,2 @@
 name libnftnl-dev
-requires libnftnl libmnl-dev
+requires libnftnl libmnl-dev crt-dev

pkg/libnftnl/libnftnl.desc

@@ -1,2 +1,2 @@
 name libnftnl
-requires libmnl
+requires libmnl crt

pkg/libnl3/build

@@ -4,6 +4,7 @@ TARBALL="${SRCDIR}.tar.gz"
 URL="https://www.infradead.org/~tgr/libnl/files"
 SHA256SUM="8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5"
 DEPENDS="toolchain"
+SUBPKG="libnl3 libnl3-dev"
 
 prepare() {
 	return

pkg/libnl3/libnl3-dev.desc

@@ -1,2 +1,2 @@
 name libnl3-dev
-requires libnl3 libc-dev
+requires libnl3 crt-dev

pkg/libnl3/libnl3.desc

@@ -1,2 +1,2 @@
 name libnl3
-requires libc
+requires crt

pkg/libpcap/build

@@ -3,7 +3,8 @@ SRCDIR="libpcap-${VERSION}"
 TARBALL="${SRCDIR}.tar.gz"
 URL="http://www.tcpdump.org/release/"
 SHA256SUM="2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
-DEPENDS="toolchain libnl3"
+DEPENDS="libnl3-dev crt-dev"
+SUBPKG="libpcap libpcap-dev"
 
 prepare() {
 	apply_patches

pkg/libpcap/libpcap-dev.desc

@@ -1,2 +1,2 @@
 name libpcap-dev
-requires libpcap libnl3-dev libc-dev
+requires libpcap libnl3-dev crt-dev

pkg/libpcap/libpcap.desc

@@ -1,2 +1,2 @@
 name libpcap
-requires libnl3 libc
+requires libnl3 crt

pkg/linux-rpi3/linux-rpi3.desc

@@ -0,0 +1 @@
+name linux-rpi3

pkg/linux-rpi3/linux.desc

@@ -1 +0,0 @@
-name linux

pkg/linux/build

@@ -67,20 +67,24 @@ deploy() {
 		case $target in
 		*Image)
 			cp "arch/$LINUX_CPU/boot/$target" "$DEPLOY/boot/vmlinuz"
-			echo "file boot/vmlinuz 0755 0 0" >> "$DEPLOY/linux.files"
+			echo "dir boot 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
+			echo "file boot/vmlinuz 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
 			;;
 		modules)
 			export KBUILD_OUTPUT="$PKGBUILDDIR"
 			make -C "$SOURCE" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" INSTALL_MOD_PATH="$DEPLOY" modules_install
 
+			echo "dir lib 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
+			echo "dir lib/modules 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
+
 			find -H "$DEPLOY/lib" -type d -printf "dir %p 0%m 0 0\\n" |\
-				tail -n +2 | sed "s#^$DEPLOY/##g" >> "$DEPLOY/linux.files"
+				tail -n +2 | sed "s#^$DEPLOY/##g" >> "$DEPLOY/$PKGNAME.files"
 
 			find -H "$DEPLOY/lib" -type l -printf "slink %p 0%m 0 0 %l\\n" |\
-				sed "s#^$DEPLOY/##g" >> "$DEPLOY/linux.files"
+				sed "s#^$DEPLOY/##g" >> "$DEPLOY/$PKGNAME.files"
 
 			find -H "$DEPLOY/lib" -type f -printf "file %p 0%m 0 0\\n" |\
-				sed "s#^$DEPLOY/##g" >> "$DEPLOY/linux.files"
+				sed "s#^$DEPLOY/##g" >> "$DEPLOY/$PKGNAME.files"
 			;;
 		esac
 	done

pkg/linux_headers/build

@@ -1,6 +1,7 @@
 # inherit package details from kernel package
 source "$SCRIPTDIR/pkg/$LINUXPKG/build"
-DEPENDS=""
+DEPENDS="tc-pkgtool"
+SUBPKG="linux-dev"
 
 build() {
 	local LINUX_CPU=$(get_linux_cpu)
@@ -14,4 +15,6 @@ deploy() {
 
 	export KBUILD_OUTPUT="$PKGBUILDDIR"
 	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$2" headers_install
+
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$2"
 }

pkg/lzo/build

@@ -4,6 +4,7 @@ TARBALL="${SRCDIR}.tar.gz"
 URL="http://www.oberhumer.com/opensource/lzo/download"
 SHA256SUM="c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072"
 DEPENDS="toolchain"
+SUBPKG="lzo lzo-dev"
 
 prepare() {
 	return

pkg/lzo/lzo-dev.desc

@@ -1,2 +1,2 @@
 name lzo-dev
-requires libc
+requires lzo crt-dev

pkg/lzo/lzo.desc

@@ -1,2 +1,2 @@
 name lzo
-requires libc
+requires crt

pkg/musl/build

@@ -3,7 +3,8 @@ SRCDIR="musl-$VERSION"
 TARBALL="$SRCDIR.tar.gz"
 URL="https://www.musl-libc.org/releases"
 SHA256SUM="44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61"
-DEPENDS="tc-gcc1 linux_headers fortify-headers tc-pkgtool"
+DEPENDS="tc-gcc1 linux-dev fortify-headers tc-pkgtool"
+SUBPKG="libc libc-dev"
 
 prepare() {
 	return
@@ -56,6 +57,8 @@ deploy() {
 	cp $SCRIPTDIR/pkg/$PKGNAME/*.{desc,files} "$DEPLOY"
 
 cat > "$DEPLOY/libc.files" <<_EOF
+dir lib 0755 0 0
+dir etc 0755 0 0
 file lib/libc.so 0755 0 0 $DEPLOY/lib/libc.so
 slink lib/ld-musl-${MUSL_CPU}.so.1 0777 0 0 libc.so
 file etc/ld-musl-${MUSL_CPU}.path 0644 0 0 $DEPLOY/LDPATH

pkg/musl/libc-dev.desc

@@ -1,2 +1,2 @@
 name libc-dev
-requires libgcc-dev linux-dev fortify-headers-dev
+requires libc linux-dev fortify-headers

pkg/musl/libc-dev.files

@@ -222,14 +222,13 @@ file include/err.h 0644 0 0
 file include/glob.h 0644 0 0
 file include/ctype.h 0644 0 0
 file include/nl_types.h 0644 0 0
-dir lib 0755
+dir lib 0755 0 0
 file lib/crt1.o 0644 0 0
 file lib/libm.a 0644 0 0
 file lib/libc.a 0644 0 0
 file lib/libpthread.a 0644 0 0
 file lib/librt.a 0644 0 0
 file lib/libssp_nonshared.a 0664 0 0
-file lib/libc.so 0755 0 0
 file lib/rcrt1.o 0644 0 0
 file lib/libresolv.a 0644 0 0
 file lib/crti.o 0644 0 0

pkg/musl/libc.desc

@@ -1,2 +1 @@
 name libc
-requires libgcc

pkg/nano/build

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

pkg/nano/nano.desc

@@ -1,2 +1,2 @@
 name nano
-requires libc ncurses
+requires crt ncurses

pkg/ncurses/build

@@ -4,6 +4,7 @@ TARBALL="${SRCDIR}.tar.gz"
 URL="https://ftp.gnu.org/gnu/ncurses/"
 SHA256SUM="aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17"
 DEPENDS="toolchain"
+SUBPKG="ncurses-dev ncurses"
 
 prepare() {
 	return

pkg/ncurses/ncurses-dev.desc

@@ -1,2 +1,2 @@
 name ncurses-dev
-requires libc-dev
+requires ncurses crt-dev

pkg/ncurses/ncurses.desc

@@ -1,2 +1,2 @@
 name ncurses
-requires libc
+requires crt

pkg/ncurses/ncurses.files

@@ -1,3 +1,4 @@
+dir share 0755 0 0
 dir share/tabset 0755 0 0
 file share/tabset/std 0644 0 0
 file share/tabset/stdcrt 0644 0 0
@@ -70,6 +71,7 @@ slink lib/libformw.so 0777 0 0 libformw.so.6.1
 slink lib/terminfo 0777 0 0 /share/terminfo
 slink lib/libtinfo.so 0777 0 0 libncursesw.so.6.1
 slink lib/libtinfo.so.6.1 0777 0 0 libncursesw.so.6.1
+dir bin 0755 0 0
 file bin/tic 0755 0 0
 file bin/toe 0755 0 0
 slink bin/infotocap 0777 0 0 tic