From a753c2409f71ec9614ec48ade330c96a1cb919bc Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 29 Jul 2020 10:46:10 +0200 Subject: qemucommand: Restore custom booloader parameter. The functionality was (presumably unintentionally) removed, but the option was still present. Signed-off-by: Patrick Vacek --- scripts/qemucommand.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 30929ac..9658fcd 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py @@ -75,7 +75,10 @@ class QemuCommand(object): if args.efi: self.bios = 'OVMF.fd' elif self.enable_u_boot: - uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom')) + if args.bootloader: + uboot_path = args.bootloader + else: + uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom')) if self.overlay: new_uboot_path = self.overlay + '.u-boot.rom' if not exists(self.overlay): -- cgit v1.2.3-54-g00ecf From 2d882d62feef02a7a4d28738ce595181f301dcd7 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Mon, 3 Aug 2020 08:58:53 +0200 Subject: Inherit python3native instead of using HOSTTOOLS. Signed-off-by: Patrick Vacek --- classes/image_repo_manifest.bbclass | 2 ++ conf/distro/sota.conf.inc | 2 +- recipes-test/big-update/big-update_1.0.bb | 2 ++ recipes-test/big-update/big-update_2.0.bb | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass index 72dc28f..47692df 100644 --- a/classes/image_repo_manifest.bbclass +++ b/classes/image_repo_manifest.bbclass @@ -9,6 +9,8 @@ # For more information, see: # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests +inherit python3native + # Write build information to target filesystem buildinfo_manifest () { if [ $(which repo) ]; then diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 9804694..99035de 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -18,4 +18,4 @@ export SOURCE_DATE_EPOCH = "0" REPRODUCIBLE_TIMESTAMP_ROOTFS = "0" HOSTTOOLS += "git sync sha256sum" -HOSTTOOLS_NONFATAL += "java repo python" +HOSTTOOLS_NONFATAL += "java repo" diff --git a/recipes-test/big-update/big-update_1.0.bb b/recipes-test/big-update/big-update_1.0.bb index 3b1d652..dfb3a96 100644 --- a/recipes-test/big-update/big-update_1.0.bb +++ b/recipes-test/big-update/big-update_1.0.bb @@ -7,6 +7,8 @@ FILES_${PN} = "/usr/lib/big-update" DEPENDS = "coreutils-native" +inherit python3native + do_install() { install -d ${D}/usr/lib/big-update python ${S}/../rand_file.py ${D}/usr/lib/big-update/a-big-file $(numfmt --from=iec 10M) diff --git a/recipes-test/big-update/big-update_2.0.bb b/recipes-test/big-update/big-update_2.0.bb index 7cb6e94..6fffbc1 100644 --- a/recipes-test/big-update/big-update_2.0.bb +++ b/recipes-test/big-update/big-update_2.0.bb @@ -7,6 +7,8 @@ FILES_${PN} = "/usr/lib/big-update" DEPENDS = "coreutils-native" +inherit python3native + do_install() { install -d ${D}/usr/lib/big-update python ${S}/../rand_file.py ${D}/usr/lib/big-update/a-big-file $(numfmt --from=iec 12M) -- cgit v1.2.3-54-g00ecf From 918dab09aa0aa3dc225cc19b9c946794daac7d81 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 9 Aug 2020 12:28:01 +0200 Subject: image_repo_manifest.bbclass: explicitly call python3 Now we have changed to inherit python3native to provide python3 binary for repo, then we need explicitly call python3 to execute repo, or else it will firstly try to locate python which will fail if python is not in HOSTTOOLS. This fixes a following warning: | Android repo tool failed to run; manifest not copied Signed-off-by: Ming Liu --- classes/image_repo_manifest.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass index 47692df..795f41f 100644 --- a/classes/image_repo_manifest.bbclass +++ b/classes/image_repo_manifest.bbclass @@ -13,8 +13,9 @@ inherit python3native # Write build information to target filesystem buildinfo_manifest () { - if [ $(which repo) ]; then - repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" + repotool=$(which repo) + if [ -n "$repotool" ]; then + python3 $repotool manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" else bbwarn "Android repo tool not found; manifest not copied." fi -- cgit v1.2.3-54-g00ecf From ec3afd483372bcfa692d649c14bb052919a44880 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 18 Aug 2020 15:57:38 +0200 Subject: image_repo_manifest.bbclass: fix build when there is no repo on host * failing "which repo" causes the run.buildinfo_manifest task to fail before it even reaches the test for empty repotool variable: dash -x some-image/1.0-r2/temp/run.buildinfo_manifest.80233 + export systemd_system_unitdir=/usr/lib/systemd/system + export systemd_unitdir=/usr/lib/systemd + export systemd_user_unitdir=/usr/lib/systemd/user + buildinfo_manifest + which repo + repotool= + bb_sh_exit_handler + ret=1 + [ 1 != 0 ] + echo WARNING: exit code 1 from a shell command. WARNING: exit code 1 from a shell command. + exit 1 causing nasty long python exception from do_image task with this fix, it just shows an warning again: dash -x some-image/1.0-r2/temp/run.buildinfo_manifest.80233 + export systemd_user_unitdir=/usr/lib/systemd/user + buildinfo_manifest + which repo + true + repotool= + [ -n ] + bbwarn Android repo tool not found; manifest not copied. + [ -p some-image/1.0-r2/temp/fifo.80233 ] + echo WARNING: Android repo tool not found; manifest not copied. WARNING: Android repo tool not found; manifest not copied. + ret=0 + trap 0 + exit 0 Signed-off-by: Martin Jansa --- classes/image_repo_manifest.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass index 795f41f..12f56f0 100644 --- a/classes/image_repo_manifest.bbclass +++ b/classes/image_repo_manifest.bbclass @@ -13,7 +13,7 @@ inherit python3native # Write build information to target filesystem buildinfo_manifest () { - repotool=$(which repo) + repotool=`which repo || true` if [ -n "$repotool" ]; then python3 $repotool manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" else -- cgit v1.2.3-54-g00ecf From 79dc91f40bd90b16d2e06e7c9dccf99560db54c9 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 26 Aug 2020 09:38:59 +0200 Subject: aktualizr: Upgrade to 2020.9 release. Signed-off-by: Patrick Vacek --- recipes-sota/aktualizr/aktualizr_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index c01a30f..69beb4b 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -17,7 +17,7 @@ PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so" PV = "1.0+git${SRCPV}" PR = "7" -GARAGE_SIGN_PV = "0.7.1-10-ga0a099a" +GARAGE_SIGN_PV = "0.7.1-22-g1d0d714" SRC_URI = " \ gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ @@ -29,10 +29,10 @@ SRC_URI = " \ ${@ d.expand("https://tuf-cli-releases.ota.here.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if not oe.types.boolean(d.getVar('GARAGE_SIGN_AUTOVERSION')) else ''} \ " -SRC_URI[garagesign.md5sum] = "e2354fb75ae56c2d253be26617b2bd10" -SRC_URI[garagesign.sha256sum] = "2ddb26b19090a42d7aeeda287ed40123ffa3ab55b5dcc4ea4c9320d0a0fd59a0" +SRC_URI[garagesign.md5sum] = "7be214beb64ce4ae443f7a4288b6d491" +SRC_URI[garagesign.sha256sum] = "b8524a03bb31551889790eca4ed44070f679d33a98b09e8220d7e0e965de68d8" -SRCREV = "753c2d73c36e3221f5e7800727d94b5c74c01499" +SRCREV = "d4811f900c765f3b4e5b9ea76531bad7d830a691" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf