From 232b73ed9a03b962e3b089c950dc6c4d02836c63 Mon Sep 17 00:00:00 2001
From: Oskari Rauta <oskari.rauta@gmail.com>
Date: Sun, 11 Jun 2023 15:17:30 +0300
Subject: [PATCH] gnu-efi: update to version 3.0.17

update library + add new package containing efi programs
provided by gnu-efi library.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
---
 libs/gnu-efi/Makefile | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/libs/gnu-efi/Makefile b/libs/gnu-efi/Makefile
index 3125069ccc..24963c212e 100644
--- a/libs/gnu-efi/Makefile
+++ b/libs/gnu-efi/Makefile
@@ -6,14 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnu-efi
-PKG_VERSION:=3.0.9
+PKG_VERSION:=3.0.17
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/vathpela/gnu-efi.git
-PKG_SOURCE_DATE:=2021-04-11
-PKG_SOURCE_VERSION:=3e4d5c79905afcd815b0beb3dcfe2dfae5b3e6dd
-PKG_MIRROR_HASH:=7660d2259c1d5208bcabee5a0ffb6dc61f41363a79ba9158f3dd413a8af8e238
+PKG_SOURCE_DATE:=2023-06-11
+PKG_SOURCE_VERSION:=64027ee9864d8a8685ae187eb91ddc519d18cedb
+PKG_MIRROR_HASH:=738addbaba775ca1fc8d31a4bb2cbea1b8a0ac9aa888434f36264b2b0ce1dc5b
 PKG_BUILD_PARALLEL:=1
 
 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
@@ -30,10 +30,24 @@ define Package/gnu-efi
   DEPENDS:=@TARGET_x86_64
 endef
 
+define Package/gnu-efi-programs
+  SECTION:=boot
+  CATEGORY:=Boot Loaders
+  TITLE:=Various EFI programs
+  URL:=https://github.com/vathpela/gnu-efi
+  DEPENDS:=@TARGET_x86_64 +gnu-efi
+endef
+
 define Package/gnu-efi/description
   GNU's EFI library
 endef
 
+define Package/gnu-efi-programs/description
+  Various EFI programs from GNU's EFI library
+endef
+
+TARGET_CFLAGS += -Wno-error=incompatible-pointer-types
+
 define Build/Install
 	$(MAKE_VARS) \
 	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
@@ -44,13 +58,19 @@ endef
 
 define Package/gnu-efi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/** $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/{crt0-efi-*.o,elf_*.lds,libefi.a,libgnuefi.a} $(1)/usr/lib/
+endef
+
+define gnu-efi-programs/install
+	$(INSTALL_DIR) $(1)/usr/share/gnuefi/apps
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/gnuefi/apps/*.efi $(1)/usr/share/gnuefi/apps/
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include/efi
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/** $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/{crt0-efi-*.o,elf_*.lds,libefi.a,libgnuefi.a} $(1)/usr/lib/
 	cp -aR $(PKG_INSTALL_DIR)/usr/local/include/efi/** $(1)/usr/include/efi/
 endef
 
 $(eval $(call BuildPackage,gnu-efi))
+$(eval $(call BuildPackage,gnu-efi-programs))