From: Quirin Gylstorff <quirin.gylstorff@...>

The variables U_BOOT_CONFIG and U_BOOT_BIN are added by
template variables[1].

[1]: https://github.com/ilbers/isar/commit/48dd7969e3c977e7e39b235be71c1f06d912b336

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...>
---
recipes-bsp/u-boot/files/{rules => rules.tmpl} | 2 +-
recipes-bsp/u-boot/u-boot-qemu-arm64_2022.04.bb | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
rename recipes-bsp/u-boot/files/{rules => rules.tmpl} (96%)

diff --git a/recipes-bsp/u-boot/files/rules b/recipes-bsp/u-boot/files/rules.tmpl
similarity index 96%
rename from recipes-bsp/u-boot/files/rules
rename to recipes-bsp/u-boot/files/rules.tmpl
index 36e1e1b..c697cdb 100755
--- a/recipes-bsp/u-boot/files/rules
+++ b/recipes-bsp/u-boot/files/rules.tmpl
@@ -19,7 +19,7 @@ override_dh_auto_build:
tools/efivar.py set -i ubootefi.var -n KEK -d secure-boot.esl -t file; \
tools/efivar.py set -i ubootefi.var -n db -d secure-boot.esl -t file; \
fi
- $(MAKE) $(PARALLEL_MAKE) $(U_BOOT_CONFIG)
+ $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG}
$(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN}
$(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \
$(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \
diff --git a/recipes-bsp/u-boot/u-boot-qemu-arm64_2022.04.bb b/recipes-bsp/u-boot/u-boot-qemu-arm64_2022.04.bb
index e462258..b026dd6 100644
--- a/recipes-bsp/u-boot/u-boot-qemu-arm64_2022.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qemu-arm64_2022.04.bb
@@ -14,7 +14,7 @@ require recipes-bsp/u-boot/u-boot-custom.inc
SRC_URI += " \
https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
file://0001-lib-date-Make-rtc_mktime-and-mktime64-Y2038-ready.patch \
- file://rules"
+ file://rules.tmpl;subdir=debian"
SRC_URI[sha256sum] = "68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0"

SRC_URI_append_secureboot = " \
@@ -31,10 +31,6 @@ DEPENDS_append_secureboot = " secure-boot-secrets"
U_BOOT_CONFIG = "qemu_arm64_defconfig"
U_BOOT_BIN = "u-boot.bin"

-do_prepare_build_append() {
- cp ${WORKDIR}/rules ${S}/debian/rules
-}
-
do_prepare_build_append_secureboot() {
sed -ni '/### Secure boot config/q;p' ${S}/configs/${U_BOOT_CONFIG}
cat ${WORKDIR}/secure-boot.cfg >> ${S}/configs/${U_BOOT_CONFIG}
--
2.35.1