From e2ade39026a6d3565e4b76b25202affa8215b290 Mon Sep 17 00:00:00 2001 From: m3tav3rse Date: Thu, 16 Mar 2023 16:41:52 +0100 Subject: [PATCH] coreboot-utils: update to 4.19. --- srcpkgs/coreboot-utils/patches/ectool-musl.patch | 11 ----------- srcpkgs/coreboot-utils/patches/inteltool-musl.patch | 2 +- srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch | 11 ----------- srcpkgs/coreboot-utils/patches/nvramtool-musl.patch | 11 ----------- srcpkgs/coreboot-utils/patches/superiotool-musl.patch | 2 +- srcpkgs/coreboot-utils/template | 6 +++--- 6 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/coreboot-utils/patches/ectool-musl.patch delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl.patch diff --git a/srcpkgs/coreboot-utils/patches/ectool-musl.patch b/srcpkgs/coreboot-utils/patches/ectool-musl.patch deleted file mode 100644 index 85abc55c428c..000000000000 --- a/srcpkgs/coreboot-utils/patches/ectool-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/util/ectool/Makefile 2020-05-20 15:20:52.396213112 +0200 -+++ b/util/ectool/Makefile 2020-05-20 15:20:52.396213112 +0200 -@@ -15,6 +15,8 @@ - LDFLAGS = -l$(shell uname -p) - endif - -+LDFLAGS = -lgcc -+ - all: $(PROGRAM) - - $(PROGRAM): ec.o ectool.o diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl.patch index 509d2dcb6077..57ae3e04cdfc 100644 --- a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch +++ b/srcpkgs/coreboot-utils/patches/inteltool-musl.patch @@ -5,7 +5,7 @@ #include -#if defined(__GLIBC__) -+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) ||defined(__NetBSD__) || defined(__DARWIN__)) ++#if defined(__linux__) #include #endif #if (defined(__MACH__) && defined(__APPLE__)) diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch deleted file mode 100644 index e6142739cfee..000000000000 --- a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/util/nvramtool/Makefile 2020-05-20 15:19:20.652210037 +0200 -+++ b/util/nvramtool/Makefile 2020-05-20 15:19:20.652210037 +0200 -@@ -34,6 +34,8 @@ - CFLAGS += -D__GLIBC__ - endif - -+LDFLAGS = -lgcc -+ - all: dep $(PROGRAM) - - $(PROGRAM): $(OBJS) diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch deleted file mode 100644 index a3e6c7c17835..000000000000 --- a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/util/nvramtool/accessors/cmos-hw-unix.c 2018-08-27 12:20:14.139599118 +0200 -+++ b/util/nvramtool/accessors/cmos-hw-unix.c 2018-08-27 12:19:45.558280906 +0200 -@@ -11,7 +11,7 @@ - #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) - #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) - #else --#if defined(__GLIBC__) && (defined(__i386__) || defined(__x86_64__)) -+#if (defined(__i386__) || defined(__x86_64__)) && !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) - #include - #endif - #if (defined(__MACH__) && defined(__APPLE__)) diff --git a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch b/srcpkgs/coreboot-utils/patches/superiotool-musl.patch index 195660c8c602..d74392142c2d 100644 --- a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch +++ b/srcpkgs/coreboot-utils/patches/superiotool-musl.patch @@ -16,7 +16,7 @@ #include #include -#if defined(__GLIBC__) -+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) ++#if defined(__linux__) #include #endif #if (defined(__MACH__) && defined(__APPLE__)) diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template index d01eb38b29c9..9bd7c87249ea 100644 --- a/srcpkgs/coreboot-utils/template +++ b/srcpkgs/coreboot-utils/template @@ -1,7 +1,7 @@ # Template file for 'coreboot-utils' pkgname=coreboot-utils -version=4.17 -revision=2 +version=4.19 +revision=1 archs="i686* x86_64*" build_wrksrc="util" build_style=gnu-makefile @@ -11,7 +11,7 @@ maintainer="m3tav3rse " license="GPL-2.0-only" homepage="https://coreboot.org" distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz" -checksum=95da11d1c6a450385101a68799258a398ce965f4e46cce6fe8d5ebd74e50c125 +checksum=65ccb2f46535b996e0066a1b76f81c8cf1ff3e27df84b3f97d8ad7b3e7cf0a43 do_build() { for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \