summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-14 14:31:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:46 +0100
commite6837f785c7f6363697ca9a2d80df006d420ce92 (patch)
tree1a0d45633745c800148ca2c058da3a75ab760381 /meta
parent6882d2d9993c8655a292c93e84ea01b4738a700d (diff)
downloadpoky-e6837f785c7f6363697ca9a2d80df006d420ce92.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
-rw-r--r--meta/classes/populate_sdk_deb.bbclass18
-rw-r--r--meta/classes/populate_sdk_ipk.bbclass3
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass16
-rw-r--r--meta/classes/rootfs_deb.bbclass18
-rw-r--r--meta/classes/rootfs_ipk.bbclass3
-rw-r--r--meta/classes/rootfs_rpm.bbclass16
7 files changed, 38 insertions, 38 deletions
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):
20SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs" 20SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs"
21SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' 21SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
22 22
23inherit populate_sdk_${IMAGE_PKGTYPE} 23inherit rootfs_${IMAGE_PKGTYPE}
24 24
25SDK_DIR = "${WORKDIR}/sdk" 25SDK_DIR = "${WORKDIR}/sdk"
26SDK_OUTPUT = "${SDK_DIR}/image" 26SDK_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 @@
1do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
2
3python () {
4 # Map TARGET_ARCH to Debian's ideas about architectures
5 darch = d.getVar('SDK_ARCH', True)
6 if darch in ["x86", "i486", "i586", "i686", "pentium"]:
7 d.setVar('DEB_SDK_ARCH', 'i386')
8 elif darch == "x86_64":
9 d.setVar('DEB_SDK_ARCH', 'amd64')
10 elif darch == "arm":
11 d.setVar('DEB_SDK_ARCH', 'armel')
12}
13
14
15do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
16
17# This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called
18DPKG_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 @@
1do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
2
3do_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 @@
1# Smart is python based, so be sure python-native is available to us.
2EXTRANATIVEPATH += "python-native"
3
4do_populate_sdk[depends] += "rpm-native:do_populate_sysroot"
5do_populate_sdk[depends] += "rpmresolve-native:do_populate_sysroot"
6do_populate_sdk[depends] += "python-smartpm-native:do_populate_sysroot"
7
8# Needed for update-alternatives
9do_populate_sdk[depends] += "opkg-native:do_populate_sysroot"
10
11# Creating the repo info in do_rootfs
12do_populate_sdk[depends] += "createrepo-native:do_populate_sysroot"
13
14rpmlibdir = "/var/lib/rpm"
15
16do_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 = ""
22 22
23opkglibdir = "${localstatedir}/lib/opkg" 23opkglibdir = "${localstatedir}/lib/opkg"
24 24
25do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
26
27python () {
28 # Map TARGET_ARCH to Debian's ideas about architectures
29 darch = d.getVar('SDK_ARCH', True)
30 if darch in ["x86", "i486", "i586", "i686", "pentium"]:
31 d.setVar('DEB_SDK_ARCH', 'i386')
32 elif darch == "x86_64":
33 d.setVar('DEB_SDK_ARCH', 'amd64')
34 elif darch == "arm":
35 d.setVar('DEB_SDK_ARCH', 'armel')
36}
37
38
39do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
40
41# This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called
42DPKG_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 () {
36 d.setVar('OPKG_POSTPROCESS_COMMANDS', '') 36 d.setVar('OPKG_POSTPROCESS_COMMANDS', '')
37} 37}
38 38
39do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
40
41do_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 () {
40 d.setVar('RPM_POSTPROCESS_COMMANDS', '') 40 d.setVar('RPM_POSTPROCESS_COMMANDS', '')
41 41
42} 42}
43# Smart is python based, so be sure python-native is available to us.
44EXTRANATIVEPATH += "python-native"
45
46do_populate_sdk[depends] += "rpm-native:do_populate_sysroot"
47do_populate_sdk[depends] += "rpmresolve-native:do_populate_sysroot"
48do_populate_sdk[depends] += "python-smartpm-native:do_populate_sysroot"
49
50# Needed for update-alternatives
51do_populate_sdk[depends] += "opkg-native:do_populate_sysroot"
52
53# Creating the repo info in do_rootfs
54do_populate_sdk[depends] += "createrepo-native:do_populate_sysroot"
55
56rpmlibdir = "/var/lib/rpm"
57
58do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"