summaryrefslogtreecommitdiffstats
path: root/meta/classes/rootfs_rpm.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r--meta/classes/rootfs_rpm.bbclass29
1 files changed, 9 insertions, 20 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index fb887e57fa..d85d001a62 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -11,15 +11,15 @@ IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("PACKAGE_INSTALL", "smar
11# Smart is python based, so be sure python-native is available to us. 11# Smart is python based, so be sure python-native is available to us.
12EXTRANATIVEPATH += "python-native" 12EXTRANATIVEPATH += "python-native"
13 13
14do_rootfs[depends] += "rpm-native:do_populate_sysroot" 14# opkg is needed for update-alternatives
15do_rootfs[depends] += "rpmresolve-native:do_populate_sysroot" 15RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \
16do_rootfs[depends] += "python-smartpm-native:do_populate_sysroot" 16 rpmresolve-native:do_populate_sysroot \
17 python-smartpm-native:do_populate_sysroot \
18 createrepo-native:do_populate_sysroot \
19 opkg-native:do_populate_sysroot"
17 20
18# Needed for update-alternatives 21do_rootfs[depends] += "${RPMROOTFSDEPENDS}"
19do_rootfs[depends] += "opkg-native:do_populate_sysroot" 22do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
20
21# Creating the repo info in do_rootfs
22do_rootfs[depends] += "createrepo-native:do_populate_sysroot"
23 23
24do_rootfs[recrdeptask] += "do_package_write_rpm" 24do_rootfs[recrdeptask] += "do_package_write_rpm"
25rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME" 25rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME"
@@ -28,6 +28,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
28# RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files 28# RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files
29# in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently 29# in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently
30do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock" 30do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
31do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
31 32
32python () { 33python () {
33 if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): 34 if d.getVar('BUILD_IMAGES_FROM_FEEDS', True):
@@ -43,16 +44,4 @@ python () {
43# Smart is python based, so be sure python-native is available to us. 44# Smart is python based, so be sure python-native is available to us.
44EXTRANATIVEPATH += "python-native" 45EXTRANATIVEPATH += "python-native"
45 46
46do_populate_sdk[depends] += "rpm-native:do_populate_sysroot"
47do_populate_sdk[depends] += "rpmresolve-native:do_populate_sysroot"
48do_populate_sdk[depends] += "python-smartpm-native:do_populate_sysroot"
49
50# Needed for update-alternatives
51do_populate_sdk[depends] += "opkg-native:do_populate_sysroot"
52
53# Creating the repo info in do_rootfs
54do_populate_sdk[depends] += "createrepo-native:do_populate_sysroot"
55
56rpmlibdir = "/var/lib/rpm" 47rpmlibdir = "/var/lib/rpm"
57
58do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"