diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2019-03-05 11:17:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-05 11:17:49 +0100 |
commit | 195135f3d01fecc099bfec43d56b87c28c9aa8a0 (patch) | |
tree | b47fd285d21b591eb534133c6192a1f1a76f7d8f | |
parent | a512fd6e0d519058fe0448098d064aa7e45dc7db (diff) | |
parent | a41e5f7eefb9557f6e8712630e58507d14cc7882 (diff) | |
download | meta-updater-195135f3d01fecc099bfec43d56b87c28c9aa8a0.tar.gz |
Merge pull request #502 from cminyard/rocko
aktualizr: Use ${libdir_native} when referring to native files
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-auto-prov.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | 2 | ||||
-rw-r--r-- | recipes-sota/ostree/ostree_git.bb | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index f506cab..be12a59 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb | |||
@@ -31,7 +31,7 @@ do_install() { | |||
31 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 31 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
32 | aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} | 32 | aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} |
33 | 33 | ||
34 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ | 34 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/${aktualizr_toml} \ |
35 | ${D}${libdir}/sota/conf.d/20-${aktualizr_toml} | 35 | ${D}${libdir}/sota/conf.d/20-${aktualizr_toml} |
36 | } | 36 | } |
37 | 37 | ||
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index 08fffe9..dfe397c 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb | |||
@@ -16,7 +16,7 @@ require credentials.inc | |||
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 18 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
19 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \ | 19 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/sota_hsm_prov.toml \ |
20 | ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml | 20 | ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml |
21 | } | 21 | } |
22 | 22 | ||
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb index cf75e79..6702d29 100644 --- a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb +++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | |||
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "aktualizr" | |||
8 | 8 | ||
9 | do_install() { | 9 | do_install() { |
10 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 10 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
11 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml | 11 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml |
12 | } | 12 | } |
13 | 13 | ||
14 | FILES_${PN} = " \ | 14 | FILES_${PN} = " \ |
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 93ae6e7..279a27f 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb | |||
@@ -57,13 +57,13 @@ FILES_${PN} = "${bindir} \ | |||
57 | ${sysconfdir}/ostree \ | 57 | ${sysconfdir}/ostree \ |
58 | ${datadir}/ostree \ | 58 | ${datadir}/ostree \ |
59 | ${libdir}/*.so.* \ | 59 | ${libdir}/*.so.* \ |
60 | ${libdir}/ostree/ostree-grub-generator \ | 60 | /usr/lib/ostree/ostree-grub-generator \ |
61 | ${libdir}/ostree/ostree-remount \ | 61 | /usr/lib/ostree/ostree-remount \ |
62 | ${libdir}/girepository-1.0/* \ | 62 | ${libdir}/girepository-1.0/* \ |
63 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','${libdir}/tmpfiles.d', '', d)} \ | 63 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','/usr/lib/tmpfiles.d', '', d)} \ |
64 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system/*.path', '', d)} \ | 64 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system/*.path', '', d)} \ |
65 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system-generators', '', d)} \ | 65 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','${systemd_unitdir}/system-generators', '', d)} \ |
66 | " | 66 | " |
67 | FILES_${PN}-dev += " ${datadir}/gir-1.0" | 67 | FILES_${PN}-dev += " ${datadir}/gir-1.0" |
68 | FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d ${libdir}/dracut" | 68 | FILES_${PN}-dracut = "${sysconfdir}/dracut.conf.d /usr/lib/dracut" |
69 | FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root" | 69 | FILES_${PN}-switchroot = "/usr/lib/ostree/ostree-prepare-root" |