Hello community, here is the log from the commit of package efibootmgr for openSUSE:Factory checked in at 2014-11-12 00:21:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efibootmgr (Old) and /work/SRC/openSUSE:Factory/.efibootmgr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "efibootmgr" Changes: -------- --- /work/SRC/openSUSE:Factory/efibootmgr/efibootmgr.changes 2014-09-10 17:02:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efibootmgr.new/efibootmgr.changes 2014-11-12 00:21:06.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Oct 31 10:34:00 UTC 2014 - dmuel...@suse.com + +- efibootmgr-0.6.0-check-boot-order.diff, efibootmgr-0.6.0-derhat.diff: + pass source validator check +- switch homepage to https://github.com/vathpela/efibootmgr + +------------------------------------------------------------------- +Wed Oct 29 03:51:49 UTC 2014 - g...@suse.com + +- Update version number to 0.11.0 +- Rebase patches + (efibootmgr-0.11.0-derhat.diff, + efibootmgr-0.11.0-check-boot-order.diff) +- Drop efibootmgr-0.6.0-set_boot_order.diff since the data size of + the variable is handled properly now +- Drop efibootmgr-0.6.0-fail-visibly.diff since err() and warn() + are introduced to show more meaningful messages +- Drop upstreamed patch + (efibootmgr-0.6.0-gcc-Wall.diff, + efibootmgr-0.6.0-write-unique-id-once.diff) + +------------------------------------------------------------------- Old: ---- efibootmgr-0.6.0-check-boot-order.diff efibootmgr-0.6.0-derhat.diff efibootmgr-0.6.0-fail-visibly.diff efibootmgr-0.6.0-gcc-Wall.diff efibootmgr-0.6.0-set_boot_order.diff efibootmgr-0.6.0-write-unique-id-once.diff efibootmgr-0.6.0.tar.gz New: ---- efibootmgr-0.11.0-check-boot-order.diff efibootmgr-0.11.0-derhat.diff efibootmgr-0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efibootmgr.spec ++++++ --- /var/tmp/diff_new_pack.w5redB/_old 2014-11-12 00:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.w5redB/_new 2014-11-12 00:21:07.000000000 +0100 @@ -20,18 +20,15 @@ Summary: EFI Boot Manager License: GPL-2.0+ Group: System/Boot -Version: 0.6.0 +Version: 0.11.0 Release: 0 -Url: http://linux.dell.com/efibootmgr/ -Source: http://linux.dell.com/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-0.6.0-gcc-Wall.diff -Patch1: %{name}-0.6.0-derhat.diff -Patch2: %{name}-0.6.0-set_boot_order.diff -Patch3: %{name}-0.6.0-fail-visibly.diff -Patch4: %{name}-0.6.0-write-unique-id-once.diff -Patch5: %{name}-0.6.0-check-boot-order.diff +Url: https://github.com/vathpela/efibootmgr +Source: https://github.com/vathpela/efibootmgr/releases/download/efibootmgr-%{version}/efibootmgr-%{version}.tar.gz +Patch1: %{name}-0.11.0-derhat.diff +Patch2: %{name}-0.11.0-check-boot-order.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: efivar-devel BuildRequires: pciutils-devel BuildRequires: zlib-devel ExclusiveArch: ia64 x86_64 aarch64 @@ -44,12 +41,8 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build LOADER="grub.efi" # default loader ++++++ efibootmgr-0.6.0-check-boot-order.diff -> efibootmgr-0.11.0-check-boot-order.diff ++++++ --- /work/SRC/openSUSE:Factory/efibootmgr/efibootmgr-0.6.0-check-boot-order.diff 2014-07-15 16:25:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.efibootmgr.new/efibootmgr-0.11.0-check-boot-order.diff 2014-11-12 00:21:05.000000000 +0100 @@ -1,14 +1,16 @@ -diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c -index 7ea1887..b01a05a 100644 +--- + src/efibootmgr/efibootmgr.c | 3 +++ + 1 file changed, 3 insertions(+) + --- a/src/efibootmgr/efibootmgr.c +++ b/src/efibootmgr/efibootmgr.c -@@ -380,6 +380,9 @@ remove_from_boot_order(uint16_t num) +@@ -467,6 +467,9 @@ remove_from_boot_order(uint16_t num) } } + if (new_i == 0) -+ return delete_variable(&boot_order); ++ return efi_del_variable(EFI_GLOBAL_GUID, "BootOrder"); + /* Now new_data has what we need */ - new_data_size = new_i * sizeof(uint16_t); - memset(&(boot_order.Data), 0, boot_order.DataSize); + free(boot_order->data); + boot_order->data = (uint8_t *)new_data; ++++++ efibootmgr-0.6.0-derhat.diff -> efibootmgr-0.11.0-derhat.diff ++++++ --- /work/SRC/openSUSE:Factory/efibootmgr/efibootmgr-0.6.0-derhat.diff 2014-02-19 11:39:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.efibootmgr.new/efibootmgr-0.11.0-derhat.diff 2014-11-12 00:21:05.000000000 +0100 @@ -1,7 +1,7 @@ From: Raymund Will <r...@suse.com> Subject: Make default '--loader' build-time configurable. - -Each distribution uses a specific 'vendor'-directory in the + +Each distribution uses a specific 'vendor'-directory in the 'efi' directory on the EFI System Partition to store their EFI loader. There's little use in hardcoding the value for just one in 'efibootmgr', which is displayed in '--help' @@ -13,8 +13,8 @@ Signed-off-by: Raymund Will <r...@suse.com> --- - Makefile | 4 ++++ - src/efibootmgr/efibootmgr.c | 12 ++++++++---- + Makefile | 4 ++++ + src/efibootmgr/efibootmgr.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) --- a/Makefile @@ -25,15 +25,15 @@ + OS_VENDOR := vendor + EFI_LOADER := boot.efi + - SIGNING_KEY := jordan_hargrave - RELEASE_DATE := "23-Jan-2013" + SIGNING_KEY := pjones RELEASE_MAJOR := 0 -@@ -10,6 +13,7 @@ - RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL) + RELEASE_MINOR := 11 +@@ -8,6 +11,7 @@ + RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL) - CFLAGS = $(EXTRA_CFLAGS) -DEFIBOOTMGR_VERSION=\"$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)$(RELEASE_EXTRALEVEL)\" \ + CFLAGS = $(EXTRA_CFLAGS) -DEFIBOOTMGR_VERSION=\"$(RELEASE_MAJOR).$(RELEASE_MINOR).$(RELEASE_SUBLEVEL)\" \ + -DDEFAULT_LOADER=\"\\\\efi\\\\$(OS_VENDOR)\\\\$(EFI_LOADER)\" \ - -Wall -g -D_FILE_OFFSET_BITS=64 + -Wsign-compare -Wall -Werror -g -D_FILE_OFFSET_BITS=64 MODULES := src --- a/src/efibootmgr/efibootmgr.c @@ -55,7 +55,7 @@ The EFI_DEVICE_PATH will look something like: ACPI device path, length 12 bytes Hardware Device Path, PCI, length 6 bytes -@@ -55,6 +56,9 @@ +@@ -59,6 +60,9 @@ #define EFIBOOTMGR_VERSION "unknown (fix Makefile!)" #endif @@ -64,8 +64,8 @@ +#endif typedef struct _var_entry { - struct dirent *name; -@@ -786,7 +790,7 @@ usage() + char *name; +@@ -965,7 +969,7 @@ usage() printf("\t-g | --gpt force disk with invalid PMBR to be treated as GPT\n"); printf("\t-H | --acpi_hid XXXX set the ACPI HID (used with -i)\n"); printf("\t-i | --iface name create a netboot entry for the named interface\n"); @@ -74,7 +74,7 @@ printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n"); printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); printf("\t-N | --delete-bootnext delete BootNext\n"); -@@ -814,7 +818,7 @@ set_default_opts() +@@ -993,7 +997,7 @@ set_default_opts() opts.active = -1; /* Don't set it */ opts.timeout = -1; /* Don't set it */ opts.edd10_devicenum = 0x80; ++++++ efibootmgr-0.6.0.tar.gz -> efibootmgr-0.11.0.tar.gz ++++++ ++++ 6395 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org