Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package efibootmgr for openSUSE:Factory checked in at 2021-12-01 20:46:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efibootmgr (Old) and /work/SRC/openSUSE:Factory/.efibootmgr.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "efibootmgr" Wed Dec 1 20:46:20 2021 rev:30 rq:934682 version:17 Changes: -------- --- /work/SRC/openSUSE:Factory/efibootmgr/efibootmgr.changes 2018-04-10 09:50:39.984169902 +0200 +++ /work/SRC/openSUSE:Factory/.efibootmgr.new.31177/efibootmgr.changes 2021-12-02 02:11:53.955276611 +0100 @@ -1,0 +2,23 @@ +Tue Aug 3 10:03:52 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com> + +- Update to v17: + * use efivar's logging facility more (more info in -v2 , -v3, etc) + * Various bug fixes + * Better -e parsing + * fix pkg-config invocation for ldflags + * Make efibootmgr use EFIDIR / efibootmgr.efidir like fwupdate does + * make --loader default build-time configurable + * sanitize set_mirror()/get_mirror() + * Add support for parsing loader options as UCS2 + * GCC 7 fixes + * Don't use -fshort-wchar since we don't run on EFI machines. +- Drop 0001-Don-t-use-fshort-wchar-when-building-63.patch (upstreamed) +- Drop 0002-Remove-extra-const-keywords-gcc-7-gripes-about.patch + (upstreamed) +- Drop 0003-Add-support-for-parsing-optional-data-as-ucs2.patch + (upstreamed) +- Drop MARM-sanitize-set_mirror.diff (upstreamed) +- Drop efibootmgr-derhat.diff (upstreamed) +- Rebase efibootmgr-delete-multiple.diff + +------------------------------------------------------------------- Old: ---- 0001-Don-t-use-fshort-wchar-when-building-63.patch 0002-Remove-extra-const-keywords-gcc-7-gripes-about.patch 0003-Add-support-for-parsing-optional-data-as-ucs2.patch MARM-sanitize-set_mirror.diff efibootmgr-14.tar.bz2 efibootmgr-derhat.diff New: ---- efibootmgr-17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efibootmgr.spec ++++++ --- /var/tmp/diff_new_pack.TY04CB/_old 2021-12-02 02:11:54.407275233 +0100 +++ /var/tmp/diff_new_pack.TY04CB/_new 2021-12-02 02:11:54.411275220 +0100 @@ -1,7 +1,7 @@ # # spec file for package efibootmgr # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: efibootmgr -Version: 14 +Version: 17 Release: 0 Summary: EFI Boot Manager License: GPL-2.0-or-later Group: System/Boot -Url: https://github.com/rhinstaller/efibootmgr -Source: https://github.com/rhinstaller/efibootmgr/releases/download/14/efibootmgr-14.tar.bz2 -Patch1: 0001-Don-t-use-fshort-wchar-when-building-63.patch -Patch2: 0002-Remove-extra-const-keywords-gcc-7-gripes-about.patch -Patch3: 0003-Add-support-for-parsing-optional-data-as-ucs2.patch -Patch4: %{name}-derhat.diff -Patch5: MARM-sanitize-set_mirror.diff -Patch6: %{name}-delete-multiple.diff -BuildRequires: efivar-devel >= 31 -BuildRequires: pciutils-devel -BuildRequires: pkg-config -BuildRequires: popt-devel -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://github.com/rhinstaller/efibootmgr +Source: https://github.com/rhboot/efibootmgr/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: %{name}-delete-multiple.diff +BuildRequires: pkgconfig +BuildRequires: pkgconfig(efiboot) >= 31 +BuildRequires: pkgconfig(efivar) >= 31 +BuildRequires: pkgconfig(libpci) +BuildRequires: pkgconfig(popt) +BuildRequires: pkgconfig(zlib) %description The EFI Boot Manager allows the user to edit the Intel Extensible @@ -44,15 +39,13 @@ <http://developer.intel.com/technology/efi/efi.htm>. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%autosetup -p1 %build +# removing hotfix function declaration: +# https://github.com/rhboot/efibootmgr/issues/128 +sed -e '/extern int efi_set_verbose/d' -i "src/efibootmgr.c" + LOADER="grub.efi" # default loader [ "$RPM_ARCH" != ia64 ] || LOADER="elilo.efi" # except Itanium @@ -62,14 +55,19 @@ (SUSE*|SLE*) VENDOR="SUSE";; (*) VENDOR="linux";; esac -make %{?_smp_mflags} CFLAGS="%{optflags} -flto -fPIE -pie" \ - OS_VENDOR="$VENDOR" EFI_LOADER="$LOADER" +%make_build CFLAGS="%{optflags} -flto -fPIE -pie" \ + OS_VENDOR="$VENDOR" EFI_LOADER="$LOADER" EFIDIR="$VENDOR" %install -make DESTDIR=%{buildroot} sbindir=%{_sbindir} install +case "%{_repository}" in +(openSUSE*) VENDOR="openSUSE";; +(SLE_11_SP*) VENDOR="SuSE" LOADER="elilo.efi";; +(SUSE*|SLE*) VENDOR="SUSE";; +(*) VENDOR="linux";; +esac +make DESTDIR=%{buildroot} sbindir=%{_sbindir} EFIDIR="$VENDOR" install %files -%defattr(-, root, root) %license COPYING %doc README %{_sbindir}/efiboot* ++++++ efibootmgr-delete-multiple.diff ++++++ --- /var/tmp/diff_new_pack.TY04CB/_old 2021-12-02 02:11:54.423275184 +0100 +++ /var/tmp/diff_new_pack.TY04CB/_new 2021-12-02 02:11:54.427275171 +0100 @@ -13,15 +13,10 @@ Signed-off-by: Raymund Will <r...@suse.com> --- - src/efibootmgr.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++- - src/include/efibootmgr.h | 3 +- - 2 files changed, 185 insertions(+), 5 deletions(-) - -diff --git a/src/efibootmgr.c b/src/efibootmgr.c -index 20d71e2..93663cb 100644 ---- a/src/efibootmgr.c -+++ b/src/efibootmgr.c -@@ -608,6 +608,146 @@ delete_var(const char *prefix, uint16_t num) +diff -ru old/src/efibootmgr.c new/src/efibootmgr.c +--- old/src/efibootmgr.c 2018-06-10 22:12:10.000000000 +0200 ++++ new/src/efibootmgr.c 2021-08-03 11:57:25.435196489 +0200 +@@ -617,6 +617,146 @@ return 0; } @@ -168,7 +163,7 @@ static void set_var_nums(const char *prefix, list_t *list) { -@@ -1215,7 +1355,9 @@ usage() +@@ -1236,7 +1376,9 @@ printf("\t-a | --active sets bootnum active\n"); printf("\t-A | --inactive sets bootnum inactive\n"); printf("\t-b | --bootnum XXXX modify BootXXXX (hex)\n"); @@ -179,23 +174,23 @@ printf("\t-c | --create create new variable bootnum and add to bootorder\n"); printf("\t-C | --create-only create new variable bootnum and do not add to bootorder\n"); printf("\t-D | --remove-dups remove duplicate values from BootOrder\n"); -@@ -1242,6 +1384,7 @@ usage() +@@ -1263,6 +1405,7 @@ printf("\t-o | --bootorder XXXX,YYYY,ZZZZ,... explicitly set BootOrder (hex)\n"); printf("\t-O | --delete-bootorder delete BootOrder\n"); - printf("\t-p | --part part (defaults to 1) containing loader\n"); -+ printf("\t-P | --part-uuid UUID select all variables for given partition UUID\n"); + printf("\t-p | --part part partition containing loader (defaults to 1 on partitioned devices)\n"); ++ printf("\t-P | --part-uuid UUID select all variables for given partition UUID\n"); printf("\t-q | --quiet be quiet\n"); printf("\t-t | --timeout seconds set boot manager timeout waiting for user input.\n"); printf("\t-T | --delete-timeout delete Timeout.\n"); -@@ -1267,6 +1410,7 @@ set_default_opts() +@@ -1288,6 +1431,7 @@ opts.label = (unsigned char *)"Linux"; opts.disk = "/dev/sda"; - opts.part = 1; -+ opts.part_uuid = NULL; + opts.part = -1; ++ opts.part_uuid = NULL; } static void -@@ -1288,6 +1432,7 @@ parse_opts(int argc, char **argv) +@@ -1310,6 +1454,7 @@ {"delete-bootnum", no_argument, 0, 'B'}, {"create", no_argument, 0, 'c'}, {"create-only", no_argument, 0, 'C'}, @@ -203,7 +198,7 @@ {"remove-dups", no_argument, 0, 'D'}, {"disk", required_argument, 0, 'd'}, {"iface", required_argument, 0, 'i'}, -@@ -1320,7 +1465,7 @@ parse_opts(int argc, char **argv) +@@ -1342,7 +1487,7 @@ }; c = getopt_long (argc, argv, @@ -212,7 +207,7 @@ "@:hry", long_options, &option_index); if (c == -1) -@@ -1368,11 +1513,16 @@ parse_opts(int argc, char **argv) +@@ -1390,11 +1535,16 @@ opts.create = 1; opts.no_order = 1; break; @@ -228,8 +223,8 @@ + opts.delete |= 2; break; case 'e': - rc = sscanf(optarg, "%u", &num); -@@ -1410,6 +1560,9 @@ parse_opts(int argc, char **argv) + rc = sscanf(optarg, "%d", &snum); +@@ -1434,6 +1584,9 @@ break; case 'l': opts.loader = optarg; @@ -239,7 +234,7 @@ break; case 'L': opts.label = (unsigned char *)optarg; -@@ -1474,6 +1627,17 @@ parse_opts(int argc, char **argv) +@@ -1498,6 +1651,17 @@ else errorx(37, "invalid numeric value %s\n", optarg); @@ -257,7 +252,7 @@ break; case 'q': opts.quiet = 1; -@@ -1595,9 +1759,24 @@ main(int argc, char **argv) +@@ -1622,9 +1786,24 @@ set_var_nums(prefices[mode], &entry_list); if (opts.delete) { @@ -284,11 +279,12 @@ else { ret = delete_var(prefices[mode], opts.num); if (ret < 0) -diff --git a/src/include/efibootmgr.h b/src/include/efibootmgr.h -index d692d0c..d2d90dc 100644 ---- a/src/include/efibootmgr.h -+++ b/src/include/efibootmgr.h -@@ -60,6 +60,7 @@ typedef struct { +Only in new/src: efibootmgr.c.orig +Only in new/src: efibootmgr.c.rej +diff -ru old/src/include/efibootmgr.h new/src/include/efibootmgr.h +--- old/src/include/efibootmgr.h 2018-06-10 22:12:10.000000000 +0200 ++++ new/src/include/efibootmgr.h 2021-08-03 11:56:14.638896535 +0200 +@@ -60,6 +60,7 @@ int keep_old_entries; char *testfile; char *extra_opts_file; @@ -296,7 +292,7 @@ uint32_t part; int edd_version; uint32_t edd10_devicenum; -@@ -70,7 +71,7 @@ typedef struct { +@@ -70,7 +71,7 @@ int below4g; int above4g; int deduplicate; @@ -305,6 +301,3 @@ unsigned int delete_order:1; unsigned int delete_bootnext:1; unsigned int quiet:1; --- -2.6.6 -
