[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: (repost) HOWTO pcmcia + 2.2.0-pre1



>>>>> "jim" == jim  <jim@laney.edu> writes:

    jim> Sorry about this... I felt others would be able to use this
    jim> reposting if it had a proper subject identifying its
    jim> purpose...

Jim, there's a buglet in your code..

diff -r -u pcmcia-cs-3.0.6/Configure pcmcia-cs-19981228-jk/Configure
- --- pcmcia-cs-3.0.6/Configure   Thu Nov 19 03:08:42 1998
+++ pcmcia-cs-19981228-jk/Configure     Mon Dec 28 20:59:58 1998
@@ -151,7 +151,8 @@
 VERSION=`sed -n -e 's/^VERSION = \(.*\)/\1/p' $LINUX/Makefile`
 PATCHLEVEL=`sed -n -e 's/^PATCHLEVEL = \(.*\)/\1/p' $LINUX/Makefile`
 SUBLEVEL=`sed -n -e 's/^SUBLEVEL = \(.*\)/\1/p' $LINUX/Makefile`
- -SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL
+EXTRAVERSION=`sed -n -e 's/^EXTRAVERSION =-\(.*\)/\1/p' $LINUX/Makefile`
+SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL-$EXTRAVERSION
 VERSION_CODE=`expr $VERSION \* 65536 + $PATCHLEVEL \* 256 + $SUBLEVEL`
 echo "The kernel source tree is version $SRC_RELEASE."
 CUR_RELEASE=`uname -r`

This should be:

diff -r -u pcmcia-cs-3.0.6/Configure pcmcia-cs-19981228-jk/Configure
- --- pcmcia-cs-3.0.6/Configure   Thu Nov 19 03:08:42 1998
+++ pcmcia-cs-19981228-jk/Configure     Mon Dec 28 20:59:58 1998
@@ -151,7 +151,8 @@
 VERSION=`sed -n -e 's/^VERSION = \(.*\)/\1/p' $LINUX/Makefile`
 PATCHLEVEL=`sed -n -e 's/^PATCHLEVEL = \(.*\)/\1/p' $LINUX/Makefile`
 SUBLEVEL=`sed -n -e 's/^SUBLEVEL = \(.*\)/\1/p' $LINUX/Makefile`
- -SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL
+EXTRAVERSION=`sed -n -e 's/^EXTRAVERSION =\(.*\)/\1/p' $LINUX/Makefile`
+SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION
 VERSION_CODE=`expr $VERSION \* 65536 + $PATCHLEVEL \* 256 + $SUBLEVEL`
 echo "The kernel source tree is version $SRC_RELEASE."
 CUR_RELEASE=`uname -r`

There is no way you can know that EXTRAVERSION will have a - in it.

Just be more general and allow anything in it.

-- 
Brought to you by the letters E and S and the number 15.
"The spiraling shape will make you go insane!" -- They Might Be Giants
Debian GNU/Linux -- where do you want to go tomorrow? http://www.debian.org/
I'm on FurryMUCK as Che, and EFNet and YiffNet IRC as Che_Fox.


Reply to: