diff options
| author | David Nyström <david.c.nystrom@gmail.com> | 2014-02-27 21:20:38 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-07 15:05:08 +0000 |
| commit | f9c7936045d40cef56c2422f6d39b55500ebabc1 (patch) | |
| tree | 6a1389003515308d696bbbe0ede0b832ae5d8da9 | |
| parent | 7af3eb8434c3347b44a906a8d557cccf2cf3ba97 (diff) | |
| download | poky-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.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 1 |
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" | |||
| 8 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" | 8 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" |
| 9 | do_rootfs[recrdeptask] += "do_package_write_deb" | 9 | do_rootfs[recrdeptask] += "do_package_write_deb" |
| 10 | rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME" | 10 | rootfs_deb_do_rootfs[vardepsexclude] += "BUILDNAME" |
| 11 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS" | ||
| 11 | 12 | ||
| 12 | do_rootfs[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | 13 | do_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 | ||
| 12 | do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" | 12 | do_rootfs[depends] += "opkg-native:do_populate_sysroot opkg-utils-native:do_populate_sysroot" |
| 13 | do_rootfs[recrdeptask] += "do_package_write_ipk" | 13 | do_rootfs[recrdeptask] += "do_package_write_ipk" |
| 14 | do_rootfs[vardeps] += "PACKAGE_FEED_URIS" | ||
| 14 | rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME" | 15 | rootfs_ipk_do_rootfs[vardepsexclude] += "BUILDNAME" |
| 15 | 16 | ||
| 16 | do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" | 17 | do_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 | ||
| 24 | do_rootfs[recrdeptask] += "do_package_write_rpm" | 24 | do_rootfs[recrdeptask] += "do_package_write_rpm" |
| 25 | rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME" | 25 | rootfs_rpm_do_rootfs[vardepsexclude] += "BUILDNAME" |
| 26 | do_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 |