SOURCES: lilo-cc.patch, lilo-dmraid.patch - updated for 22.7.2

[qboosh]

Author: qboosh                       Date: Tue Jul 18 12:18:10 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 22.7.2

---- Files affected:
SOURCES:
   lilo-cc.patch (1.3 -> 1.4) , lilo-dmraid.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/lilo-cc.patch
diff -u SOURCES/lilo-cc.patch:1.3 SOURCES/lilo-cc.patch:1.4
--- SOURCES/lilo-cc.patch:1.3	Tue Jan  4 23:51:00 2005
+++ SOURCES/lilo-cc.patch	Tue Jul 18 14:18:05 2006
@@ -1,5 +1,5 @@
---- lilo-22.6.1/diagnose/Makefile	2004-09-08 04:34:59.000000000 +0000
-+++ lilo-22.6.1.new/diagnose/Makefile	2005-01-04 22:44:02.960179952 +0000
+--- lilo-22.7.2/diagnose/Makefile.orig	2005-09-23 19:24:33.000000000 +0200
++++ lilo-22.7.2/diagnose/Makefile	2006-07-18 14:07:54.594440000 +0200
 @@ -1,11 +1,11 @@
  # Makefile for BCC tests
  #
@@ -11,15 +11,15 @@
  AS = as86
 -LINK = $(CC) -v
 +LINK = $(BCC) -v
- COPT = -ansi -I$(CINCL) -c -O -DDEBUG=1
+ COPT = -ansi -I$(CINCL) -c -O -DDEBUG=0
  LOPT = -m >$*.map -M -d
  AOPT = -0 -a -w
 @@ -17,7 +17,7 @@
  .SUFFIXES:	.com .S
  
  .c.o:
--	$(CC) $(COPT) -o $@ $<
-+	$(BCC) $(COPT) -o $@ $<
+-	$(CC) $(COPT) -o $@ $< -A-l -A$*.lis
++	$(BCC) $(COPT) -o $@ $< -A-l -A$*.lis
  
  .o.com:
  	$(LINK) $(LOPT) -o $@ $^

================================================================
Index: SOURCES/lilo-dmraid.patch
diff -u SOURCES/lilo-dmraid.patch:1.1 SOURCES/lilo-dmraid.patch:1.2
--- SOURCES/lilo-dmraid.patch:1.1	Thu Nov  4 12:06:08 2004
+++ SOURCES/lilo-dmraid.patch	Tue Jul 18 14:18:05 2006
@@ -271,19 +271,18 @@
  #else
  /* Werner's original conditional */
      if (keep_cyls) {
-diff -urN lilo-orig/Makefile lilo-22.6/Makefile
---- lilo-orig/Makefile	2004-11-04 11:55:36.451155200 +0100
-+++ lilo-22.6/Makefile	2004-11-04 12:01:02.984514584 +0100
-@@ -53,7 +53,7 @@
- #   XL_SECS=n	  Support for extra large (non-standard) floppies.
- 
- CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DONE_SHOT -DPASS160 \
--   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL
-+   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL -DDEVMAPPER
+--- lilo-22.7.2/Makefile.orig	2006-07-18 14:08:17.584440000 +0200
++++ lilo-22.7.2/Makefile	2006-07-18 14:09:42.544440000 +0200
+@@ -65,7 +65,7 @@
+ 
+ CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \
+    -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \
+-   -DATARAID -DMDPRAID
++   -DATARAID -DMDPRAID -DDEVMAPPER
  
  # set the compiler optimization level
  
-@@ -94,6 +94,8 @@
+@@ -108,6 +108,8 @@
  LDFLAGS=#-Xlinker -qmagic
  LIBS=
  
@@ -292,7 +291,7 @@
  OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \
    partition.o identify.o probe.o shs2.o edit.o temp.o
  
-@@ -269,7 +271,11 @@
+@@ -345,7 +347,11 @@
  		cp -p dparam.S dparam.s
  
  lilo:		$(OBJS)
@@ -302,5 +301,5 @@
  		$(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS)
 +endif
  
- lilo-static:	$(OBJS)
- 		$(CC) -o lilo-static -static $(LDFLAGS) $(OBJS) $(LIBS)
+ lilo.static:	$(OBJS)
+ 		$(CC) -o lilo.static -static $(LDFLAGS) $(OBJS) $(LIBS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lilo-cc.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/lilo-dmraid.patch?r1=1.1&r2=1.2&f=u