[2/2] make-release: don't use --mtime and --transform tar options

Commit Message

Eduardo Habkost Sept. 24, 2010, 5:03 p.m. UTC

None

Patch

diff --git a/kvm/scripts/make-release b/kvm/scripts/make-release
index c5f8c92..56302c3 100755
--- a/kvm/scripts/make-release
+++ b/kvm/scripts/make-release
@@ -52,20 +52,22 @@  mkdir -p "$(dirname "$tarball")"
 git archive --prefix="$name/" --format=tar "$commit" > "$tarball"
 
 mtime=`git show --format=%ct "$commit""^{commit}" --`
-tarargs="--owner=root --group=root --mtime=@$mtime"
+tarargs="--owner=root --group=root"
 
-mkdir -p "$tmpdir"
+mkdir -p "$tmpdir/$name"
 git cat-file -p "${commit}:roms" | awk ' { print $4, $3 } ' \
-    > "$tmpdir/EXTERNAL_DEPENDENCIES"
-tar -rf "$tarball" --transform "s,^,$name/," -C "$tmpdir" \
+    > "$tmpdir/$name/EXTERNAL_DEPENDENCIES"
+touch -d "@$mtime" "$tmpdir/$name/EXTERNAL_DEPENDENCIES"
+tar -rf "$tarball" -C "$tmpdir" \
     $tarargs \
-    "EXTERNAL_DEPENDENCIES"
+    "$name/EXTERNAL_DEPENDENCIES"
 rm -rf "$tmpdir"
 
 if [[ -n "$formal" ]]; then
-    mkdir -p "$tmpdir"
-    echo "$name" > "$tmpdir/KVM_VERSION"
-    tar -rf "$tarball" --transform "s,^,$name/," -C "$tmpdir" "KVM_VERSION" \
+    mkdir -p "$tmpdir/$name"
+    echo "$name" > "$tmpdir/$name/KVM_VERSION"
+    touch -d "@$mtime" "$tmpdir/$name/KVM_VERSION"
+    tar -rf "$tarball" -C "$tmpdir" "$name/KVM_VERSION" \
         $tarargs
     rm -rf "$tmpdir"
 fi