summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-11-10 10:05:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-24 15:50:27 +0000
commitcf218e56afb82458d554608c137bdbed83acb76b (patch)
treead6d93ccaaabacd8978e8d631d0203fbdb2818ae
parent7d8616c2fc11add194a157402999b385024e447e (diff)
downloadpoky-cf218e56afb82458d554608c137bdbed83acb76b.tar.gz
rootfs_*.bbclass: don't add BUILDNAME to do_rootfs vardepsexclude
* rootfs_*.bbclass doesn't use this variable anymore, so we can drop it (From OE-Core rev: bf91547d887aee2893e26e6073e12c540222b422) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_deb.bbclass1
-rw-r--r--meta/classes/rootfs_ipk.bbclass1
-rw-r--r--meta/classes/rootfs_rpm.bbclass1
3 files changed, 0 insertions, 3 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index d51b4582d2..f79fca608e 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -8,7 +8,6 @@ ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
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_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
10do_rootfs[recrdeptask] += "do_package_write_deb" 10do_rootfs[recrdeptask] += "do_package_write_deb"
11rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME"
12do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 11do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
13 12
14do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 13do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index dd144e49ef..d417800b22 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -13,7 +13,6 @@ do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_popu
13do_populate_sdk[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"
14do_rootfs[recrdeptask] += "do_package_write_ipk" 14do_rootfs[recrdeptask] += "do_package_write_ipk"
15do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 15do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
16rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME"
17 16
18do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" 17do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
19do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" 18do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index d85d001a62..b4cd55b289 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -22,7 +22,6 @@ do_rootfs[depends] += "${RPMROOTFSDEPENDS}"
22do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}" 22do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
23 23
24do_rootfs[recrdeptask] += "do_package_write_rpm" 24do_rootfs[recrdeptask] += "do_package_write_rpm"
25rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME"
26do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 25do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
27 26
28# RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files 27# RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files