From 2501287c69c67579f86b75839a410e5808f528dc 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 (From OE-Core rev: 96427656ef73bb50753a33ec6ad5e73de711ceb3) Signed-off-by: Richard Purdie --- meta/classes/rootfs_deb.bbclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'meta/classes/rootfs_deb.bbclass') 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" -- cgit v1.2.3-54-g00ecf