File 0001-make-times-in-iso-images-reproducible.patch of Package product-builder

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-make-times-in-iso-images-reproducible.patch of Package product-builder (Revision 6b784dc6317e30815406bf366fafb4c0)

Currently displaying revision 6b784dc6317e30815406bf366fafb4c0 , Show latest

From 1e152452729e96c284faa94b50e361e469904690 Mon Sep 17 00:00:00 2001
From: Jan Zerebecki <jan.suse@zerebecki.de>
Date: Fri, 9 Jun 2023 12:46:15 +0200
Subject: [PATCH] make times in iso images reproducible

by replacing mkisofs with xorriso, which enables reproducible mode when
environment variable SOURCE_DATE_EPOCH is set.
---
 modules/KIWIIsoLinux.pm  | 94 ++++++++++++++++++++++++++++++++--------
 rpm/product-builder.spec |  2 +-
 2 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/modules/KIWIIsoLinux.pm b/modules/KIWIIsoLinux.pm
index ef94687..b3979d3 100644
--- a/modules/KIWIIsoLinux.pm
+++ b/modules/KIWIIsoLinux.pm
@@ -24,6 +24,7 @@ use Carp qw /cluck/;
 use Fcntl;
 use File::Find;
 use File::Basename;
+use POSIX qw(strftime);
 
 #==========================================
 # Base class
@@ -105,8 +106,13 @@ sub new {
         $tool = $genTool;
         $tool_type = "genisoimage";
     } else {
-        my $mkTool = $locator -> getExecPath('mkisofs');
+        my $mkTool = $locator -> getExecPath('xorrisofs');
         if ($mkTool && -x $mkTool) {
+            $tool = $mkTool;
+            # xorrisofs is a drop in replacement
+            $tool_type = "mkisofs";
+        } elsif ($mkTool && -x $mkTool) {
+            $mkTool = $locator -> getExecPath('mkisofs');
             $tool = $mkTool;
             $tool_type = "mkisofs";
         } else {
@@ -625,6 +631,8 @@ sub createSortFile {
         return "";
     }
 
+    my $arg = "-sort";
+    if (0 == 1) {
     if ($base{$arch}{loader}) {
       print $FD "$src/$base{$arch}{loader} 2\n";
       (my $loader_dir = $base{$arch}{loader}) =~ s#/[^/]+$##;
@@ -635,9 +643,28 @@ sub createSortFile {
     print $FD "$src/$base{$arch}{boot}/boot.catalog 3\n";
     print $FD "$ldir/$base{$arch}{boot}/boot.catalog 3\n";
     print $FD "$ldir/glump 1000000\n";
+    } else {
+        $arg = "--sort-weight-list";
+    if ($base{$arch}{loader}) {
+      print $FD "2 $base{$arch}{loader}\n";
+      (my $loader_dir = $base{$arch}{loader}) =~ s#/[^/]+$##;
+      print $FD "1 $loader_dir\n";
+    }
+
+    print $FD "1000001 $base{$arch}{efi}\n" if $base{$arch}{efi};
+    if (-f "$src/$base{$arch}{boot}/boot.catalog") {
+      print $FD "3 $base{$arch}{boot}/boot.catalog 3\n";
+    }
+    if (-f "$ldir/$base{$arch}{boot}/boot.catalog") {
+      print $FD "3 $base{$arch}{boot}/boot.catalog 3\n";
+    }
+    if (-f "$ldir/glump") {
+      print $FD "1000000 glump 1000000\n";
+    }
+    }
     close $FD;
 
-    return " -sort $sort";
+    return " $arg $sort";
 }
 
 #==========================================
@@ -1021,12 +1048,26 @@ sub createISO {
         }
     }
     #==========================================
+    # Ensure xorrisofs which stands in for mkisofs produces reproducible output
+    #------------------------------------------
+    if(!$ENV{SOURCE_DATE_EPOCH}) {
+        $kiwi->warning("[W] Failed to read environment variable SOURCE_DATE_EPOCH, setting to 0.");
+        $ENV{SOURCE_DATE_EPOCH} = "0";
+    }
+    my $date = strftime("%Y%m%d%H%M%S00", gmtime($ENV{SOURCE_DATE_EPOCH}));
+    $para = "$para --set_all_file_dates $date";
+    #==========================================
     # Call mkisofs first stage
     #------------------------------------------
     # log sort file
     $kiwi -> info ("[I] Sort file $this->{tmpfile}:");
     $kiwi -> info ("  $_") for (`cat $this->{tmpfile}`);
 
+    my $data = KIWIQX::qxx('find '.$src.' -type l -exec bash -c \'echo "$0"; ln -f "$(readlink -m "$0")" "$0"\' {} \; 2>&1');
+    $kiwi ->info("[I] Replacing symlinks with hardlinks had return code $? and output: $data");
+    my $data = KIWIQX::qxx('find '.$src.' -name .hashed -print -exec rm -rf {} \; 2>&1');
+    $kiwi ->info("[I] Deleting .hashed had return code $? and output: $data");
+
     if ($this -> isEmptyDir ($ldir)) {
         $cmdln = "$prog $para -o $dest $src 2>&1";
     } else {
@@ -1040,6 +1081,7 @@ sub createISO {
         $this -> cleanISO();
         return;
     }
+    $kiwi ->info("[I] Output of $prog: $data");
     #==========================================
     # Call mkisofs second stage
     #------------------------------------------
@@ -1063,6 +1105,7 @@ sub createISO {
             $this -> cleanISO();
             return;
         }
+        $kiwi ->info("[I] Output of $prog: $data");
     }
     #==========================================
     # Call post bootloader install
@@ -1110,32 +1153,47 @@ sub isols {
     my $iso  = $this -> {dest};
     my $fd   = FileHandle -> new();
     my $dir  = "/";
-    my $isoinfo_opts = " -R -l -i $iso 2>/dev/null |";
+    my $opts = " -indev $iso -find / -not -type d -exec report_lba 2>/dev/null |";
     my $files;
     local $_;
-    my $isoinfo_cmd = "/usr/bin/isoinfo";
-    if (! -x $isoinfo_cmd){
-        $isoinfo_cmd = "/usr/lib/genisoimage/isoinfo";
-        if (! -x $isoinfo_cmd){
-            return;
+    my $cmd = "/usr/bin/xorriso";
+    if (! -x $cmd){
+        $cmd = "/usr/bin/isoinfo";
+        $opts = " -R -l -i $iso 2>/dev/null |";
+        if (! -x $cmd){
+            $cmd = "/usr/lib/genisoimage/isoinfo";
+            if (! -x $cmd){
+                return;
+            }
         }
     }
-    if (! $fd -> open ($isoinfo_cmd . $isoinfo_opts)) {
+    if (! $fd -> open ($cmd . $opts)) {
         return;
     }
     while(<$fd>) {
-        if(/^Directory listing of\s*(\/.*\/)/) {
-            $dir = $1;
-            next;
-        }
-        if(/.*(-)[-rxw]{9}.*\s\[\s*(\d+)(\s+\d+)?\]\s+(.*?)\s*$/) {
-            my $type = $1;
-            $type = ' ' if $type eq '-';
-            if($4 ne '.' && $4 ne '..') {
+        if($cmd eq "/usr/bin/xorriso") {
+            if(/Report layout:\s+xt\s,\s+Startlba\s,\s+Blocks\s,\s+Filesize\s,\s+ISO image path$/) {
+                next;
+            }
+            if(/File data lba:\s+(\d+)\s,\s+(\d+)\s,\s+(\d+)\s,\s+(\d+)\s,\s+'(\/.*)'$/) {
                 push @$files, {
-                    name => "$dir$4",type => $type,start => $2 + 0
+                    name => $5, type => ' ', start => $2
                 };
             }
+        } else {
+            if(/^Directory listing of\s*(\/.*\/)/) {
+                $dir = $1;
+                next;
+            }
+            if(/.*(-)[-rxw]{9}.*\s\[\s*(\d+)(\s+\d+)?\]\s+(.*?)\s*$/) {
+                my $type = $1;
+                $type = ' ' if $type eq '-';
+                if($4 ne '.' && $4 ne '..') {
+                    push @$files, {
+                        name => "$dir$4",type => $type,start => $2 + 0
+                    };
+                }
+            }
         }
     }
     $fd -> close();
diff --git a/rpm/product-builder.spec b/rpm/product-builder.spec
index 59a71b0..9fe0688 100644
--- a/rpm/product-builder.spec
+++ b/rpm/product-builder.spec
@@ -50,7 +50,7 @@ Requires:       obs-build
 %endif
 Requires:       checkmedia
 Requires:       inst-source-utils
-Requires:       mkisofs
+Requires:       xorriso
 Requires:       product-builder-plugin
 %ifarch %ix86 x86_64
 Requires:       syslinux
-- 
2.30.2

Places

File 0001-make-times-in-iso-images-reproducible.patch of Package product-builder (Revision 6b784dc6317e30815406bf366fafb4c0)

Places