mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
run-postinsts: simplify the logic of whether to install it to images
The logic is scattered all over the place, but amounts to "install, unless the rootfs is read only". Let's express that directly. (From OE-Core rev: 697804229a172125ce7d3bfc9b343812d6fe3240) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
55928d1237
commit
529244ee21
@@ -29,7 +29,7 @@ IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password
|
||||
IMAGE_GEN_DEBUGFS ?= "0"
|
||||
|
||||
# rootfs bootstrap install
|
||||
ROOTFS_BOOTSTRAP_INSTALL = "${@bb.utils.contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}"
|
||||
ROOTFS_BOOTSTRAP_INSTALL = "run-postinsts"
|
||||
|
||||
# These packages will be removed from a read-only rootfs after all other
|
||||
# packages have been installed
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#
|
||||
|
||||
ROOTFS_PKGMANAGE = "dpkg apt"
|
||||
ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
|
||||
|
||||
do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
|
||||
do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
EXTRAOPKGCONFIG ?= ""
|
||||
ROOTFS_PKGMANAGE = "opkg ${EXTRAOPKGCONFIG}"
|
||||
ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
|
||||
|
||||
do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
|
||||
do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#
|
||||
|
||||
ROOTFS_PKGMANAGE = "rpm dnf"
|
||||
ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
|
||||
|
||||
# dnf is using our custom distutils, and so will fail without these
|
||||
export STAGING_INCDIR
|
||||
|
||||
Reference in New Issue
Block a user