From: m3tav3rse <m3tav3rse@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] coreboot-utils: update to 4.20.1.
Date: Tue, 27 Jun 2023 22:59:23 +0200 [thread overview]
Message-ID: <20230627205923.kmnQai6RSGgMsCqLmqppBL0O9PnWODOqpn5NJrk_LhI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42810@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
There is an updated pull request by m3tav3rse against master on the void-packages repository
https://github.com/m3tav3rse/void-packages coreboot-utils
https://github.com/void-linux/void-packages/pull/42810
coreboot-utils: update to 4.20.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl crossbuild
A patch file from https://github.com/void-linux/void-packages/pull/42810.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreboot-utils-42810.patch --]
[-- Type: text/x-diff, Size: 6388 bytes --]
From 6f59b28630ee25de7d5156b01ddeb671d6051913 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Thu, 15 Jun 2023 11:41:24 +0200
Subject: [PATCH] coreboot-utils: update to 4.20.1.
---
.../coreboot-utils/patches/ectool-musl.patch | 11 ----------
.../patches/inteltool-musl-2.patch | 10 ---------
.../patches/inteltool-musl.patch | 11 ----------
.../patches/nvramtool-musl-2.patch | 11 ----------
.../patches/nvramtool-musl.patch | 11 ----------
.../patches/superiotool-musl.patch | 22 -------------------
srcpkgs/coreboot-utils/template | 7 +++---
7 files changed, 4 insertions(+), 79 deletions(-)
delete mode 100644 srcpkgs/coreboot-utils/patches/ectool-musl.patch
delete mode 100644 srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
delete mode 100644 srcpkgs/coreboot-utils/patches/inteltool-musl.patch
delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch
delete mode 100644 srcpkgs/coreboot-utils/patches/nvramtool-musl.patch
delete mode 100644 srcpkgs/coreboot-utils/patches/superiotool-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-2.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
deleted file mode 100644
index a27523bc9734..000000000000
--- a/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:31.750138013 +0200
-+++ b/src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:13.438137399 +0200
-@@ -4,6 +4,7 @@
- #define __ARCH_MMIO_H__
-
- #include <stdint.h>
-+#define __always_inline inline __attribute__((always_inline))
-
- static __always_inline uint8_t read8(
- const volatile void *addr)
diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl.patch
deleted file mode 100644
index 509d2dcb6077..000000000000
--- a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/util/inteltool/inteltool.h 2018-08-27 12:35:48.049321340 +0200
-+++ b/util/inteltool/inteltool.h 2018-08-27 12:30:27.434969376 +0200
-@@ -21,7 +21,7 @@
-
- #include <stdint.h>
-
--#if defined(__GLIBC__)
-+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) ||defined(__NetBSD__) || defined(__DARWIN__))
- #include <sys/io.h>
- #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 <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch b/srcpkgs/coreboot-utils/patches/superiotool-musl.patch
deleted file mode 100644
index 195660c8c602..000000000000
--- a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/util/superiotool/Makefile 2018-05-16 21:00:17.000000000 +0200
-+++ b/util/superiotool/Makefile 2018-08-27 12:56:28.070741476 +0200
-@@ -25,7 +25,7 @@
- VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
-
- CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
-- -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
-+ -Werror-implicit-function-declaration -pedantic $(VERSION)
- LDFLAGS += -lz
-
- OBJS = superiotool.o serverengines.o ali.o exar.o fintek.o ite.o nsc.o \
---- a/util/superiotool/superiotool.h 2018-05-16 21:00:17.000000000 +0200
-+++ b/util/superiotool/superiotool.h 2018-08-27 12:50:25.627387315 +0200
-@@ -25,7 +25,7 @@
- #include <stdint.h>
- #include <string.h>
- #include <getopt.h>
--#if defined(__GLIBC__)
-+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__))
- #include <sys/io.h>
- #endif
- #if (defined(__MACH__) && defined(__APPLE__))
diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index d01eb38b29c9..f91a0f0c7f87 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.20.1
+revision=1
archs="i686* x86_64*"
build_wrksrc="util"
build_style=gnu-makefile
@@ -11,7 +11,8 @@ maintainer="m3tav3rse <mtvrs@tuta.io>"
license="GPL-2.0-only"
homepage="https://coreboot.org"
distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz"
-checksum=95da11d1c6a450385101a68799258a398ce965f4e46cce6fe8d5ebd74e50c125
+checksum=b41539a8c2eab2fec752157eb4acbd0e2a637a7203530c12e66b43a5c3c3a931
+CFLAGS="-D_GNU_SOURCE"
do_build() {
for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \
next prev parent reply other threads:[~2023-06-27 20:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-16 15:45 [PR PATCH] coreboot-utils: update to 4.19 m3tav3rse
2023-06-15 1:59 ` github-actions
2023-06-15 9:40 ` [PR PATCH] [Updated] " m3tav3rse
2023-06-15 9:43 ` m3tav3rse
2023-06-15 9:43 ` m3tav3rse
2023-06-15 11:55 ` [PR PATCH] [Updated] " m3tav3rse
2023-06-15 12:00 ` m3tav3rse
2023-06-27 8:33 ` [PR REVIEW] coreboot-utils: update to 4.20.1 classabbyamp
2023-06-27 20:59 ` m3tav3rse
2023-06-27 20:59 ` m3tav3rse [this message]
2023-06-27 21:27 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230627205923.kmnQai6RSGgMsCqLmqppBL0O9PnWODOqpn5NJrk_LhI@z \
--to=m3tav3rse@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).