Merge pull request #89 from Trellis-Logic/master+use-machine-var

raspberrypi: use MACHINE variable
rauc · Apr 2, 2024 · 85b4aaa · 85b4aaa
2 parents f6db93d + 08bc256
commit 85b4aaa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb b/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "RAUC bundle generator"
 
 inherit bundle
 
-RAUC_BUNDLE_COMPATIBLE = "RaspberryPi4"
+RAUC_BUNDLE_COMPATIBLE = "${MACHINE}"
 RAUC_BUNDLE_VERSION = "v20200703"
 RAUC_BUNDLE_DESCRIPTION = "RAUC Demo Bundle"
 

diff --git a/meta-rauc-raspberrypi/recipes-core/rauc/files/system.conf b/meta-rauc-raspberrypi/recipes-core/rauc/files/system.conf
@@ -1,5 +1,5 @@
 [system]
-compatible=RaspberryPi4
+compatible=@@MACHINE@@
 bootloader=uboot
 data-directory=/data/
 

diff --git a/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend b/meta-rauc-raspberrypi/recipes-core/rauc/rauc_%.bbappend
@@ -15,6 +15,10 @@ PACKAGES += "rauc-grow-data-part"
 
 RDEPENDS:${PN}-grow-data-part += "parted"
 
+do_install:prepend() {
+    sed -i "s|@@MACHINE@@|${MACHINE}|g" ${WORKDIR}/system.conf
+}
+
 do_install:append() {
 	install -d ${D}${systemd_unitdir}/system/
 	install -m 0644 ${WORKDIR}/rauc-grow-data-partition.service ${D}${systemd_unitdir}/system/