diff options
-rw-r--r-- | classes/image_repo_manifest.bbclass | 7 | ||||
-rw-r--r-- | conf/distro/sota.conf.inc | 2 | ||||
-rw-r--r-- | recipes-connectivity/nfs-utils/nfs-utils/nfs-home-mount.service | 13 | ||||
-rw-r--r-- | recipes-connectivity/nfs-utils/nfs-utils_%.bbappend | 25 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 12 | ||||
-rw-r--r-- | recipes-test/big-update/big-update_1.0.bb | 2 | ||||
-rw-r--r-- | recipes-test/big-update/big-update_2.0.bb | 2 | ||||
-rw-r--r-- | scripts/qemucommand.py | 5 |
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 @@ | |||
9 | # For more information, see: | 9 | # For more information, see: |
10 | # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests | 10 | # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests |
11 | 11 | ||
12 | inherit python3native | ||
13 | |||
12 | # Write build information to target filesystem | 14 | # Write build information to target filesystem |
13 | buildinfo_manifest () { | 15 | buildinfo_manifest () { |
14 | if [ $(which repo) ]; then | 16 | repotool=`which repo || true` |
15 | repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" | 17 | if [ -n "$repotool" ]; then |
18 | python3 $repotool manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" | ||
16 | else | 19 | else |
17 | bbwarn "Android repo tool not found; manifest not copied." | 20 | bbwarn "Android repo tool not found; manifest not copied." |
18 | fi | 21 | 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" | |||
17 | REPRODUCIBLE_TIMESTAMP_ROOTFS ?= "0" | 17 | REPRODUCIBLE_TIMESTAMP_ROOTFS ?= "0" |
18 | 18 | ||
19 | HOSTTOOLS += "git sync sha256sum" | 19 | HOSTTOOLS += "git sync sha256sum" |
20 | HOSTTOOLS_NONFATAL += "java repo python" | 20 | 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 @@ | |||
1 | [Unit] | ||
2 | Description=NFS home mount @LOCALSTATEDIR@/local/lib/nfs -> @LOCALSTATEDIR@/lib/nfs. | ||
3 | DefaultDependencies=no | ||
4 | Conflicts=umount.target | ||
5 | After=local-fs.target | ||
6 | |||
7 | [Service] | ||
8 | ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/nfs | ||
9 | ExecStart=@BASE_BINDIR@/mount -o bind @LOCALSTATEDIR@/local/lib/nfs @LOCALSTATEDIR@/lib/nfs | ||
10 | RemainAfterExit=yes | ||
11 | |||
12 | [Install] | ||
13 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend_sota := "${THISDIR}/${BPN}:" | ||
2 | |||
3 | SRC_URI_append_sota = " file://nfs-home-mount.service" | ||
4 | |||
5 | SYSTEMD_SERVICE_${PN}_append_sota = " nfs-home-mount.service" | ||
6 | |||
7 | CONFFILES_${PN}-client_append_sota = " ${localstatedir}/local/lib" | ||
8 | |||
9 | do_install_append_sota () { | ||
10 | install -d ${D}${localstatedir}/local | ||
11 | cp -aPR ${D}${localstatedir}/lib ${D}${localstatedir}/local | ||
12 | |||
13 | install -m 0644 ${WORKDIR}/nfs-home-mount.service ${D}${systemd_unitdir}/system/ | ||
14 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | ||
15 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ | ||
16 | ${D}${systemd_unitdir}/system/nfs-home-mount.service | ||
17 | |||
18 | sed -i -e '0,/Requires=/{s,Requires=\(.*\),Requires=\1 nfs-home-mount.service,}' \ | ||
19 | -e '0,/After=/{s,After=\(.*\),After=\1 nfs-home-mount.service,}' \ | ||
20 | ${D}${systemd_unitdir}/system/nfs-statd.service | ||
21 | |||
22 | sed -i -e '0,/Requires=/{s,Requires=\(.*\),Requires=\1 nfs-home-mount.service,}' \ | ||
23 | -e '0,/After=/{s,After=\(.*\),After=\1 nfs-home-mount.service,}' \ | ||
24 | ${D}${systemd_unitdir}/system/nfs-mountd.service | ||
25 | } | ||
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" | |||
17 | PV = "1.0+git${SRCPV}" | 17 | PV = "1.0+git${SRCPV}" |
18 | PR = "7" | 18 | PR = "7" |
19 | 19 | ||
20 | GARAGE_SIGN_PV = "0.7.1-10-ga0a099a" | 20 | GARAGE_SIGN_PV = "0.7.1-22-g1d0d714" |
21 | 21 | ||
22 | SRC_URI = " \ | 22 | SRC_URI = " \ |
23 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ | 23 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ |
@@ -29,10 +29,10 @@ SRC_URI = " \ | |||
29 | ${@ 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 ''} \ | 29 | ${@ 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 ''} \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRC_URI[garagesign.md5sum] = "e2354fb75ae56c2d253be26617b2bd10" | 32 | SRC_URI[garagesign.md5sum] = "7be214beb64ce4ae443f7a4288b6d491" |
33 | SRC_URI[garagesign.sha256sum] = "2ddb26b19090a42d7aeeda287ed40123ffa3ab55b5dcc4ea4c9320d0a0fd59a0" | 33 | SRC_URI[garagesign.sha256sum] = "b8524a03bb31551889790eca4ed44070f679d33a98b09e8220d7e0e965de68d8" |
34 | 34 | ||
35 | SRCREV = "4169157a1874fca3fb55571c60507c1aefd4e1e5" | 35 | SRCREV = "d4811f900c765f3b4e5b9ea76531bad7d830a691" |
36 | BRANCH ?= "master" | 36 | BRANCH ?= "master" |
37 | 37 | ||
38 | S = "${WORKDIR}/git" | 38 | S = "${WORKDIR}/git" |
@@ -178,7 +178,9 @@ FILES_${PN}-sotatools-lib = " \ | |||
178 | ${libdir}/libsota_tools.so \ | 178 | ${libdir}/libsota_tools.so \ |
179 | " | 179 | " |
180 | 180 | ||
181 | FILES_${PN}-dev = "" | 181 | FILES_${PN}-dev = " \ |
182 | ${includedir}/lib${PN} \ | ||
183 | " | ||
182 | 184 | ||
183 | BBCLASSEXTEND = "native" | 185 | BBCLASSEXTEND = "native" |
184 | 186 | ||
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" | |||
7 | 7 | ||
8 | DEPENDS = "coreutils-native" | 8 | DEPENDS = "coreutils-native" |
9 | 9 | ||
10 | inherit python3native | ||
11 | |||
10 | do_install() { | 12 | do_install() { |
11 | install -d ${D}/usr/lib/big-update | 13 | install -d ${D}/usr/lib/big-update |
12 | python ${S}/../rand_file.py ${D}/usr/lib/big-update/a-big-file $(numfmt --from=iec 10M) | 14 | 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" | |||
7 | 7 | ||
8 | DEPENDS = "coreutils-native" | 8 | DEPENDS = "coreutils-native" |
9 | 9 | ||
10 | inherit python3native | ||
11 | |||
10 | do_install() { | 12 | do_install() { |
11 | install -d ${D}/usr/lib/big-update | 13 | install -d ${D}/usr/lib/big-update |
12 | python ${S}/../rand_file.py ${D}/usr/lib/big-update/a-big-file $(numfmt --from=iec 12M) | 14 | 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): | |||
75 | if args.efi: | 75 | if args.efi: |
76 | self.bios = 'OVMF.fd' | 76 | self.bios = 'OVMF.fd' |
77 | elif self.enable_u_boot: | 77 | elif self.enable_u_boot: |
78 | uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom')) | 78 | if args.bootloader: |
79 | uboot_path = args.bootloader | ||
80 | else: | ||
81 | uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom')) | ||
79 | if self.overlay: | 82 | if self.overlay: |
80 | new_uboot_path = self.overlay + '.u-boot.rom' | 83 | new_uboot_path = self.overlay + '.u-boot.rom' |
81 | if not exists(self.overlay): | 84 | if not exists(self.overlay): |