Devmapper patch by Christophe Saout instead of rediffed 22.5.9 one with issues, closes bug #66188.

3 files changed, 51 insertions, 46 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 290b9abddffd..9a67b598945d 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.23 2004/10/02 12:04:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.24 2004/10/06 19:38:07 chainsaw Exp $
+
+  06 Oct 2004; Tony Vroon <chainsaw@gentoo.org>
+  files/lilo-22.6-devmapper_gentoo.patch:
+  Use new devmapper patch by Christophe Saout, rediffed 22.5.9 one had issues.
+  Closes bug #66188
 
 *lilo-22.6 (02 Oct 2004)
 
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 77f8cbb95c19..2ee7095f872b 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,10 +1,10 @@
 MD5 09c0202c69fb19d8b05556ba92b80d62 lilo-22.6.ebuild 4866
 MD5 1d57e4303e8c79db5805712770b5e5e9 lilo-22.5.9-r2.ebuild 5072
-MD5 dbf46a60f50542c6337231efd6219273 ChangeLog 1508
+MD5 55c541e3829c68272557d70b58a2aa3c ChangeLog 1698
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.5.9-correct-usage-info.patch 683
 MD5 925f55c96304e240bdb20cc35c6745ae files/digest-lilo-22.5.9-r2 124
-MD5 a4189ad9b887dbba03b5757f276bbb28 files/lilo-22.6-devmapper_gentoo.patch 11858
+MD5 42faa8a84fae547fe181da0ad7b67b04 files/lilo-22.6-devmapper_gentoo.patch 11826
 MD5 77acd52c9bdf0a660026777a3419ccb3 files/lilo-22.5.9-glibc233.patch 584
 MD5 a12e27d3f9076bb13d357533303f77ff files/digest-lilo-22.6 122
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.6-create-install-dirs.patch 970
diff --git a/sys-boot/lilo/files/lilo-22.6-devmapper_gentoo.patch b/sys-boot/lilo/files/lilo-22.6-devmapper_gentoo.patch
index e2267fcccfe9..2ad3255c0853 100644
--- a/sys-boot/lilo/files/lilo-22.6-devmapper_gentoo.patch
+++ b/sys-boot/lilo/files/lilo-22.6-devmapper_gentoo.patch
@@ -1,40 +1,7 @@
-diff -uNr lilo-22.5.9.orig/Makefile lilo-22.5.9/Makefile
---- lilo-22.5.9.orig/Makefile	2004-06-09 22:41:24.519057048 +0100
-+++ lilo-22.5.9/Makefile	2004-06-09 22:42:25.269821528 +0100
-@@ -53,7 +53,8 @@
- #   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
- 
- # set the compiler optimization level
- 
-@@ -88,6 +89,8 @@
- LDFLAGS=#-Xlinker -qmagic
- LIBS=
- 
-+DEVMAPPER=-ldevmapper
-+
- OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \
-   temp.o partition.o identify.o probe.o shs2.o loader.o edit.o
- 
-@@ -255,7 +258,11 @@
- 		cp -p dparam.S dparam.s
- 
- lilo:		$(OBJS)
-+ifneq (,$(findstring DEVMAPPER,$(CONFIG)))
-+		$(CC) -o lilo -L/lib $(LDFLAGS) $(DEVMAPPER) $(OBJS) $(LIBS)
-+else
- 		$(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS)
-+endif
- 
- lilo-static:	$(OBJS)
- 		$(CC) -o lilo-static -static $(LDFLAGS) $(OBJS) $(LIBS)
-diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
---- lilo-22.5.9.orig/geometry.c	2004-06-09 22:41:24.526055984 +0100
-+++ lilo-22.5.9/geometry.c	2004-06-09 22:41:42.016397048 +0100
-@@ -14,6 +14,9 @@
+diff -Nur lilo-22.6.orig/geometry.c lilo-22.6/geometry.c
+--- lilo-22.6.orig/geometry.c	2004-08-25 20:21:08.000000000 +0200
++++ lilo-22.6/geometry.c	2004-09-21 22:42:05.023500680 +0200
+@@ -15,6 +15,9 @@
  #include <stdio.h>
  #include <fcntl.h>
  #include <errno.h>
@@ -44,7 +11,7 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
  #include <sys/types.h>
  
  #ifdef LCF_REISERFS
-@@ -26,6 +29,10 @@
+@@ -27,6 +30,10 @@
  
  #include <string.h>
  
@@ -55,7 +22,7 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
  #include "config.h"
  #include "lilo.h"
  #include "common.h"
-@@ -60,6 +67,25 @@
+@@ -61,6 +68,25 @@
  #endif
  #endif
  
@@ -81,7 +48,7 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
  #ifdef LCF_LVM
  struct lv_bmap {
      __u32 lv_block;
-@@ -121,6 +147,12 @@
+@@ -115,6 +141,12 @@
  {
      FILE *file;
      char line[MAX_LINE+1];
@@ -94,7 +61,7 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
      char *here;
      DT_ENTRY *entry;
      int disk_section,items;
-@@ -129,29 +161,69 @@
+@@ -123,29 +155,69 @@
  	if ((file = fopen(name,"r")) == NULL)
  	    die("open %s: %s",name,strerror(errno));
      }
@@ -184,7 +151,7 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
  }
  
  
-@@ -775,6 +847,161 @@
+@@ -776,6 +848,161 @@
  {
      DT_ENTRY *walk;
      int inherited,keep_cyls,is_raid=0;
@@ -346,7 +313,7 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
  
      if (verbose>=5) printf("geo_get: device %04X, all=%d\n", device, all);
  #ifdef LCF_LVM
-@@ -1146,14 +1373,50 @@
+@@ -1147,14 +1374,50 @@
              die("EVMS boot volume cannot be on multiple disks.\n");
          sector = ebm.rsector + ((offset/SECTOR_SIZE) % geo->spb) + geo->start;
      }
@@ -404,3 +371,36 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
   /*   DON'T always use CHS addressing on floppies:     JRC   */
  /*    if ((geo->device & 0x80) && (linear || lba32)) {	*/
      if ((linear || lba32)) {
+diff -Nur lilo-22.6.orig/Makefile lilo-22.6/Makefile
+--- lilo-22.6.orig/Makefile	2004-09-02 20:06:27.000000000 +0200
++++ lilo-22.6/Makefile	2004-09-21 22:42:05.018501440 +0200
+@@ -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
+ 
+ # set the compiler optimization level
+ 
+@@ -95,6 +95,8 @@
+ LDFLAGS=#-Xlinker -qmagic
+ LIBS=
+ 
++DEVMAPPER=-ldevmapper
++
+ 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
+ 
+@@ -270,7 +272,11 @@
+ 		cp -p dparam.S dparam.s
+ 
+ lilo:		$(OBJS)
++ifneq (,$(findstring DEVMAPPER,$(CONFIG)))
++		$(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS) $(DEVMAPPER)
++else
+ 		$(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS)
++endif
+ 
+ lilo-static:	$(OBJS)
+ 		$(CC) -o lilo-static -static $(LDFLAGS) $(OBJS) $(LIBS)