CVS: moonbase/kernel/linux-stable BUILD, 1.6, 1.7 DETAILS, 1.18, 1.19 POST_INSTALL, 1.5, 1.6 PRE_BUILD, 1.9, 1.10

[elaine at lunar-linux.org]

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

Modified Files:
	BUILD DETAILS POST_INSTALL PRE_BUILD 
Log Message:
Bumped version; corrected backup of modules, kernel; fixed lilo.conf edits


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-stable/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	27 Aug 2003 21:08:53 -0000	1.6
+++ BUILD	1 Sep 2003 15:42:53 -0000	1.7
@@ -26,7 +26,7 @@
 done
 
 
-backup_modules()  {
+backup_mods_krnl()  {
 
   if    [  -d  /lib/modules/$VERSION-stable      ];  then
     rm   -rf   /lib/modules/$VERSION-stable.old
@@ -34,6 +34,11 @@
                /lib/modules/$VERSION-stable.old
   fi
 
+  if    [  -f  /boot/stable_bz-$VERSION   ];  then
+    mv -f /boot/stable_bz-$VERSION.old /boot/stable_bz-$VERSION.old_2
+    cp -p /boot/stable_bz-$VERSION /boot/stable_bz-$VERSION.old
+  fi
+
 }
 
 
@@ -47,7 +52,7 @@
   make  bzImage          &&
   make  modules          &&
   prepare_install        &&
-  backup_modules         &&
+  backup_mods_krnl       &&
   make  modules_install  &&
   cp    arch/i386/boot/bzImage   /boot/stable_bz-$VERSION &&
   # link the modules so depmod can find them!

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-stable/DETAILS,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- DETAILS	24 Aug 2003 04:38:53 -0000	1.18
+++ DETAILS	1 Sep 2003 15:42:53 -0000	1.19
@@ -1,27 +1,22 @@
           MODULE=linux-stable
              PKG=linux
-         VERSION=2.4.20
+         VERSION=2.4.22
+
           SOURCE=$PKG-$VERSION.tar.bz2
-         SOURCE2=kernel_24_ptrace.patch
-	 SOURCE3=linux-2.4.20-nethashfix.patch
-         SOURCE4=linux_conntrack_dos_patch_2.4.20_f
-         SOURCE5=linux_NAT_dos_patch_2.4.20
+#        SOURCE2=kernel_24_ptrace.patch
 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
-  SOURCE3_URL[0]=$PATCH_URL/$SOURCE3
-  SOURCE4_URL[0]=http://lunar-linux.org/lunar/cache/$SOURCE4
-  SOURCE5_URL[0]=http://lunar-linux.org/lunar/cache/$SOURCE5
-      SOURCE_VFY=md5:c439d5c93d7fc9a1480a90842465bb97
-     SOURCE2_VFY=md5:30cf627b48fa04245cbb50d8ffec7f4c
-     SOURCE3_VFY=md5:2ae41d0b59f834249242de8e0949d61e
-     SOURCE4_VFY=md5:2ade9ea8638fcc06551e1d6f7064e905
-     SOURCE5_VFY=md5:34a7c11c961acd48f16428ab1dbe325c
+# SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
+
+      SOURCE_VFY=md5:75dc85149b06ac9432106b8941eb9f7b
+#    SOURCE2_VFY=md5:30cf627b48fa04245cbb50d8ffec7f4c
+
         WEB_SITE=http://www.kernel.org
         KEEP_SOURCE=on
 	 ENTERED=20020720
-         UPDATED=20030923
+         UPDATED=20030901
            SHORT="The Linux kernel is the core of a Linux GNU Operating System."
 cat << EOF
 This is the Linus-tree Linux kernel with only critical patches included.

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-stable/POST_INSTALL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- POST_INSTALL	6 Aug 2003 11:52:06 -0000	1.5
+++ POST_INSTALL	1 Sep 2003 15:42:53 -0000	1.6
@@ -3,9 +3,9 @@
   cat  <<  EOF
 
 image			=	/boot/stable_bz-$VERSION
-	label		=	linux-$VERSION
+	label		=	stable-$VERSION
 	read-only
-	restricted
+
 
 EOF
 

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-stable/PRE_BUILD,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PRE_BUILD	8 Aug 2003 12:12:02 -0000	1.9
+++ PRE_BUILD	1 Sep 2003 15:42:53 -0000	1.10
@@ -3,7 +3,7 @@
 
 unpack  $SOURCE
 
-ln  -s     linux-$VERSION  linux
+ln  -sf   linux-$VERSION  linux
 
 if  [  -f   $CONFIG_CACHE/.config  ];  then
   cp        $CONFIG_CACHE/.config  /usr/src/linux
@@ -11,9 +11,7 @@
 
 chown -R root.root /usr/src/linux-$VERSION
 cd /usr/src/linux-$VERSION
-sedit 's/EXTRAVERSION =/EXTRAVERSION = -stable/g' Makefile &&
+sedit 's/EXTRAVERSION =/EXTRAVERSION = -stable/g' Makefile 
+
+#patch_it $SOURCE_CACHE/$SOURCE2 1
 
-patch_it $SOURCE_CACHE/$SOURCE2 1 &&
-patch_it $SOURCE_CACHE/$SOURCE3 1 &&
-patch_it $SOURCE_CACHE/$SOURCE4 1 &&
-patch_it $SOURCE_CACHE/$SOURCE5 1