diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-21 10:07:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-02 16:53:08 +0000 |
commit | e24afc304af2212ba5253b20fcabb958275ed4cc (patch) | |
tree | f4a94637033d177b68b600c8bd97608e2624638f /meta | |
parent | 22c84eea241d3d253b7ccaf11b0a3019a8598030 (diff) | |
download | poky-e24afc304af2212ba5253b20fcabb958275ed4cc.tar.gz |
reproducible_build/package_XXX: Ensure SDE task is in dependency chain
(From OE-Core rev: c8c0757f06a8cfa2159575e0b98530b899a889b1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 938e4dfb68a465f61cb754b2cd28d0728616b5a9)
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/package_deb.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/reproducible_build.bbclass | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 790b26aef2..fa8c6c82ff 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -315,8 +315,8 @@ do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" | |||
315 | do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" | 315 | do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" |
316 | do_package_write_deb[umask] = "022" | 316 | do_package_write_deb[umask] = "022" |
317 | do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" | 317 | do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" |
318 | addtask package_write_deb after do_packagedata do_package | 318 | EPOCHTASK ??= "" |
319 | 319 | addtask package_write_deb after do_packagedata do_package ${EPOCHTASK} | |
320 | 320 | ||
321 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" | 321 | PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" |
322 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" | 322 | PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index c008559e4a..4927cfba00 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -274,7 +274,8 @@ do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" | |||
274 | do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" | 274 | do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" |
275 | do_package_write_ipk[umask] = "022" | 275 | do_package_write_ipk[umask] = "022" |
276 | do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" | 276 | do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" |
277 | addtask package_write_ipk after do_packagedata do_package | 277 | EPOCHTASK ??= "" |
278 | addtask package_write_ipk after do_packagedata do_package ${EPOCHTASK} | ||
278 | 279 | ||
279 | PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" | 280 | PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" |
280 | PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" | 281 | PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" |
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index fc9007922a..65587d228b 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -743,7 +743,8 @@ do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" | |||
743 | do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" | 743 | do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" |
744 | do_package_write_rpm[umask] = "022" | 744 | do_package_write_rpm[umask] = "022" |
745 | do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" | 745 | do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" |
746 | addtask package_write_rpm after do_packagedata do_package | 746 | EPOCHTASK ??= "" |
747 | addtask package_write_rpm after do_packagedata do_package ${EPOCHTASK} | ||
747 | 748 | ||
748 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" | 749 | PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" |
749 | PACKAGEINDEXDEPS += "createrepo-c-native:do_populate_sysroot" | 750 | PACKAGEINDEXDEPS += "createrepo-c-native:do_populate_sysroot" |
diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 2b402b9966..3c01dbd5b3 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass | |||
@@ -106,6 +106,8 @@ python create_source_date_epoch_stamp() { | |||
106 | os.rename(tmp_file, epochfile) | 106 | os.rename(tmp_file, epochfile) |
107 | } | 107 | } |
108 | 108 | ||
109 | EPOCHTASK = "do_deploy_source_date_epoch" | ||
110 | |||
109 | # Generate the stamp after do_unpack runs | 111 | # Generate the stamp after do_unpack runs |
110 | do_unpack[postfuncs] += "create_source_date_epoch_stamp" | 112 | do_unpack[postfuncs] += "create_source_date_epoch_stamp" |
111 | 113 | ||