Author: glen Date: Sun Jun 10 20:21:40 2012 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- try to figure out what kernel the build is against
---- Files affected:
pld-builder.new/client:
rebuild-th-kernel.sh (1.12 -> 1.13)
---- Diffs:
================================================================
Index: pld-builder.new/client/rebuild-th-kernel.sh
diff -u pld-builder.new/client/rebuild-th-kernel.sh:1.12
pld-builder.new/client/rebuild-th-kernel.sh:1.13
--- pld-builder.new/client/rebuild-th-kernel.sh:1.12 Sat Apr 28 12:01:32 2012
+++ pld-builder.new/client/rebuild-th-kernel.sh Sun Jun 10 22:21:35 2012
@@ -30,14 +30,19 @@
# autotag from rpm-build-macros
# displays latest used tag for a specfile
autotag() {
- local out s
- for s in "$@"; do
+ local out spec pkg
+ for spec in "$@"; do
+ set -x
# strip branches
- s=${s%:*}
+ pkg=${spec%:*}
# 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"
+ spec=${pkg%.spec}.spec
+ # and pkg without subdir
+ pkg=${pkg#*/}
+ # or .ext
+ pkg=${pkg%%.spec}
+ out=$(cvs status -v $spec | awk
"!/Sticky/&&/auto-$dist-$pkg-$alt_kernel/{if (!a++) print \$1}")
+ echo "$spec:$out"
done
}
@@ -55,7 +60,7 @@
echo "$pkg"
else
spec=$(autotag $pkg/$pkg.spec)
- spec=${spec:#*/}
+ spec=${spec#*/}
echo >&2 "... $spec"
echo $spec
fi
@@ -65,18 +70,22 @@
cd $rpmdir
case "$1" in
head)
+ kernel=$(get_last_tags kernel)
+ kernel=$(echo ${kernel#*auto-??-} | tr _ .)
for pkg in $pkgs_head; do
echo >&2 "Rebuilding $pkg..."
$rpmdir/builder -g $pkg -ns
- $rpmdir/relup.sh -ui $pkg/$pkg.spec &&
$dir/make-request.sh -r -d th $pkg.spec
+ $rpmdir/relup.sh -m "rebuild for $kernel" -ui
$pkg/$pkg.spec && $dir/make-request.sh -r -d th $pkg.spec
done
;;
longterm)
cd $rpmdir
+ kernel=$(alt_kernel=longterm get_last_tags kernel)
+ kernel=$(echo ${kernel#*auto-??-} | tr _ .)
for pkg in $pkgs_longterm; do
echo >&2 "Rebuilding $pkg..."
$rpmdir/builder -g $pkg -ns
- $rpmdir/relup.sh -ui $pkg/$pkg.spec &&
$dir/make-request.sh -r -d th --without kernel $pkg.spec
+ $rpmdir/relup.sh -m "rebuild for $kernel" -ui
$pkg/$pkg.spec && $dir/make-request.sh -r -d th --without kernel $pkg.spec
done
specs=$(get_last_tags $pkgs_head $pkgs_longterm)
for pkg in $specs; do
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-builder.new/client/rebuild-th-kernel.sh?r1=1.12&r2=1.13
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
