From 2cf42b49003494e1b10775523c9a2547eaf16ea4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Aug 2014 14:31:40 +0100 Subject: classes: Combine rootfs_ and populate_sdk_ There is no real reason to have these separate files any longer. It does mean in meta-toolchain type recipes some extra variables are defined but it also means the common code can be grouped and maintained together which I believe is more beneficial. We therefore merge the classes. Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_deb.bbclass | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 meta/classes/populate_sdk_deb.bbclass (limited to 'meta/classes/populate_sdk_deb.bbclass') diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass deleted file mode 100644 index 6690e2e2ed..0000000000 --- a/meta/classes/populate_sdk_deb.bbclass +++ /dev/null @@ -1,18 +0,0 @@ -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) - if darch in ["x86", "i486", "i586", "i686", "pentium"]: - d.setVar('DEB_SDK_ARCH', 'i386') - elif darch == "x86_64": - d.setVar('DEB_SDK_ARCH', 'amd64') - elif darch == "arm": - 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