diff options
author | Loic Domaigne <tech@domaigne.com> | 2020-11-16 22:24:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-09 23:49:01 +0000 |
commit | a1b95d367457c73f60e218f3918a4bf7f11f260a (patch) | |
tree | 4b59575ddfaf76d54b51c8342447d2ad9e9fe429 /meta | |
parent | 0cde674b1eb5fe757713abc951ba9224c8d18cc1 (diff) | |
download | poky-a1b95d367457c73f60e218f3918a4bf7f11f260a.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: 5ebd147ecb59a8b3b9919c5c96ebc1dd66fefa36)
Signed-off-by: Loic Domaigne (ljd) <tech@domaigne.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e5329464f5ebad909c4c9bd27a718bbd8f4cc221)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 2 |
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" | |||
7 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" | 7 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" |
8 | do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot" | 8 | do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot" |
9 | do_rootfs[recrdeptask] += "do_package_write_deb do_package_qa" | 9 | do_rootfs[recrdeptask] += "do_package_write_deb do_package_qa" |
10 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS" | 10 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS PACKAGE_FEED_BASE_PATHS PACKAGE_FEED_ARCHS" |
11 | 11 | ||
12 | do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | 12 | do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" |
13 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | 13 | do_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}" | |||
11 | do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" | 11 | do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" |
12 | do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" | 12 | do_populate_sdk[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" |
13 | do_rootfs[recrdeptask] += "do_package_write_ipk do_package_qa" | 13 | do_rootfs[recrdeptask] += "do_package_write_ipk do_package_qa" |
14 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS" | 14 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS PACKAGE_FEED_BASE_PATHS PACKAGE_FEED_ARCHS" |
15 | 15 | ||
16 | do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" | 16 | do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" |
17 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" | 17 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" |
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 51f89ea990..ae0f541c49 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -24,7 +24,7 @@ do_rootfs[depends] += "${RPMROOTFSDEPENDS}" | |||
24 | do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}" | 24 | do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}" |
25 | 25 | ||
26 | do_rootfs[recrdeptask] += "do_package_write_rpm do_package_qa" | 26 | do_rootfs[recrdeptask] += "do_package_write_rpm do_package_qa" |
27 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS" | 27 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS PACKAGE_FEED_BASE_PATHS PACKAGE_FEED_ARCHS" |
28 | 28 | ||
29 | python () { | 29 | python () { |
30 | if d.getVar('BUILD_IMAGES_FROM_FEEDS'): | 30 | if d.getVar('BUILD_IMAGES_FROM_FEEDS'): |