summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Nyström <david.c.nystrom@gmail.com>2014-02-27 21:20:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 15:05:08 +0000
commitf9c7936045d40cef56c2422f6d39b55500ebabc1 (patch)
tree6a1389003515308d696bbbe0ede0b832ae5d8da9
parent7af3eb8434c3347b44a906a8d557cccf2cf3ba97 (diff)
downloadpoky-f9c7936045d40cef56c2422f6d39b55500ebabc1.tar.gz
do_rootfs: Add PACKAGE_FEED_URIS as a vardep
A bit uncertain on where to put this, suggestions welcome. Needed to automatically rebuild do_rootfs when PACKAGE_FEED_URIS change. (From OE-Core rev: c779bf78f2e1f66f3c8a6b02054e39bee4ea88a5) Signed-off-by: David Nyström <david.c.nystrom@gmail.com> Signed-off-by: David Nyström <david.nystrom@enea.com> Signed-off-by: Saul Wold <sgw@linux.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, 3 insertions, 0 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 728ea0e2d1..a42a472822 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -8,6 +8,7 @@ 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_rootfs[recrdeptask] += "do_package_write_deb" 9do_rootfs[recrdeptask] += "do_package_write_deb"
10rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME" 10rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME"
11do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
11 12
12do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 13do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
13 14
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 1887dd3565..f5fef00166 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -11,6 +11,7 @@ ROOTFS_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_rootfs[recrdeptask] += "do_package_write_ipk" 13do_rootfs[recrdeptask] += "do_package_write_ipk"
14do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
14rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME" 15rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME"
15 16
16do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" 17do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 032dabcd0c..4b02247d49 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -23,6 +23,7 @@ do_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"
26do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
26 27
27# 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
28# 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