rpms/kernel/F-11/scripts sort-config,1.1,1.2
Chuck Ebbert
cebbert at fedoraproject.org
Wed Feb 3 04:12:12 UTC 2010
- Previous message: rpms/kernel/F-11 config-generic, 1.298, 1.299 config-ia64-generic, 1.27, 1.28 config-powerpc-generic, 1.45, 1.46 config-powerpc32-generic, 1.32, 1.33 config-powerpc64, 1.30, 1.31 config-rhel-generic, 1.17, 1.18 config-s390x, 1.15, 1.16 config-sparc64-generic, 1.29, 1.30 config-x86-generic, 1.82, 1.83 config-x86_64-generic, 1.83, 1.84 kernel.spec, 1.1802, 1.1803
- Next message: [pkgdb] gnome-xcf-thumbnailer was added for melmorabity
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-11/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv719/scripts
Modified Files:
sort-config
Log Message:
Update scripts/sort-config from devel
Remove obsolete config options
Index: sort-config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/scripts/sort-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sort-config 4 Jan 2010 15:26:03 -0000 1.1
+++ sort-config 3 Feb 2010 04:12:12 -0000 1.2
@@ -5,35 +5,38 @@ 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) [-dfcn] input target\n"
+ echo -e "Usage:\n $(basename $0) [-$ALL_OPTS] 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 " -c: insert comments about non-matching items"
+ 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 " -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 "dfcn" OPTION ; do
+while getopts "$ALL_OPTS" OPTION ; do
case $OPTION in
+c)
+ ADDCOMMENT=1 ;;
d)
- DEBUG=1
-;;
+ DEBUG=1 ;;
f)
- FORCE=1
-;;
-c)
- ADDCOMMENT=1
-;;
+ FORCE=1 ;;
+i)
+ FIND_IMPOSS=1 ;;
+m)
+ FIND_CHANGED=1 ;;
n)
- NOSORT=1
-;;
+ NOSORT=1 ;;
\?)
- exit 2
-;;
+ exit 2 ;;
esac
done
@@ -44,12 +47,17 @@ fi
shift $((OPTIND-1))
-if [ -f xx00 -o -f xx01 -o -f xx99 ] ; then
+TEMPFILES="xx00 xx01 xx98 xx99"
+TEMPLEFT=
+for FILE in $TEMPFILES ; do
+ [ -f "$FILE" ] && TEMPLEFT="Y"
+done
+if [ "$TEMPLEFT" ] ; 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 xx00 xx01 xx99
+rm -f $TEMPFILES
SRCFILE=config-$1
[ ! -f $SRCFILE ] && echo "Input file" $SRCFILE "missing" && exit 2
@@ -57,15 +65,54 @@ 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=
- [ -z "$TEXT" ] && TEXT='#'
+
+ # replace empty lines
+ [ -z "$TEXT" ] && TEXT='//'
if [ "${TEXT:0:7}" = "CONFIG_" -o "${TEXT:0:9}" = "# CONFIG_" ] ; then
@@ -73,42 +120,52 @@ cat ${SRCFILE} | while read TEXT ; do
if [ -z "$LINE" ] ; then
[ "$DEBUG" ] && echo "nofind ->" "$TEXT"
- # 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
+ extract_optname
if [ "$OPTNAME" ] ; 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}
+
+ 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 --"
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
- done
+ fi
+
fi
fi
else
+ # not a config variable
COMMENT="$TEXT"
TEXT=
fi
@@ -118,51 +175,48 @@ cat ${SRCFILE} | while read TEXT ; do
if [ "$TEXT" ] ; then
- # use input line numbers if not sorting
- [ "$NOSORT" ] && LINE=$IN
- # make sure it has a line number
- [ -z "$LINE" ] && LINE=999999
+ assign_line_number
- # 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
+ # print the saved comments first
+ print_saved_comments
+ # now print the latest comment and text
[ "$COMMENT" ] && echo "$LINE":"$COMMENT"
echo "$LINE":"$TEXT"
- else
+ elif [ "$COMMENT" ] ; then
# no output yet, save the comment
SAVECOMMENT[$IX]="$COMMENT"
- [ "$DEBUG" ] && echo "savecomment ->" "$LINE" "${SAVECOMMENT[$IX]}"
- (( IX++ ))
+ let IX++
+ [ "$DEBUG" ] && echo 'savecomment (#'${IX}')'
fi
- ((IN++))
+ let IN++
-done > xx99
+done
+# flush the buffers
+assign_line_number
+print_saved_comments
+[ "$DEBUG" ] && echo "$IN lines read from input"
+} >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 ':'
+ cat xx00 | cut -f 2- -d ':' | sed 's/^\/\/$//'
if [ -s xx01 ] ; then
echo
echo '# ------------ UNMATCHED OPTIONS ------------'
echo
- cat xx01 | cut -f 2- -d ':'
+ cat xx01 | cut -f 2- -d ':' | sed 's/^\/\/$//'
fi
fi
-rm -f xx00 xx01 xx99
+rm -f $TEMPFILES
- Previous message: rpms/kernel/F-11 config-generic, 1.298, 1.299 config-ia64-generic, 1.27, 1.28 config-powerpc-generic, 1.45, 1.46 config-powerpc32-generic, 1.32, 1.33 config-powerpc64, 1.30, 1.31 config-rhel-generic, 1.17, 1.18 config-s390x, 1.15, 1.16 config-sparc64-generic, 1.29, 1.30 config-x86-generic, 1.82, 1.83 config-x86_64-generic, 1.83, 1.84 kernel.spec, 1.1802, 1.1803
- Next message: [pkgdb] gnome-xcf-thumbnailer was added for melmorabity
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list