summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-11-22 13:58:29 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:25:33 +0000
commit6c04d113647b872e8d0bb8d40ff475eebcbdd94d (patch)
tree5bdd57c54b36fbdfe4fe76d513a9105804e7e13e
parent885ff683f0498adf404d87efb6a20c08484a73bd (diff)
downloadpoky-6c04d113647b872e8d0bb8d40ff475eebcbdd94d.tar.gz
ltp: improve reproducibility
ltp package contains several gzipped files. Improve reproducibility of the build by ensuring the gzipped files do not contain timestamps in their headers. https://wiki.debian.org/ReproducibleBuilds/TimestampsInGzipHeaders (From OE-Core rev: d4ac52bef9f5364619fcb8e2f8c05927d660fff7) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch20
-rw-r--r--meta/recipes-extended/ltp/ltp_20170929.bb1
2 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch b/meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch
new file mode 100644
index 0000000000..0153ace8ea
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch
@@ -0,0 +1,20 @@
1Do not generate timestamps in gzipped file headers.
2The timestamps prevent reproducible build.
3
4Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/233]
5
6Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
7
8diff --git a/testcases/network/generate.sh b/testcases/network/generate.sh
9index 00216a6..939f792 100755
10--- a/testcases/network/generate.sh
11+++ b/testcases/network/generate.sh
12@@ -55,7 +55,7 @@ fi
13 if [ ! -e "bin.sm" ] ; then
14 cnt=0
15 while [ $cnt -lt 5 ] ; do
16- gzip -1 -c ascii.sm >> "bin.sm"
17+ gzip -1 -c -n ascii.sm >> "bin.sm"
18 cnt=$(($cnt + 1))
19 done
20 fi
diff --git a/meta/recipes-extended/ltp/ltp_20170929.bb b/meta/recipes-extended/ltp/ltp_20170929.bb
index 93a59b31bd..8a870b36ac 100644
--- a/meta/recipes-extended/ltp/ltp_20170929.bb
+++ b/meta/recipes-extended/ltp/ltp_20170929.bb
@@ -49,6 +49,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
49 file://0035-fix-test_proc_kill-hang.patch \ 49 file://0035-fix-test_proc_kill-hang.patch \
50 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ 50 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
51 file://0037-ltp-fix-format-security-error.patch \ 51 file://0037-ltp-fix-format-security-error.patch \
52 file://0038-generate-reproducible-gzip.patch \
52 " 53 "
53 54
54S = "${WORKDIR}/git" 55S = "${WORKDIR}/git"