sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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:
Alexander Kanavin 2017-02-17 18:47:22 +02:00 committed by Richard Purdie
parent 55928d1237
commit 529244ee21
10 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-selftest/recipes-test/images/oe-selftest-image.bb
View File

@ -1,6 +1,6 @@
SUMMARY = "An image used during oe-selftest tests" SUMMARY = "An image used during oe-selftest tests"
IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} dropbear" IMAGE_INSTALL = "packagegroup-core-boot dropbear"
IMAGE_FEATURES = "debug-tweaks" IMAGE_FEATURES = "debug-tweaks"
IMAGE_LINGUAS = " " IMAGE_LINGUAS = " "

2
meta-selftest/recipes-test/images/wic-image-minimal.bb
View File

@ -2,7 +2,7 @@ SUMMARY = "An example of partitioned image."
SRC_URI = "file://${FILE_DIRNAME}/${BPN}.wks" SRC_URI = "file://${FILE_DIRNAME}/${BPN}.wks"
IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP}" IMAGE_INSTALL = "packagegroup-core-boot"
IMAGE_FSTYPES = "wic" IMAGE_FSTYPES = "wic"

2
meta/classes/image.bbclass
View File

@ -29,7 +29,7 @@ IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password
IMAGE_GEN_DEBUGFS ?= "0" IMAGE_GEN_DEBUGFS ?= "0"
# rootfs bootstrap install # 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 # These packages will be removed from a read-only rootfs after all other
# packages have been installed # packages have been installed

1
meta/classes/rootfs_deb.bbclass
View File

@ -3,7 +3,6 @@
# #
ROOTFS_PKGMANAGE = "dpkg apt" ROOTFS_PKGMANAGE = "dpkg apt"
ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" 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" do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"

1
meta/classes/rootfs_ipk.bbclass
View File

@ -7,7 +7,6 @@
EXTRAOPKGCONFIG ?= "" EXTRAOPKGCONFIG ?= ""
ROOTFS_PKGMANAGE = "opkg ${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_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" do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"

1
meta/classes/rootfs_rpm.bbclass
View File

@ -3,7 +3,6 @@
# #
ROOTFS_PKGMANAGE = "rpm dnf" ROOTFS_PKGMANAGE = "rpm dnf"
ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
# dnf is using our custom distutils, and so will fail without these # dnf is using our custom distutils, and so will fail without these
export STAGING_INCDIR export STAGING_INCDIR

2
meta/lib/oe/manifest.py
View File

@ -104,7 +104,7 @@ class Manifest(object, metaclass=ABCMeta):
pkg_list['lgp'] = \ pkg_list['lgp'] = \
"locale-base-en-us locale-base-en-gb" "locale-base-en-us locale-base-en-gb"
elif image_rootfs.find("core-image-minimal") > 0: elif image_rootfs.find("core-image-minimal") > 0:
pkg_list[self.PKG_TYPE_MUST_INSTALL] = "run-postinsts packagegroup-core-boot" pkg_list[self.PKG_TYPE_MUST_INSTALL] = "packagegroup-core-boot"
with open(self.initial_manifest, "w+") as manifest: with open(self.initial_manifest, "w+") as manifest:
manifest.write(self.initial_manifest_file_header) manifest.write(self.initial_manifest_file_header)

2
meta/recipes-core/images/core-image-minimal.bb
View File

@ -1,6 +1,6 @@
SUMMARY = "A small image just capable of allowing a device to boot." SUMMARY = "A small image just capable of allowing a device to boot."
IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" IMAGE_INSTALL = "packagegroup-core-boot ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_LINGUAS = " " IMAGE_LINGUAS = " "

2
meta/recipes-devtools/dpkg/dpkg.inc
View File

@ -4,7 +4,7 @@ SECTION = "base"
DEPENDS = "zlib bzip2 perl ncurses" DEPENDS = "zlib bzip2 perl ncurses"
DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native"
RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl" RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz perl"
RDEPENDS_${PN}_class-native = "xz-native" RDEPENDS_${PN}_class-native = "xz-native"
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/"

2
meta/recipes-devtools/opkg/opkg_0.3.4.bb
View File

@ -59,7 +59,7 @@ do_install_append () {
fi fi
} }
RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config run-postinsts libarchive" RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive"
RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-nativesdk = ""
RREPLACES_${PN} = "opkg-nogpg opkg-collateral" RREPLACES_${PN} = "opkg-nogpg opkg-collateral"