File 0001-update-mtime-to-avoid-mirror-failures.patch of Package product-builder

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-update-mtime-to-avoid-mirror-failures.patch of Package product-builder (Revision 659368645c0683abd3ca86b2fb6e4fe4)

Currently displaying revision 659368645c0683abd3ca86b2fb6e4fe4 , Show latest

From debc19e8f14d597bbc2170f3ee250da4038884b6 Mon Sep 17 00:00:00 2001
From: Jan Zerebecki <jan.suse@zerebecki.de>
Date: Wed, 17 May 2023 16:28:11 +0200
Subject: [PATCH] update mtime to avoid mirror failures

Mirrors may use rsync with the skip on same mtime feature, which would
skip files that are different in content but have the same mtime. This
results in an inconsistent mirror.

Avoid this by touching files of extracted content so the mtime is updated.

When the rpm macro %clamp_mtime_to_source_date_epoch is set to Y to
enable reproducible builds, the mtime of files in the rpm will be set to
the date of the last changes entry, but build dependencies that affect
the content may be newer. This is relevant when extracting such an rpm
for a repo that is used by the installer. Some mirrors may fail to
sync to the newest content as they skipped them. This would make an
installer using that mirror fail.

Fixes: https://bugzilla.opensuse.org/show_bug.cgi?id=1148824
---
 modules/KIWIUtil.pm | 47 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/modules/KIWIUtil.pm b/modules/KIWIUtil.pm
index 9285fe6..e7b9e3a 100644
--- a/modules/KIWIUtil.pm
+++ b/modules/KIWIUtil.pm
@@ -22,6 +22,7 @@ use warnings;
 use File::Glob ':glob';
 use File::Find;
 use File::Path;
+use Time::HiRes qw(utime);
 
 #==========================================
 # KIWI Modules
@@ -500,26 +501,60 @@ sub unpac_package {
             goto up_failed;
         }
     }
+
+    my $tmpdir = KIWIQX::qxx ("mktemp -qdt kiwiunpac.XXXXXX"); chomp $tmpdir;
+
     if($p_uri =~ m{(.*\.tgz|.*\.tar\.gz|.*\.taz|.*\.tar\.Z)}) {
-        my $out = qx(cd $dir && tar -zxvfp $p_uri);
+        my $out = qx(cd $tmpdir && tar -zxvfp $p_uri);
         my $status = $?>>8;
         if($status != 0) {
-            my $msg = "[E] command cp $dir && tar xvzfp $p_uri failed!\n";
+            my $msg = "[E] command cd $tmpdir && tar xvzfp $p_uri failed!\n";
             $this->{m_collect}->logMsg("E", $msg);
             $this->{m_collect}->logMsg("E", "\t$out\n");
             $retval = 5;
             goto up_failed;
-        } else {
-            my $msg = "[I] unpacked $p_uri in directory $dir\n";
-            $this->{m_collect}->logMsg("I", $msg);
         }
     } elsif($p_uri =~ m{.*\.rpm}i) {
-        my $out = qx(cd $dir && unrpm -q $p_uri);
+        my $out = qx(cd $tmpdir && unrpm -q $p_uri);
+        if($? != 0) {
+            $this->{m_collect}->logMsg("E", "[E] command cd $tmpdir && unrpm -q $p_uri failed, output follows!\n");
+            $this->{m_collect}->logMsg("E", "\t$out\n");
+            $retval = 5;
+            goto up_failed;
+        }
     } else {
         $this->{m_collect}->logMsg("E", "[E] cannot process file $p_uri\n");
         $retval = 4;
         goto up_failed;
     }
+
+    # Update the mtime of each file.
+    #
+    # Mirrors may use rsync with the skip on same mtime feature, which would
+    # skip files that are different in content but have the same mtime. This
+    # results in an inconsistent mirror.
+    #
+    # Avoid this by updating the mtime files of extracted content.
+    #
+    # When later these files will be put into images like an iso or archives
+    # that process is responsible to use a better reproducible mtime.
+    my $now = time();
+    find({ wanted => sub {
+        my $time;
+        # this is the equivalent of the touch command
+        utime($now, $now, $_);
+    } , no_chdir => 1 }, $tmpdir);
+    my $out = qx(find $tmpdir -mindepth 1 -maxdepth 1 -exec cp -a -t $dir '{}' '+' && rm -rf $tmpdir);
+    if($? != 0) {
+        $this->{m_collect}->logMsg("E", "[E] command find $tmpdir -mindepth 1 -maxdepth 1 -exec cp -a -t $dir '{}' '+' && rm -rf $tmpdir failed, output follows!\n");
+        $this->{m_collect}->logMsg("E", "\t$out\n");
+        $retval = 6;
+        goto up_failed;
+    }
+
+    my $msg = "[I] unpacked $p_uri in directory $dir\n";
+    $this->{m_collect}->logMsg("I", $msg);
+
     up_failed:
     return $retval;
 }
-- 
2.30.2

Places

File 0001-update-mtime-to-avoid-mirror-failures.patch of Package product-builder (Revision 659368645c0683abd3ca86b2fb6e4fe4)

Places