[arch-commits] Commit in seabios/trunk (PKGBUILD reproducible-version.patch)

[Anatol Pomozov]

    Date: Wednesday, July 8, 2020 @ 17:47:27
  Author: anatolik
Revision: 391023

FS#67178: Do not embedd buildtime/hostname into version

This helps to with the package reproducibility

Added:
  seabios/trunk/reproducible-version.patch
Modified:
  seabios/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   11 +++++++++--
 reproducible-version.patch |   15 +++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-08 10:55:59 UTC (rev 391022)
+++ PKGBUILD	2020-07-08 17:47:27 UTC (rev 391023)
@@ -22,7 +22,8 @@
         config.vga.vmware
         config.vga.bochs-display
         config.vga.ramfb
-        config.vga.virtio)
+        config.vga.virtio
+        reproducible-version.patch)
 sha1sums=('b63b9fd5f73f74f0e8076ad23623c975ec0c2127'
           '5f2adb09c9006def1719b8cbd4792f14a7c7f7c9'
           '7a4ec70237476c7cdd78589b069d0d39dfeaa8eb'
@@ -35,7 +36,8 @@
           '5b017b16aec445df873618aaebd154aa97107148'
           'c7c730ade7a63e1efc7de81c7536632e0617e808'
           'c2f4a7708befd6a0763dd4a5a4f8b5168db30340'
-          'a2b3d09f944e3d6857ceee272b733075a7edc52e')
+          'a2b3d09f944e3d6857ceee272b733075a7edc52e'
+          '352aa180d17642d1230391e5a1a26389a9629c47')
 
 # build routine from fedora
 build_bios() {
@@ -50,8 +52,13 @@
 
 prepare() {
   cd seabios-$_tag
+
+  patch -p1 < ../reproducible-version.patch # FS#67178
+
   rm -rf binaries
   mkdir binaries
+
+  echo "ArchLinux ${pkgver}-${pkgrel}" > .version
 }
 
 build() {

Added: reproducible-version.patch
===================================================================
--- reproducible-version.patch	                        (rev 0)
+++ reproducible-version.patch	2020-07-08 17:47:27 UTC (rev 391023)
@@ -0,0 +1,15 @@
+diff --git a/scripts/buildversion.py b/scripts/buildversion.py
+index 8875497..a0eb646 100755
+--- a/scripts/buildversion.py
++++ b/scripts/buildversion.py
+@@ -124,10 +124,6 @@ def main():
+         cleanbuild = cleanbuild and ver and options.extra != ""
+         if not ver:
+             ver = "?"
+-    if not cleanbuild:
+-        btime = time.strftime("%Y%m%d_%H%M%S")
+-        hostname = socket.gethostname()
+-        ver = "%s-%s-%s" % (ver, btime, hostname)
+     write_version(outfile, ver + options.extra, toolstr)
+ 
+ if __name__ == '__main__':