[packages/rpm-build-tools/merge-pld-builder-client: 241/2675] - fixes to make it work for me and likely others. longterm part works

[glen]

commit 97be2fa6f3908ca754a2c20b257dfcda21d59a70
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Apr 1 13:55:51 2012 +0000

    - fixes to make it work for me and likely others. longterm part works
    
    Changed files:
        client/rebuild-th-kernel.sh -> 1.2

 rebuild-th-kernel.sh | 81 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 69 insertions(+), 12 deletions(-)
---
diff --git a/rebuild-th-kernel.sh b/rebuild-th-kernel.sh
index 1df6b64..d97d3d2 100644
--- a/rebuild-th-kernel.sh
+++ b/rebuild-th-kernel.sh
@@ -1,21 +1,78 @@
 #!/bin/sh
 
+dir=$(cd "$(dirname "$0")"; pwd)
+rpmdir=$(rpm -E %_topdir)
+dist=th
+
+pkgs_head="
+	dahdi-linux
+   	ipset
+   	iscsitarget
+   	lirc
+   	madwifi-ng
+   	open-vm-tools
+   	r8168
+   	VirtualBox
+   	xorg-driver-video-nvidia
+   	xorg-driver-video-nvidia-legacy3
+   	xtables-addons
+   	xorg-driver-video-fglrx
+"
+
+pkgs_longterm="
+	$pkgs_head
+	openvswitch
+"
+pkgs_longterm_only="
+	e1000e
+	igb
+"
+
+# autotag from rpm-build-macros
+# displays latest used tag for a specfile
+autotag() {
+	local out s
+	for s in "$@"; do
+		# strip branches
+		s=${s%:*}
+		# ensure package ends with .spec
+		s=${s%.spec}.spec
+		out=$(cvs status -v $s | awk "!/Sticky/&&/auto-$dist-/{if (!a++) print \$1}")
+		echo "$s:$out"
+	done
+}
+
+get_last_tags() {
+	local pkg spec
+	for pkg in $*; do
+		echo >&2 "$pkg... "
+		if [ ! -e  $pkg/$pkg.spec ]; then
+			$rpmdir/builder -g $pkg -ns -r HEAD
+		fi
+		spec=$(autotag $pkg/$pkg.spec)
+		echo >&2 "... $spec"
+		echo $spec
+	done
+}
+
 case "$1" in
-	longterm)
-		cd ~/rpm/packages
-		for a in dahdi-linux ipset iscsitarget lirc madwifi-ng open-vm-tools r8168 VirtualBox xorg-driver-video-nvidia xorg-driver-video-nvidia-legacy3 xtables-addons xorg-driver-video-fglrx openvswitch; do
-			~/bin/send-last-th-tag.sh -d th --kernel longterm --without userspace $a/$a.spec
-		done
-		for a in e1000e igb; do
-			./relup.sh -ui $a/$a.spec && make-request.sh -d th --kernel longterm $a.spec
-		done
-		;;
 	head)
-		cd ~/rpm/packages
-		for a in dahdi-linux ipset iscsitarget lirc madwifi-ng open-vm-tools r8168 VirtualBox xorg-driver-video-nvidia xorg-driver-video-nvidia-legacy3 xtables-addons xorg-driver-video-fglrx; do
-			./relup.sh -ui $a/$a.spec && make-request.sh -d th $a.spec
+		cd $rpmdir
+		for pkg in $pkgs_head; do
+			$rpmdir/builder -g $pkg -ns
+			echo ./relup.sh -ui $a/$a.spec && make-request.sh -d th $a.spec
 		done
 		;;
+	longterm)
+		cd $rpmdir
+		echo "Fetching package tags..."
+		specs=$(get_last_tags $pkgs_longterm)
+		set -x
+		$dir/make-request.sh -r -d $dist --kernel longterm --without userspace $specs
+#		for pkg in $pkgs_longterm_only; do
+#			echo ./relup.sh -ui $a/$a.spec && make-request.sh -d th --kernel longterm $a.spec
+#		done
+		;;
 	*)
 		echo "UNKNOWN CRAP $1 !"
 		;;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/cca6584b96e6c33d0732d559e43e100d804e2ecd