From bb25319aa8996d39a5d94ee15cd84ea3364a76fa Mon Sep 17 00:00:00 2001 From: m3tav3rse Date: Wed, 20 May 2020 14:10:53 +0200 Subject: [PATCH] coreboot-utils: update to 4.12. --- srcpkgs/coreboot-utils/patches/ectool-musl.patch | 11 +++++++++++ srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch | 10 ++++++++++ srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch | 11 +++++++++++ srcpkgs/coreboot-utils/template | 6 +++--- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/coreboot-utils/patches/ectool-musl.patch create mode 100644 srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch create mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch diff --git a/srcpkgs/coreboot-utils/patches/ectool-musl.patch b/srcpkgs/coreboot-utils/patches/ectool-musl.patch new file mode 100644 index 00000000000000..1bdbfbe551eef2 --- /dev/null +++ b/srcpkgs/coreboot-utils/patches/ectool-musl.patch @@ -0,0 +1,11 @@ +--- util/ectool/Makefile 2020-05-20 15:20:52.396213112 +0200 ++++ - 2020-05-20 15:20:46.512212915 +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-2.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch new file mode 100644 index 00000000000000..05d4d431b064cc --- /dev/null +++ b/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch @@ -0,0 +1,10 @@ +--- src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:31.750138013 +0200 ++++ src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:13.438137399 +0200 +@@ -4,6 +4,7 @@ + #define __ARCH_MMIO_H__ + + #include ++#define __always_inline inline __attribute__((always_inline)) + + static __always_inline uint8_t read8( + const volatile void *addr) diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch new file mode 100644 index 00000000000000..cd3078d10bed31 --- /dev/null +++ b/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch @@ -0,0 +1,11 @@ +--- util/nvramtool/Makefile 2020-05-20 15:19:20.652210037 +0200 ++++ - 2020-05-20 15:20:00.145211360 +0200 +@@ -34,6 +34,8 @@ + CFLAGS += -D__GLIBC__ + endif + ++LDFLAGS = -lgcc ++ + all: dep $(PROGRAM) + + $(PROGRAM): $(OBJS) diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template index 1a70f3d769a6ea..e6c57472ea17e9 100644 --- a/srcpkgs/coreboot-utils/template +++ b/srcpkgs/coreboot-utils/template @@ -1,6 +1,6 @@ # Template file for 'coreboot-utils' pkgname=coreboot-utils -version=4.11 +version=4.12 revision=1 archs="i686* x86_64*" wrksrc="coreboot-${version}" @@ -8,11 +8,11 @@ build_wrksrc="util" build_style=gnu-makefile makedepends="pciutils-devel zlib-devel" short_desc="Coreboot firmware utilities" -maintainer="m3tav3rse " +maintainer="m3tav3rse " license="GPL-2.0-only" homepage="https://coreboot.org" distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz" -checksum=97fd859b4c39a25534fe33c30eb86e54a233952e08a024c55858d11598a8ad87 +checksum=edcad000ee9b73183c396ea76155629b3d27c693e0f1ae83e3424c4d936e2be2 do_build() { for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \