diff --git a/config.conf b/config.conf index d18b25b..ddbb153 100644 --- a/config.conf +++ b/config.conf @@ -17,16 +17,13 @@ +alpha alpha/smp -+ppc ppc/default -+ppc ppc/smp -+ppc ppc/power3 -+ppc ppc/pmac64_32bit -+ppc ppc64/iseries64 -+ppc ppc64/pseries64 -+ppc ppc64/pmac64 -+ppc64 ppc64/iseries64 -+ppc64 ppc64/pseries64 -+ppc64 ppc64/pmac64 ++PPC ppc/default ++PPC ppc/smp ++PPC ppc/power3 ++PPC ppc/pmac64_32bit ++PPC ppc64/iseries64 ++PPC ppc64/pseries64 ++PPC ppc64/pmac64 +s390 s390/s390 +s390x s390/s390x diff --git a/misc/build-most-recent-kernel b/misc/build-most-recent-kernel index a41b5ae..95a6232 100755 --- a/misc/build-most-recent-kernel +++ b/misc/build-most-recent-kernel @@ -175,10 +175,14 @@ build_rpm() { # Get certain flavors in front of others schwartz_sort() { for word in "$@"; do + case word in + ppc64/*) echo "0" ;; # ppc64 before ppc + *) echo "1" ;; + esac case $word in - default) echo "0 $word" ;; - smp) echo "1 $word" ;; - *) echo "2 $word" ;; + */default) echo "0 $word" ;; + */smp) echo "1 $word" ;; + *) echo "2 $word" ;; esac done \ | sort \ @@ -397,12 +401,9 @@ if setup="$(update_and_prepare "${archs[*]}" "${rnums[*]}")" \ configs="$($directory/scripts/guards \ $($directory/scripts/arch-symbols $arch) \ < $directory/config.conf)" - flavors=$(schwartz_sort $( - shopt -s nullglob - for config in $configs; do - flavor=${config##*/} - echo $flavor - done)) + flavors=$(echo "$configs" \ + | schwartz_sort \ + | sed -e 's,.*/,,') flavors="$flavors source" else flavors=$opt_flavors