forked from pool/elilo
This commit is contained in:
parent
8c4e780b47
commit
6c3f6c3b17
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:78e922f877c23a6c3d8b492fbef6eda60474d2245e1e7c658c9d701c228461e7
|
|
||||||
size 168941
|
|
3
elilo-3.8.tar.gz
Normal file
3
elilo-3.8.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:eca0d67a6764d088a5526a2ef7b0f23ee51dc4a29ac58fb10e4d93421d6b7901
|
||||||
|
size 206250
|
16
elilo-avoid-tab.diff
Normal file
16
elilo-avoid-tab.diff
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff -urp elilo-3.8/config.c elilo-3.8-tab/config.c
|
||||||
|
--- elilo-3.8/config.c 2008-07-29 23:22:07.637647427 +0200
|
||||||
|
+++ elilo-3.8-tab/config.c 2008-07-31 01:24:31.346046245 +0200
|
||||||
|
@@ -897,10 +897,10 @@ print_label_list(VOID)
|
||||||
|
{
|
||||||
|
boot_image_t *img, *dfl = global_config.default_image;
|
||||||
|
|
||||||
|
- if (dfl) Print(L"\t%s\n", dfl->label);
|
||||||
|
+ if (dfl) Print(L" %s\n", dfl->label);
|
||||||
|
|
||||||
|
for (img = image_list; img; img = img->next) {
|
||||||
|
- if (img != dfl) Print(L"\t%s\n", img->label);
|
||||||
|
+ if (img != dfl) Print(L" %s\n", img->label);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
27
elilo-fix-possible-overflow.diff
Normal file
27
elilo-fix-possible-overflow.diff
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From: Bernhard Walle <bwalle@suse.de>
|
||||||
|
Subject: [PATCH] Fix possible array length overflow
|
||||||
|
References: 256676
|
||||||
|
|
||||||
|
Found by dan.yeisley@unisys.com.
|
||||||
|
|
||||||
|
|
||||||
|
Signed-off-by: Bernhard Walle <bwalle@suse.de>
|
||||||
|
|
||||||
|
---
|
||||||
|
choosers/simple.c | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/choosers/simple.c
|
||||||
|
+++ b/choosers/simple.c
|
||||||
|
@@ -283,8 +283,10 @@ restart:
|
||||||
|
}
|
||||||
|
|
||||||
|
if (elilo_opt.prompt) {
|
||||||
|
- ret = select_kernel(buffer, sizeof(buffer));
|
||||||
|
+ ret = select_kernel(buffer, CMDLINE_MAXLEN);
|
||||||
|
if (ret == -1) return -1;
|
||||||
|
+
|
||||||
|
+ /* this function takes really the number of bytes ... */
|
||||||
|
argc = argify(buffer,sizeof(buffer), argv);
|
||||||
|
index = 0;
|
||||||
|
}
|
@ -3,25 +3,85 @@ References: 242702
|
|||||||
Increase command line size to 2048 chars.
|
Increase command line size to 2048 chars.
|
||||||
|
|
||||||
---
|
---
|
||||||
elilo.c | 2 +-
|
choosers/simple.c | 10 +++++-----
|
||||||
elilo.h | 2 +-
|
choosers/textmenu.c | 6 +++---
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
config.c | 6 +++---
|
||||||
|
elilo.c | 2 +-
|
||||||
|
elilo.h | 3 ++-
|
||||||
|
5 files changed, 14 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
Index: b/elilo.h
|
--- a/choosers/simple.c
|
||||||
===================================================================
|
+++ b/choosers/simple.c
|
||||||
--- a/elilo.h
|
@@ -36,8 +36,8 @@ static VOID
|
||||||
+++ b/elilo.h
|
display_label_info(CHAR16 *name)
|
||||||
@@ -57,7 +57,7 @@
|
{
|
||||||
#define ELILO_DEFAULT_TIMEOUT ELILO_TIMEOUT_INFINITY
|
CHAR16 *desc;
|
||||||
#define ELILO_TIMEOUT_INFINITY (~0UL)
|
- CHAR16 initrd_name[CMDLINE_MAXLEN];
|
||||||
|
- CHAR16 vmcode_name[CMDLINE_MAXLEN];
|
||||||
|
+ CHAR16 initrd_name[PATHNAME_MAXLEN];
|
||||||
|
+ CHAR16 vmcode_name[PATHNAME_MAXLEN];
|
||||||
|
CHAR16 options_tmp[CMDLINE_MAXLEN];
|
||||||
|
CHAR16 options[CMDLINE_MAXLEN];
|
||||||
|
CHAR16 kname[FILENAME_MAXLEN];
|
||||||
|
@@ -248,10 +248,10 @@ simple_choose(CHAR16 **argv, INTN argc,
|
||||||
|
# define BOOT_IMG_STR L"BOOT_IMAGE="
|
||||||
|
CHAR16 buffer[CMDLINE_MAXLEN];
|
||||||
|
CHAR16 alt_buffer[CMDLINE_MAXLEN];
|
||||||
|
- CHAR16 initrd_name[CMDLINE_MAXLEN];
|
||||||
|
- CHAR16 vmcode_name[CMDLINE_MAXLEN];
|
||||||
|
+ CHAR16 initrd_name[PATHNAME_MAXLEN];
|
||||||
|
+ CHAR16 vmcode_name[PATHNAME_MAXLEN];
|
||||||
|
CHAR16 args[CMDLINE_MAXLEN];
|
||||||
|
- CHAR16 devname[CMDLINE_MAXLEN];
|
||||||
|
+ CHAR16 devname[PATHNAME_MAXLEN];
|
||||||
|
CHAR16 dpath[FILENAME_MAXLEN];
|
||||||
|
CHAR16 *slash_pos, *colon_pos, *backslash_pos;
|
||||||
|
UINTN len;
|
||||||
|
--- a/choosers/textmenu.c
|
||||||
|
+++ b/choosers/textmenu.c
|
||||||
|
@@ -362,10 +362,10 @@ textmenu_choose(CHAR16 **argv, INTN argc
|
||||||
|
{
|
||||||
|
# define BOOT_IMG_STR L"BOOT_IMAGE="
|
||||||
|
CHAR16 label[CMDLINE_MAXLEN];
|
||||||
|
- CHAR16 initrd_name[CMDLINE_MAXLEN];
|
||||||
|
- CHAR16 vmcode_name[CMDLINE_MAXLEN];
|
||||||
|
+ CHAR16 initrd_name[PATHNAME_MAXLEN];
|
||||||
|
+ CHAR16 vmcode_name[PATHNAME_MAXLEN];
|
||||||
|
CHAR16 args[CMDLINE_MAXLEN];
|
||||||
|
- CHAR16 devname[CMDLINE_MAXLEN];
|
||||||
|
+ CHAR16 devname[PATHNAME_MAXLEN];
|
||||||
|
CHAR16 dpath[FILENAME_MAXLEN];
|
||||||
|
CHAR16 *slash_pos, *colon_pos, *backslash_pos;
|
||||||
|
UINTN len;
|
||||||
|
--- a/config.c
|
||||||
|
+++ b/config.c
|
||||||
|
@@ -51,7 +51,7 @@
|
||||||
|
*/
|
||||||
|
#define ELILO_DEFAULT_CONFIG L"elilo.conf"
|
||||||
|
|
||||||
-#define CMDLINE_MAXLEN 512 /* needed by ia32 */
|
-#define MAX_STRING CMDLINE_MAXLEN
|
||||||
+#define CMDLINE_MAXLEN 2048 /* needed by ia32 */
|
+#define MAX_STRING 512
|
||||||
#define FILENAME_MAXLEN 256
|
#define CONFIG_BUFSIZE 512 /* input buffer size */
|
||||||
#define MAX_ARGS 256
|
|
||||||
/* Just pick an arbitrary number that's high enough for now :o) */
|
/*
|
||||||
Index: b/elilo.c
|
@@ -66,7 +66,7 @@ typedef struct boot_image {
|
||||||
===================================================================
|
struct boot_image *next;
|
||||||
|
CHAR16 label[MAX_STRING];
|
||||||
|
CHAR16 kname[FILENAME_MAXLEN];
|
||||||
|
- CHAR16 options[MAX_STRING];
|
||||||
|
+ CHAR16 options[CMDLINE_MAXLEN];
|
||||||
|
CHAR16 initrd[FILENAME_MAXLEN];
|
||||||
|
CHAR16 vmcode[FILENAME_MAXLEN];
|
||||||
|
CHAR16 root[FILENAME_MAXLEN];
|
||||||
|
@@ -95,7 +95,7 @@ typedef struct {
|
||||||
|
CHAR16 root[FILENAME_MAXLEN]; /* globally defined root fs */
|
||||||
|
CHAR16 initrd[FILENAME_MAXLEN];/* globally defined initrd */
|
||||||
|
CHAR16 vmcode[FILENAME_MAXLEN];/* globally defined boot-time module */
|
||||||
|
- CHAR16 options[MAX_STRING];
|
||||||
|
+ CHAR16 options[CMDLINE_MAXLEN];
|
||||||
|
CHAR16 default_image_name[MAX_STRING];
|
||||||
|
CHAR16 message_file[MAX_MESSAGES][FILENAME_MAXLEN];
|
||||||
|
CHAR16 chooser[FILENAME_MAXLEN];/* which image chooser to use */
|
||||||
--- a/elilo.c
|
--- a/elilo.c
|
||||||
+++ b/elilo.c
|
+++ b/elilo.c
|
||||||
@@ -87,7 +87,7 @@ do_kernel_load(CHAR16 *kname, kdesc_t *k
|
@@ -87,7 +87,7 @@ do_kernel_load(CHAR16 *kname, kdesc_t *k
|
||||||
@ -33,3 +93,16 @@ Index: b/elilo.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Do the vm image switch here
|
* Do the vm image switch here
|
||||||
|
--- a/elilo.h
|
||||||
|
+++ b/elilo.h
|
||||||
|
@@ -57,7 +57,8 @@
|
||||||
|
#define ELILO_DEFAULT_TIMEOUT ELILO_TIMEOUT_INFINITY
|
||||||
|
#define ELILO_TIMEOUT_INFINITY (~0UL)
|
||||||
|
|
||||||
|
-#define CMDLINE_MAXLEN 512 /* needed by ia32 */
|
||||||
|
+#define CMDLINE_MAXLEN 2048
|
||||||
|
+#define PATHNAME_MAXLEN 512
|
||||||
|
#define FILENAME_MAXLEN 256
|
||||||
|
#define MAX_ARGS 256
|
||||||
|
/* Just pick an arbitrary number that's high enough for now :o) */
|
||||||
|
|
||||||
|
@ -1,41 +1,63 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 31 10:22:56 CEST 2008 - rw@suse.de
|
||||||
|
|
||||||
|
- elilo.efi
|
||||||
|
* Update to final elilo-3.8 for uEFI support. (fate#301882)
|
||||||
|
- elilo.pl
|
||||||
|
* Preserve time-stamps but not permissions. (bnc#394331)
|
||||||
|
* Unconditionally strip deprecated 'read-only' from 'elilo.conf'.
|
||||||
|
* Support '$LIBEXECDIR' to please uEFI/x86_64 and
|
||||||
|
relocate efi-binaries from 'elilo' to 'efi'. (fate#301882)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Feb 28 17:48:31 CET 2008 - ro@suse.de
|
Thu Feb 28 17:48:31 CET 2008 - ro@suse.de
|
||||||
|
|
||||||
- no strip for elilo.efi during install (unknown binary format)
|
- elilo.spec
|
||||||
|
* No strip for elilo.efi during install (unknown binary format).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun May 27 00:56:14 CEST 2007 - schwab@suse.de
|
Sun May 27 00:56:14 CEST 2007 - schwab@suse.de
|
||||||
|
|
||||||
- Revert last change.
|
- elilo.spec
|
||||||
|
* Revert last change.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat May 26 23:55:13 CEST 2007 - ro@suse.de
|
Sat May 26 23:55:13 CEST 2007 - ro@suse.de
|
||||||
|
|
||||||
- added gnu-efi-devel to buildreq
|
- elilo.spec
|
||||||
|
* Added gnu-efi-devel to buildreq.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 9 14:29:40 CEST 2007 - rw@suse.de
|
||||||
|
|
||||||
|
- elilo.efi
|
||||||
|
* Reduce non-"command line" strings back to 512. (#256676)
|
||||||
|
* Fix another buffer overrun. (#256676)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 23 10:44:35 CET 2007 - schwab@suse.de
|
Fri Feb 23 10:44:35 CET 2007 - schwab@suse.de
|
||||||
|
|
||||||
- Disable stack protector.
|
- elilo.spec
|
||||||
|
* Disable stack protector.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 6 18:33:55 CET 2007 - bwalle@suse.de
|
Tue Feb 6 18:33:55 CET 2007 - bwalle@suse.de
|
||||||
|
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* increase command line size to 2048 (as in >= 2.6.20-rc6-mm1)
|
* Increase command line size to 2048. (#242702)
|
||||||
(#242702)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Nov 10 10:37:13 CET 2006 - schwab@suse.de
|
Fri Nov 10 10:37:13 CET 2006 - schwab@suse.de
|
||||||
|
|
||||||
- Fix spelling.
|
- elilo.efi
|
||||||
|
* Fix spelling.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Feb 2 17:33:57 CET 2006 - rw@suse.de
|
Thu Feb 2 17:33:57 CET 2006 - rw@suse.de
|
||||||
|
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Update to final 3.6
|
* Update to final 3.6
|
||||||
(Fixed vmcode_name initialization in textmenu chooser)
|
(Fixed vmcode_name initialization in textmenu chooser)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 25 21:44:13 CET 2006 - mls@suse.de
|
Wed Jan 25 21:44:13 CET 2006 - mls@suse.de
|
||||||
@ -58,7 +80,7 @@ Mon Jan 9 18:57:56 CET 2006 - rw@suse.de
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Dec 9 16:37:17 CET 2005 - rw@suse.de
|
Fri Dec 9 16:37:17 CET 2005 - rw@suse.de
|
||||||
|
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Fix formatting of man-page.
|
* Fix formatting of man-page.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
@ -66,19 +88,19 @@ Wed Dec 7 16:31:04 CET 2005 - rw@suse.de
|
|||||||
|
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Update to 3.5-pre2.
|
* Update to 3.5-pre2.
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Make "best effort" instead of giving up early.
|
* Make "best effort" instead of giving up early.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Aug 13 16:03:14 CEST 2005 - schwab@suse.de
|
Sat Aug 13 16:03:14 CEST 2005 - schwab@suse.de
|
||||||
|
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Check that the default label is defined.
|
* Check that the default label is defined.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 5 18:14:04 CEST 2005 - schwab@suse.de
|
Fri Aug 5 18:14:04 CEST 2005 - schwab@suse.de
|
||||||
|
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Barf on duplicate labels.
|
* Barf on duplicate labels.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
@ -102,7 +124,7 @@ Wed Oct 6 17:10:32 CEST 2004 - rw@suse.de
|
|||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 27 17:39:05 CEST 2004 - rw@suse.de
|
Thu May 27 17:39:05 CEST 2004 - rw@suse.de
|
||||||
|
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Make all image-objects (kernel/initrd) *optional* by default (#41315)
|
* Make all image-objects (kernel/initrd) *optional* by default (#41315)
|
||||||
|
|
||||||
------------------------------------------------------------------
|
------------------------------------------------------------------
|
||||||
@ -110,7 +132,7 @@ Mon Feb 23 15:32:53 CET 2004 - rw@suse.de
|
|||||||
|
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Use '$RPM_OPT_FLAGS' with '-fno-strict-aliasing' appended.
|
* Use '$RPM_OPT_FLAGS' with '-fno-strict-aliasing' appended.
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Take care of FPSWA.
|
* Take care of FPSWA.
|
||||||
* Try to avoid copying the same files more than once.
|
* Try to avoid copying the same files more than once.
|
||||||
|
|
||||||
|
28
elilo.pl
28
elilo.pl
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/perl -w
|
#!/usr/bin/perl -w
|
||||||
# $Id: elilo.pl,v 0.12 2005/12/09 11:46:06 rw Exp $
|
# $Id: elilo.pl,v 0.14 2008/07/30 09:36:48 rw Exp $
|
||||||
use strict;
|
use strict;
|
||||||
|
|
||||||
my $C = $0; $C =~ s%^.*/%%;
|
my $C = $0; $C =~ s%^.*/%%;
|
||||||
@ -8,7 +8,8 @@ my $dbg = (exists( $ENV{"ELILO_DEBUG"})) ? $ENV{"ELILO_DEBUG"} : "";
|
|||||||
my $Edition = q(@EDITION@);
|
my $Edition = q(@EDITION@);
|
||||||
my $MPold = "$dbg/boot";
|
my $MPold = "$dbg/boot";
|
||||||
my $MPnew = "$dbg/boot/efi";
|
my $MPnew = "$dbg/boot/efi";
|
||||||
my $Dlib = "$dbg/usr/lib/elilo";
|
my $Dlibold = "$dbg@LIBEXECDIR@/elilo";
|
||||||
|
my $Dlib = "$dbg@LIBEXECDIR@/efi";
|
||||||
my $Fconf = "elilo.conf";
|
my $Fconf = "elilo.conf";
|
||||||
my $Sconf = "$dbg/etc/" . $Fconf;
|
my $Sconf = "$dbg/etc/" . $Fconf;
|
||||||
|
|
||||||
@ -35,7 +36,7 @@ $| = 1;
|
|||||||
$[ = 0;
|
$[ = 0;
|
||||||
|
|
||||||
sub Version() {
|
sub Version() {
|
||||||
my $v = q($Revision: 0.12 $ );
|
my $v = q($Revision: 0.14 $ );
|
||||||
$v =~ s/^\$ Rev.*:\ ([0-9.]+)\ \$\ /$1/x;
|
$v =~ s/^\$ Rev.*:\ ([0-9.]+)\ \$\ /$1/x;
|
||||||
$v .= " (part of elilo-$Edition)" if ( $Edition ne "\@EDITION\@" );
|
$v .= " (part of elilo-$Edition)" if ( $Edition ne "\@EDITION\@" );
|
||||||
print "$C version $v\n";
|
print "$C version $v\n";
|
||||||
@ -131,6 +132,8 @@ sub Transfer ($$) {
|
|||||||
} elsif (m%^\s*default\s*=\s*(\S+)%) {
|
} elsif (m%^\s*default\s*=\s*(\S+)%) {
|
||||||
$default_label = $1;
|
$default_label = $1;
|
||||||
$default_loc = $#Out + 1;
|
$default_loc = $#Out + 1;
|
||||||
|
} elsif (m%^\s*read-only\s*$%) {
|
||||||
|
$_ = "#read-only # Deprecated! (May be forced by appending 'ro')\n";
|
||||||
}
|
}
|
||||||
push @Out, $_;
|
push @Out, $_;
|
||||||
}
|
}
|
||||||
@ -194,26 +197,33 @@ sub Install($$$$) {
|
|||||||
my( $f, $o, $s, $d) = @_;
|
my( $f, $o, $s, $d) = @_;
|
||||||
my @C = ( "install", $o, $s, $d);
|
my @C = ( "install", $o, $s, $d);
|
||||||
|
|
||||||
|
if ( $o eq "-p" ) {
|
||||||
|
@C = ( "cp", "--preserve=timestamps", $s, $d);
|
||||||
|
}
|
||||||
System( $f, @C);
|
System( $f, @C);
|
||||||
}
|
}
|
||||||
|
|
||||||
sub InstallFPSWA($) {
|
sub InstallFPSWA($) {
|
||||||
my ( $d) = @_;
|
my ( $d) = @_;
|
||||||
|
my $Dfpswa = $Dlib;
|
||||||
|
|
||||||
$d .= "/efi/Intel Firmware";
|
$d .= "/efi/Intel Firmware";
|
||||||
return 0 unless ( -r "$Dlib/fpswa.efi" );
|
$Dfpswa = $Dlibold unless ( -r "$Dfpswa/fpswa.efi" );
|
||||||
|
|
||||||
|
return 0 unless ( -r "$Dfpswa/fpswa.efi" );
|
||||||
|
|
||||||
my $head = "## fpswa: Floating Point Software Assist\n";
|
my $head = "## fpswa: Floating Point Software Assist\n";
|
||||||
if ( -d $d && -r "$d/fpswa.efi" ) {
|
if ( -d $d && -r "$d/fpswa.efi" ) {
|
||||||
# check, if we need to update and failing that do nothing?!
|
# check, if we need to update and failing that do nothing?!
|
||||||
my $c = "$Dlib/fpswa-cmp-version";
|
my $c = "$Dfpswa/fpswa-cmp-version";
|
||||||
if ( -x $c ) {
|
if ( -x $c ) {
|
||||||
my $chk = `$c "$d/fpswa.efi" "$Dlib/fpswa.efi"`;
|
my $chk = `$c "$d/fpswa.efi" "$Dfpswa/fpswa.efi"`;
|
||||||
if ( $chk =~ /older/ ) {
|
if ( $chk =~ /older/ ) {
|
||||||
Info( 1, $head .
|
Info( 1, $head .
|
||||||
"## Update '$d/fpswa.efi'.\n");
|
"## Update '$d/fpswa.efi'.\n");
|
||||||
Info( 2,
|
Info( 2,
|
||||||
"## $chk");
|
"## $chk");
|
||||||
Install( 0, "-p", "$Dlib/fpswa.efi", $d);
|
Install( 0, "-p", "$Dfpswa/fpswa.efi", $d);
|
||||||
} else {
|
} else {
|
||||||
Info( 1, $head .
|
Info( 1, $head .
|
||||||
"## Do NOT update '$d/fpswa.efi'.\n");
|
"## Do NOT update '$d/fpswa.efi'.\n");
|
||||||
@ -222,7 +232,7 @@ sub InstallFPSWA($) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
use File::Compare;
|
use File::Compare;
|
||||||
if ( compare( "$d/fpswa.efi", "$Dlib/fpswa.efi") == 0 ) {
|
if ( compare( "$d/fpswa.efi", "$Dfpswa/fpswa.efi") == 0 ) {
|
||||||
Info( 2, $head .
|
Info( 2, $head .
|
||||||
"## Already installed.\n");
|
"## Already installed.\n");
|
||||||
} else {
|
} else {
|
||||||
@ -234,7 +244,7 @@ sub InstallFPSWA($) {
|
|||||||
} else {
|
} else {
|
||||||
Info( 1, $head . "## Install 'fpswa.efi' to '$d'.\n");
|
Info( 1, $head . "## Install 'fpswa.efi' to '$d'.\n");
|
||||||
System( 0, "mkdir", $d) unless ( -d $d );
|
System( 0, "mkdir", $d) unless ( -d $d );
|
||||||
Install( 0, "-p", "$Dlib/fpswa.efi", $d);
|
Install( 0, "-p", "$Dfpswa/fpswa.efi", $d);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
83
elilo.spec
83
elilo.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package elilo (Version 3.6)
|
# spec file for package elilo (Version 3.8)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -12,22 +12,25 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: elilo
|
Name: elilo
|
||||||
Url: http://elilo.sourceforge.net/
|
|
||||||
Summary: EFI Linux Loader
|
Summary: EFI Linux Loader
|
||||||
Version: 3.6
|
Version: 3.8
|
||||||
Release: 142
|
Release: 3
|
||||||
Group: System/Boot
|
Group: System/Boot
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
PreReq: /usr/bin/perl
|
PreReq: /usr/bin/perl
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
Source: http://mesh.dl.sourceforge.net/sourceforge/elilo/elilo-3.6.src.tgz
|
Url: http://elilo.sourceforge.net/
|
||||||
|
Source: http://dl.sourceforge.net/elilo/elilo-3.8.tar.gz
|
||||||
Source1: elilo.pl
|
Source1: elilo.pl
|
||||||
Patch0: elilo-%{version}-asm.diff
|
Source2: rpmlintrc
|
||||||
Patch1: elilo-%{version}-MAC.diff
|
Patch0: elilo-asm.diff
|
||||||
Patch2: elilo-%{version}-spelling.diff
|
Patch1: elilo-MAC.diff
|
||||||
|
Patch2: elilo-spelling.diff
|
||||||
Patch3: elilo-longer-commandline.diff
|
Patch3: elilo-longer-commandline.diff
|
||||||
|
Patch4: elilo-fix-possible-overflow.diff
|
||||||
|
Patch5: elilo-avoid-tab.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: gnu-efi
|
BuildRequires: gnu-efi >= 3.0e
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The EFI Linux boot loader.
|
The EFI Linux boot loader.
|
||||||
@ -47,7 +50,11 @@ Authors:
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2
|
%patch2
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
perl -pe 's/\@EDITION\@/%{version}-%{release}/' < %{SOURCE1} > elilo.pl &&
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
perl -pe 's{\@EDITION\@}{%{version}-%{release}};
|
||||||
|
s{\@LIBEXECDIR\@}{%{_libexecdir}}' < %{SOURCE1} > elilo.pl &&
|
||||||
|
perl -pi -e 's{/usr/lib}{%{_libexecdir}}' Make.defaults
|
||||||
chmod 555 elilo.pl && touch -r %{SOURCE1} elilo.pl
|
chmod 555 elilo.pl && touch -r %{SOURCE1} elilo.pl
|
||||||
! fgrep '%%{version}-%%{release}' elilo.pl
|
! fgrep '%%{version}-%%{release}' elilo.pl
|
||||||
|
|
||||||
@ -58,11 +65,13 @@ pod2man -s 8 -c "System Boot" -r "SuSE Linux" \
|
|||||||
touch -r elilo.pl elilo.8
|
touch -r elilo.pl elilo.8
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -d $RPM_BUILD_ROOT/usr/lib/elilo $RPM_BUILD_ROOT/sbin
|
install -d $RPM_BUILD_ROOT%{_libexecdir}/efi $RPM_BUILD_ROOT/sbin
|
||||||
install -m 444 elilo.efi $RPM_BUILD_ROOT/usr/lib/elilo
|
install -m 444 elilo.efi $RPM_BUILD_ROOT%{_libexecdir}/efi
|
||||||
install tools/eliloalt $RPM_BUILD_ROOT/sbin
|
install tools/eliloalt $RPM_BUILD_ROOT/sbin
|
||||||
install -p -m 555 elilo.pl $RPM_BUILD_ROOT/sbin/elilo
|
install -p -m 555 elilo.pl $RPM_BUILD_ROOT/sbin/elilo
|
||||||
#install -D -p elilo.8 $RPM_BUILD_ROOT/usr/share/man/man8/elilo.8
|
%if 0
|
||||||
|
install -D -p elilo.8 $RPM_BUILD_ROOT/usr/share/man/man8/elilo.8
|
||||||
|
%endif
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -fr $RPM_BUILD_ROOT
|
rm -fr $RPM_BUILD_ROOT
|
||||||
@ -74,26 +83,44 @@ echo "Please run /sbin/elilo!"
|
|||||||
%files
|
%files
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%doc README README.* TODO docs/*.txt
|
%doc README README.* TODO docs/*.txt
|
||||||
/usr/lib/elilo
|
%{_libexecdir}/efi
|
||||||
/sbin/elilo
|
/sbin/elilo
|
||||||
/sbin/eliloalt
|
/sbin/eliloalt
|
||||||
#/usr/share/man/man8/*
|
%if 0
|
||||||
|
/usr/share/man/man8/*
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 31 2008 rw@suse.de
|
||||||
|
- elilo.efi
|
||||||
|
* Update to final elilo-3.8 for uEFI support. (fate#301882)
|
||||||
|
- elilo.pl
|
||||||
|
* Preserve time-stamps but not permissions. (bnc#394331)
|
||||||
|
* Unconditionally strip deprecated 'read-only' from 'elilo.conf'.
|
||||||
|
* Support '$LIBEXECDIR' to please uEFI/x86_64 and
|
||||||
|
relocate efi-binaries from 'elilo' to 'efi'. (fate#301882)
|
||||||
* Thu Feb 28 2008 ro@suse.de
|
* Thu Feb 28 2008 ro@suse.de
|
||||||
- no strip for elilo.efi during install (unknown binary format)
|
- elilo.spec
|
||||||
|
* No strip for elilo.efi during install (unknown binary format).
|
||||||
* Sun May 27 2007 schwab@suse.de
|
* Sun May 27 2007 schwab@suse.de
|
||||||
- Revert last change.
|
- elilo.spec
|
||||||
|
* Revert last change.
|
||||||
* Sun May 27 2007 ro@suse.de
|
* Sun May 27 2007 ro@suse.de
|
||||||
- added gnu-efi-devel to buildreq
|
- elilo.spec
|
||||||
|
* Added gnu-efi-devel to buildreq.
|
||||||
|
* Wed May 09 2007 rw@suse.de
|
||||||
|
- elilo.efi
|
||||||
|
* Reduce non-"command line" strings back to 512. (#256676)
|
||||||
|
* Fix another buffer overrun. (#256676)
|
||||||
* Fri Feb 23 2007 schwab@suse.de
|
* Fri Feb 23 2007 schwab@suse.de
|
||||||
- Disable stack protector.
|
- elilo.spec
|
||||||
|
* Disable stack protector.
|
||||||
* Tue Feb 06 2007 bwalle@suse.de
|
* Tue Feb 06 2007 bwalle@suse.de
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* increase command line size to 2048 (as in >= 2.6.20-rc6-mm1)
|
* Increase command line size to 2048. (#242702)
|
||||||
(#242702)
|
|
||||||
* Fri Nov 10 2006 schwab@suse.de
|
* Fri Nov 10 2006 schwab@suse.de
|
||||||
- Fix spelling.
|
- elilo.efi
|
||||||
|
* Fix spelling.
|
||||||
* Thu Feb 02 2006 rw@suse.de
|
* Thu Feb 02 2006 rw@suse.de
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Update to final 3.6
|
* Update to final 3.6
|
||||||
@ -108,18 +135,18 @@ echo "Please run /sbin/elilo!"
|
|||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Fix vmcode_name initialization in textmenu chooser. (#140519)
|
* Fix vmcode_name initialization in textmenu chooser. (#140519)
|
||||||
* Fri Dec 09 2005 rw@suse.de
|
* Fri Dec 09 2005 rw@suse.de
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Fix formatting of man-page.
|
* Fix formatting of man-page.
|
||||||
* Wed Dec 07 2005 rw@suse.de
|
* Wed Dec 07 2005 rw@suse.de
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Update to 3.5-pre2.
|
* Update to 3.5-pre2.
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Make "best effort" instead of giving up early.
|
* Make "best effort" instead of giving up early.
|
||||||
* Sat Aug 13 2005 schwab@suse.de
|
* Sat Aug 13 2005 schwab@suse.de
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Check that the default label is defined.
|
* Check that the default label is defined.
|
||||||
* Fri Aug 05 2005 schwab@suse.de
|
* Fri Aug 05 2005 schwab@suse.de
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Barf on duplicate labels.
|
* Barf on duplicate labels.
|
||||||
* Wed Apr 13 2005 schwab@suse.de
|
* Wed Apr 13 2005 schwab@suse.de
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
@ -131,12 +158,12 @@ echo "Please run /sbin/elilo!"
|
|||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Fix simple-chooser (#45493)
|
* Fix simple-chooser (#45493)
|
||||||
* Thu May 27 2004 rw@suse.de
|
* Thu May 27 2004 rw@suse.de
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Make all image-objects (kernel/initrd) *optional* by default (#41315)
|
* Make all image-objects (kernel/initrd) *optional* by default (#41315)
|
||||||
* Mon Feb 23 2004 rw@suse.de
|
* Mon Feb 23 2004 rw@suse.de
|
||||||
- elilo.efi
|
- elilo.efi
|
||||||
* Use '$RPM_OPT_FLAGS' with '-fno-strict-aliasing' appended.
|
* Use '$RPM_OPT_FLAGS' with '-fno-strict-aliasing' appended.
|
||||||
- /sbin/elilo
|
- elilo.pl
|
||||||
* Take care of FPSWA.
|
* Take care of FPSWA.
|
||||||
* Try to avoid copying the same files more than once.
|
* Try to avoid copying the same files more than once.
|
||||||
* Mon Nov 24 2003 rw@suse.de
|
* Mon Nov 24 2003 rw@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user