From c6b331027241396480bd5880455132f5db4b1efa Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 14 Jan 2022 23:42:39 +0000 Subject: [PATCH] efivar: update to 39 release notes: - https://github.com/rhboot/efivar/releases/tag/38 - https://github.com/rhboot/efivar/releases/tag/39 --- .../system-tools-depends/depends/efivar/package.mk | 6 +++--- .../patches/efivar-01-compile-with-glibc-2.36.patch | 13 ------------- .../efivar/patches/efivar-01-static_lib.patch | 11 ----------- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch delete mode 100644 packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk index bb8cb19b8c..527749d85d 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="efivar" -PKG_VERSION="b920a6ca82250504167066d24aa8731ad29a0de8" # 10 Dec 2021 -PKG_SHA256="def327792854bdb5bc442e2907e1871c954e55e33d67045dcd2d2988f8a08afd" +PKG_VERSION="39" +PKG_SHA256="c9edd15f2eeeea63232f3e669a48e992c7be9aff57ee22672ac31f5eca1609a6" PKG_ARCH="x86_64" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/rhboot/efivar" @@ -27,7 +27,7 @@ pre_make_target() { } make_target() { - make CROSS_COMPILE=${TARGET_NAME}- -C src/ libefivar.a libefiboot.a efivar.h efivar + make CROSS_COMPILE=${TARGET_NAME}- -C src/ libefivar.a libefiboot.a efivar.h efivar-static } makeinstall_host() { diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch b/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch deleted file mode 100644 index a281f11add..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/util.h 2022-01-14 19:29:35.000000000 +0000 -+++ b/src/util.h 2022-07-19 09:43:36.718759307 +0000 -@@ -23,7 +23,9 @@ - #include - #include - #include --#include -+#define BLKGETSIZE _IO(0x12, 96) /* Return device size. */ -+#define BLKSSZGET _IO(0x12,104) /* Get block device sector size. */ -+#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size. */ - #include - #include - #include diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch b/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch deleted file mode 100644 index 74d0bb8952..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile 2018-10-01 21:30:06.000000000 +0200 -+++ b/src/Makefile 2018-10-17 14:16:46.000000000 +0200 -@@ -93,7 +93,7 @@ - libefivar.so : LIBS=dl - libefivar.so : MAP=libefivar.map - --efivar : $(EFIVAR_OBJECTS) | libefivar.so -+efivar : $(EFIVAR_OBJECTS) | libefivar.a - efivar : LIBS=efivar dl - - efivar-static : $(EFIVAR_OBJECTS) $(patsubst %.o,%.static.o,$(LIBEFIVAR_OBJECTS))