From 409e90e04504715028019eb09cb75425a47ab3ee Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 3 Nov 2020 10:44:46 +0100 Subject: cleanup: remove run-postinsts, dpkg status-old - initramfs: remove run-postinsts package, it has no purpose as there is no package manager inside the initramfs; - rootfs: remove run-postinsts if the package manager is DPKG/APT, since it duplicates the existing dpkg-configure.service installed by the dpkg recipe; - rootfs: cleanup DPKG backup file 'status-old', it contains information about packages before the final installation stages of the rootfs build process (completely irrelevant for the end user), saves >500kB; Change-Id: I6bd257d56805a3dfee4478c88977942e9f210afc Signed-off-by: Alexandru Avadanii --- images/core-image-minimal-initramfs.bbappend | 4 +++- images/enea-nfv-access-common.inc | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'images') diff --git a/images/core-image-minimal-initramfs.bbappend b/images/core-image-minimal-initramfs.bbappend index e743bb3..5512158 100644 --- a/images/core-image-minimal-initramfs.bbappend +++ b/images/core-image-minimal-initramfs.bbappend @@ -4,6 +4,9 @@ PACKAGE_INSTALL += " nfv-installer kernel-modules" # ostree version specified in the kernel command line PACKAGE_INSTALL_append_sota = " ostree-switchroot" +# run-postinsts does not belong in the minimal initramfs +PACKAGE_INSTALL_remove = "run-postinsts" + create_enea_symlink() { # enea image used in bare metal installation cd ${DEPLOY_DIR_IMAGE} @@ -12,4 +15,3 @@ create_enea_symlink() { } IMAGE_POSTPROCESS_COMMAND_append += " create_enea_symlink;" - diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index 3f9fc84..5472056 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc @@ -7,6 +7,17 @@ IMAGE_INSTALL += " \ kernel-modules \ " +# run-postinsts duplicates dpkg-configure if package_deb is used +PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}" + +# After installing packages inside the rootfs, remove backup DPKG status file +rootfs_postinstall_dpkg_cleanup () { + if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then + rm -f ${IMAGE_ROOTFS}/var/lib/dpkg/status-old + fi +} +ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" + IMAGE_FSTYPES = "ext4 ext4.gz tar.gz" # Add ostree specific image types if sota support is set -- cgit v1.2.3-54-g00ecf