diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-14 14:32:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 08:43:27 +0100 |
| commit | 96427656ef73bb50753a33ec6ad5e73de711ceb3 (patch) | |
| tree | dd73ec6b074a611b13bb3d80f8b00dc9985ceb1a /meta/classes/rootfs_rpm.bbclass | |
| parent | 2cf42b49003494e1b10775523c9a2547eaf16ea4 (diff) | |
| download | openembedded-core-contrib-96427656ef73bb50753a33ec6ad5e73de711ceb3.tar.gz | |
rootfs_*: Refactor common depends/lockfile task flags
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 29 |
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 # Smart is python based, so be sure python-native is available to us. EXTRANATIVEPATH += "python-native" -do_rootfs[depends] += "rpm-native:do_populate_sysroot" -do_rootfs[depends] += "rpmresolve-native:do_populate_sysroot" -do_rootfs[depends] += "python-smartpm-native:do_populate_sysroot" +# opkg is needed for update-alternatives +RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \ + rpmresolve-native:do_populate_sysroot \ + python-smartpm-native:do_populate_sysroot \ + createrepo-native:do_populate_sysroot \ + opkg-native:do_populate_sysroot" -# Needed for update-alternatives -do_rootfs[depends] += "opkg-native:do_populate_sysroot" - -# Creating the repo info in do_rootfs -do_rootfs[depends] += "createrepo-native:do_populate_sysroot" +do_rootfs[depends] += "${RPMROOTFSDEPENDS}" +do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}" do_rootfs[recrdeptask] += "do_package_write_rpm" rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME" @@ -28,6 +28,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS" # RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files # in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock" +do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock" python () { if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): @@ -43,16 +44,4 @@ python () { # Smart is python based, so be sure python-native is available to us. EXTRANATIVEPATH += "python-native" -do_populate_sdk[depends] += "rpm-native:do_populate_sysroot" -do_populate_sdk[depends] += "rpmresolve-native:do_populate_sysroot" -do_populate_sdk[depends] += "python-smartpm-native:do_populate_sysroot" - -# Needed for update-alternatives -do_populate_sdk[depends] += "opkg-native:do_populate_sysroot" - -# Creating the repo info in do_rootfs -do_populate_sdk[depends] += "createrepo-native:do_populate_sysroot" - rpmlibdir = "/var/lib/rpm" - -do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock" |