rpms/kernel/F-12/scripts pull-upstreams.sh, 1.6, 1.7 sort-config, 1.7, 1.8

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15637/scripts

Modified Files:
	pull-upstreams.sh sort-config 
Log Message:
* Fri Jan  1 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.2-1
- Rebased F-12 to 2.6.32, still needs forward porting of patches.



Index: pull-upstreams.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/scripts/pull-upstreams.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pull-upstreams.sh	8 Jan 2009 04:42:24 -0000	1.6
+++ pull-upstreams.sh	4 Jan 2010 15:44:17 -0000	1.7
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-url=http://people.redhat.com/roland/utrace/${1:-2.6-current}
+utrace_base=2.6.32
+
+url=http://people.redhat.com/roland/utrace/${1:-$utrace_base}
 
 wget -q -O /dev/stdout $url/series | grep 'patch$' |
 while read i


Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/scripts/sort-config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sort-config	31 Oct 2009 08:40:56 -0000	1.7
+++ sort-config	4 Jan 2010 15:44:17 -0000	1.8
@@ -5,38 +5,35 @@ TGT=($(ls kernel-*/linux-*.noarch/config
           kernel-*/linux-*.noarch/configs/kernel-2.6.*-*-debug.config 2>/dev/null))
 TGT1=(${TGT[*]#kernel-*/linux-*.noarch/configs/kernel-2.6.*-})
 
-ALL_OPTS="cdfimn"
 if [ $# -lt 2 ] ; then
-   echo -e "Usage:\n   $(basename $0) [-$ALL_OPTS] input target\n"
+   echo -e "Usage:\n   $(basename $0) [-dfcn] input target\n"
    echo -e " Sort input config file into the same order as the target\n"
-   echo -e "      -c: insert comments about non-matching/impossible items"
    echo -e "      -d: show raw unsorted output with extra debug text"
-   echo -e "      -f: force output to match what is in the target config,"
-   echo -e "          and/or remove impossible config items"
-   echo -e "      -i: find impossible config items"
-   echo -e "      -m: find changed config items"
+   echo -e "      -f: force output to match what is in the target config"
+   echo -e "      -c: insert comments about non-matching items"
    echo -e "      -n: do not sort output\n"
    echo -e "   input: source config file" ' [' "${SRC[*]#config-}" ']\n'
    echo -e "  target: output arch name" ' [' "${TGT1[*]%.config}" ']\n'
    exit 1
 fi
 
-while getopts "$ALL_OPTS" OPTION ; do
+while getopts "dfcn" OPTION ; do
 case $OPTION in
-c)
-   ADDCOMMENT=1 ;;
 d)
-   DEBUG=1 ;;
+   DEBUG=1
+;;
 f)
-   FORCE=1 ;;
-i)
-   FIND_IMPOSS=1 ;;
-m)
-   FIND_CHANGED=1 ;;
+   FORCE=1
+;;
+c)
+   ADDCOMMENT=1
+;;
 n)
-   NOSORT=1 ;;
+   NOSORT=1
+;;
 \?)
-   exit 2 ;;
+   exit 2
+;;
 esac
 done
 
@@ -47,17 +44,12 @@ fi
 
 shift $((OPTIND-1))
 
-TEMPFILES="xx00 xx01 xx98 xx99"
-TEMPLEFT=
-for FILE in $TEMPFILES ; do
-   [ -f "$FILE" ] && TEMPLEFT="Y"
-done
-if [ "$TEMPLEFT" ] ; then
+if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
    echo "WARNING! Output files named xx?? already exist." >&2
    read -p "Press <Enter> to erase files, or Ctrl-C to exit..."
    echo >&2
 fi
-rm -f $TEMPFILES
+rm -f xx00 xx01 xx99
 
 SRCFILE=config-$1
 [ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2
@@ -65,54 +57,15 @@ SRCFILE=config-$1
 TGTFILE=kernel-*/linux-*.noarch/configs/kernel-2.6.*-$2.config
 [ ! -f $TGTFILE ] && echo "No target file matching" $TGTFILE "exists" && exit 2
 
-[ "$FIND_IMPOSS" ] && \
-   find kernel-*/*.noarch -name Kconfig\* -type f \
-   | xargs egrep -s -h '^[[:space:]]*(menu)?config[[:space:]]+' \
-   | sed -r 's/^[[:space:]]*(menu)?config[[:space:]]+/CONFIG_/' \
-   | sort | uniq >xx98
-
-extract_optname() {
-         # extract the option name from $TEXT, setting $OPTNAME
-         OPTNAME=
-         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
-            OPTNAME=${TEXT%%=*}
-         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
-            OPTNAME=${TEXT%" is not set"}
-            OPTNAME=${OPTNAME#\# }
-         fi
-}
-
-print_saved_comments() {
-      if [ $IX -gt 0 ] ; then
-         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
-         (( IX-- ))
-         for IX in $(seq 0 $IX) ; do
-            echo "$LINE":"${SAVECOMMENT[$IX]}"
-         done
-         unset SAVECOMMENT
-         IX=0
-      fi
-}
-
-assign_line_number() {
-      # use input line numbers if not sorting
-      [ "$NOSORT" ] && LINE=$IN
-      # make sure it has a line number
-      [ -z "$LINE" ] && LINE=999999
-}
-
 IX=0
 IN=0
 declare -a SAVECOMMENT
 
-cat ${SRCFILE} | {
-while read TEXT ; do
+cat ${SRCFILE} | while read TEXT ; do
 
    LINE=
    COMMENT=
-
-   # replace empty lines
-   [ -z "$TEXT" ] && TEXT='//'
+   [ -z "$TEXT" ] && TEXT='#'
 
    if [ "${TEXT:0:7}" = "CONFIG_" -o "${TEXT:0:9}" = "# CONFIG_" ] ; then
 
@@ -120,52 +73,42 @@ while read TEXT ; do
       if [ -z "$LINE" ] ; then
          [ "$DEBUG" ] && echo "nofind      ->" "$TEXT"
 
-         extract_optname
+         # see if option changed in output file
+         OPTNAME=
+         if [ "${TEXT:0:7}" = "CONFIG_" ] ; then
+            OPTNAME=${TEXT%%=*}
+         elif [ "${TEXT:0:9}" = "# CONFIG_" ] ; then
+            OPTNAME=${TEXT%" is not set"}
+            OPTNAME=${OPTNAME#\# }
+         fi
          if [ "$OPTNAME" ] ; then
-
-            if [ "$FIND_CHANGED" ] ; then
-               for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
-                  if [ -z "$LINE" ] ; then
-                     [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
-                     LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
-                     if [ "$LINE" ] ; then
-                        CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
-                        if [ "$FORCE" ] ; then
-                           TEXT=$CHANGED
-                           [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
-                        else
-                           if [ "$ADDCOMMENT" ] ; then
-                              if [ ${CHANGED:0:1} = '#' ] ; then
-                                 NEWOPT="not set"
-                              else
-                                 NEWOPT=${CHANGED#$OPTNAME}
-                              fi
-                              COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
+            for FINDTEXT in "^${OPTNAME}=" "^# ${OPTNAME} is not set" ; do
+               if [ -z "$LINE" ] ; then
+                  [ "$DEBUG" ] && echo "looking for ->" "$FINDTEXT"
+                  LINE=$(grep -n "$FINDTEXT" $TGTFILE | head -1 | cut -f 1 -d ':')
+                  if [ "$LINE" ] ; then
+                     CHANGED=$(grep "$FINDTEXT" $TGTFILE | head -1)
+                     if [ "$FORCE" ] ; then
+                        TEXT="$CHANGED"
+                        [ "$DEBUG" ] && echo 'forced      ->' "$TEXT"
+                     else
+                        if [ "$ADDCOMMENT" ] ; then
+                           if [ ${CHANGED:0:1} = '#' ] ; then
+                              NEWOPT="not set"
+                           else
+                              NEWOPT=${CHANGED#$OPTNAME}
                            fi
+                           COMMENT="# -- Next option changed to \"${NEWOPT}\" at target line $LINE --"
                         fi
                      fi
                   fi
-               done
-            fi
-
-            if [ "$FIND_IMPOSS" -a -z "$LINE" -a -z "$COMMENT" ] ; then
-               POSSIBLE=$(grep -n "^$OPTNAME" xx98)
-               if [ -z "$POSSIBLE" ] ; then
-                  if [ "$ADDCOMMENT" ] ; then
-                     COMMENT="# -- Next option is impossible --"
-                  elif [ "$FORCE" ] ; then
-                     [ "$DEBUG" ] && echo 'impossible  ->' "$TEXT"
-                     TEXT=""
-                  fi
                fi
-            fi
-
+            done
          fi
 
       fi
 
    else
-      # not a config variable
       COMMENT="$TEXT"
       TEXT=
    fi
@@ -175,48 +118,51 @@ while read TEXT ; do
 
    if [ "$TEXT" ] ; then
 
-      assign_line_number
+      # use input line numbers if not sorting
+      [ "$NOSORT" ] && LINE=$IN
+      # make sure it has a line number
+      [ -z "$LINE" ] && LINE=999999
 
-      # print the saved comments first
-      print_saved_comments
-      # now print the latest comment and text
+      # print saved comments first
+      if [ $IX -gt 0 ] ; then
+         [ "$DEBUG" ] && echo "            ->" $IX "comments were saved"
+         (( IX-- ))
+         for IX in $(seq 0 $IX) ; do
+            echo "$LINE":"${SAVECOMMENT[$IX]}"
+         done
+         unset SAVECOMMENT
+         IX=0
+      fi
       [ "$COMMENT" ] && echo "$LINE":"$COMMENT"
       echo "$LINE":"$TEXT"
 
-   elif [ "$COMMENT" ] ; then
+   else
 
       # no output yet, save the comment
       SAVECOMMENT[$IX]="$COMMENT"
-      let IX++
-      [ "$DEBUG" ] && echo 'savecomment (#'${IX}')'
+      [ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
+      (( IX++ ))
 
    fi
 
-   let IN++
+   ((IN++))
 
-done
-# flush the buffers
-assign_line_number
-print_saved_comments
-[ "$DEBUG" ] && echo "$IN lines read from input"
-} >xx99
+done > xx99
 
 if [ "$DEBUG" ] ; then
-   # just show the raw output with debug info, then exit
    cat xx99
 else
 
-   # split output into two files, for matched and unmatched items
    cat xx99 | sort -s -t ":" -k 1g | csplit -k -s - /^999999/ 2>/dev/null
 
-   cat xx00 | cut -f 2- -d ':' | sed 's/^\/\/$//'
+   cat xx00 | cut -f 2- -d ':'
    if [ -s xx01 ] ; then
       echo
       echo '# ------------  UNMATCHED OPTIONS  ------------'
       echo
-      cat xx01 | cut -f 2- -d ':' | sed 's/^\/\/$//'
+      cat xx01 | cut -f 2- -d ':'
    fi
 
 fi
 
-rm -f $TEMPFILES
+rm -f xx00 xx01 xx99