CVS: moonbase/kernel/linux BUILD, 1.16, 1.17 CONFIGURE, 1.13, 1.14 DETAILS, 1.24, 1.25 POST_INSTALL, 1.18, 1.19 PRE_BUILD, 1.13, 1.14

Niki Guldbrand niki at lunar-linux.org
Fri Dec 5 10:59:41 GMT 2003


Update of /var/cvs/lunar/moonbase/kernel/linux
In directory dbguin.lunar-linux.org:/tmp/cvs-serv20607

Modified Files:
	BUILD CONFIGURE DETAILS POST_INSTALL PRE_BUILD 
Log Message:
Bumped the Linux module to 2.4.23 with patchset r3.1.1, and this time the
module has been converted to elaines kenel module "framework" ;-)


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux/BUILD,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- BUILD	19 Nov 2003 21:13:47 -0000	1.16
+++ BUILD	5 Dec 2003 10:59:38 -0000	1.17
@@ -1,85 +1,65 @@
 cd  /usr/src/linux
 
-#set the arch once
-XARCH="x`arch`"
-
-#Select the prefered linux config method and lets things fall back
 while
-  case  $CONFIG_KERNEL in
-      y|Y)  case $CONFIG_METHOD in
-              xconfig ) 
-	      		   if [ $DISPLAY ]
-			   then
-			       make xconfig || make menuconfig || make config
-			   else
-			       make menuconfig || make config
-			   fi ;;
-	      menuconfig ) make menuconfig || make config ;;
-	      config )     make config ;;
-	    esac
-            if  query  "Repeat $CONFIG_METHOD?"  n
-            then  CONFIG_KERNEL=y
-            else  CONFIG_KERNEL=n
-            fi     ;;
-        *)  false  ;;
+    case  $CONFIG_KERNEL in
+        y|Y)
+
+            case $CONFIG_METHOD in
+                xconfig )
+                    if [ "$DISPLAY" ]; then
+                        make xconfig || make menuconfig || make config
+                    else
+                        make menuconfig || make config
+                    fi ;;
+
+                menuconfig )
+                  make menuconfig || make config ;;
+
+                config )
+                  make config ;;
+            esac
+
+            if  query  "Repeat $CONFIG_METHOD?  "  n ; then
+                CONFIG_KERNEL=y
+            else
+                CONFIG_KERNEL=n
+            fi
+            ;;
+
+        *)
+            false  ;;
     esac
 do
   true
-done			
-
-backup_modules()  {
-  if    [  -d  /lib/modules/$VERSION      ];  then
-    rm   -rf   /lib/modules/$VERSION.old
-    mv         /lib/modules/$VERSION      \
-               /lib/modules/$VERSION.old
-  fi
-}
+done
 
 (
 
   yes  n  |  make  oldconfig
-  cp .config $CONFIG_CACHE
-  make dep                                   &&
+  cp .config $CONFIG_CACHE/.config
+  rm -f arch/i386/boot/bzImage
 
-  case $XARCH in
-     xi386 | xi486 | xi586 | xi686 ) make bzImage;;
-    xalpha   ) make boot;;
-      xppc   ) make vmlinux;;
-    xsparc   ) echo "Sorry no Lunar port yet want to try its easy :-P the penguin team will help.";;
-    xsparc64 ) make vmlinux;;
-      xarm   ) echo "Sorry no Lunar port yet want to try its easy :-P the penguin team will help.";;
-     xm68k   ) echo "Sorry no Lunar port yet want to try its easy :-P the penguin team will help.";;
-     xmips   ) echo "Sorry no Lunar port yet want to try its easy :-P the penguin team will help.";;
-          *  ) echo "Opps. You, yea you, yap at hardkrash for forgetting to put in your arch in this module. :-P";;
-  esac					     &&
-  
-  if grep -q "CONFIG_MODULES=y" .config
-  then
-    make modules
-  fi                                         &&
-  
-  prepare_install                            &&
-  
-  if grep -q "CONFIG_MODULES=y" .config
-  then
-    backup_modules                           &&
-    make modules_install
-  fi                                         &&
-  
-  case $XARCH in
-     xi386 | xi486 | xi586 | xi686 )
-             cp arch/i386/boot/bzImage   /boot/vmlinubz-$VERSION;;
-	
-    xalpha )
-             cp arch/alpha/boot/vmlinux.gz /boot/vmlinux-$VERSION.gz;;
+  # Because parallel make seems not to work, a hack
 
-      xppc ) 
-             cp vmlinux /boot/vmlinux-$VERSION;;
-  xsparc64 )
-             cp vmlinux /boot/vmlinux-$VERSION;;
-      xarm ) echo "Oh crud they forgot to tell me what should I do for arm.";;
-     xm68k ) echo "Oh crud they forgot to tell me what should I do for m68k.";;
-     xmips ) echo "Oh crud they forgot to tell me what should I do for mips.";;
-         * ) echo "Oh crud they forgot to tell me what to do for you. ;~-(";;
-  esac
+if [ "$CONFIG_AGGRESSIVE" == "y" ]; then
+  EXTENSION="-aggressive"
+else
+  EXTENSION=""
+fi
+
+  optimize_make                                        &&
+  KMAKES=${MAKES:=1}                                   &&
+  make -j${KMAKES} dep                                 &&
+  make -j${KMAKES} clean                               &&
+  make -j${KMAKES} bzImage                             &&
+  make -j${KMAKES} modules                             &&
+  backup_mods_krnl  ${VERSION}-${PVERSION}${EXTENSION} &&
+  prepare_install                                      &&
+  make  modules_install                                &&
+
+  cp    arch/i386/boot/bzImage   /boot/${VERSION}-${PVERSION} &&
+  # link the modules so depmod can find them!
+  rm /lib/modules/${VERSION}                                  &&
+  ln -f -s /lib/modules/${VERSION}-${PVERSION}${EXTENSION} /lib/modules/${VERSION}
+  
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux/CONFIGURE,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CONFIGURE	19 Nov 2003 21:13:47 -0000	1.13
+++ CONFIGURE	5 Dec 2003 10:59:38 -0000	1.14
@@ -1,149 +1,69 @@
-XARCH="x`arch`"
-
 if  !  grep  -q  "BOOT_LOADER"  $MODULE_CONFIG;  then
+  #message  "The Linux Kernel requires a boot loader"
+  message  "Choose either GRUB or LILO"
+  #BOOT_LOADER=lilo
 
-	case $XARCH in
-	     xi386|xi486|xi586|xi686) 
-	      message  "The Linux Kernel requires a boot loader"
-	      message  "Choose either GRUB or LILO"
-	      if  query  "To use lilo choose yes, to use grub choose no"  y
-		then  BOOT_LOADER=lilo
-	      else  BOOT_LOADER=grub
-	      fi;;
-	  
-	    xalpha) BOOT_LOADER=aboot;;
-	      xppc) BOOT_LOADER=yaboot;;
-            xsparc|xsparc64)
-                    BOOT_LOADER=silo;;
-	      xarm) echo ";~( I am not setup for arms. Can you give me limbs?";;
-	     xm68k) echo ";~( I am not setup for 68k. Can you configure me?";;
-	     xmips) echo ";~( I am not setup for mips. Can you configure me?";;
-	  esac
-	    
-	  echo  "BOOT_LOADER=$BOOT_LOADER"  >>  $MODULE_CONFIG
+  if  query  "Use  LILO?"  y
+    then  BOOT_LOADER=lilo
+    else  BOOT_LOADER=grub
+  fi
 
+  echo  "BOOT_LOADER=$BOOT_LOADER"  >>  $MODULE_CONFIG
 fi
 
 CONFIG_GRUB="n"
 CONFIG_LILO="n"
-CONFIG_ABOOT="n"
-CONFIG_YABOOT="n"
-CONFIG_SILO="n"
 
 if    grep  -q  "BOOT_LOADER=grub"  $MODULE_CONFIG  &&
       query  "Configure grub?"  n
-then  CONFIG_GRUB=y
-fi
-
-if    grep  -q  "BOOT_LOADER=lilo"  $MODULE_CONFIG; then
-      if ! grep -q "CONFIG_LILO=[yn]" $MODULE_CONFIG; then
-	      if query  "Automaticaly configure and run lilo?"  n; 
-	      then
-		CONFIG_LILO=y
-	      fi
-      fi	    
-      
-      if query  "Hand edit /etc/lilo.conf?" n; 
-      then
-        EDIT_LILO=y
-      else
-        EDIT_LILO=n
-      fi
+  then  CONFIG_GRUB=y
 fi
 
-if    grep  -q  "BOOT_LOADER=aboot" $MODULE_CONFIG  &&
-      query  "Configure aboot?" n
-then  CONFIG_ABOOT=y
+if    grep  -q  "BOOT_LOADER=lilo"  $MODULE_CONFIG  &&
+      query  "Configure lilo?"  n
+  then  CONFIG_LILO=y
 fi
 
-if    grep  -q  "BOOT_LOADER=yaboot" $MODULE_CONFIG; then
-	if ! grep -q "CONFIG_YABOOT=[yn]" $MODULE_CONFIG; then
-		if query "Automatically configure and run yaboot?" n;
-		then
-			CONFIG_YABOOT=y
-		fi
-	fi
-	
-	if query "Hand edit /etc/yaboot.conf?" n;
-	then
-		EDIT_YABOOT=y
-	else
-		EDIT_YABOOT=n
-	fi
-fi
 
-if    grep  -q  "BOOT_LOADER=silo" $MODULE_CONFIG  &&
-      query  "Configure silo?" n
-then  CONFIG_SILO=y
+if  !  grep -q  "CONFIG_METHOD="  $MODULE_CONFIG; then
+  if    query  "Do you prefer make menuconfig over make config"  y
+    then  CONFIG_METHOD="menuconfig"
+  else
+    CONFIG_METHOD="config"
+  fi
+  echo  "CONFIG_METHOD=$CONFIG_METHOD"  >>  $MODULE_CONFIG
 fi
+                           
 
 CONFIG_AGGRESSIVE="n"
 
-if !  grep  -q  "CONFIG_AGGRESSIVE=" $MODULE_CONFIG &&
-      query  "Use Aggressive patchset?" n
-then  CONFIG_AGGRESSIVE="y"
-else  if grep -q "CONFIG_AGGRESSIVE=y"  $MODULE_CONFIG
-      then  CONFIG_AGGRESSIVE="y"
-      fi
-fi      
-
-if  !  grep  -q  "CONFIG_METHOD="  $MODULE_CONFIG
-then
-      CONFIG_HELP="Answer \Z1one\Zn question at a time. (Are you SURE?)"
-  MENUCONFIG_HELP="Menu driven ncurses interface, falls back to config."
-     XCONFIG_HELP="Graphical interface with X windows, falls back to menuconfig."
-     
-  OPTIONS=( "config"     "text based"             "off" "$CONFIG_HELP"
-            "menuconfig" "ncurses menu interface" "off" "$MENUCONFIG_HELP"
-	    "xconfig"    "X graphical interface"  "off" "$XCONFIG_HELP" )
-
-  while [ -z "$CONFIG_METHOD" ] ; do
-  CONFIG_METHOD=`dialog --title "Select how to configure your kernel" 	\
-  			--backtitle "Lunar Linux Kernel Configuration"  \
-			--ok-label  "Ok"				\
-			--no-cancel                                   	\
-			--stdout                                      	\
-			--item-help				      	\
-			--colors				      	\
-			--radiolist                                   	\
-			"Select your kernel configuration method"    	      	\
-			 0 0 0                                        	\
-			"${OPTIONS[@]}"`
-
-  done
-  
-  echo  "CONFIG_METHOD=$CONFIG_METHOD"  >>  $MODULE_CONFIG
+if  !  grep  -q  "CONFIG_AGGRESSIVE=" $MODULE_CONFIG &&
+       query  "Use Aggressive patchset?" n
+  then  CONFIG_AGGRESSIVE="y"
+else
+  if grep -q "CONFIG_AGGRESSIVE=y"  $MODULE_CONFIG
+    then  CONFIG_AGGRESSIVE="y"
+  fi
 fi
-
-
-if  [  !  -f  $CONFIG_CACHE/.config  ];  then
-  message  "Preparing to make $CONFIG_METHOD"
+                                                             
+if  [  !  -f $CONFIG_CACHE/.config  ];  then
+  message  "Preparing to make menuconfig."
   CONFIG_KERNEL="y"
 else
   message  "Reconfiguration is optional."
   if    query  "Configure linux kernel?"  n
-  then  CONFIG_KERNEL=y
-  else  CONFIG_KERNEL=n
+    then CONFIG_KERNEL=y
+  else
+    CONFIG_KERNEL=n
   fi
 fi
 
-TEMP=`grep  -v  "CONFIG_KERNEL="          $MODULE_CONFIG  |
-      grep  -v  "CONFIG_LILO="                            |
-      grep  -v  "CONFIG_GRUB="                            |
-      grep  -v  "CONFIG_ABOOT="				  |
-      grep  -v  "CONFIG_YABOOT="			  |
-      grep  -v  "CONFIG_SILO="  			  |
-      grep  -v  "CONFIG_AGGRESSIVE="                      |
-      grep  -v  "EDIT_YABOOT="                            |
-      grep  -v  "EDIT_LILO"`
+TEMP=$(grep  -v  "CONFIG_KERNEL="          $MODULE_CONFIG  |
+       grep  -v  "CONFIG_LILO="                            |
+       grep  -v  "CONFIG_GRUB=")
 
 echo  "$TEMP"                                >   $MODULE_CONFIG
+echo  "CONFIG_AGGRESSIVE=$CONFIG_AGGRESSIVE" >>  $MODULE_CONFIG
 echo  "CONFIG_KERNEL=$CONFIG_KERNEL"         >>  $MODULE_CONFIG
 echo  "CONFIG_LILO=$CONFIG_LILO"             >>  $MODULE_CONFIG
 echo  "CONFIG_GRUB=$CONFIG_GRUB"             >>  $MODULE_CONFIG
-echo  "CONFIG_ABOOT=$CONFIG_ABOOT"           >>  $MODULE_CONFIG
-echo  "CONFIG_YABOOT=$CONFIG_YABOOT"         >>  $MODULE_CONFIG
-echo  "CONFIG_ABOOT=$CONFIG_SILO"            >>  $MODULE_CONFIG
-echo  "CONFIG_AGGRESSIVE=$CONFIG_AGGRESSIVE" >>  $MODULE_CONFIG
-echo  "EDIT_YABOOT=$EDIT_YABOOT"             >>  $MODULE_CONFIG
-echo  "EDIT_LILO=$EDIT_LILO"	             >>  $MODULE_CONFIG

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux/DETAILS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- DETAILS	18 Nov 2003 20:11:48 -0000	1.24
+++ DETAILS	5 Dec 2003 10:59:38 -0000	1.25
@@ -1,18 +1,19 @@
-         MODULE=linux
-        VERSION=2.4.22
-   PATCHVERSION=r2.1.4
-         SOURCE=linux-$VERSION.tar.bz2
-        SOURCE2=linux-$VERSION-lunar-patch-set-$PATCHVERSION.tar.bz2
-  SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.4/$SOURCE
-  SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.4/$SOURCE
- SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
-     SOURCE_VFY=md5:75dc85149b06ac9432106b8941eb9f7b
-    SOURCE2_VFY=md5:2e4b501d62c8f27e8d2b15c7c9e8bd89
-        WEBSITE=http://www.kernel.org
-        ENTERED=20020916
-        UPDATED=20031115
-    KEEP_SOURCE="on"
-          SHORT="The Linux kernel, the core of the GNU/Linux OS, with the lunar patch set"
+           MODULE=linux
+          VERSION=2.4.23
+         PVERSION=r3.1.1
+           SOURCE=linux-$VERSION.tar.bz2
+          SOURCE2=$MODULE-$VERSION-patch-set-$PVERSION.tar.bz2
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/linux-$VERSION
+    SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.4/$SOURCE
+    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.4/$SOURCE
+   SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
+       SOURCE_VFY=md5:642af5ab5e1fc63685fde85e9ae601e4
+      SOURCE2_VFY=md5:38b995bab779149274f1733e065747f4
+          WEBSITE=http://www.kernel.org
+          ENTERED=20030227
+          UPDATED=20031205
+      KEEP_SOURCE="on"
+            SHORT="The Linux kernel, the core of the GNU/Linux OS, with the lunar patch set"
 cat << EOF
 This is the Linux kernel with the Lunar Linux kernel patch set.
 

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux/POST_INSTALL,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- POST_INSTALL	3 Dec 2003 03:46:50 -0000	1.18
+++ POST_INSTALL	5 Dec 2003 10:59:39 -0000	1.19
@@ -1,214 +1,7 @@
-lilo_image_entry()  {
-
-  cat  <<  EOF
-
-image			=	/boot/vmlinubz-$VERSION
-	label		=	linux-$VERSION
-	read-only
-
-EOF
-
-}
-
-grub_image_entry()  {
-
-. $DEPENDS_CONFIG/grub
-
-  cat  <<  EOF
-
-title   linux-$VERSION
-kernel  $GRUB_BOOT/vmlinubz-$VERSION
-root    $GRUB_ROOT
-
-EOF
-
-}
-
-yaboot_image_entry()  {
-
-  cat  <<  EOF
-
-image			=	/boot/vmlinubx-$VERSION
-	label		=	linux-$VERSION
-
-EOF
-
-}
-
-update_lilo()  {
-  if  !  grep  -q  "$VERSION"  /etc/lilo.conf;  then
-
-    IFS_OLD=$IFS
-    export  IFS="
-"
-
-    rm  -rf  /etc/lilo.conf.new
-    cp  /etc/lilo.conf  /etc/lilo.conf.old
-
-    (( IMAGE_COUNT=0  ))
-
-    for  LINE  in  `cat /etc/lilo.conf`;  do
-
-      if   echo  $LINE  |  grep  -q  "image"  ||
-           echo  $LINE  |  grep  -q  "other"  ;  then
-        if  (( IMAGE_COUNT  == 0  ));  then
-          echo  -e  "`lilo_image_entry`"  >>  /etc/lilo.conf.new
-        fi
-        ((  IMAGE_COUNT++  ))
-      fi
-
-      if  ((  IMAGE_COUNT == 14  ));  then
-        break
-      fi
-    
-      echo  $LINE  >>  /etc/lilo.conf.new
-
-    done
-
-    if  ((  IMAGE_COUNT ==  0  ));  then
-      echo  -e  "`lilo_image_entry`"  >>  /etc/lilo.conf.new
-    fi
-
-    cp  /etc/lilo.conf.new  /etc/lilo.conf
-
-    export  IFS=$IFS_OLD
-
-  fi
-
-  case  $EDIT_LILO in
-    y|Y|j|J)  ${EDITOR:-nano}  /etc/lilo.conf  ;;
-  esac
-
-  /sbin/lilo
-
-}
-
-
-update_grub()  {
-  if  !  grep  -q  "$VERSION"  /boot/grub/menu.lst;  then
-
-    IFS_OLD=$IFS
-    export  IFS="
-"
-
-    rm  -rf  /boot/grub/menu.lst.new
-    cp  /boot/grub/menu.lst  /boot/grub/menu.lst.old
-
-    (( IMAGE_COUNT=0  ))
-
-    for  LINE  in  `cat /boot/grub/menu.lst`;  do
-
-      if   echo  $LINE  |  grep  -q  "title";  then
-        if  (( IMAGE_COUNT  == 0  ));  then
-          echo  -e  "`grub_image_entry`"  >>  /boot/grub/menu.lst.new
-        fi
-        ((  IMAGE_COUNT++  ))
-      fi
-
-      if  ((  IMAGE_COUNT == 14  ));  then
-        break
-      fi
-    
-      echo  $LINE  >>  /boot/grub/menu.lst.new
-
-    done
-
-    if  ((  IMAGE_COUNT ==  0  ));  then
-      echo  -e  "`grub_image_entry`"  >>  /boot/grub/menu.lst.new
-    fi
-
-    cp  /boot/grub/menu.lst.new  /boot/grub/menu.lst
-
-    export  IFS=$IFS_OLD
-
-  fi
-
-  case  $CONFIG_GRUB in
-
-    y|Y)  ${EDITOR:-nano}  /boot/grub/menu.lst;;
-  esac
-
-  message "Install GRUB into MBR of first drive? [y|Y]"
-  read GRUB_FIRST_DRIVE
-  case $GRUB_FIRST_DRIVE in
-    y|Y) GRUB_BOOT_DEVICE="(hd0)" ;; 
-    *  ) 
-         message "Otherwise please specify in GRUB notation the desired drive/partition"
-         message "Using parenthesis and NO spaces!"
-         message "Samples: (hd1)    2nd drive MBR"
-         message "         (hd1,0)  2nd drive with 1st partition"
-         message "         (hd0,2)  1st drive with 3rd partition"
-         echo -n "GRUB_BOOT_DEVICE=(hd#,#):  "
-         read GRUB_BOOT_DEVICE
-  esac
-  
-  /usr/sbin/grub-install "$GRUB_BOOT_DEVICE"
-  sleep 4
-
-}
-
-update_aboot() {
-    ${EDITOR:-nano}  /etc/aboot.conf;
-}
-
-update_yaboot() {
-  if  !  grep  -q  "$VERSION"  /etc/yaboot.conf;  then
-
-    IFS_OLD=$IFS
-    export  IFS="
-"
-
-    rm  -rf  /etc/yaboot.conf.new
-    cp  /etc/yaboot.conf  /etc/yaboot.conf.old
-
-    (( IMAGE_COUNT=0  ))
-
-    for  LINE  in  `cat /etc/yaboot.conf`;  do
-
-      if   echo  $LINE  |  grep  -q  "image"  ||
-           echo  $LINE  |  grep  -q  "other"  ;  then
-        if  (( IMAGE_COUNT  == 0  ));  then
-          echo  -e  "`yaboot_image_entry`"  >>  /etc/yaboot.conf.new
-        fi
-        ((  IMAGE_COUNT++  ))
-      fi
-
-      if  ((  IMAGE_COUNT == 14  ));  then
-        break
-      fi
-    
-      echo  $LINE  >>  /etc/yaboot.conf.new
-
-    done
-
-    if  ((  IMAGE_COUNT ==  0  ));  then
-      echo  -e  "`yaboot_image_entry`"  >>  /etc/yaboot.conf.new
-    fi
-
-    cp  /etc/yaboot.conf.new  /etc/yaboot.conf
-
-    export  IFS=$IFS_OLD
-
-  fi
-
-  case  $EDIT_YABOOT in
-    y|Y|j|J)  ${EDITOR:-nano}  /etc/yaboot.conf  ;;
-  esac
-
-  /sbin/ybin
-
-}
-
-update_silo() {
-    ${EDITOR:-nano}  /boot/silo.conf;
-}
 
 case  $BOOT_LOADER  in
-  lilo)  [ $CONFIG_LILO = y ] && update_lilo  ;;
-  grub)  [ $CONFIG_GRUB = y ] && update_grub  ;;
-  aboot) [ $CONFIG_ABOOT = y ] && update_aboot ;;
-  yaboot) [ $CONFIG_YABOOT = y ] && update_yaboot ;;
-  silo)  [ $CONFIG_SILO = y ] && update_silo ;;
+  lilo)  update_lilo ${VERSION}-${PVERSION} $VERSION ;;
+  grub)  update_grub ${VERSION}-${PVERSION} $VERSION ;;
 esac
 
 
@@ -221,9 +14,7 @@
 if  module_installed  NVIDIA;         then  lin  NVIDIA;         fi
 if  module_installed  alsa-driver;    then  lin  alsa-driver;    fi
 if  module_installed  cryptoapi;      then  lin  cryptoapi;      fi
-if  module_installed  pcmcia-cs;      then  lin  pcmcia-cs;      fi
+if  module_installed  pcmcia-cs;      then  lin -r -c pcmcia-cs; fi
 if  module_installed  mwavem;         then  lin  mwavem;         fi
 if  module_installed  cipe;           then  lin  cipe;           fi
 if  module_installed  snare-core;     then  lin  snare-core;     fi
-if  module_installed  ltmodem;        then  lin  ltmodem;        fi
-if  module_installed  bluez-kernel;   then  lin  bluez-kernel;   fi

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux/PRE_BUILD,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- PRE_BUILD	18 Nov 2003 17:57:54 -0000	1.13
+++ PRE_BUILD	5 Dec 2003 10:59:39 -0000	1.14
@@ -1,39 +1,41 @@
+# Bail if we're not running a core with kernel fuctions
+
+if [ ! -e $FUNCTIONS/kernel.lunar ] ; then
+  message "   ${PROBLEM_COLOR}Bailing out, ${DEFAULT_COLOR}Lunar (or theedge) code version too old"
+  message "   ${PROBLEM_COLOR}Update core ${MODULE_COLOR}(lin lunar or lin theedge)${DEFAULT_COLOR} to install this kernel"
+  kill $PPID
+  exit;
+fi
+
 cd       /usr/src
-rm  -rf  linux-$VERSION
-rm  -f   linux
+rm  -rf  linux-$VERSION linux
 
 unpack  $SOURCE
 
 ln  -s     linux-$VERSION  linux
 
 if  [  -f   $CONFIG_CACHE/.config  ];  then
-  cp        $CONFIG_CACHE/.config  /usr/src/linux
+  cp        $CONFIG_CACHE/.config  /usr/src/linux/.config
 fi
 
 cd /usr/src/linux
 mkdir patches
 bzcat $SOURCE_CACHE/$SOURCE2 | tar -xf - -C patches
 
-#
-# Patch in main feature enhancements
-#
 for pat in patches/main/*
 do
-    patch -p1 < $pat
+  patch_it $pat 1
 done
 
-#
-# Patch in kernel fixes
-#
 for pat in patches/fix/*
 do
-    patch -p1 < $pat
+  patch_it $pat 1
 done
-    
+
 if [ "$CONFIG_AGGRESSIVE" == "y" ]; then
    for pat in patches/aggressive/*
    do
-       patch -p1 < $pat
+     patch -p1 < $pat
    done
 fi
 
@@ -41,4 +43,3 @@
 chown -R root:root /usr/src/linux-$VERSION
 
 true
-




More information about the Lunar-commits mailing list