sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

classes: Combine rootfs_<pkgtype> and populate_sdk_<pkgtype> 

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.

(From OE-Core rev: 2cf42b49003494e1b10775523c9a2547eaf16ea4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2014-08-14 14:31:40 +01:00
parent 6882d2d999
commit e6837f785c
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/populate_sdk_base.bbclass
View File

@ -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"

18
meta/classes/populate_sdk_deb.bbclass
View File

@ -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"

3
meta/classes/populate_sdk_ipk.bbclass
View File

@ -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"

16
meta/classes/populate_sdk_rpm.bbclass
View File

@ -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"

18
meta/classes/rootfs_deb.bbclass
View File

@ -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"

3
meta/classes/rootfs_ipk.bbclass
View File

@ -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"

16
meta/classes/rootfs_rpm.bbclass
View File

@ -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"