From c89d5f1e80b1582b6065b6f9a771b1c77f72c170 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 28 Aug 2004 11:51:02 -0600 Subject: [PATCH] Imported Debian patch 0.5.0-1 --- Makefile | 4 ++-- debian/changelog | 28 ++++++++++++++++++++++++++++ doc/ChangeLog | 3 +++ src/lib/efi.c | 3 ++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b7162d8..854277e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ default: all - RELEASE_DATE := "09-Jun-2004" + RELEASE_DATE := "26-Aug-2004" RELEASE_MAJOR := 0 RELEASE_MINOR := 5 RELEASE_SUBLEVEL := 0 - RELEASE_EXTRALEVEL := -test4 + RELEASE_EXTRALEVEL := RELEASE_NAME := efibootmgr RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL) diff --git a/debian/changelog b/debian/changelog index 5e57ff8..a7025e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +efibootmgr (0.5.0-1) unstable; urgency=low + + * new upstream version. No code changes from 0.5.0-test4, which I called + 0.4.9 to avoid an epoch roll at this release... this upload just gets us + back in version sync with the official release from upstream. + + -- Bdale Garbee Sat, 28 Aug 2004 11:51:02 -0600 + +efibootmgr (0.4.9-0.sarge.2) testing; urgency=high + + * Base dependencies are frozen; this release reverts the portion of the + test4 changes that added a dependency on pciutils. Thanks to Dann Frazier + for figuring this out and providing a suitable patch. Closes: #268490 + + -- Bdale Garbee Fri, 27 Aug 2004 23:12:38 -0600 + +efibootmgr (0.4.9-0.sarge.1) testing; urgency=high + + * build 0.4.9-1 in testing chroot for sarge + * new upstream version. This is actually 0.5.0-test4, renumbered to avoid + nastiness when 0.5.0 is released. Upstream says 0.5.0 will be this code + with a documentation change. Closes: #258838, #235227 + * add pciutils-dev to build dependencies since we need libpci now + * hack in a typedef to get a u64 definition for ethtool.h + * urgency high because previous version fails with current 2.6 kernels + + -- Bdale Garbee Wed, 18 Aug 2004 09:47:21 -0600 + efibootmgr (0.4.9-1) unstable; urgency=high * new upstream version. This is actually 0.5.0-test4, renumbered to avoid diff --git a/doc/ChangeLog b/doc/ChangeLog index 8ba7756..906bc6f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,6 @@ +* Thu Aug 26 2004 Matt Domsch +- v0.5.0-test4 released as v0.5.0 with no code changes + * Wed Jun 07 2004 Matt Domsch - Fixed bug where read_boot_order() would wrongly return EFI_NOT_FOUND when it needed to create a new BootOrder variable. Reported by Micah Parrish. diff --git a/src/lib/efi.c b/src/lib/efi.c index dcc5e91..26c144a 100644 --- a/src/lib/efi.c +++ b/src/lib/efi.c @@ -20,6 +20,8 @@ #define _FILE_OFFSET_BITS 64 +typedef unsigned long long u64; /* hack to allow include of ethtool.h */ + #include #include #include @@ -36,7 +38,6 @@ #include #include #include -typedef __u64 u64; #include #include "efi.h" #include "efichar.h" -- 2.30.2