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_base.bbclass | 2 +- meta/classes/populate_sdk_deb.bbclass | 18 ------------------ meta/classes/populate_sdk_ipk.bbclass | 3 --- meta/classes/populate_sdk_rpm.bbclass | 16 ---------------- meta/classes/rootfs_deb.bbclass | 18 ++++++++++++++++++ meta/classes/rootfs_ipk.bbclass | 3 +++ meta/classes/rootfs_rpm.bbclass | 16 ++++++++++++++++ 7 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 meta/classes/populate_sdk_deb.bbclass delete mode 100644 meta/classes/populate_sdk_ipk.bbclass delete mode 100644 meta/classes/populate_sdk_rpm.bbclass diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 06112dcf81..8736942fd2 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -20,7 +20,7 @@ def complementary_globs(featurevar, d): SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs" SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' -inherit populate_sdk_${IMAGE_PKGTYPE} +inherit rootfs_${IMAGE_PKGTYPE} SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" 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" diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass deleted file mode 100644 index 8b2cb6dc48..0000000000 --- a/meta/classes/populate_sdk_ipk.bbclass +++ /dev/null @@ -1,3 +0,0 @@ -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/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass deleted file mode 100644 index 4954d00490..0000000000 --- a/meta/classes/populate_sdk_rpm.bbclass +++ /dev/null @@ -1,16 +0,0 @@ -# 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" diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index a42a472822..5add7a8a5f 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -22,3 +22,21 @@ 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) + 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" diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index f5fef00166..288d9aae4d 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -36,3 +36,6 @@ python () { 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 9e97d341d9..fb887e57fa 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -40,3 +40,19 @@ python () { d.setVar('RPM_POSTPROCESS_COMMANDS', '') } +# 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 1.2.3-korg