summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-14 14:32:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:46 +0100
commit2501287c69c67579f86b75839a410e5808f528dc (patch)
treecaaae6c93a7abe4005c868eb90dff48671c8d20d
parente6837f785c7f6363697ca9a2d80df006d420ce92 (diff)
downloadpoky-2501287c69c67579f86b75839a410e5808f528dc.tar.gz
rootfs_*: Refactor common depends/lockfile task flags
(From OE-Core rev: 96427656ef73bb50753a33ec6ad5e73de711ceb3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_deb.bbclass7
-rw-r--r--meta/classes/rootfs_ipk.bbclass6
-rw-r--r--meta/classes/rootfs_rpm.bbclass29
3 files changed, 13 insertions, 29 deletions
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"
6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
7 7
8do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" 8do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
9do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
9do_rootfs[recrdeptask] += "do_package_write_deb" 10do_rootfs[recrdeptask] += "do_package_write_deb"
10rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME" 11rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME"
11do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 12do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
12 13
13do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 14do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
15do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
14 16
15python rootfs_deb_bad_recommendations() { 17python rootfs_deb_bad_recommendations() {
16 if d.getVar("BAD_RECOMMENDATIONS", True): 18 if d.getVar("BAD_RECOMMENDATIONS", True):
@@ -22,8 +24,6 @@ DEB_POSTPROCESS_COMMANDS = ""
22 24
23opkglibdir = "${localstatedir}/lib/opkg" 25opkglibdir = "${localstatedir}/lib/opkg"
24 26
25do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
26
27python () { 27python () {
28 # Map TARGET_ARCH to Debian's ideas about architectures 28 # Map TARGET_ARCH to Debian's ideas about architectures
29 darch = d.getVar('SDK_ARCH', True) 29 darch = d.getVar('SDK_ARCH', True)
@@ -35,8 +35,5 @@ python () {
35 d.setVar('DEB_SDK_ARCH', 'armel') 35 d.setVar('DEB_SDK_ARCH', 'armel')
36} 36}
37 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 38# 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" 39DPKG_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 288d9aae4d..6139cc7d59 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -10,11 +10,13 @@ ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}"
10ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 10ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
11 11
12do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" 12do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
13do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
13do_rootfs[recrdeptask] += "do_package_write_ipk" 14do_rootfs[recrdeptask] += "do_package_write_ipk"
14do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 15do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
15rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME" 16rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME"
16 17
17do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" 18do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
19do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
18 20
19OPKG_PREPROCESS_COMMANDS = "" 21OPKG_PREPROCESS_COMMANDS = ""
20 22
@@ -35,7 +37,3 @@ python () {
35 d.setVar('OPKG_PREPROCESS_COMMANDS', "") 37 d.setVar('OPKG_PREPROCESS_COMMANDS', "")
36 d.setVar('OPKG_POSTPROCESS_COMMANDS', '') 38 d.setVar('OPKG_POSTPROCESS_COMMANDS', '')
37} 39}
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 fb887e57fa..d85d001a62 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -11,15 +11,15 @@ IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("PACKAGE_INSTALL", "smar
11# Smart is python based, so be sure python-native is available to us. 11# Smart is python based, so be sure python-native is available to us.
12EXTRANATIVEPATH += "python-native" 12EXTRANATIVEPATH += "python-native"
13 13
14do_rootfs[depends] += "rpm-native:do_populate_sysroot" 14# opkg is needed for update-alternatives
15do_rootfs[depends] += "rpmresolve-native:do_populate_sysroot" 15RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \
16do_rootfs[depends] += "python-smartpm-native:do_populate_sysroot" 16 rpmresolve-native:do_populate_sysroot \
17 python-smartpm-native:do_populate_sysroot \
18 createrepo-native:do_populate_sysroot \
19 opkg-native:do_populate_sysroot"
17 20
18# Needed for update-alternatives 21do_rootfs[depends] += "${RPMROOTFSDEPENDS}"
19do_rootfs[depends] += "opkg-native:do_populate_sysroot" 22do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
20
21# Creating the repo info in do_rootfs
22do_rootfs[depends] += "createrepo-native:do_populate_sysroot"
23 23
24do_rootfs[recrdeptask] += "do_package_write_rpm" 24do_rootfs[recrdeptask] += "do_package_write_rpm"
25rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME" 25rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME"
@@ -28,6 +28,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
28# RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files 28# RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files
29# in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently 29# in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently
30do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock" 30do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
31do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
31 32
32python () { 33python () {
33 if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): 34 if d.getVar('BUILD_IMAGES_FROM_FEEDS', True):
@@ -43,16 +44,4 @@ python () {
43# Smart is python based, so be sure python-native is available to us. 44# Smart is python based, so be sure python-native is available to us.
44EXTRANATIVEPATH += "python-native" 45EXTRANATIVEPATH += "python-native"
45 46
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" 47rpmlibdir = "/var/lib/rpm"
57
58do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"