Merge pull request #769 from advancedtelematic/feat/warrior/2020.9

Feat/warrior/2020.9

8 files changed, 59 insertions, 9 deletions

diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass
index 72dc28f..12f56f0 100644
--- a/classes/image_repo_manifest.bbclass
+++ b/classes/image_repo_manifest.bbclass
@@ -9,10 +9,13 @@
 # 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
-    repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied"
+  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
     bbwarn "Android repo tool not found; manifest not copied."
   fi
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 1d5f8df..7a0ac66 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -17,4 +17,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-connectivity/nfs-utils/nfs-utils/nfs-home-mount.service b/recipes-connectivity/nfs-utils/nfs-utils/nfs-home-mount.service
new file mode 100644
index 0000000..514151a
--- /dev/null
+++ b/recipes-connectivity/nfs-utils/nfs-utils/nfs-home-mount.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=NFS home mount @LOCALSTATEDIR@/local/lib/nfs -> @LOCALSTATEDIR@/lib/nfs.
+DefaultDependencies=no
+Conflicts=umount.target
+After=local-fs.target
+
+[Service]
+ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/nfs
+ExecStart=@BASE_BINDIR@/mount -o bind @LOCALSTATEDIR@/local/lib/nfs @LOCALSTATEDIR@/lib/nfs
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
new file mode 100644
index 0000000..7cce775
--- /dev/null
+++ b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
@@ -0,0 +1,25 @@
+FILESEXTRAPATHS_prepend_sota := "${THISDIR}/${BPN}:"
+
+SRC_URI_append_sota = " file://nfs-home-mount.service"
+
+SYSTEMD_SERVICE_${PN}_append_sota = " nfs-home-mount.service"
+
+CONFFILES_${PN}-client_append_sota = " ${localstatedir}/local/lib"
+
+do_install_append_sota () {
+    install -d ${D}${localstatedir}/local
+    cp -aPR ${D}${localstatedir}/lib ${D}${localstatedir}/local
+
+    install -m 0644 ${WORKDIR}/nfs-home-mount.service ${D}${systemd_unitdir}/system/
+    sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+           -e 's,@LOCALSTATEDIR@,${localstatedir},g' \
+           ${D}${systemd_unitdir}/system/nfs-home-mount.service
+
+    sed -i -e '0,/Requires=/{s,Requires=\(.*\),Requires=\1 nfs-home-mount.service,}' \
+           -e '0,/After=/{s,After=\(.*\),After=\1 nfs-home-mount.service,}' \
+           ${D}${systemd_unitdir}/system/nfs-statd.service
+
+    sed -i -e '0,/Requires=/{s,Requires=\(.*\),Requires=\1 nfs-home-mount.service,}' \
+           -e '0,/After=/{s,After=\(.*\),After=\1 nfs-home-mount.service,}' \
+           ${D}${systemd_unitdir}/system/nfs-mountd.service
+}
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index d9b464f..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 = "4169157a1874fca3fb55571c60507c1aefd4e1e5"
+SRCREV = "d4811f900c765f3b4e5b9ea76531bad7d830a691"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
@@ -178,7 +178,9 @@ FILES_${PN}-sotatools-lib = " \
                 ${libdir}/libsota_tools.so \
                 "
 
-FILES_${PN}-dev = ""
+FILES_${PN}-dev = " \
+                ${includedir}/lib${PN} \
+                "
 
 BBCLASSEXTEND = "native"
 
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)
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):