diff options
author | Tony Vroon <chainsaw@gentoo.org> | 2004-11-18 16:57:28 +0000 |
---|---|---|
committer | Tony Vroon <chainsaw@gentoo.org> | 2004-11-18 16:57:28 +0000 |
commit | ee58df9cf73fb153cc1da680c81a95f23972605b (patch) | |
tree | 83261508cb73a1aac9e896f323b4c6c099be3748 /sys-boot/lilo | |
parent | Minor change (diff) | |
download | gentoo-2-ee58df9cf73fb153cc1da680c81a95f23972605b.tar.gz gentoo-2-ee58df9cf73fb153cc1da680c81a95f23972605b.tar.bz2 gentoo-2-ee58df9cf73fb153cc1da680c81a95f23972605b.zip |
Version bump, closes bug #71608. 22.6-r1 stable on x86 and old ebuild cleaned.
Diffstat (limited to 'sys-boot/lilo')
-rw-r--r-- | sys-boot/lilo/ChangeLog | 11 | ||||
-rw-r--r-- | sys-boot/lilo/Manifest | 11 | ||||
-rw-r--r-- | sys-boot/lilo/files/digest-lilo-22.6 | 2 | ||||
-rw-r--r-- | sys-boot/lilo/files/digest-lilo-22.6.1 | 2 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.6.1-correct-usage-info.patch | 13 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.6.1-create-install-dirs.patch | 21 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.6.1-devmapper_gentoo.patch | 406 | ||||
-rw-r--r-- | sys-boot/lilo/lilo-22.6-r1.ebuild | 7 | ||||
-rw-r--r-- | sys-boot/lilo/lilo-22.6.1.ebuild (renamed from sys-boot/lilo/lilo-22.6.ebuild) | 19 |
9 files changed, 474 insertions, 18 deletions
diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog index 083876571f76..a0a1331a40ed 100644 --- a/sys-boot/lilo/ChangeLog +++ b/sys-boot/lilo/ChangeLog @@ -1,6 +1,15 @@ # 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.27 2004/11/07 17:24:06 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.28 2004/11/18 16:57:27 chainsaw Exp $ + +*lilo-22.6.1 (18 Nov 2004) + + 18 Nov 2004; Tony Vroon <chainsaw@gentoo.org> + +files/lilo-22.6.1-correct-usage-info.patch, + +files/lilo-22.6.1-create-install-dirs.patch, + +files/lilo-22.6.1-devmapper_gentoo.patch, lilo-22.6-r1.ebuild, + +lilo-22.6.1.ebuild, -lilo-22.6.ebuild: + Version bump, closes bug #71608. 22.6-r1 stable on x86. Cleaned old ebuild. *lilo-22.6-r1 (07 Nov 2004) diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index e73d7cac0562..670c7085a7e3 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -1,10 +1,13 @@ -MD5 604d21f27d3d62c0687b8c9229d0e489 lilo-22.6.ebuild 4759 -MD5 355509e51e86c886bfcf68ee724ca9df lilo-22.6-r1.ebuild 4763 -MD5 8c8e2f22604a2fd507aaedf5fb71f5b2 ChangeLog 2176 +MD5 af1311f9dea398991cfac41ac303e930 lilo-22.6-r1.ebuild 4763 +MD5 c66e425610cc6212b57f23f84a51d3f9 lilo-22.6.1.ebuild 4694 +MD5 7739cb824a8ad2e4d35a41abed305ec1 ChangeLog 2534 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254 +MD5 42faa8a84fae547fe181da0ad7b67b04 files/lilo-22.6.1-devmapper_gentoo.patch 11826 +MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.6.1-create-install-dirs.patch 970 MD5 45fc85b5af273bddd66b0056811624ba files/digest-lilo-22.6-r1 122 +MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.6.1-correct-usage-info.patch 683 +MD5 fff6910b2180128e251d89f31221b683 files/digest-lilo-22.6.1 128 MD5 42faa8a84fae547fe181da0ad7b67b04 files/lilo-22.6-devmapper_gentoo.patch 11826 -MD5 a12e27d3f9076bb13d357533303f77ff files/digest-lilo-22.6 122 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.6-create-install-dirs.patch 970 MD5 5f2172291cc1252b30f5a60981a51ac4 files/lilo.conf 1722 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.6-correct-usage-info.patch 683 diff --git a/sys-boot/lilo/files/digest-lilo-22.6 b/sys-boot/lilo/files/digest-lilo-22.6 deleted file mode 100644 index 15d15a79b459..000000000000 --- a/sys-boot/lilo/files/digest-lilo-22.6 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 ae9665536347d9cc92e0ebd473a9ac6b lilo-22.6.tar.gz 419138 -MD5 62a7ebbbf998d84e06a3f18569567a9e dolilo-0.2.tar.bz2 4263 diff --git a/sys-boot/lilo/files/digest-lilo-22.6.1 b/sys-boot/lilo/files/digest-lilo-22.6.1 new file mode 100644 index 000000000000..edf8246ca993 --- /dev/null +++ b/sys-boot/lilo/files/digest-lilo-22.6.1 @@ -0,0 +1,2 @@ +MD5 18473e10859767b8af5d08aa7d9fe1e7 lilo-22.6.1.src.tar.gz 422818 +MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554 diff --git a/sys-boot/lilo/files/lilo-22.6.1-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.6.1-correct-usage-info.patch new file mode 100644 index 000000000000..3812115fe41d --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.6.1-correct-usage-info.patch @@ -0,0 +1,13 @@ +diff -uNr lilo-22.5.8-ORIG/lilo.c lilo-22.5.8/lilo.c +--- lilo-22.5.8-ORIG/lilo.c 2004-06-07 19:47:58.028442608 +0100 ++++ lilo-22.5.8/lilo.c 2004-06-07 19:50:17.837188448 +0100 +@@ -336,7 +336,8 @@ + fprintf(errstd,"%7s%s -M /dev/XXX [ mbr | ext ]\tinstall master boot record\n","",name); + fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name); + fprintf(errstd,"%7s%s -X\t\t\t\tinternal compile-time options\n", "", name); +- fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name); ++ fprintf(errstd,"%7s%s -V\t\t\t\tversion information\n","",name); ++ fprintf(errstd,"%7s%s -v\t\t\t\tverbose mode\n\n","",name); + exit(1); + } + diff --git a/sys-boot/lilo/files/lilo-22.6.1-create-install-dirs.patch b/sys-boot/lilo/files/lilo-22.6.1-create-install-dirs.patch new file mode 100644 index 000000000000..c9e58a2312a5 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.6.1-create-install-dirs.patch @@ -0,0 +1,21 @@ +--- lilo-22.5.8/Makefile.bak 2004-02-06 01:41:06.000000000 +0000 ++++ lilo-22.5.8/Makefile 2004-02-06 02:02:57.000000000 +0000 +@@ -302,16 +302,8 @@ + # normal install, but doesn't make the diagnostic binaries + # + install: all +- if [ ! -d $$ROOT$(SBIN_DIR) ]; then mkdir $$ROOT$(SBIN_DIR); fi +- if [ ! -d $$ROOT$(CFG_DIR) ]; then mkdir $$ROOT$(CFG_DIR); fi +- if [ ! -d $$ROOT$(BOOT_DIR) ]; then mkdir $$ROOT$(BOOT_DIR); fi +- if [ ! -d $$ROOT$(USRSBIN_DIR) ]; then \ +- mkdir -p $$ROOT$(USRSBIN_DIR); fi +- if [ ! -d $$ROOT$(MAN_DIR) ]; then mkdir $$ROOT$(MAN_DIR); fi +- if [ ! -d $$ROOT$(MAN_DIR)/man5 ]; then \ +- mkdir $$ROOT$(MAN_DIR)/man5; fi +- if [ ! -d $$ROOT$(MAN_DIR)/man8 ]; then \ +- mkdir $$ROOT$(MAN_DIR)/man8; fi ++ mkdir -p $$ROOT$(SBIN_DIR) $$ROOT$(CFG_DIR) $$ROOT$(BOOT_DIR) \ ++ $$ROOT$(USRSBIN_DIR) $$ROOT$(MAN_DIR)/man5 $$ROOT$(MAN_DIR)/man8 + if [ -f diag1.img ]; then \ + cp -f diag1.img $$ROOT$(BOOT_DIR); fi + if [ -f diag2.img ]; then \ diff --git a/sys-boot/lilo/files/lilo-22.6.1-devmapper_gentoo.patch b/sys-boot/lilo/files/lilo-22.6.1-devmapper_gentoo.patch new file mode 100644 index 000000000000..2ad3255c0853 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.6.1-devmapper_gentoo.patch @@ -0,0 +1,406 @@ +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> ++#include <stdlib.h> ++#include <limits.h> ++#include <ctype.h> + #include <sys/types.h> + + #ifdef LCF_REISERFS +@@ -27,6 +30,10 @@ + + #include <string.h> + ++#ifdef LCF_DEVMAPPER ++#include <libdevmapper.h> ++#endif ++ + #include "config.h" + #include "lilo.h" + #include "common.h" +@@ -61,6 +68,25 @@ + #endif + #endif + ++#ifdef LCF_DEVMAPPER ++typedef struct _dm_target { ++ struct _dm_target *next; ++ uint64_t start,length,offset; ++ int device; ++} DM_TARGET; ++ ++typedef struct _dm_table { ++ struct _dm_table *next; ++ int device; ++ struct _dm_target *target; ++} DM_TABLE; ++ ++int dm_version_nr = 0; ++int dm_major_list[16]; ++int dm_major_nr = 0; ++DM_TABLE *dmtab = NULL; ++#endif ++ + #ifdef LCF_LVM + struct lv_bmap { + __u32 lv_block; +@@ -115,6 +141,12 @@ + { + FILE *file; + char line[MAX_LINE+1]; ++#ifdef LCF_DEVMAPPER ++ struct dm_task *dmt; ++ char major_name[32]; ++ char dm_version[32]; ++ int major; ++#endif + char *here; + DT_ENTRY *entry; + int disk_section,items; +@@ -123,29 +155,69 @@ + if ((file = fopen(name,"r")) == NULL) + die("open %s: %s",name,strerror(errno)); + } +- else if ((file = fopen(DFL_DISKTAB,"r")) == NULL) return; +- disk_section = !!disktab; +- while (fgets(line,MAX_LINE,file)) { +- here = strchr(line,'\n'); +- if (here) *here = 0; +- here = strchr(line,'#'); +- if (here) *here = 0; +- if (strspn(line," \t") != strlen(line)) { +- entry = alloc_t(DT_ENTRY); +- items = sscanf(line,"0x%x 0x%x %d %d %d %d",&entry->device, +- &entry->bios,&entry->sectors,&entry->heads,&entry->cylinders, +- &entry->start); +- if (items == 5) entry->start = -1; +- if (items < 5) +- die("Invalid line in %s:\n\"%s\"",name ? name : DFL_DISKTAB, +- line); +- entry->next = disktab; +- disktab = entry; +- if (disk_section) die("DISKTAB and DISK are mutually exclusive"); +- old_disktab = 1; ++ if (name || (file = fopen(DFL_DISKTAB,"r")) != NULL) { ++ disk_section = !!disktab; ++ while (fgets(line,MAX_LINE,file)) { ++ here = strchr(line,'\n'); ++ if (here) *here = 0; ++ here = strchr(line,'#'); ++ if (here) *here = 0; ++ if (strspn(line," \t") != strlen(line)) { ++ entry = alloc_t(DT_ENTRY); ++ items = sscanf(line,"0x%x 0x%x %d %d %d %d",&entry->device, ++ &entry->bios,&entry->sectors,&entry->heads,&entry->cylinders, ++ &entry->start); ++ if (items == 5) entry->start = -1; ++ if (items < 5) ++ die("Invalid line in %s:\n\"%s\"",name ? name : DFL_DISKTAB, ++ line); ++ entry->next = disktab; ++ disktab = entry; ++ if (disk_section) die("DISKTAB and DISK are mutually exclusive"); ++ old_disktab = 1; ++ } + } ++ (void) fclose(file); + } ++ ++#ifdef LCF_DEVMAPPER ++ if (!(dmt = dm_task_create(DM_DEVICE_VERSION))) ++ return; ++ if (!dm_task_run(dmt)) ++ return; ++ if (!dm_task_get_driver_version(dmt, dm_version, sizeof dm_version)) ++ return; ++ ++ /* ++ * to not confuse returned device number formats %02x:%02x and %d:%d ++ * we assume here that the %02x:%02x format is only found in the ioctl ++ * interface version < 4 (this is really getting ugly...) ++ */ ++ dm_version_nr = atoi(dm_version); ++ ++ dm_task_destroy(dmt); ++ ++ dm_major_nr = 0; ++ file = fopen("/proc/devices", "r"); ++ if (!file) return; ++ ++ do { ++ if (!fgets(line, (sizeof line)-1, file)) { ++ (void) fclose(file); ++ return; ++ } ++ line[(sizeof line)-1] = 0; ++ } while(strncmp(line, "Block", 5) != 0); ++ ++ while(fgets(line, (sizeof line)-1, file)) { ++ if (sscanf(line, "%d %31s\n", &major, major_name) != 2) continue; ++ if (strcmp(major_name, "device-mapper") != 0) continue; ++ dm_major_list[dm_major_nr] = major; ++ if (++dm_major_nr > (sizeof dm_major_list)/(sizeof dm_major_list[0])) break; ++ } ++ + (void) fclose(file); ++#endif + } + + +@@ -776,6 +848,161 @@ + { + DT_ENTRY *walk; + int inherited,keep_cyls,is_raid=0; ++#ifdef LCF_DEVMAPPER ++ int i; ++ ++ for(i = 0; i < dm_major_nr; i++) ++ if (MAJOR(device) == dm_major_list[i]) ++ break; ++ while (i < dm_major_nr) { ++ DM_TABLE *dm_table; ++ ++ for(dm_table = dmtab; dm_table; dm_table = dm_table->next) ++ if (dm_table->device == device) ++ break; ++ ++ if (dm_table) { ++ DM_TARGET *target; ++ ++ device = 0; ++ for(target = dm_table->target; target; target = target->next) ++ device = target->device; ++ } else { ++ DEVICE dev; ++ struct dm_task *dmt; ++ void *next = NULL; ++ char dmdev[PATH_MAX+1]; ++ char buf[PATH_MAX+1]; ++ char *slash; ++ int result; ++ ++ dev_open(&dev, device, -1); ++ strncpy(dmdev, dev.name, PATH_MAX); ++ dmdev[PATH_MAX] = 0; ++ do { ++ memset(buf, 0, PATH_MAX + 1); ++ if ((result = readlink(dmdev, buf, PATH_MAX)) < 0 && errno != EINVAL) ++ die("device-mapper: readlink(\"%s\") failed with: %s",buf, ++ strerror(errno)); ++ if (result >= 0) { ++ if (buf[0] != '/' && (slash = strrchr(dmdev, '/')) != NULL) ++ slash++; ++ else ++ slash = dmdev; ++ strncpy(slash, buf, PATH_MAX - (slash-dmdev)); ++ } ++ if (realpath(dmdev, buf) == NULL) ++ die("device-mapper: realpath(\"%s\") failed with: %s",dmdev, ++ strerror(errno)); ++ strncpy(dmdev, buf, PATH_MAX); ++ } while (result >= 0); ++ dmdev[PATH_MAX] = 0; ++ ++ if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) ++ die("device-mapper: dm_task_create(DM_DEVICE_TABLE) failed"); ++ slash = strrchr(dmdev, '/'); ++ if (slash) ++ slash++; ++ else ++ slash = dmdev; ++ if (!dm_task_set_name(dmt, slash)) ++ die("device-mapper: dm_task_set_name(\"%s\") failed",dmdev); ++ if (!dm_task_run(dmt)) ++ die("device-mapper: dm_task_run(DM_DEVICE_TABLE) failed"); ++ ++ dm_table = alloc_t(DM_TABLE); ++ dm_table->device = device; ++ dm_table->target = NULL; ++ dm_table->next = dmtab; ++ dmtab = dm_table; ++ ++ device = 0; ++ ++ do { ++ DM_TARGET *target; ++ uint64_t start,length; ++ int major,minor; ++ char *target_type,*params; ++ char *p; ++ ++ next = dm_get_next_target(dmt, next, &start, &length, ++ &target_type, ¶ms); ++ ++ if (!target_type) continue; ++ ++ if (strcmp(target_type, "linear") != 0) ++ die("device-mapper: only linear boot device supported"); ++ ++ target = alloc_t(DM_TARGET); ++ target->start = start; ++ target->length = length; ++ if (dm_version_nr < 4 && ++ isxdigit(params[0]) && ++ isxdigit(params[1]) && ++ params[2] == ':' && ++ isxdigit(params[3]) && ++ isxdigit(params[4])) { /* old 2.4 format */ ++ if (sscanf(params, "%02x:%02x %"PRIu64, &major, &minor, &target->offset) != 3) ++ die("device-mapper: parse error in linear params (\"%s\")", params); ++ } else if (isdigit(params[0]) && ++ strchr(params, ':')) { /* dm_bdevname/format_dev_t (>= 2.6.0-test4?) format */ ++ if (sscanf(params, "%u:%u %"PRIu64, &major, &minor, &target->offset) != 3) ++ die("device-mapper: parse error in linear params (\"%s\")", params); ++ } else { /* >= 2.5.69 format, this should go away soon */ ++ struct stat st; ++ FILE *file; ++ ++ p = strrchr(params, ' '); ++ if (p == NULL) ++ die("device-mapper: parse error in linear params (\"%s\")", params); ++ *p = 0; ++ sprintf(buf, "/dev/%s", params); /* let's hope it's there */ ++ if (stat(buf, &st) == 0) { ++ if (!S_ISBLK(st.st_mode)) ++ die("device-mapper: %s is not a valid block device", buf); ++ major = MAJOR(st.st_rdev); ++ minor = MINOR(st.st_rdev); ++ } else { /* let's try sysfs */ ++ int dev; ++ sprintf(buf, "/sys/block/%s/dev", params); ++ file = fopen(buf, "r"); ++ if (!file) ++ die("device-mapper: \"%s\" could not be opened. /sys mounted?", buf); ++ if (!fgets(buf, PATH_MAX, file)) ++ die("device-mapper: read error from \"/sys/block/%s/dev\"", params); ++ if (sscanf(buf, "%u:%u", &major, &minor) != 2) { ++ if (sscanf(buf, "%x", &dev) != 1) ++ die("device-mapper: error getting device from \"%s\"", buf); ++ major = MAJOR(dev); ++ minor = MINOR(dev); ++ } ++ (void) fclose(file); ++ } ++ *p = ' '; ++ if (sscanf(p+1, "%"PRIu64, &target->offset) != 1) ++ die("device-mapper: parse error in linear params (\"%s\")", params); ++ } ++ target->device = (major << 8) | minor; ++ if (!device) ++ device = target->device; ++ target->next = dm_table->target; ++ dm_table->target = target; ++ } while(next); ++ ++ dm_task_destroy(dmt); ++ ++ dev_close(&dev); ++ } ++ ++ if (!device) ++ die("device-mapper: Error finding real device"); ++ geo->base_dev = device; ++ ++ for(i = 0; i < dm_major_nr; i++) ++ if (MAJOR(device) == dm_major_list[i]) ++ break; ++ } ++#endif + + if (verbose>=5) printf("geo_get: device %04X, all=%d\n", device, all); + #ifdef LCF_LVM +@@ -1147,14 +1374,50 @@ + die("EVMS boot volume cannot be on multiple disks.\n"); + sector = ebm.rsector + ((offset/SECTOR_SIZE) % geo->spb) + geo->start; + } +- else { +- sector = block*geo->spb+((offset/SECTOR_SIZE) % geo->spb); +- sector += geo->start; +- } +-#else +- sector = block*geo->spb+((offset/SECTOR_SIZE) % geo->spb); +- sector += geo->start; ++ else ++#endif ++ { ++#ifdef LCF_DEVMAPPER ++ int dev = geo->dev; ++ int i; ++#endif ++ sector = block*geo->spb+((offset/SECTOR_SIZE) % geo->spb); ++#ifdef LCF_DEVMAPPER ++ for(i = 0; i < dm_major_nr; i++) ++ if (MAJOR(dev) == dm_major_list[i]) ++ break; ++ while (i < dm_major_nr) { ++ DM_TABLE *dm_table; ++ DM_TARGET *dm_target; ++ ++ for(dm_table = dmtab; dm_table; dm_table = dm_table->next) ++ if (dm_table->device == dev) ++ break; ++ if (!dm_table) ++ die("device-mapper: Mapped device suddenly lost? (%d)", dev); ++ ++ for(dm_target = dm_table->target; dm_target; dm_target = dm_target->next) ++ if (dm_target->start <= sector && sector < (dm_target->start+dm_target->length)) ++ break; ++ if (!dm_target) ++ die("device-mapper: Sector outside mapped device? (%d: %u/%"PRIu64")", ++ geo->base_dev, sector, (uint64_t)(dm_table->target ? ++ (dm_table->target->start+dm_table->target->length) : 0)); ++ ++ dev = dm_target->device; ++ sector = dm_target->offset+(sector-dm_target->start); ++ ++ for(i = 0; i < dm_major_nr; i++) ++ if (MAJOR(dev) == dm_major_list[i]) ++ break; ++ } ++ ++ if (dev != geo->dev && dev != geo->base_dev) ++ die("device-mapper: mapped boot device cannot be on multiple real devices\n"); + #endif ++ sector += geo->start; ++ } ++ + /* 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) diff --git a/sys-boot/lilo/lilo-22.6-r1.ebuild b/sys-boot/lilo/lilo-22.6-r1.ebuild index 133973b3394d..77c6001a4361 100644 --- a/sys-boot/lilo/lilo-22.6-r1.ebuild +++ b/sys-boot/lilo/lilo-22.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6-r1.ebuild,v 1.1 2004/11/07 17:24:06 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6-r1.ebuild,v 1.2 2004/11/18 16:57:27 chainsaw Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -17,7 +17,7 @@ SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${P}.tar.gz SLOT="0" LICENSE="BSD GPL-2" -KEYWORDS="-* ~x86" +KEYWORDS="-* x86" RDEPEND=">=sys-apps/sed-4 devmap? ( >=sys-libs/device-mapper-1.00.08 )" @@ -50,7 +50,6 @@ src_unpack() { fi cd ${S} - unpack ${DOLILO_TAR} # Fix creating install dirs, bug #39405 epatch ${FILESDIR}/${P}-create-install-dirs.patch @@ -58,6 +57,8 @@ src_unpack() { epatch ${FILESDIR}/${P}-correct-usage-info.patch # Get the manpage path right sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile + + unpack ${DOLILO_TAR} } src_compile() { diff --git a/sys-boot/lilo/lilo-22.6.ebuild b/sys-boot/lilo/lilo-22.6.1.ebuild index 3cc0a744f756..3a775edbc68d 100644 --- a/sys-boot/lilo/lilo-22.6.ebuild +++ b/sys-boot/lilo/lilo-22.6.1.ebuild @@ -1,23 +1,25 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.ebuild,v 1.3 2004/11/05 11:11:11 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1.ebuild,v 1.1 2004/11/18 16:57:27 chainsaw Exp $ inherit eutils flag-o-matic toolchain-funcs -DOLILO_V="0.2" +DOLILO_V="0.3" IUSE="devmap static" DESCRIPTION="Standard Linux boot loader" HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/" DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" -SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${P}.tar.gz +MY_P=${P}.src + +SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz + ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz + ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz mirror://gentoo/${DOLILO_TAR}" SLOT="0" LICENSE="BSD GPL-2" -KEYWORDS="-* x86" +KEYWORDS="-* ~x86" RDEPEND=">=sys-apps/sed-4 devmap? ( >=sys-libs/device-mapper-1.00.08 )" @@ -32,7 +34,7 @@ src_unpack() { einfo "\"devmap\" USE flag." einfo - unpack ${P}.tar.gz + unpack ${MY_P}.tar.gz # Do not try and build the dos crap. sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile @@ -50,7 +52,6 @@ src_unpack() { fi cd ${S} - unpack ${DOLILO_TAR} # Fix creating install dirs, bug #39405 epatch ${FILESDIR}/${P}-create-install-dirs.patch @@ -58,6 +59,8 @@ src_unpack() { epatch ${FILESDIR}/${P}-correct-usage-info.patch # Get the manpage path right sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile + + unpack ${DOLILO_TAR} } src_compile() { |