From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 2/2] make-release: don't use --mtime and --transform tar options Date: Fri, 24 Sep 2010 14:03:04 -0300 Message-ID: <1285347784-21180-3-git-send-email-ehabkost@redhat.com> References: <1285347784-21180-1-git-send-email-ehabkost@redhat.com> To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:53977 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757077Ab0IXRDG (ORCPT ); Fri, 24 Sep 2010 13:03:06 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8OH36w6025114 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 24 Sep 2010 13:03:06 -0400 Received: from blackpad.lan.raisama.net (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8OH3501025505 for ; Fri, 24 Sep 2010 13:03:06 -0400 In-Reply-To: <1285347784-21180-1-git-send-email-ehabkost@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Those options are not available on older systems. Instead of --transform, just create the file inside the expected directory. Instead of --mtime, use 'touch' to set file mtime before running tar. Signed-off-by: Eduardo Habkost --- kvm/scripts/make-release | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) 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 -- 1.7.2.1