mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 17:23:36 +00:00
kbuild: eradicate bashisms in scripts/patch-kernel
Make the patch-kernel shell script sufficiently compatible with POSIX shells, i.e., remove bashisms from scripts/patch-kernel. This means that it now also works on dash 0.5.3-5 and still works on bash 3.1dfsg-8. Full changelog: - replaced non-standard "==" by standard "=" - replaced non-standard "source" statement by POSIX "dot" command - use leading ./ on mktemp filename to force the tempfile to a local directory, so that the search path is not used - replace bash syntax to remove leading dot by similar POSIX syntax - added missing (optional/not required) $ signs to shell variable names Signed-off-by: Andreas Mohr <andi@lisas.de> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
7491a76b23
commit
22d6a6a018
@ -65,7 +65,7 @@ sourcedir=${1-/usr/src/linux}
|
||||
patchdir=${2-.}
|
||||
stopvers=${3-default}
|
||||
|
||||
if [ "$1" == -h -o "$1" == --help -o ! -r "$sourcedir/Makefile" ]; then
|
||||
if [ "$1" = -h -o "$1" = --help -o ! -r "$sourcedir/Makefile" ]; then
|
||||
cat << USAGE
|
||||
usage: $PNAME [-h] [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ]
|
||||
source directory defaults to /usr/src/linux,
|
||||
@ -182,10 +182,12 @@ reversePatch () {
|
||||
}
|
||||
|
||||
# set current VERSION, PATCHLEVEL, SUBLEVEL, EXTRAVERSION
|
||||
TMPFILE=`mktemp .tmpver.XXXXXX` || { echo "cannot make temp file" ; exit 1; }
|
||||
# force $TMPFILEs below to be in local directory: a slash character prevents
|
||||
# the dot command from using the search path.
|
||||
TMPFILE=`mktemp ./.tmpver.XXXXXX` || { echo "cannot make temp file" ; exit 1; }
|
||||
grep -E "^(VERSION|PATCHLEVEL|SUBLEVEL|EXTRAVERSION)" $sourcedir/Makefile > $TMPFILE
|
||||
tr -d [:blank:] < $TMPFILE > $TMPFILE.1
|
||||
source $TMPFILE.1
|
||||
. $TMPFILE.1
|
||||
rm -f $TMPFILE*
|
||||
if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ]
|
||||
then
|
||||
@ -202,11 +204,7 @@ echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION} ($
|
||||
EXTRAVER=
|
||||
if [ x$EXTRAVERSION != "x" ]
|
||||
then
|
||||
if [ ${EXTRAVERSION:0:1} == "." ]; then
|
||||
EXTRAVER=${EXTRAVERSION:1}
|
||||
else
|
||||
EXTRAVER=$EXTRAVERSION
|
||||
fi
|
||||
EXTRAVER=${EXTRAVERSION#.}
|
||||
EXTRAVER=${EXTRAVER%%[[:punct:]]*}
|
||||
#echo "$PNAME: changing EXTRAVERSION from $EXTRAVERSION to $EXTRAVER"
|
||||
fi
|
||||
@ -251,16 +249,16 @@ while : # incrementing SUBLEVEL (s in v.p.s)
|
||||
do
|
||||
CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
|
||||
EXTRAVER=
|
||||
if [ $stopvers == $CURRENTFULLVERSION ]; then
|
||||
if [ $stopvers = $CURRENTFULLVERSION ]; then
|
||||
echo "Stopping at $CURRENTFULLVERSION base as requested."
|
||||
break
|
||||
fi
|
||||
|
||||
SUBLEVEL=$((SUBLEVEL + 1))
|
||||
SUBLEVEL=$(($SUBLEVEL + 1))
|
||||
FULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
|
||||
#echo "#___ trying $FULLVERSION ___"
|
||||
|
||||
if [ $((SUBLEVEL)) -gt $((STOPSUBLEVEL)) ]; then
|
||||
if [ $(($SUBLEVEL)) -gt $(($STOPSUBLEVEL)) ]; then
|
||||
echo "Stopping since sublevel ($SUBLEVEL) is beyond stop-sublevel ($STOPSUBLEVEL)"
|
||||
exit 1
|
||||
fi
|
||||
@ -297,7 +295,7 @@ fi
|
||||
if [ x$gotac != x ]; then
|
||||
# Out great user wants the -ac patches
|
||||
# They could have done -ac (get latest) or -acxx where xx=version they want
|
||||
if [ $gotac == "-ac" ]; then
|
||||
if [ $gotac = "-ac" ]; then
|
||||
# They want the latest version
|
||||
HIGHESTPATCH=0
|
||||
for PATCHNAMES in $patchdir/patch-${CURRENTFULLVERSION}-ac*\.*
|
||||
|
Loading…
Reference in New Issue
Block a user