From 17dae722fbab32bd477a650b3f6b412b7dc7b20f Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 22 Mar 2021 20:55:06 +0100 Subject: 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 --- images/enea-nfv-access-host-common.inc | 14 +++----------- 1 file 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 () { d.setVar("APPEND", d.getVar("APPEND") + ostree_params) } -# Get rid of GRUB dependencies added by ostree. See: -# https://git.enea.com/cgit/linux/meta-updater.git/tree/classes/image_types_ota.bbclass#n45 -python __anonymous () { - d.delVarFlag("do_image_otaimg", "depends") - d.setVarFlag("do_image_otaimg", "depends", "e2fsprogs-native:do_populate_sysroot") -} - # Before building the OSTree image, move DPKG data to /usr/dpkg, because # OSTree does not preserve the contents of /var IMAGE_CMD_ostree_prepend () { - - install -d ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg - if [ "$(ls -A ${IMAGE_ROOTFS}/var/lib/dpkg)" ]; then - mv ${IMAGE_ROOTFS}/var/lib/dpkg/* ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg/ + mkdir -p usr/dpkg/lib/dpkg + if [ "$(ls -A var/lib/dpkg)" ]; then + mv var/lib/dpkg/* usr/dpkg/lib/dpkg/ fi } -- cgit v1.2.3-54-g00ecf