diff --git a/qemu.changes b/qemu.changes index c68b12e..1a74265 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 diff --git a/update_git.sh b/update_git.sh index ccabfbf..b981d19 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"