diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-03-22 20:55:06 +0100 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2021-04-09 13:07:01 +0200 |
commit | 17dae722fbab32bd477a650b3f6b412b7dc7b20f (patch) | |
tree | 956815654002b8b095ebfaaa2f2c4bef7c12400a | |
parent | 24c464744901765d1a0f03b2d95b2f8e7f5a4662 (diff) | |
download | meta-el-nfv-access-17dae722fbab32bd477a650b3f6b412b7dc7b20f.tar.gz |
do_image_ostree: Fix dpkg data mv
While at it, remove one obsoleted workaround from do_image_otaimg:
grub:do_populate_sysroot was removed from do_image_otaimg
(do_image_ota_ext4) deps in [1].
[1] https://github.com/advancedtelematic/meta-updater/commit/850801c
Change-Id: I45f77010aa9cd62dec2e37b278539dc4d28605c5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r-- | images/enea-nfv-access-host-common.inc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc index 6b9c99e..b3f110a 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-nfv-access-host-common.inc | |||
@@ -51,19 +51,11 @@ python do_bootimg_prepend () { | |||
51 | d.setVar("APPEND", d.getVar("APPEND") + ostree_params) | 51 | d.setVar("APPEND", d.getVar("APPEND") + ostree_params) |
52 | } | 52 | } |
53 | 53 | ||
54 | # Get rid of GRUB dependencies added by ostree. See: | ||
55 | # https://git.enea.com/cgit/linux/meta-updater.git/tree/classes/image_types_ota.bbclass#n45 | ||
56 | python __anonymous () { | ||
57 | d.delVarFlag("do_image_otaimg", "depends") | ||
58 | d.setVarFlag("do_image_otaimg", "depends", "e2fsprogs-native:do_populate_sysroot") | ||
59 | } | ||
60 | |||
61 | # Before building the OSTree image, move DPKG data to /usr/dpkg, because | 54 | # Before building the OSTree image, move DPKG data to /usr/dpkg, because |
62 | # OSTree does not preserve the contents of /var | 55 | # OSTree does not preserve the contents of /var |
63 | IMAGE_CMD_ostree_prepend () { | 56 | IMAGE_CMD_ostree_prepend () { |
64 | 57 | mkdir -p usr/dpkg/lib/dpkg | |
65 | install -d ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg | 58 | if [ "$(ls -A var/lib/dpkg)" ]; then |
66 | if [ "$(ls -A ${IMAGE_ROOTFS}/var/lib/dpkg)" ]; then | 59 | mv var/lib/dpkg/* usr/dpkg/lib/dpkg/ |
67 | mv ${IMAGE_ROOTFS}/var/lib/dpkg/* ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg/ | ||
68 | fi | 60 | fi |
69 | } | 61 | } |