diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 127e62d5d9..405fd73c04 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -29,7 +29,7 @@ IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password | |||
29 | IMAGE_GEN_DEBUGFS ?= "0" | 29 | IMAGE_GEN_DEBUGFS ?= "0" |
30 | 30 | ||
31 | # rootfs bootstrap install | 31 | # rootfs bootstrap install |
32 | ROOTFS_BOOTSTRAP_INSTALL = "${@bb.utils.contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}" | 32 | ROOTFS_BOOTSTRAP_INSTALL = "run-postinsts" |
33 | 33 | ||
34 | # These packages will be removed from a read-only rootfs after all other | 34 | # These packages will be removed from a read-only rootfs after all other |
35 | # packages have been installed | 35 | # packages have been installed |
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index e8facd4368..10af4b5ff0 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
@@ -3,7 +3,6 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | ROOTFS_PKGMANAGE = "dpkg apt" | 5 | ROOTFS_PKGMANAGE = "dpkg apt" |
6 | ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" | ||
7 | 6 | ||
8 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" | 7 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" |
9 | do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot" | 8 | do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot" |
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 6b60c46638..a57b1d34f7 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass | |||
@@ -7,7 +7,6 @@ | |||
7 | 7 | ||
8 | EXTRAOPKGCONFIG ?= "" | 8 | EXTRAOPKGCONFIG ?= "" |
9 | ROOTFS_PKGMANAGE = "opkg ${EXTRAOPKGCONFIG}" | 9 | ROOTFS_PKGMANAGE = "opkg ${EXTRAOPKGCONFIG}" |
10 | ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" | ||
11 | 10 | ||
12 | do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" | 11 | do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" |
13 | do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" | 12 | do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" |
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 65881a60a7..af0f23877a 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -3,7 +3,6 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | ROOTFS_PKGMANAGE = "rpm dnf" | 5 | ROOTFS_PKGMANAGE = "rpm dnf" |
6 | ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" | ||
7 | 6 | ||
8 | # dnf is using our custom distutils, and so will fail without these | 7 | # dnf is using our custom distutils, and so will fail without these |
9 | export STAGING_INCDIR | 8 | export STAGING_INCDIR |