Merge pull request #122 from hnez/trickle-down-fixes

Apply review results from a meta-lxatac derived BSP
linux-automation · Mar 28, 2024 · 97d5ca8 · 97d5ca8
2 parents b6bff9f + 34a18ff
commit 97d5ca8
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ how to build fully-custom images for your LXA TAC.
 Building the image as-is
 ------------------------
 
-This chapter describes building rougly the same RAUC bundles as the ones
+This chapter describes building roughly the same RAUC bundles as the ones
 available from the official mirror mentioned above.
 
 > The image building process will compile a lot of software from source code,

diff --git a/meta-lxatac-bsp/conf/layer.conf b/meta-lxatac-bsp/conf/layer.conf
@@ -10,6 +10,7 @@ BBFILE_COLLECTIONS += "lxatac-bsp"
 BBFILE_PATTERN_lxatac-bsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_lxatac-bsp = "11"
 
+LAYERDEPENDS_lxatac-bsp = "core ptx rauc lxatac-software"
 LAYERSERIES_COMPAT_lxatac-bsp = "nanbield"
 
 RAUC_KEY_FILE ?= "${LAYERDIR}/recipes-core/rauc/files/devel.key.pem"

diff --git a/meta-lxatac-bsp/conf/machine/lxatac.conf b/meta-lxatac-bsp/conf/machine/lxatac.conf
@@ -38,5 +38,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-modules"
 VOLATILE_LOG_DIR = "no"
 
 MACHINE_FEATURES = "serial ext2 rtc usbhost usbgadget"
-
-RAUC_BUNDLE_COMPATIBLE = "Linux Automation GmbH - LXA TAC"
diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2023.03.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2023.03.0.bb
@@ -10,6 +10,7 @@ SRC_URI[sha256sum] = "d0f78a69ba240327247c8fd0e1d45287e4a0dff99ed847e9a696cc2da0
 
 COMPATIBLE_MACHINE = "lxatac"
 
+# barebox DTs are needed in the FIP image, so deploy all built DTs as barebox-*.dtb
 BAREBOX_DTBS_TO_DEPLOY = "arch/arm/dts/*.dtb"
 
 do_deploy:append () {

diff --git a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb
@@ -1,3 +1,4 @@
+SUMMARY = "Use systemd's update mechanism to only re-partition the disk after image install"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
@@ -9,6 +10,8 @@ SRC_URI = " \
 
 S = "${WORKDIR}"
 
+RDEPENDS:${PN} = "systemd"
+
 do_install () {
     install -d ${D}${libdir}/systemd/system/systemd-repart.service.d/
     install -m 0644 -t ${D}${libdir}/systemd/system/systemd-repart.service.d/ ${S}/*.conf

diff --git a/meta-lxatac-bsp/recipes-core/rauc/rauc_%.bbappend b/meta-lxatac-bsp/recipes-core/rauc/rauc_%.bbappend
@@ -8,7 +8,7 @@ SRC_URI += " \
 
 do_install:append() {
     install -D -m 0644 ${WORKDIR}/require-mount-srv.conf \
-        ${D}${systemd_unitdir}/system/rauc.service.d/require-mount-srv.conf
+        ${D}${systemd_system_unitdir}/rauc.service.d/require-mount-srv.conf
 }
 
-FILES:${PN} += "${systemd_unitdir}/system/rauc.service.d/"
+FILES:${PN} += "${systemd_system_unitdir}/rauc.service.d/"
diff --git a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass
@@ -2,8 +2,7 @@ DEPENDS = "panel-mipi-dbi-native"
 
 PANEL_FIRMWARE_BIN ?= "${@d.getVar('PANEL_FIRMWARE').removesuffix('.txt')}.bin"
 
-do_configure () {
-}
+do_configure[noexec] = "1"
 
 do_compile () {
     mipi-dbi-cmd \

diff --git a/meta-lxatac-software/conf/layer.conf b/meta-lxatac-software/conf/layer.conf
@@ -10,5 +10,6 @@ BBFILE_COLLECTIONS += "lxatac-software"
 BBFILE_PATTERN_lxatac-software = "^${LAYERDIR}/"
 BBFILE_PRIORITY_lxatac-software = "7"
 
+LAYERDEPENDS_lxatac-software = "core openembedded-layer networking-layer ptx rauc"
 LAYERSERIES_COMPAT_lxatac-software = "nanbield"
 
diff --git a/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb b/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb
@@ -7,7 +7,7 @@ SRC_URI += "file://hook.sh"
 
 RAUC_BUNDLE_FORMAT = "verity"
 
-RAUC_BUNDLE_COMPATIBLE ?= "Linux Automation GmbH - LXA TAC"
+RAUC_BUNDLE_COMPATIBLE = "Linux Automation GmbH - LXA TAC"
 
 RAUC_BUNDLE_VERSION = "${DISTRO_VERSION}-${DATETIME}"
 RAUC_BUNDLE_VERSION[vardepsexclude] = "DATETIME"

diff --git a/meta-lxatac-software/recipes-daemons/atftp/atftp_%.bbappend b/meta-lxatac-software/recipes-daemons/atftp/atftp_%.bbappend
@@ -10,7 +10,7 @@ do_install:append() {
     rmdir ${D}/srv/tftp ${D}/srv
 
     install -D -m 0644 ${S}/../create-dir.conf \
-        ${D}${systemd_unitdir}/system/atftpd.service.d/create-dir.conf
+        ${D}${systemd_system_unitdir}/atftpd.service.d/create-dir.conf
 }
 
-FILES:${PN}d += "${systemd_unitdir}/system/atftpd.service.d"
+FILES:${PN}d += "${systemd_system_unitdir}/atftpd.service.d"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,5 +38,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-modules"
		VOLATILE_LOG_DIR = "no"

		MACHINE_FEATURES = "serial ext2 rtc usbhost usbgadget"

		RAUC_BUNDLE_COMPATIBLE = "Linux Automation GmbH - LXA TAC"