- builder: add new kernel build infra support to alt-kernel option

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 2ff153fd1abc681d105ebbf71bd473ecd9dde19a..160c418d01ad03edc80587e3aecdab8e1cd8d17d 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -463,7 +463,7 @@ tempdir() {
 }
 
 # inserts git log instead of %changelog
-# outputs name of modified file created by tempfile
+# @output directory containing modified specfile
 insert_gitlog() {
        local SPECFILE=$1 specdir=$(tempdir) gitlog=$(tempfile) speclog=$(tempfile)
 
@@ -1828,7 +1828,7 @@ run_sub_builder() {
 # this requires following sudo rules:
 # - poldek --noask --caplookup -uG
 poldek_install() {
-       LANG=C $POLDEK_CMD --noask --caplookup -uG "$@"
+       LANG=C $POLDEK_CMD --noask --caplookup --uniq -uG "$@"
 }
 
 # install packages
@@ -2052,6 +2052,11 @@ if [ $# = 0 ]; then
        exit 1
 fi
 
+# stuff global $BUILDER_OPTS from env as args
+if [ "$BUILDER_OPTS" ]; then
+       set -- "$BUILDER_OPTS" "$@"
+fi
+
 while [ $# -gt 0 ]; do
        case "${1}" in
                -4|-6)
@@ -2310,7 +2315,7 @@ while [ $# -gt 0 ]; do
                        ;;
                --alt_kernel)
                        shift
-                       RPMOPTS="${RPMOPTS} --define \"alt_kernel $1\""
+                       RPMOPTS="${RPMOPTS} --define \"alt_kernel $1\" --define \"build_kernels $1\""
                        shift
                        ;;
                --short-circuit)