efibootmgr: bump version
PATCH 1/1 efibootmgr: bump version
Drop 0001-dont-use-fshort-wchar-when-building.patch and 0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch as they are now upstream.
The upstream repo moved to the 'rhboot' github project, so adjust upstream URL in .mk and help text to match.
Version 15 introduces build time configuration of the default EFI directory (E.G. the subdirectory in the EFI system partition where the loader is installed). This used to be hardcoded to redhat, but now a value must be specified at build time. Given that, it is unlikely that people relied on the default value so set it to the more sensible 'buildroot'.
While we are at it, also add a hash for the license file.
---
...bc.patch => 0001-Allow-build-with-uClibc.patch} | 0
.../0001-dont-use-fshort-wchar-when-building.patch | 28 ------------
...e-extra-const-keywords-gcc-7-gripes-about.patch | 51 ----------------------
package/efibootmgr/Config.in | 2 +-
package/efibootmgr/efibootmgr.hash | 3 +-
package/efibootmgr/efibootmgr.mk | 10 +++--
6 files changed, 9 insertions(+), 85 deletions(-)
rename package/efibootmgr/{0002-Allow-build-with-uClibc.patch => 0001-Allow-build-with-uClibc.patch} (100%)
delete mode 100644 package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch
delete mode 100644 package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patchpackage/efibootmgr/0001-Allow-build-with-uClibc.patch renamed from package/efibootmgr/0002-Allow-build-with-uClibc.patch +0 -0
package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 3466fd05c8c6f1052e0426d64eed40f8a88fd78f Mon Sep 17 00:00:00 2001 -From: steve-mcintyre <[email protected]> -Date: Fri, 6 Jan 2017 18:18:47 +0000 -Subject: [PATCH] Don't use -fshort-wchar when building (#63) - -It's not needed and is causing build failures with gcc 6. Closes -Debian bug #849651 - -Signed-off-by: Steve McIntyre <[email protected]> -[Upstream commit: https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f] -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - Make.defaults | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Make.defaults b/Make.defaults -index 50f1f4d..0ac50ef 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -26,7 +26,7 @@ clang_cflags = - gcc_cflags = - cflags = $(CFLAGS) $(SUBDIR_CFLAGS) \ - -Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \ -- -std=gnu11 -fshort-wchar -fPIC \ -+ -std=gnu11 -fPIC \ - -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \ - -DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \ - $(if $(findstring clang,$(CC)),$(clang_cflags),) \
package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch deleted +0 -51
51 lines not on this page · raw message
package/efibootmgr/Config.in +1 -1
@@ -13,7 +13,7 @@ config BR2_PACKAGE_EFIBOOTMGR create and destroy boot entries, change the boot order, change the next running boot option, and more. - https://github.com/rhinstaller/efibootmgr + https://github.com/rhboot/efibootmgr comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
package/efibootmgr/efibootmgr.hash +2 -1
@@ -1,2 +1,3 @@ # locally computed hash -sha256 3f260491e2c62e93cb6347ea6f21aaa5f93152e9e7f0269d314623769d82e473 efibootmgr-14.tar.gz +sha256 5a708b9690cdc631fd75d8f598128d20cad007e711b975b0143f9517c2dd1bf4 efibootmgr-15.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING
package/efibootmgr/efibootmgr.mk +6 -4
@@ -4,12 +4,13 @@ # ################################################################################ -EFIBOOTMGR_VERSION = 14 -EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION)) +EFIBOOTMGR_VERSION = 15 +EFIBOOTMGR_SITE = $(call github,rhboot,efibootmgr,$(EFIBOOTMGR_VERSION)) EFIBOOTMGR_LICENSE = GPL-2.0+ EFIBOOTMGR_LICENSE_FILES = COPYING EFIBOOTMGR_DEPENDENCIES = efivar $(TARGET_NLS_DEPENDENCIES) EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) +EFIBOOTMGR_MAKE_ARGS = EFIDIR=buildroot define EFIBOOTMSR_PATCH_HEADER_PATH $(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile
@@ -19,12 +20,13 @@ EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH define EFIBOOTMGR_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D) + LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D) \ + $(EFIBOOTMGR_MAKE_ARGS) endef define EFIBOOTMGR_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install + $(EFIBOOTMGR_MAKE_ARGS) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package))
Signature · 1 line
2.11.0
PATCH 1/1 efibootmgr: bump version
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Drop 0001-dont-use-fshort-wchar-when-building.patch and 0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch as they are now upstream.
The upstream repo moved to the 'rhboot' github project, so adjust upstream URL in .mk and help text to match.
Version 15 introduces build time configuration of the default EFI directory (E.G. the subdirectory in the EFI system partition where the loader is installed). This used to be hardcoded to redhat, but now a value must be specified at build time. Given that, it is unlikely that people relied on the default value so set it to the more sensible 'buildroot'.
Quoted 3 lines
While we are at it, also add a hash for the license file.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard