summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoic Domaigne <tech@domaigne.com>2020-11-16 22:24:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-17 21:53:14 +0000
commit3ca9265dbe37e9dc86313c40f09165ae04c44d3d (patch)
treec711ce80423d9103b3f0b221c431e0df1a8f371d
parent749091eac952feed60e7b71860a9a87b02afa704 (diff)
downloadpoky-3ca9265dbe37e9dc86313c40f09165ae04c44d3d.tar.gz
roofs_*.bbclass: fix missing vardeps for do_rootfs
As per lib/oe/rootfs.py and lib/oe/package_manager/???/__init__.py the PACKAGE_FEED baseurl is defined as the joined paths of: URIS/BASE_PATHS/ARCHS Therefore, the do_rootfs task should depend furthermore on PACKAGE_FEED_{BASE_PATHS,ARCHS} to properly retrigger a build if the value changes. (From OE-Core rev: e5329464f5ebad909c4c9bd27a718bbd8f4cc221) Signed-off-by: Loic Domaigne (ljd) <tech@domaigne.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs_deb.bbclass2
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
-rw-r--r--meta/classes/rootfs_rpm.bbclass2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 2b93796a76..ef616da229 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -7,7 +7,7 @@ ROOTFS_PKGMANAGE = "dpkg apt"
7do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" 7do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
8do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot" 8do_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 do_package_qa" 9do_rootfs[recrdeptask] += "do_package_write_deb do_package_qa"
10do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 10do_rootfs[vardeps] += "PACKAGE_FEED_URIS PACKAGE_FEED_BASE_PATHS PACKAGE_FEED_ARCHS"
11 11
12do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 12do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
13do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 13do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index e73d2bfdae..f1e0219732 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -11,7 +11,7 @@ ROOTFS_PKGMANAGE = "opkg ${EXTRAOPKGCONFIG}"
11do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" 11do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
12do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" 12do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot"
13do_rootfs[recrdeptask] += "do_package_write_ipk do_package_qa" 13do_rootfs[recrdeptask] += "do_package_write_ipk do_package_qa"
14do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 14do_rootfs[vardeps] += "PACKAGE_FEED_URIS PACKAGE_FEED_BASE_PATHS PACKAGE_FEED_ARCHS"
15 15
16do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" 16do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock"
17do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" 17do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 82584f386c..0af7d65b1a 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -24,7 +24,7 @@ do_rootfs[depends] += "${RPMROOTFSDEPENDS}"
24do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}" 24do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}"
25 25
26do_rootfs[recrdeptask] += "do_package_write_rpm do_package_qa" 26do_rootfs[recrdeptask] += "do_package_write_rpm do_package_qa"
27do_rootfs[vardeps] += "PACKAGE_FEED_URIS" 27do_rootfs[vardeps] += "PACKAGE_FEED_URIS PACKAGE_FEED_BASE_PATHS PACKAGE_FEED_ARCHS"
28 28
29python () { 29python () {
30 if d.getVar('BUILD_IMAGES_FROM_FEEDS'): 30 if d.getVar('BUILD_IMAGES_FROM_FEEDS'):