From c12b58ce039ea04a4605a1f7d1027b300d0aaba7 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Mon, 10 Mar 2025 23:56:10 +0100
Subject: [PATCH] Move rockchip package to different category (#1309)

Make it in line with others. Also dont be opinionated on where the
needed files are set, just drop them in the root package dir like we do
with others

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 packages/firmware/debian/bcm4345/build.yaml        | 13 -------------
 packages/firmware/debian/bcm4345/definition.yaml   |  3 ---
 .../firmware/debian/u-boot-rockchip/build.yaml     | 10 ----------
 .../debian/u-boot-rockchip/definition.yaml         |  5 -----
 packages/uboot/rockchip/build.yaml                 | 14 ++++++++++++++
 packages/uboot/rockchip/definition.yaml            |  3 +++
 6 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 packages/firmware/debian/bcm4345/build.yaml
 delete mode 100644 packages/firmware/debian/bcm4345/definition.yaml
 delete mode 100644 packages/firmware/debian/u-boot-rockchip/build.yaml
 delete mode 100644 packages/firmware/debian/u-boot-rockchip/definition.yaml
 create mode 100644 packages/uboot/rockchip/build.yaml
 create mode 100644 packages/uboot/rockchip/definition.yaml

diff --git a/packages/firmware/debian/bcm4345/build.yaml b/packages/firmware/debian/bcm4345/build.yaml
deleted file mode 100644
index b91bf55..0000000
--- a/packages/firmware/debian/bcm4345/build.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-package_dir: /package
-steps:
-- apk add git
-- git clone --depth 1 https://github.com/armbian/firmware.git
-- |
-   cd firmware/ && \
-   mkdir -p /package/lib/firmware/brcm/ && \
-   cp brcm/BCM4345C5.hcd /package/lib/firmware/brcm/BCM4345C5.hcd && \
-   cp brcm/brcmfmac43456-sdio.txt /package/lib/firmware/brcm/brcmfmac43456-sdio.pine64,pinebook-pro.txt && \
-   cp brcm/brcmfmac43456-sdio.bin /package/lib/firmware/brcm/brcmfmac43456-sdio.bin && \
-   cp brcm/brcmfmac43456-sdio.clm_blob /package/lib/firmware/brcm/brcmfmac43456-sdio.clm_blob
-
-image: "alpine"
\ No newline at end of file
diff --git a/packages/firmware/debian/bcm4345/definition.yaml b/packages/firmware/debian/bcm4345/definition.yaml
deleted file mode 100644
index 5d68ab4..0000000
--- a/packages/firmware/debian/bcm4345/definition.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-category: "firmware"
-name: "bcm4345"
-version: "0.1"
\ No newline at end of file
diff --git a/packages/firmware/debian/u-boot-rockchip/build.yaml b/packages/firmware/debian/u-boot-rockchip/build.yaml
deleted file mode 100644
index 876fe21..0000000
--- a/packages/firmware/debian/u-boot-rockchip/build.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-image: ubuntu
-
-package_dir: /package
-prelude:
-- apt-get update
-- DEBIAN_FRONTEND=noninteractive apt-get install -y wget
-- mkdir /package
-- wget http://http.us.debian.org/debian/pool/main/u/u-boot/u-boot-rockchip_2023.01+dfsg-2_arm64.deb -O u-boot.deb
-steps:
-- dpkg -x u-boot.deb /package
diff --git a/packages/firmware/debian/u-boot-rockchip/definition.yaml b/packages/firmware/debian/u-boot-rockchip/definition.yaml
deleted file mode 100644
index 680ce2a..0000000
--- a/packages/firmware/debian/u-boot-rockchip/definition.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-category: arm-vendor-blob
-name: u-boot-rockchip
-version: "0.3"
-license: "mixed"
-license_url: "https://metadata.ftp-master.debian.org/changelogs//main/u/u-boot/u-boot_2022.10+dfsg-1_copyright"
\ No newline at end of file
diff --git a/packages/uboot/rockchip/build.yaml b/packages/uboot/rockchip/build.yaml
new file mode 100644
index 0000000..732524e
--- /dev/null
+++ b/packages/uboot/rockchip/build.yaml
@@ -0,0 +1,14 @@
+requires:
+  - name: "toolchain"
+    category: "development"
+    version: ">=0"
+
+package_dir: /package
+
+prelude:
+- wget http://http.us.debian.org/debian/pool/main/u/u-boot/u-boot-rockchip_2025.01-2_arm64.deb -O u-boot.deb
+steps:
+- mkdir -p /tmp/uboot
+- mkdir -p /package
+- dpkg -x u-boot.deb /tmp/uboot
+- cp /tmp/uboot/usr/lib/u-boot/pinebook-pro-rk3399/* /package
\ No newline at end of file
diff --git a/packages/uboot/rockchip/definition.yaml b/packages/uboot/rockchip/definition.yaml
new file mode 100644
index 0000000..ef0e8f6
--- /dev/null
+++ b/packages/uboot/rockchip/definition.yaml
@@ -0,0 +1,3 @@
+category: "uboot"
+name: "rockchip"
+version: "0.3.1"
\ No newline at end of file