summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2008-02-08 17:41:11 +0000
committerRaúl Porcel <armin76@gentoo.org>2008-02-08 17:41:11 +0000
commit88ae6d87aadfc2ef862200e40fe893c4148bcd5a (patch)
tree70a28e3785673001112fd869f4214c71f855dd21 /sys-boot/elilo/files
parentVersion bump, thanks to plasmaroo for testing (diff)
downloadgentoo-2-88ae6d87aadfc2ef862200e40fe893c4148bcd5a.tar.gz
gentoo-2-88ae6d87aadfc2ef862200e40fe893c4148bcd5a.tar.bz2
gentoo-2-88ae6d87aadfc2ef862200e40fe893c4148bcd5a.zip
Version bump wrt #208639, thanks to plasmaroo for testing
(Portage version: 2.1.3.19)
Diffstat (limited to 'sys-boot/elilo/files')
-rw-r--r--sys-boot/elilo/files/elilo-3.3a-devscheme.patch124
-rw-r--r--sys-boot/elilo/files/elilo-3.4-makefile.patch8
-rw-r--r--sys-boot/elilo/files/elilo-3.4-proc-sigsetjmp.patch15
-rw-r--r--sys-boot/elilo/files/elilo.8-3.4113
-rw-r--r--sys-boot/elilo/files/eliloalt.8-3.420
5 files changed, 0 insertions, 280 deletions
diff --git a/sys-boot/elilo/files/elilo-3.3a-devscheme.patch b/sys-boot/elilo/files/elilo-3.3a-devscheme.patch
deleted file mode 100644
index 3d8f0c42f55d..000000000000
--- a/sys-boot/elilo/files/elilo-3.3a-devscheme.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- elilo-3.3a/devschemes/simple.c.devscheme 2002-09-16 20:51:52.000000000 +0200
-+++ elilo-3.3a/devschemes/simple.c 2003-05-26 15:05:13.000000000 +0200
-@@ -38,52 +38,50 @@ typedef struct {
- } devices_types_t;
-
-
--static UINT32 atapi_count, scsi_count, net_count;
-+static UINT32 cdrom_count, hd_count, net_count;
-
- static INTN
--atapi_device(device_t *dev, EFI_DEVICE_PATH *dp)
-+network_device(device_t *dev, EFI_DEVICE_PATH *dp)
- {
-- //ATAPI_DEVICE_PATH *atapi = (ATAPI_DEVICE_PATH *)dp;
-+ //MAC_ADDR_DEVICE_PATH *mac = (MAC_ADDR_DEVICE_PATH *)dp;
-
-- dev->name[0] = L'a';
-- dev->name[1] = L't';
-- dev->name[2] = L'a';
-- dev->name[3] = L'p';
-- dev->name[4] = L'i';
-+ dev->name[0] = L'n';
-+ dev->name[1] = L'e';
-+ dev->name[2] = L't';
-
-- SPrint(dev->name+5,FILEOPS_DEVNAME_MAXLEN-5-1, L"%d", atapi_count);
-- atapi_count++;
-+ SPrint(dev->name+3,FILEOPS_DEVNAME_MAXLEN-3-1, L"%d", net_count);
-+ net_count++;
-
- return 0;
- }
-
- static INTN
--scsi_device(device_t *dev, EFI_DEVICE_PATH *dp)
-+harddrive_device(device_t *dev, EFI_DEVICE_PATH *dp)
- {
- //SCSI_DEVICE_PATH *scsi = (SCSI_DEVICE_PATH *)dp;
-
-- dev->name[0] = L's';
-- dev->name[1] = L'c';
-- dev->name[2] = L's';
-- dev->name[3] = L'i';
-+ dev->name[0] = L'h';
-+ dev->name[1] = L'd';
-
-- SPrint(dev->name+4, FILEOPS_DEVNAME_MAXLEN-4-1, L"%d", scsi_count);
-- scsi_count++;
-+ SPrint(dev->name+2, FILEOPS_DEVNAME_MAXLEN-2-1, L"%d", hd_count);
-+ hd_count++;
-
- return 0;
- }
-
- static INTN
--network_device(device_t *dev, EFI_DEVICE_PATH *dp)
-+cdrom_device(device_t *dev, EFI_DEVICE_PATH *dp)
- {
- //MAC_ADDR_DEVICE_PATH *mac = (MAC_ADDR_DEVICE_PATH *)dp;
-
-- dev->name[0] = L'n';
-- dev->name[1] = L'e';
-- dev->name[2] = L't';
-+ dev->name[0] = L'c';
-+ dev->name[1] = L'd';
-+ dev->name[2] = L'r';
-+ dev->name[3] = L'o';
-+ dev->name[4] = L'm';
-
-- SPrint(dev->name+3, FILEOPS_DEVNAME_MAXLEN-3-1, L"%d", net_count);
-- net_count++;
-+ SPrint(dev->name+5, FILEOPS_DEVNAME_MAXLEN-5-1, L"%d", cdrom_count);
-+ cdrom_count++;
-
- return 0;
- }
-@@ -92,9 +90,12 @@ network_device(device_t *dev, EFI_DEVICE
- * what we are looking for in the device path
- */
- static devices_types_t dev_types[]={
-- { MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, atapi_device},
-- { MESSAGING_DEVICE_PATH, MSG_SCSI_DP, scsi_device},
-+ // { MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, atapi_device},
-+ // { MESSAGING_DEVICE_PATH, MSG_SCSI_DP, scsi_device},
- { MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, network_device},
-+ { MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, harddrive_device},
-+ { MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, cdrom_device},
-+ // { MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, network_device},
- { 0, 0 , NULL}
- };
-
-@@ -121,6 +122,7 @@ simple_scheme(device_t *tab, UINTN n)
-
- for(i=0; i < n; i++) {
- dp = DevicePathFromHandle(tab[i].dev);
-+ Print(L"New Dev :");
- if (dp == NULL) {
- ERR_PRT((L"cannot get device path for device %d", i));
- continue;
-@@ -128,6 +130,7 @@ simple_scheme(device_t *tab, UINTN n)
- dp1 = dp = UnpackDevicePath(dp);
-
- while (!IsDevicePathEnd(dp)) {
-+ Print(L"(%d,%d) ",DevicePathType(dp),DevicePathSubType(dp) );
- p = dev_types;
- while (p->type) {
- if ( p->type == DevicePathType(dp)
-@@ -135,6 +138,8 @@ simple_scheme(device_t *tab, UINTN n)
- (*p->device_func)(tab+i, dp);
- goto done;
- }
-+ // if (DevicePathType(dp) == MEDIA_DEVICE_PATH) Print(L"Unknown : %d : %d\n", DevicePathType(dp) , DevicePathSubType(dp) );
-+
-
- p++;
- }
-@@ -142,6 +147,7 @@ simple_scheme(device_t *tab, UINTN n)
- }
- done:
- FreePool(dp1);
-+ Print(L"\n");
- }
- return 0;
- }
diff --git a/sys-boot/elilo/files/elilo-3.4-makefile.patch b/sys-boot/elilo/files/elilo-3.4-makefile.patch
deleted file mode 100644
index 2a315c0352f6..000000000000
--- a/sys-boot/elilo/files/elilo-3.4-makefile.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- elilo-3.4/Make.defaults.makefile 2002-10-08 20:50:27.000000000 +0200
-+++ elilo-3.4/Make.defaults 2003-05-26 14:59:04.000000000 +0200
-@@ -123,3 +121,5 @@
- OBJCOPY = $(prefix)objcopy
- endif
- endif
-+
-+CFLAGS += $(shell if $(CC) -fno-merge-constants -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-merge-constants"; fi)
diff --git a/sys-boot/elilo/files/elilo-3.4-proc-sigsetjmp.patch b/sys-boot/elilo/files/elilo-3.4-proc-sigsetjmp.patch
deleted file mode 100644
index 5796b0f05d13..000000000000
--- a/sys-boot/elilo/files/elilo-3.4-proc-sigsetjmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix an error with newer binutils:
-
-setjmp.S: Assembler messages:
-setjmp.S:170: Error: .endp outside of procedure
-
---- elilo-3.4/ia64/setjmp.S
-+++ elilo-3.4/ia64/setjmp.S
-@@ -78,6 +78,7 @@
-
- /* __sigsetjmp(__jmp_buf buf, int savemask) */
-
-+ .proc __sigsetjmp
- __sigsetjmp:
- //.prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(2)
- alloc loc1=ar.pfs,2,2,2,0
diff --git a/sys-boot/elilo/files/elilo.8-3.4 b/sys-boot/elilo/files/elilo.8-3.4
deleted file mode 100644
index a88dcec3d015..000000000000
--- a/sys-boot/elilo/files/elilo.8-3.4
+++ /dev/null
@@ -1,113 +0,0 @@
-.TH ELILO 8 "18 Mar 2002"
-.SH NAME
-elilo \- install EFI boot loader
-.SH SYNOPSIS
-.B elilo
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B elilo
-command, which was written specifically for the Debian distribution to
-simplify configuring and using the elilo.efi bootloader. The command works
-equally on Gentoo Linux.
-.sp
-There are two parts to elilo, the bootloader itself and this utility which
-installs or updates a bootload configuration.
-.sp
-The primary function of elilo is to copy files necessary for booting
-Gentoo Linux from the main filesystem to a subdirectory /EFI/gentoo
-on the boot partition. These include elilo.efi, elilo.conf, and the kernel
-and ramdisk images referenced by elilo.conf.
-.sp
-In addition, elilo can create a default
-configuration file, /etc/elilo.conf, and can invoke efibootmgr to create
-an entry in the EFI Boot Manager menu such that a system will autoboot
-in to Gentoo Linux on power up.
-.sp
-.B elilo
-requires a couple of extra parameters in elilo.conf that elio.efi does
-not currently support.
-These are needed so that a normal run of elilo with no parameters can find
-the elilo.efi binary and boot partition in order to rebuild it.
-They are:
-.sp
-install=<path to elilo.efi>
-.br
-boot=<boot partition>
-.sp
-.SH OPTIONS
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-.TP
-.B \-b, \-\-boot
-set bootstrap partition device [ -b /dev/sda1 ]
-.TP
-.B \-i, \-\-install
-pathname to the actual bootloader binary,
-default: /usr/{local/}lib/elilo/elilo.efi
-.TP
-.B \-C, \-\-config
-use alternate configuration file [ -C config_file ]
-.TP
-.B \-\-autoconf
-auto-generate a /etc/elilo.conf. Typically only used during system
-installation. In normal use, an elilo.conf file already exists and will not
-be modified by elilo.
-.TP
-.B \-\-efiboot
-elilo auto configuration: create an efi boot manager entry for elilo. This
-option requires that the
-.B efibootmgr
-package also be installed.
-.TP
-.B \-\-timeout
-elilo auto configuration: sets the time elilo
-will wait for user input before booting default
-image default: 20 (2 seconds)
-.TP
-.B \-\-image
-elilo auto configuration: sets the path to the
-kernel image. default: /vmlinuz
-.TP
-.B \-\-label
-elilo auto configuration: sets the image label
-default: Linux
-.TP
-.B \-\-root
-elilo auto configuration: sets the root device default: /dev/sda3
-.TP
-.B \-\-format
-create a new FAT filesystem on the boot partition. Use this cautiously if
-you have more than one operating system installed, and they may be sharing
-the same EFI partition!
-.TP
-.B \-v, \-\-verbose
-make elilo more verbose
-.TP
-.B \-\-debug
-print boring junk only useful for debugging
-.TP
-.B \-h, \-\-help
-display this help and exit
-.TP
-.B \-V, \-\-version
-output version information and exit
-.SH FILES
-.I /etc/elilo.conf
-.br
-.I /usr/lib/elilo/elilo.efi
-.SH SEE ALSO
-.BR efibootmgr (8)
-.sp
-Additional information about
-.B elilo
-is available in the /usr/share/doc/elilo directory.
-.SH AUTHOR
-The
-.B elilo
-program and this manual page were written by
-Richard Hirst <rhirst@linuxcare.com> and Bdale Garbee <bdale@gag.com>
-as additions to the
-.B elilo
-bootloader package from Stephane Eranian <eranian@hpl.hp.com>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/sys-boot/elilo/files/eliloalt.8-3.4 b/sys-boot/elilo/files/eliloalt.8-3.4
deleted file mode 100644
index 81bcdf6e80a8..000000000000
--- a/sys-boot/elilo/files/eliloalt.8-3.4
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH ELILOALT 8 "18 Mar 2002"
-.SH NAME
-eliloalt \- manipulate elilo alternate
-.SH SYNOPSIS
-.B eliloalt
-.RI [ options ]
-.SH DESCRIPTION
-The
-.B eliloalt
-command makes it possible to coerce elilo to boot an alternate
-kernel configuration one time only, as when engaging in kernel development or
-debugging.
-.sp
-.SH SEE ALSO
-Additional information about
-.B eliloalt
-is available in the /usr/share/doc/elilo directory.
-.SH AUTHOR
-This manual page was written by Bdale Garbee <bdale@gag.com>
-for the Debian GNU/Linux system (but may be used by others).