From cdafe12abc35314313f3bded65e58200edcdb89d7239d3cd66b0545744f9eb92 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Tue, 14 Jan 2020 17:11:04 +0000
Subject: [PATCH] Accepting request 764366 from
 home:olh:branches:Virtualization

- Create files within bundles.tar.xz with fixed timestamp and uid

OBS-URL: https://build.opensuse.org/request/show/764366
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=524
---
 qemu.changes  |  5 +++++
 update_git.sh | 14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/qemu.changes b/qemu.changes
index c68b12e6..1a742659 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 14 16:14:03 UTC 2020 - ohering@suse.de
+
+- Create files within bundles.tar.xz with fixed timestamp and uid
+
 -------------------------------------------------------------------
 Sat Jan 11 01:54:12 UTC 2020 - Bruce Rogers <brogers@suse.com>
 
diff --git a/update_git.sh b/update_git.sh
index ccabfbf6..b981d19f 100644
--- a/update_git.sh
+++ b/update_git.sh
@@ -150,9 +150,14 @@ for (( i=0; i <$REPO_COUNT; i++ )); do
         fi
     fi
 done
-# keep diffs to a minimum - touch bundle files to "something common" TODO: decide if there's something better
-find $BUNDLE_DIR -exec touch -r qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz {} \;
-tar --format gnu --xz -cf bundles.tar.xz -C $BUNDLE_DIR .
+# keep diffs to a minimum - touch bundle files to "something common"
+tar --format gnu --xz \
+    --numeric-owner \
+    --owner=0 \
+    --group=0 \
+    --mtime="@$(date -r qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz +%s)" \
+    --create \
+    -f bundles.tar.xz -C $BUNDLE_DIR .
 rm -rf $BUNDLE_DIR
 rm -rf $GIT_DIR
 }
@@ -579,9 +584,6 @@ rm -rf $BUNDLE_DIR
     if [ -e qemu.changes.added ]; then
         rm -f qemu.changes.added
     fi
-    if [[ "0" = "$(expr $CHANGED_COUNT + $DELETED_COUNT + $ADDED_COUNT)" ]]; then
-        osc revert bundles.tar.xz
-    fi
     echo "git patch summary"
     echo "  unchanged: $UNCHANGED_COUNT"
     echo "    changed: $CHANGED_COUNT"