tags 828867 + pending patch
tags 1021374 + pending patch
thanks
I've just uploaded zephyr 3.1.2-1.1 to DELAYED/10:
zephyr (3.1.2-1.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Apply patches by Vagrant Cascadian and Reiner Herrmann to make the build
reproducible. (Closes: #828867, #1021374)
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
diffstat for zephyr-3.1.2 zephyr-3.1.2
changelog | 8 ++++++++
patches/reproducible-build.patch | 17 +++++++++++++++++
patches/series | 1 +
rules | 2 +-
4 files changed, 27 insertions(+), 1 deletion(-)
diff -Nru zephyr-3.1.2/debian/changelog zephyr-3.1.2/debian/changelog
--- zephyr-3.1.2/debian/changelog 2013-10-28 14:57:21.000000000 +0000
+++ zephyr-3.1.2/debian/changelog 2022-11-17 17:29:45.000000000 +0000
@@ -1,3 +1,11 @@
+zephyr (3.1.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply patches by Vagrant Cascadian and Reiner Herrmann to make the build
+ reproducible. (Closes: #828867, #1021374)
+
+ -- Chris Lamb <la...@debian.org> Thu, 17 Nov 2022 17:29:45 +0000
+
zephyr (3.1.2-1) unstable; urgency=low
* New upstream version.
diff -Nru zephyr-3.1.2/debian/patches/reproducible-build.patch
zephyr-3.1.2/debian/patches/reproducible-build.patch
--- zephyr-3.1.2/debian/patches/reproducible-build.patch 1970-01-01
01:00:00.000000000 +0100
+++ zephyr-3.1.2/debian/patches/reproducible-build.patch 2022-11-17
17:29:45.000000000 +0000
@@ -0,0 +1,17 @@
+Author: Reiner Herrmann <rei...@reiner-h.de>
+Description: Strip non-deterministic information from the version string
+
+--- a/new_vers.sh
++++ b/new_vers.sh
+@@ -2,10 +2,7 @@
+ #
+ top_srcdir=${1:-`pwd`}
+
+-u=${USER-the_zephyr_builder}
+-h=`hostname`
+-t=`date`
+ v=`sh ${top_srcdir}/get_vers.sh ${top_srcdir}`
+
+ umask 002
+-/bin/echo "#define ZEPHYR_VERSION_STRING \"${v} (${t}) ${u}@${h}\"" >
h/zephyr_version.h
++/bin/echo "#define ZEPHYR_VERSION_STRING \"${v}\"" > h/zephyr_version.h
diff -Nru zephyr-3.1.2/debian/patches/series zephyr-3.1.2/debian/patches/series
--- zephyr-3.1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ zephyr-3.1.2/debian/patches/series 2022-11-17 17:29:45.000000000 +0000
@@ -0,0 +1 @@
+reproducible-build.patch
diff -Nru zephyr-3.1.2/debian/rules zephyr-3.1.2/debian/rules
--- zephyr-3.1.2/debian/rules 2013-07-08 16:46:41.000000000 +0100
+++ zephyr-3.1.2/debian/rules 2022-11-17 17:29:45.000000000 +0000
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
VARIETALS=krb5
-CFLAGS=-g -O
+CFLAGS=-g -O -ffile-prefix-map=$(CURDIR)=.
PACKAGES:=-plibzephyr4 -pzephyr-clients -pzephyr-server -plibzephyr-dev
$(foreach i,$(VARIETALS),-plibzephyr4-$(i) -pzephyr-server-$(i))
