From 856c49e20f9f7e8524ee7d2cae3ca17fc44e566f Mon Sep 17 00:00:00 2001 From: "Sam Hocevar (Debian packages)" Date: Sun, 8 Oct 2006 14:21:38 +0200 Subject: [PATCH] Imported Debian patch 0.5.3-1.1 --- debian/changelog | 14 ++++++++++++++ debian/control | 4 ++-- src/include/gpt.h | 2 +- src/lib/efi.c | 5 +---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c86251..77c749f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +efibootmgr (0.5.3-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * src/include/gpt.h: + + Fix GPT_HEADER_SIGNATURE declaration on 32bit architectures. + * src/lib/efi.c: + + Remove questionable "hack to allow include of ethtool.h". + + Include asm/types.h so that proper types are defined (Closes: #389923). + * debian/control: + + Set policy to 3.7.2. + + Uncapitalised short description. + + -- Sam Hocevar (Debian packages) Sun, 8 Oct 2006 14:21:38 +0200 + efibootmgr (0.5.3-1) unstable; urgency=low * new upstream version, closes: #357884 diff --git a/debian/control b/debian/control index 516728f..3d892d1 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: admin Priority: optional Maintainer: Bdale Garbee Build-Depends: debhelper (>> 5), docbook-to-man, pciutils-dev -Standards-Version: 3.6.2.2 +Standards-Version: 3.7.2 Package: efibootmgr Architecture: amd64 i386 ia64 Depends: ${shlibs:Depends} -Description: Interact with the EFI Boot Manager +Description: interact with the EFI Boot Manager This is a Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager configuration. This application can create and destroy boot entries, change the boot order, change the next diff --git a/src/include/gpt.h b/src/include/gpt.h index 8944885..1eefca3 100644 --- a/src/include/gpt.h +++ b/src/include/gpt.h @@ -35,7 +35,7 @@ #define GPT_BLOCK_SIZE 512 -#define GPT_HEADER_SIGNATURE 0x5452415020494645 +#define GPT_HEADER_SIGNATURE ((uint64_t)(0x5452415020494645LL)) #define GPT_HEADER_REVISION_V1_02 0x00010200 #define GPT_HEADER_REVISION_V1_00 0x00010000 #define GPT_HEADER_REVISION_V0_99 0x00009900 diff --git a/src/lib/efi.c b/src/lib/efi.c index 7dd2ab3..a760eb1 100644 --- a/src/lib/efi.c +++ b/src/lib/efi.c @@ -18,10 +18,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _FILE_OFFSET_BITS 64 - -typedef unsigned long long u64; /* hack to allow include of ethtool.h */ - #include #include #include @@ -39,6 +35,7 @@ typedef unsigned long long u64; /* hack to allow include of ethtool.h */ #include #include #include +#include #include #include "efi.h" #include "efichar.h" -- 2.30.2