packages (LILO_22): lilo/lilo.spec, lilo/lilo-setupspecs.patch (NEW) - allo...

[arekm]

Author: arekm                        Date: Thu Jul 21 17:50:02 2011 GMT
Module: packages                      Tag: LILO_22
---- Log message:
- allow 22.8 to boot newer kernels (>=2.6.36)

---- Files affected:
packages/lilo:
   lilo.spec (1.156 -> 1.156.2.1) , lilo-setupspecs.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lilo/lilo.spec
diff -u packages/lilo/lilo.spec:1.156 packages/lilo/lilo.spec:1.156.2.1
--- packages/lilo/lilo.spec:1.156	Wed Feb  3 13:33:16 2010
+++ packages/lilo/lilo.spec	Thu Jul 21 19:49:57 2011
@@ -13,7 +13,7 @@
 Summary(zh_CN.UTF-8):	Linux 和其它系统的引导模块。
 Name:		lilo
 Version:	22.8
-Release:	6
+Release:	7
 Epoch:		2
 License:	BSD
 Group:		Applications/System
@@ -34,6 +34,7 @@
 Patch5:		%{name}-dm.patch
 Patch6:		%{name}-devmapper.patch
 Patch7:		%{name}-degraded_arrary.patch
+Patch8:		%{name}-setupspecs.patch
 URL:		http://freshmeat.net/projects/lilo/
 BuildRequires:	bin86 >= 0.15
 BuildRequires:	device-mapper-devel >= 1.01.01
@@ -115,6 +116,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p2
 
 %build
 :> checkit
@@ -183,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156.2.1  2011/07/21 17:49:57  arekm
+- allow 22.8 to boot newer kernels (>=2.6.36)
+
 Revision 1.156  2010/02/03 12:33:16  matkor
 - Release 6. degraded_arrary.patch by Christian Schoniger for running lilo when first disk on array is failed.
 

================================================================
Index: packages/lilo/lilo-setupspecs.patch
diff -u /dev/null packages/lilo/lilo-setupspecs.patch:1.1.2.1
--- /dev/null	Thu Jul 21 19:50:02 2011
+++ packages/lilo/lilo-setupspecs.patch	Thu Jul 21 19:49:57 2011
@@ -0,0 +1,40 @@
+commit 5600dbd0049699c3847bfa15eb0bfc745f76d407
+Author: Joachim Wiedorn <ad_debian at joonet.de>
+Date:   Sat Apr 9 12:18:56 2011 +0200
+
+    Enlarge maximum number of SETUPSECS to 63
+
+diff --git a/src/bootsect.S b/src/bootsect.S
+index 77e5b45..4b38aaa 100644
+--- a/src/bootsect.S
++++ b/src/bootsect.S
+@@ -36,7 +38,7 @@ BOOTSEG   = 0x07C0			! original address of boot-sector
+ INITSEG   = 0x9000			! we move boot here - out of the way
+ SETUPSEG  = INITSEG+0x20		! setup starts here
+ SYSSEG    = 0x1000			! system loaded at 0x10000 (65536).
+-MAX_SETUPSECS = 31			! same as  lilo.h
++MAX_SETUPSECS = 63			! same as  lilo.h   (for kernel >= 2.4.0)
+ STK_SIZE  = MAX_SETUPSECS*512+512	! 0x4000
+ 
+ #ifndef SIZEKRNL
+diff --git a/src/lilo.h b/src/lilo.h
+index 1f1ef7d..86d87ca 100644
+--- a/src/lilo.h
++++ b/src/lilo.h
+@@ -253,12 +252,11 @@ source directory.
+ #define STAGE_FLAG_MENU	0x0200	/* boot loader supports menu interface */
+ #define STAGE_FLAG_BMP4	0x0400	/* boot loader supports 640x480x4 bitmaps */
+ 
+-#define SETUPSECS	4	/* nr of setup sectors */
+-#define VSS_NUM		497	/* address where variable setup size is
+-				   stored */
++#define VSS_NUM		497	/* address where variable setup size is stored */
+ #define VGA_SET		506	/* address of initial kernel VGA mode */
+-#define MAX_SETUPSECS	31	/* maximum number of sectors in kernel
+-				   setup code (+ bootsect) */
++#define SETUPSECS	4	/* default number of setup sectors */
++#define MAX_SETUPSECS	63	/* maximum number of sectors in kernel
++				   setup code (+ bootsect)  (for kernel >= 2.4.0) */
+ #define MAX_KERNEL_SECS	1024	/* absolute maximum kernel size */
+ #define SPECIAL_SECTORS	2	/* special sectors (don't compact) at beginning
+ 				   of map sections */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilo/lilo.spec?r1=1.156&r2=1.156.2.1&f=u