rpms/qemu/devel make-release,NONE,1.1 qemu.spec,1.83,1.84

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23561

Modified Files:
	qemu.spec 
Added Files:
	make-release 
Log Message:
* Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
- Improve instructions for generating the tarball



--- NEW FILE make-release ---
#!/bin/bash -e

# Based on avi's scripts/make-release from kvm-userspace.git

usage()
{
    echo "usage: make-release name kernel-dir kernel-commit user-dir user-commit"
    exit 1
}

[ $# -eq 5 ] || usage

name="$1"
kdir="$2"
kcommit="$3"
udir="$4"
ucommit="$5"
archs=(x86 ia64)

release_dir=$(mktemp -d)

tarball="$(pwd)/$name.tar.gz"

cd "${release_dir}"
(cd "$udir";  git archive --format=tar --prefix="$name"/ "$ucommit") | tar x
cd "$name"
cat <<EOF > SOURCES
kernel:    $(cd "$kdir"; git rev-parse "$kcommit")
userspace: $(cd "$udir"; git rev-parse "$ucommit")
EOF

paths=(drivers/kvm virt/kvm)
files=(kvm.h kvm_host.h kvm_para.h kvm_types.h kvm_x86_emulate.h virtext.h svm.h vmx.h)
for file in "${files[@]}"; do
    for arch in "${archs[@]}"; do
	for variant in include/asm-"$arch" arch/"$arch"/include/asm; do
	    paths+=("$variant"/"$file")
	done
    done
    paths+=(include/linux/"$file")
done
for arch in "${archs[@]}"; do
    paths+=(arch/"$arch"/kvm)
done

(cd "$kdir"; git archive --format=tar --prefix=linux/ "$kcommit" "${paths[@]}") | tar x

touch kernel/config.kbuild
echo ARCH=ia64 > config.mak
make -C kernel sync LINUX=../linux version="$name" >/dev/null
echo ARCH=x86_64 > config.mak
make -C kernel sync LINUX=../linux version="$name" >/dev/null
rm -rf config.mak linux kernel/config.kbuild
#rm -rf kernel/include/asm kernel/include-compat/asm
sed -i "s/kvm-devel/$name/" qemu/configure

cd ..

tar czf "$tarball" "$name"

cd $(dirname "$tarball")
md5sum $(basename "$tarball")

rm -rf "${release_dir}"


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- qemu.spec	21 Apr 2009 13:53:59 -0000	1.83
+++ qemu.spec	23 Apr 2009 10:11:52 -0000	1.84
@@ -1,26 +1,24 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 13%{?dist}
+Release: 14%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
 URL: http://www.qemu.org/
-#Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
-# echo "kdir=$(pwd)/kvm" > ~/.kvm-release-config
-# cd kvm-userspace
-# mkdir $(HOME)/sf-releases
-# ./scripts/make-release kvm-85rc-1.git-snapshot-date +%Y%m%d HEAD HEAD
 
+# To re-create the tarball below:
+#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git
+#   $> git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
+#   $> make-release qemu-kvm-%{version}.tar.gz $(pwd)/kvm v2.6.29-6998-g1d0cdf1 \
+#                                              $(pwd)/kvm-userspace kvm-84-196-ga01bd3f
 Source0: qemu-kvm-%{version}.tar.gz
+
 Source1: qemu.init
 Source2: kvm.modules
 
-
 Patch1: 01-tls-handshake-fix.patch
 Patch2: 02-vnc-monitor-info.patch
 Patch3: 03-display-keymaps.patch
@@ -468,6 +466,9 @@
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Thu Apr 23 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-14
+- Improve instructions for generating the tarball
+
 * Tue Apr 21 2009 Mark McLoughlin <markmc at redhat.com> - 2:0.10-13
 - Enable pulseaudio driver to fix qemu lockup at shutdown (#495964)