Skip to contentSkip to conversation

linux-torvalds-next: add rauc config

PATCH Superseded Trevor Woerner 2 participants 2 messages Jul 31, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux-torvalds-next: add rauc config

The kernel needs a couple configuration tweaks in order to work with RAUC, and the default upstream kernel recipes already have this built-in due to meta-rauc. The non-upstream, one-off kernel required to support the Radxa Zero 3{e|w} boards (linux-torvalds-next) needs a similar tweak.

---
 .../rk-rauc-demo/recipes-kernel/linux/files/rauc.cfg       | 7 +++++++
 .../recipes-kernel/linux/linux-torvalds-next_%.bbappend    | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 dynamic-layers/rk-rauc-demo/recipes-kernel/linux/files/rauc.cfg
 create mode 100644 dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend
dynamic-layers/rk-rauc-demo/recipes-kernel/linux/files/rauc.cfg new file +7 -0
new file mode 100644
index 000000000000..3fa86bb87186
@@ -0,0 +1,7 @@
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SQUASHFS=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_NBD=y
+CONFIG_DM_VERITY=y
+CONFIG_CRYPTO_SHA256=y
dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend new file +7 -0
new file mode 100644
index 000000000000..e35f9db61fa2
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS:prepend:rk-rauc-demo := "${THISDIR}/files:"
+
+inherit rk-rauc-demo-features-check
+
+SRC_URI:append:rk-rauc-demo = " \
+	file://rauc.cfg \
+	"
Signature · 1 line
2.44.0.478.g7774cfed6261
Reviewed-by on v1 1/1
#1 lore raw

Hi Trevor,

Mit freundlichen Grüßen / Best regards / 此致 敬礼
Quentin Schulz
Senior Software EngineerCherry Embedded Solutions GmbH [email protected] embedded.cherry.deSeestadtstraße 27, 1220 Vienna, Austria

Quoted 32 lines · Trevor Woerner via lists.yoctoproject.org

The kernel needs a couple configuration tweaks in order to work with RAUC, and the default upstream kernel recipes already have this built-in due to meta-rauc. The non-upstream, one-off kernel required to support the Radxa Zero 3{e|w} boards (linux-torvalds-next) needs a similar tweak.

---
   .../rk-rauc-demo/recipes-kernel/linux/files/rauc.cfg       | 7 +++++++ .../recipes-kernel/linux/linux-torvalds-next_%.bbappend    | 7 +++++++

   2 files changed, 14 insertions(+)

   create mode 100644 dynamic-layers/rk-rauc-demo/recipes-kernel/linux/files/rauc.cfg create mode 100644 dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend

dynamic-layers/rk-rauc-demo/recipes-kernel/linux/files/rauc.cfg new file +7 -0
new file mode 100644
index 000000000000..3fa86bb87186
@@ -0,0 +1,7 @@
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_SQUASHFS=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_NBD=y
+CONFIG_DM_VERITY=y
+CONFIG_CRYPTO_SHA256=y
dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend new file +0 -0
new file mode 100644
index 000000000000..e35f9db61fa2

dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend line 7

Quoted 7 lines
dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend new file +7 -0
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS:prepend:rk-rauc-demo := "${THISDIR}/files:"
+
+inherit rk-rauc-demo-features-check
+
+SRC_URI:append:rk-rauc-demo = " \
+     file://rauc.cfg \
+     "

What about adding

include recipes-kernel/linux/linux-yocto_rauc.inc

which should do all of this I believe?

If meta-rauc is not present, the include will silently fail if I remember correctly. Otherwise it'll be included.

The issue I see is if you want this to be rk-rauc-demo override-specific like you did above. But since meta-rauc isn't doing this... is it worth the trouble? They are doing:

require ${@bb.utils.contains('DISTRO_FEATURES', 'rauc', '${BPN}_rauc.inc', '', d)}

maybe we could do the same in linux-torvalds-next_%.bbappend? or even the original recipe (if in the original recipe, with "include" instead).

Otherwise, looks good to me:

Thanks,
Quentin