Tagging module linux-2.6 - linux-2.6-22-4

[build.git] / build.common

diff --git a/build.common b/build.common
index 72b166c..9cd25f2 100644 (file)
--- a/build.common
+++ b/build.common
@@ -57,12 +57,12 @@ function pl_getReleaseName () {
                releasename=f$release
            fi ;;
        [Cc]entOS*)
-           if [ "$release" = "4.5" ] ; then
-           # centos 4.5 is just centos4 + enhancements
-               releasename=centos4
-           else
-               releasename=centos$release
-           fi ;;
+           old_IFS="$IFS"
+           IFS="."
+           set -- $release
+           IFS="$old_IFS"
+           releasename=centos$1
+           ;;
        *)
            releasename="unknown-name-for-${pl_DISTRO}-please-edit-build.common"
            echo 1>&2 "build.common: WARNING - releasename not set for distro=$distro" 
@@ -607,7 +607,8 @@ function pl_fixdirs() {
 function pl_getPkgsAttribute () {
     keyword=$1; shift
     file=$1; shift
-    grep -v '^#' $file | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,,"
+    # remove any initial white spaces from the result
+    grep -v '^#' $file | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,," -e "s,^[[:space:]][[:space:]]*,,"
 }
 
 # for a given keyword like 'package' :
@@ -673,14 +674,13 @@ function pl_locateDistroFile () {
     fi
 }
 
-# experimental
 function yumgroups_from_pkgs () {
     builddir=$1; shift
     pldistro=$1; shift
     fcdistro=$1; shift
     pkgsnames=$@
 
-sedargs="-e s,@FCDISTRO@,$fcdistro,g"
+    sedargs="-e s,@FCDISTRO@,$fcdistro,g"
 
    cat <<__header
 <?xml version="1.0"?>
@@ -704,9 +704,8 @@ __header
   <group>
     <id>$(echo $groupname|tr A-Z a-z)</id>
     <name>$groupname</name>
-    <default>true</default>
     <description>$groupdesc</description>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
 __group_header
         for package in $packages; do