diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-05-07 14:35:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-15 17:18:21 +0100 |
commit | 32f185b0cf40b897a36f42cf3553e895dc924663 (patch) | |
tree | c3310f46e668047eba62d58ad8c7ec2a109a6919 /meta | |
parent | 81aabb718e4ac8c3baf683b9eb93ecb24bf48271 (diff) | |
download | poky-32f185b0cf40b897a36f42cf3553e895dc924663.tar.gz |
lsb-release: fix reproducibility failure
Make sure help2man output is reproducible. Fixes:
| .\"·DO·NOT·MODIFY·THIS·FILE!··It·was·generated·by·help2man·1.022. .\"·DO·NOT·MODIFY·THIS·FILE!··It·was·generated·by·help2man·1.022.
| .TH·FSG·"1"·"April·2021"·"FSG·lsb_release·v1.4"·FSG .TH·FSG·"1"·"May·2021"·"FSG·lsb_release·v1.4"·FSG
| .SH·NAME 3 .SH·NAME
(From OE-Core rev: e73898b59eb79d20082963e629ce6f8cc75103c9)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 49371207a7f1fe3d3feb7b8b9aabb62b43ae34d1)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch | 27 | ||||
-rw-r--r-- | meta/recipes-extended/lsb/lsb-release_1.4.bb | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch b/meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch new file mode 100644 index 0000000000..f32cd18370 --- /dev/null +++ b/meta/recipes-extended/lsb/lsb-release/help2man-reproducibility.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | lsb-release maintains it's own copy of help2man. Include the support | ||
2 | for specifying SOURCE_DATE_EPOCH from upstream. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
7 | |||
8 | diff --git a/help2man b/help2man | ||
9 | index 13015c2..63439db 100755 | ||
10 | --- a/help2man | ||
11 | +++ b/help2man | ||
12 | @@ -173,7 +173,14 @@ my ($help_text, $version_text) = map { | ||
13 | or die "$this_program: can't get `--$_' info from $ARGV[0]\n" | ||
14 | } qw(help), $opt_version_key; | ||
15 | |||
16 | -my $date = strftime "%B %Y", localtime; | ||
17 | +my $epoch_secs = time; | ||
18 | +if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/) | ||
19 | +{ | ||
20 | + $epoch_secs = $1; | ||
21 | + $ENV{TZ} = 'UTC0'; | ||
22 | +} | ||
23 | + | ||
24 | +my $date = strftime "%B %Y", localtime $epoch_secs; | ||
25 | (my $program = $ARGV[0]) =~ s!.*/!!; | ||
26 | my $package = $program; | ||
27 | my $version; | ||
diff --git a/meta/recipes-extended/lsb/lsb-release_1.4.bb b/meta/recipes-extended/lsb/lsb-release_1.4.bb index 3e8f7a13ec..bafc18fcc0 100644 --- a/meta/recipes-extended/lsb/lsb-release_1.4.bb +++ b/meta/recipes-extended/lsb/lsb-release_1.4.bb | |||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" | |||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ |
12 | file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ | 12 | file://0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch \ |
13 | file://0001-Remove-timestamp-from-manpage.patch \ | 13 | file://0001-Remove-timestamp-from-manpage.patch \ |
14 | file://help2man-reproducibility.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" | 17 | SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" |