OBS User unknown 2008-07-31 19:30:20 +00:00 committed by Git OBS Bridge
parent ad10bbe90e
commit 13bff509f3
6 changed files with 60 additions and 76 deletions

View File

@ -1,35 +0,0 @@
diff -ur efibootmgr-0.5.3/src/efibootmgr/module.mk efibootmgr-0.5.3-4/src/efibootmgr/module.mk
--- efibootmgr-0.5.3/src/efibootmgr/module.mk 2004-06-09 23:45:42.000000000 +0200
+++ efibootmgr-0.5.3-4/src/efibootmgr/module.mk 2006-12-20 00:00:01.000000000 +0100
@@ -11,7 +11,7 @@
efibootmgr_LIBDIR := src/lib
efibootmgr_FULLLIB := \
$(patsubst %,$(efibootmgr_LIBDIR)/%,$(efibootmgr_LIBS))
-LIBS = -lpci
+LIBS = -lpci -lz
ALLDEPS += $(efibootmgr_FULLTARGET)
CLEANLIST += $(efibootmgr_FULLTARGET)
diff -ur efibootmgr-0.5.3/src/lib/disk.c efibootmgr-0.5.3-4/src/lib/disk.c
--- efibootmgr-0.5.3/src/lib/disk.c 2005-08-10 07:25:48.000000000 +0200
+++ efibootmgr-0.5.3-4/src/lib/disk.c 2006-12-19 23:51:38.000000000 +0100
@@ -55,7 +55,7 @@
return 1;
}
major = buf.st_dev >> 8;
- minor = buf.st_dev && 0xFF;
+ minor = buf.st_dev & 0xFF;
/* IDE disks can have up to 64 partitions, or 6 bits worth,
* and have one bit for the disk number.
diff -ur efibootmgr-0.5.3/src/lib/efi.c efibootmgr-0.5.3-4/src/lib/efi.c
--- efibootmgr-0.5.3/src/lib/efi.c 2005-08-10 17:58:13.000000000 +0200
+++ efibootmgr-0.5.3-4/src/lib/efi.c 2006-12-19 23:52:21.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/sockios.h>
#include <net/if.h>
#include <pci/pci.h>
+#include <linux/types.h>
#include <linux/ethtool.h>
#include "efi.h"
#include "efichar.h"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d66693a1a9e1dbe6e8c528a4143d419c9280cf310ed037a66e3f7b64fe271f1
size 58093

11
efibootmgr-0.5.4.diff Normal file
View File

@ -0,0 +1,11 @@
--- a/src/lib/disk.c
+++ b/src/lib/disk.c
@@ -55,7 +55,7 @@ disk_info_from_fd(int fd,
return 1;
}
major = buf.st_dev >> 8;
- minor = buf.st_dev && 0xFF;
+ minor = buf.st_dev & 0xFF;
/* IDE disks can have up to 64 partitions, or 6 bits worth,
* and have one bit for the disk number.

3
efibootmgr-0.5.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b562a47a4f5327494992f2ee6ae14a75c5aeb9b4a3a78a06749d5cd2917b8e71
size 59121

View File

@ -1,7 +1,12 @@
-------------------------------------------------------------------
Fri Feb 9 14:46:53 CET 2007 - rw@suse.de
Thu Jul 31 09:48:27 CEST 2008 - rw@suse.de
- Fix compilation for STABLE (again).
- Update to efibootmgr 0.5.4. [FATE#301882]
-------------------------------------------------------------------
Fri Jan 18 13:09:14 CET 2008 - rw@suse.de
- Return non-zero exit code on errors. [#307965, FATE#302608]
-------------------------------------------------------------------
Wed Dec 20 00:07:46 CET 2006 - rw@suse.de
@ -12,7 +17,7 @@ Wed Dec 20 00:07:46 CET 2006 - rw@suse.de
-------------------------------------------------------------------
Wed Jan 25 21:44:51 CET 2006 - mls@suse.de
- Converted neededforbuild to BuildRequires.
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Wed Nov 9 22:36:56 CET 2005 - schwab@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package efibootmgr (Version 0.5.3)
# spec file for package efibootmgr (Version 0.5.4)
#
# Copyright (c) 2007 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
# package are under the same license as the package itself.
#
@ -9,17 +9,18 @@
#
Name: efibootmgr
BuildRequires: pciutils-devel
URL: http://linux.dell.com/efibootmgr/
Summary: EFI Boot Manager
Version: 0.5.3
Release: 2
Version: 0.5.4
Release: 1
Group: System/Boot
License: GNU General Public License (GPL)
License: GPL v2 or later
Url: http://linux.dell.com/efibootmgr/
Source: http://linux.dell.com/efibootmgr/efibootmgr-%{version}.tar.gz
Patch: %{name}-%{version}.diff
Patch0: %{name}-%{version}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pciutils-devel
%description
The EFI Boot Manager allows the user to edit the Intel Extensible
@ -34,16 +35,16 @@ Authors:
Matt Domsch <Matt_Domsch@dell.com>
%prep
%setup
%patch -p1
%setup -q
%patch0 -p1
chmod +x tools/install.pl
%build
CFLAGS=$RPM_OPT_FLAGS make
make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%install
install -d $RPM_BUILD_ROOT/usr/sbin
make install BINDIR=$RPM_BUILD_ROOT/usr/sbin
install -d $RPM_BUILD_ROOT%{_sbindir}
make install BINDIR=$RPM_BUILD_ROOT%{_sbindir}
install -d $RPM_BUILD_ROOT%{_mandir}/man8
install -m 644 src/man/man8/efibootmgr.8 $RPM_BUILD_ROOT%{_mandir}/man8
@ -53,44 +54,46 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc README
/usr/sbin/efibootmgr
%{_sbindir}/efibootmgr
%{_mandir}/man8/*.gz
%changelog -n efibootmgr
* Fri Feb 09 2007 - rw@suse.de
- Fix compilation for STABLE (again).
* Wed Dec 20 2006 - rw@suse.de
%changelog
* Thu Jul 31 2008 rw@suse.de
- Update to efibootmgr 0.5.4. [FATE#301882]
* Fri Jan 18 2008 rw@suse.de
- Return non-zero exit code on errors. [#307965, FATE#302608]
* Wed Dec 20 2006 rw@suse.de
- Use '&' instead of '&&' to mask bits. [#219735]
- Fix compilation for STABLE.
* Wed Jan 25 2006 - mls@suse.de
- Converted neededforbuild to BuildRequires.
* Wed Nov 09 2005 - schwab@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Nov 10 2005 schwab@suse.de
- Update to efibootmgr 0.5.3.
* Mon Sep 19 2005 - schwab@suse.de
* Mon Sep 19 2005 schwab@suse.de
- Update to efibootmgr 0.5.2.2.
* Wed Aug 10 2005 - schwab@suse.de
* Wed Aug 10 2005 schwab@suse.de
- Update to efibootmgr 0.5.2 [#102441].
* Tue May 10 2005 - schwab@suse.de
* Tue May 10 2005 schwab@suse.de
- Fix parsing of bus info for network boot entry [#82882].
* Wed Mar 09 2005 - schwab@suse.de
* Wed Mar 09 2005 schwab@suse.de
- Update to efibootmgr 0.5.1.
* Fri Aug 27 2004 - schwab@suse.de
* Fri Aug 27 2004 schwab@suse.de
- Update to efibootmgr 0.5.0.
* Thu Jun 10 2004 - schwab@suse.de
* Thu Jun 10 2004 schwab@suse.de
- Update to efibootmgr 0.5.0-test4.
* Mon May 03 2004 - schwab@suse.de
* Mon May 03 2004 schwab@suse.de
- Update to efibootmgr 0.5.0-test3.
* Fri Sep 05 2003 - schwab@suse.de
* Sat Sep 06 2003 schwab@suse.de
- Update to efibootmgr 0.4.2.
* Wed Oct 23 2002 - schwab@suse.de
* Wed Oct 23 2002 schwab@suse.de
- Update to efibootmgr 0.4.1.
* Sun May 05 2002 - schwab@suse.de
* Sun May 05 2002 schwab@suse.de
- Update to efibootmgr 0.4.0.
* Fri Aug 10 2001 - schwab@suse.de
* Fri Aug 10 2001 schwab@suse.de
- Update to efibootmgr 0.3.4.
* Wed May 23 2001 - schwab@suse.de
* Wed May 23 2001 schwab@suse.de
- Update to efibootmgr 0.3.2.
* Tue May 22 2001 - schwab@suse.de
* Tue May 22 2001 schwab@suse.de
- Fix uninitialized variable.
* Sat May 19 2001 - schwab@suse.de
* Sat May 19 2001 schwab@suse.de
- Initial version 0.3.1.