[PATCH 0/2] qemu-kvm: make make-release work on older systems

[PATCH 0/2] qemu-kvm: make make-release work on older systems

[Eduardo Habkost]

Hi,

The following patches allow make-release to be run on older systems (such as
RHEL5), where mktemp doesn't have the --tmpdir option and tar doesn't have the
--transform and --mtime options.

I made those changes on the scripts for my own use (to help testing and
packaging of qemu-kvm), but I don't know if they are really interesting to be
applied on upstream qemu-kvm.

Eduardo Habkost (2):
  make-release: don't use --tmpdir mktemp option
  make-release: don't use --mtime and --transform tar options

 kvm/scripts/make-release |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

-- 
1.7.2.1

[PATCH 1/2] make-release: don't use --tmpdir mktemp option

[Eduardo Habkost]

This allows the script to work on older systems, where 'mktemp --tmpdir' is not
available.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 kvm/scripts/make-release |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kvm/scripts/make-release b/kvm/scripts/make-release
index 64e77f9..c5f8c92 100755
--- a/kvm/scripts/make-release
+++ b/kvm/scripts/make-release
@@ -12,7 +12,7 @@ formal=
 
 releasedir=~/sf-release
 [[ -z "$TMP" ]] && TMP="/tmp"
-tmpdir=`mktemp -d --tmpdir="$TMP" qemu-kvm-make-release.XXXXXXXXXX`
+tmpdir=`mktemp -d "$TMP/qemu-kvm-make-release.XXXXXXXXXX"`
 while [[ "$1" = -* ]]; do
     opt="$1"
     shift
-- 
1.7.2.1

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

[Eduardo Habkost]

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 <ehabkost@redhat.com>
---
 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

Re: [PATCH 0/2] qemu-kvm: make make-release work on older systems

[Marcelo Tosatti]

On Fri, Sep 24, 2010 at 02:03:02PM -0300, Eduardo Habkost wrote:
> Hi,
> 
> The following patches allow make-release to be run on older systems (such as
> RHEL5), where mktemp doesn't have the --tmpdir option and tar doesn't have the
> --transform and --mtime options.
> 
> I made those changes on the scripts for my own use (to help testing and
> packaging of qemu-kvm), but I don't know if they are really interesting to be
> applied on upstream qemu-kvm.
> 
> Eduardo Habkost (2):
>   make-release: don't use --tmpdir mktemp option
>   make-release: don't use --mtime and --transform tar options
> 
>  kvm/scripts/make-release |   20 +++++++++++---------
>  1 files changed, 11 insertions(+), 9 deletions(-)

Applied, thanks.