From 56cf428a1d8ed890fa4b45b019bb94bb2987f019 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Sun, 31 Mar 2019 20:06:39 +0200
Subject: [PATCH] cleanup: merge firmware-rpi3 and boot-rpi3 packages

Make boot-rpi a sub package of firmware-rpi3.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 pkg/boot-rpi3/build                              | 16 ----------------
 pkg/{boot-rpi3 => firmware-rpi3}/boot-rpi3.desc  |  0
 pkg/{boot-rpi3 => firmware-rpi3}/boot-rpi3.files |  0
 pkg/firmware-rpi3/build                          |  3 +++
 pkg/{boot-rpi3 => firmware-rpi3}/config.txt      |  0
 5 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100755 pkg/boot-rpi3/build
 rename pkg/{boot-rpi3 => firmware-rpi3}/boot-rpi3.desc (100%)
 rename pkg/{boot-rpi3 => firmware-rpi3}/boot-rpi3.files (100%)
 rename pkg/{boot-rpi3 => firmware-rpi3}/config.txt (100%)

diff --git a/pkg/boot-rpi3/build b/pkg/boot-rpi3/build
deleted file mode 100755
index 58d0a87..0000000
--- a/pkg/boot-rpi3/build
+++ /dev/null
@@ -1,16 +0,0 @@
-# inherit package details from kernel package
-source "$SCRIPTDIR/pkg/firmware-rpi3/build"
-DEPENDS="toolchain"
-
-build() {
-	return
-}
-
-deploy() {
-	local SOURCE="$1"
-
-	cp -r ${SOURCE}/boot/* "$PKGDEPLOYDIR/"
-
-	cp "$SCRIPTDIR/pkg/boot-rpi3/config.txt" "$PKGDEPLOYDIR/config.txt"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
-}
diff --git a/pkg/boot-rpi3/boot-rpi3.desc b/pkg/firmware-rpi3/boot-rpi3.desc
similarity index 100%
rename from pkg/boot-rpi3/boot-rpi3.desc
rename to pkg/firmware-rpi3/boot-rpi3.desc
diff --git a/pkg/boot-rpi3/boot-rpi3.files b/pkg/firmware-rpi3/boot-rpi3.files
similarity index 100%
rename from pkg/boot-rpi3/boot-rpi3.files
rename to pkg/firmware-rpi3/boot-rpi3.files
diff --git a/pkg/firmware-rpi3/build b/pkg/firmware-rpi3/build
index ea8ae23..08deaf8 100755
--- a/pkg/firmware-rpi3/build
+++ b/pkg/firmware-rpi3/build
@@ -4,6 +4,7 @@ TARBALL="${VERSION}.tar.gz"
 URL="https://github.com/raspberrypi/firmware/archive"
 SHA256SUM="6b6db5f15c400bc1224266fd44238dd9b2479fd09f8a55e36ccdac2120632f8f"
 DEPENDS="toolchain"
+SUBPKG="boot-rpi3 firmware-rpi3 firmware-rpi3-dev"
 
 prepare() {
 	return
@@ -17,6 +18,8 @@ deploy() {
 	local SOURCE="$1"
 
 	cp -r "$SOURCE/hardfp/opt" "$PKGDEPLOYDIR"
+	cp -r ${SOURCE}/boot/* "$PKGDEPLOYDIR/"
+	cp "$SCRIPTDIR/pkg/$PKGNAME/config.txt" "$PKGDEPLOYDIR/config.txt"
 	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
 	strip_files ${PKGDEPLOYDIR}/opt/vc/bin/*
diff --git a/pkg/boot-rpi3/config.txt b/pkg/firmware-rpi3/config.txt
similarity index 100%
rename from pkg/boot-rpi3/config.txt
rename to pkg/firmware-rpi3/config.txt