From bb479125d34f284b168959cb8085134c0a39f6ca Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Wed, 3 Apr 2019 18:22:57 +0200
Subject: [PATCH] cleanup nameing of Raspberry Pi firmware packages

 - drop the 3 suffix, they contain generic firmware
 - rename the "firwmare" package to "vc" as it contains stuff for the
   video core

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 layer/bsp-rpi3/ROOTFS                                           | 2 +-
 .../boot-rpi3-dtb.desc => firmware-rpi/boot-rpi-dtb.desc}       | 0
 .../boot-rpi3-dtb.files => firmware-rpi/boot-rpi-dtb.files}     | 0
 .../boot-rpi3-dtbo.desc => firmware-rpi/boot-rpi-dtbo.desc}     | 0
 .../boot-rpi3-dtbo.files => firmware-rpi/boot-rpi-dtbo.files}   | 0
 .../boot-rpi3.desc => firmware-rpi/boot-rpi.desc}               | 0
 .../boot-rpi3.files => firmware-rpi/boot-rpi.files}             | 0
 pkg/{firmware-rpi3 => firmware-rpi}/build                       | 2 +-
 pkg/firmware-rpi/rpi-vc-dev.desc                                | 1 +
 .../firmware-rpi3-dev.files => firmware-rpi/rpi-vc-dev.files}   | 0
 .../firmware-rpi3.desc => firmware-rpi/rpi-vc.desc}             | 0
 .../firmware-rpi3.files => firmware-rpi/rpi-vc.files}           | 0
 pkg/firmware-rpi3/firmware-rpi3-dev.desc                        | 1 -
 pkg/release-rpi3/build                                          | 2 +-
 14 files changed, 4 insertions(+), 4 deletions(-)
 rename pkg/{firmware-rpi3/boot-rpi3-dtb.desc => firmware-rpi/boot-rpi-dtb.desc} (100%)
 rename pkg/{firmware-rpi3/boot-rpi3-dtb.files => firmware-rpi/boot-rpi-dtb.files} (100%)
 rename pkg/{firmware-rpi3/boot-rpi3-dtbo.desc => firmware-rpi/boot-rpi-dtbo.desc} (100%)
 rename pkg/{firmware-rpi3/boot-rpi3-dtbo.files => firmware-rpi/boot-rpi-dtbo.files} (100%)
 rename pkg/{firmware-rpi3/boot-rpi3.desc => firmware-rpi/boot-rpi.desc} (100%)
 rename pkg/{firmware-rpi3/boot-rpi3.files => firmware-rpi/boot-rpi.files} (100%)
 rename pkg/{firmware-rpi3 => firmware-rpi}/build (90%)
 create mode 100644 pkg/firmware-rpi/rpi-vc-dev.desc
 rename pkg/{firmware-rpi3/firmware-rpi3-dev.files => firmware-rpi/rpi-vc-dev.files} (100%)
 rename pkg/{firmware-rpi3/firmware-rpi3.desc => firmware-rpi/rpi-vc.desc} (100%)
 rename pkg/{firmware-rpi3/firmware-rpi3.files => firmware-rpi/rpi-vc.files} (100%)
 delete mode 100644 pkg/firmware-rpi3/firmware-rpi3-dev.desc

diff --git a/layer/bsp-rpi3/ROOTFS b/layer/bsp-rpi3/ROOTFS
index 318fef9..61edcd4 100644
--- a/layer/bsp-rpi3/ROOTFS
+++ b/layer/bsp-rpi3/ROOTFS
@@ -2,6 +2,6 @@ kmod
 btrfs-progs
 dosfstools
 linux-modules
-firmware-rpi3
+rpi-vc
 linux-firmware-rpi3
 kbd
diff --git a/pkg/firmware-rpi3/boot-rpi3-dtb.desc b/pkg/firmware-rpi/boot-rpi-dtb.desc
similarity index 100%
rename from pkg/firmware-rpi3/boot-rpi3-dtb.desc
rename to pkg/firmware-rpi/boot-rpi-dtb.desc
diff --git a/pkg/firmware-rpi3/boot-rpi3-dtb.files b/pkg/firmware-rpi/boot-rpi-dtb.files
similarity index 100%
rename from pkg/firmware-rpi3/boot-rpi3-dtb.files
rename to pkg/firmware-rpi/boot-rpi-dtb.files
diff --git a/pkg/firmware-rpi3/boot-rpi3-dtbo.desc b/pkg/firmware-rpi/boot-rpi-dtbo.desc
similarity index 100%
rename from pkg/firmware-rpi3/boot-rpi3-dtbo.desc
rename to pkg/firmware-rpi/boot-rpi-dtbo.desc
diff --git a/pkg/firmware-rpi3/boot-rpi3-dtbo.files b/pkg/firmware-rpi/boot-rpi-dtbo.files
similarity index 100%
rename from pkg/firmware-rpi3/boot-rpi3-dtbo.files
rename to pkg/firmware-rpi/boot-rpi-dtbo.files
diff --git a/pkg/firmware-rpi3/boot-rpi3.desc b/pkg/firmware-rpi/boot-rpi.desc
similarity index 100%
rename from pkg/firmware-rpi3/boot-rpi3.desc
rename to pkg/firmware-rpi/boot-rpi.desc
diff --git a/pkg/firmware-rpi3/boot-rpi3.files b/pkg/firmware-rpi/boot-rpi.files
similarity index 100%
rename from pkg/firmware-rpi3/boot-rpi3.files
rename to pkg/firmware-rpi/boot-rpi.files
diff --git a/pkg/firmware-rpi3/build b/pkg/firmware-rpi/build
similarity index 90%
rename from pkg/firmware-rpi3/build
rename to pkg/firmware-rpi/build
index e86ace8..1cf385d 100755
--- a/pkg/firmware-rpi3/build
+++ b/pkg/firmware-rpi/build
@@ -4,7 +4,7 @@ TARBALL="${VERSION}.tar.gz"
 URL="https://github.com/raspberrypi/firmware/archive"
 SHA256SUM="6b6db5f15c400bc1224266fd44238dd9b2479fd09f8a55e36ccdac2120632f8f"
 DEPENDS="toolchain"
-SUBPKG="boot-rpi3 boot-rpi3-dtbo firmware-rpi3 firmware-rpi3-dev boot-rpi3-dtb"
+SUBPKG="boot-rpi boot-rpi-dtbo rpi-vc rpi-vc-dev boot-rpi-dtb"
 
 prepare() {
 	return
diff --git a/pkg/firmware-rpi/rpi-vc-dev.desc b/pkg/firmware-rpi/rpi-vc-dev.desc
new file mode 100644
index 0000000..adad384
--- /dev/null
+++ b/pkg/firmware-rpi/rpi-vc-dev.desc
@@ -0,0 +1 @@
+requires rpi-vc
diff --git a/pkg/firmware-rpi3/firmware-rpi3-dev.files b/pkg/firmware-rpi/rpi-vc-dev.files
similarity index 100%
rename from pkg/firmware-rpi3/firmware-rpi3-dev.files
rename to pkg/firmware-rpi/rpi-vc-dev.files
diff --git a/pkg/firmware-rpi3/firmware-rpi3.desc b/pkg/firmware-rpi/rpi-vc.desc
similarity index 100%
rename from pkg/firmware-rpi3/firmware-rpi3.desc
rename to pkg/firmware-rpi/rpi-vc.desc
diff --git a/pkg/firmware-rpi3/firmware-rpi3.files b/pkg/firmware-rpi/rpi-vc.files
similarity index 100%
rename from pkg/firmware-rpi3/firmware-rpi3.files
rename to pkg/firmware-rpi/rpi-vc.files
diff --git a/pkg/firmware-rpi3/firmware-rpi3-dev.desc b/pkg/firmware-rpi3/firmware-rpi3-dev.desc
deleted file mode 100644
index 471088d..0000000
--- a/pkg/firmware-rpi3/firmware-rpi3-dev.desc
+++ /dev/null
@@ -1 +0,0 @@
-requires firmware-rpi3
diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build
index a42a6c1..9e0e8d6 100755
--- a/pkg/release-rpi3/build
+++ b/pkg/release-rpi3/build
@@ -1,4 +1,4 @@
-DEPENDS="rootfs boot-rpi3 boot-rpi3-dtbo boot-rpi3-dtb linux"
+DEPENDS="rootfs boot-rpi boot-rpi-dtbo boot-rpi-dtb linux"
 SUBPKG="release"
 
 build() {