From 9dfbdd9d12246683e0aca650d9f84050e0d8fb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 14 Nov 2024 09:44:12 +0100 Subject: [PATCH] Fix Yellow's post-install hook for config.txt migration (#3671) The hook was missing in the manifest, enable it conditionally for Yellow and add reminder to remove it once it's not needed. --- buildroot-external/ota/manifest.raucm.gtpl | 4 ++++ buildroot-external/ota/rauc-hook | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/buildroot-external/ota/manifest.raucm.gtpl b/buildroot-external/ota/manifest.raucm.gtpl index dff6e29edf1..a3cff3f9c0a 100644 --- a/buildroot-external/ota/manifest.raucm.gtpl +++ b/buildroot-external/ota/manifest.raucm.gtpl @@ -11,7 +11,11 @@ hooks=install-check; [image.boot] filename=boot.vfat +{{- if eq (env "ota_compatible") "haos-yellow" }} +hooks=install;post-install; +{{- else }} hooks=install; +{{- end }} [image.kernel] filename=kernel.img diff --git a/buildroot-external/ota/rauc-hook b/buildroot-external/ota/rauc-hook index cc0e91d4b3b..81d66227215 100755 --- a/buildroot-external/ota/rauc-hook +++ b/buildroot-external/ota/rauc-hook @@ -91,7 +91,7 @@ check_grubenv() { post_install_boot() { BOOT_MNT=/mnt/boot - # Add CM5 support for Yellow. Can be removed in HAOS 15. + # Add CM5 support for Yellow. Can be removed in HAOS 15. Make sure manifest.raucm.gtpl is updated. if [ "$RAUC_SYSTEM_COMPATIBLE" = "haos-yellow" ]; then # Mount boot if ! systemctl -q is-active mnt-boot.mount; then