From 96427656ef73bb50753a33ec6ad5e73de711ceb3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Aug 2014 14:32:10 +0100 Subject: rootfs_*: Refactor common depends/lockfile task flags Signed-off-by: Richard Purdie --- meta/classes/rootfs_deb.bbclass | 7 ++----- meta/classes/rootfs_ipk.bbclass | 6 ++---- meta/classes/rootfs_rpm.bbclass | 29 +++++++++-------------------- 3 files changed, 13 insertions(+), 29 deletions(-) diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 5add7a8a5f..d51b4582d2 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -6,11 +6,13 @@ 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" do_rootfs[recrdeptask] += "do_package_write_deb" rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME" do_rootfs[vardeps] += "PACKAGE_FEED_URIS" do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" +do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" python rootfs_deb_bad_recommendations() { if d.getVar("BAD_RECOMMENDATIONS", True): @@ -22,8 +24,6 @@ DEB_POSTPROCESS_COMMANDS = "" opkglibdir = "${localstatedir}/lib/opkg" -do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot" - python () { # Map TARGET_ARCH to Debian's ideas about architectures darch = d.getVar('SDK_ARCH', True) @@ -35,8 +35,5 @@ python () { d.setVar('DEB_SDK_ARCH', 'armel') } - -do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" - # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg" diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 288d9aae4d..6139cc7d59 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -10,11 +10,13 @@ ROOTFS_PKGMANAGE = "opkg opkg-collateral ${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" do_rootfs[recrdeptask] += "do_package_write_ipk" do_rootfs[vardeps] += "PACKAGE_FEED_URIS" rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME" do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" +do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" OPKG_PREPROCESS_COMMANDS = "" @@ -35,7 +37,3 @@ python () { d.setVar('OPKG_PREPROCESS_COMMANDS', "") d.setVar('OPKG_POSTPROCESS_COMMANDS', '') } - -do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" - -do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" 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" -- cgit v1.2.3