[Lunar-commits] CVS: moonbase/utils/lilo BUILD, 1.1.1.1, 1.2 DEPENDS, 1.1.1.1, 1.2 DETAILS, 1.14, 1.15 PRE_BUILD, 1.1, 1.2

[Auke Kok]

Update of /var/cvs/lunar/moonbase/utils/lilo
In directory espresso.foo-projects.org:/tmp/cvs-serv10749

Modified Files:
	BUILD DEPENDS DETAILS PRE_BUILD 
Log Message:
update to 22.6:
- tested with both 2.4 and 2.6
- bumped patch up too/recreated patch
- no longer needs nasm


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/lilo/BUILD,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- BUILD	21 Aug 2002 00:55:21 -0000	1.1.1.1
+++ BUILD	3 Oct 2004 19:07:43 -0000	1.2
@@ -1,7 +1,7 @@
 (
 
   sedit "/^MAN_DIR/s/.*/MAN_DIR=\/usr\/share\/man/" Makefile                &&
-  sedit "/  manpath/d"                              Makefile                &&
+  sedit "/	manpath/d"                          Makefile                &&
   sedit "s/lilo\.8/lilo\.8\.gz/"                    Makefile                &&
   sedit "s/mkrescue\.8/mkrescue\.8\.gz/"            Makefile                &&
   sedit "s/lilo\.conf\.5/lilo\.conf\.5\.gz/"        Makefile                &&  
@@ -12,5 +12,4 @@
   prepare_install  &&
   make  ROOT= install
   
-
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/lilo/DEPENDS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DEPENDS	21 Aug 2002 00:55:21 -0000	1.1.1.1
+++ DEPENDS	3 Oct 2004 19:07:43 -0000	1.2
@@ -1,2 +1 @@
-depends  nasm  &&
 depends  bin86

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/lilo/DETAILS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- DETAILS	13 Jul 2004 08:07:56 -0000	1.14
+++ DETAILS	3 Oct 2004 19:07:43 -0000	1.15
@@ -1,15 +1,15 @@
           MODULE=lilo
-         VERSION=22.5.9
-          SOURCE=lilo-$VERSION.tar.gz
+         VERSION=22.6
+          SOURCE=$MODULE-$VERSION.tar.gz
+	 SOURCE2=$MODULE-$VERSION-kernel-2.6.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=http://www.ibiblio.org/pub/Linux/system/boot/$MODULE/$SOURCE
-      SOURCE_VFY=md5:d5b561190cbe0968d50e09e0031edb79
-         SOURCE2=lilo-22.5.9-kernel-2.6.7.patch.bz2
-     SOURCE2_URL=$PATCH_URL/$SOURCE2
-     SOURCE2_VFY=md5:796e04e5f2df4c565710cc0f39da2c1f
+     SOURCE2_URL=$PATCH_URL/
+      SOURCE_VFY=sha1:13c89d424930df54d601c007154c4a0e399d4fff
+     SOURCE2_VFY=sha1:ad0b08a64e9839f9203dca2410eabd5d6c464cf9
         WEB_SITE=http://home.san.rr.com/johninsd/pub/linux/lilo/
          ENTERED=20010922
-         UPDATED=20040513
+         UPDATED=20041003
            SHORT="Boot loader for Linux/x86 and other PC operating systems."
 cat << EOF
 Lilo is a Boot loader for Linux/x86 and other PC operating systems.

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/utils/lilo/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD	13 Jul 2004 08:07:56 -0000	1.1
+++ PRE_BUILD	3 Oct 2004 19:07:43 -0000	1.2
@@ -1,13 +1,12 @@
+default_pre_build &&
+
 KERNEL_MAJOR=$(grep UTS_RELEASE /usr/include/linux/version.h | cut -d'"' -f2 | cut -d. -f1,2)
-if [ "$KERNEL_MAJOR" ==  "2.6" ] ; then
+if [ "$KERNEL_MAJOR" == "2.6" ] ; then
   if [ ! -f /usr/include/libdevmapper.h ] ; then
     message "${PROBLEM_COLOR}Module device-mapper is not installed and is required to build lilo against 2.6 headers!${DEFAULT_COLOR}"
     exit 1
   else
-    default_pre_build &&
     cd $SOURCE_DIRECTORY &&
     patch_it $SOURCE2 1
   fi
-else
-  default_pre_build
 fi