From 363e9b282b6bd3908c2a2b56c894d785cf2fb94d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 30 Dec 2022 14:17:35 +0000 Subject: gentoo auto-resync : 30:12:2022 - 14:17:35 --- app-admin/Manifest.gz | Bin 32370 -> 32373 bytes app-admin/coreboot-utils/Manifest | 4 +- .../coreboot-utils/coreboot-utils-4.18-r1.ebuild | 67 -------------------- .../coreboot-utils/coreboot-utils-4.18-r2.ebuild | 68 +++++++++++++++++++++ .../files/coreboot-utils-4.18-musl.patch | 19 +++--- 5 files changed, 77 insertions(+), 81 deletions(-) delete mode 100644 app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild create mode 100644 app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index bc677d59ed64..ac0437bb64f6 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/coreboot-utils/Manifest b/app-admin/coreboot-utils/Manifest index 132e3b50e694..e7bd5d3a3493 100644 --- a/app-admin/coreboot-utils/Manifest +++ b/app-admin/coreboot-utils/Manifest @@ -1,5 +1,5 @@ AUX coreboot-utils-4.18-flags.patch 1264 BLAKE2B 001658e09f1a580d2523c8cd09d1dfdbe6771b787e7e7af9b1f80ae6491a969536d54fb80af8914394ac6193744be2cd23068e2a577b2cd31208e3dd10b9e11d SHA512 5325b7f639f5d010fd8fed565a123f6e9688642c0834bfda2c7b9dbb49b157427f34292069785fe8f8b6d2e6b4d60fa45187d91a79a66db7f6a041fd0a9da562 -AUX coreboot-utils-4.18-musl.patch 2033 BLAKE2B 27bb15016ff4642134c9f01037ba84ae9be2c0e02ad37b5d32b30f7f5186d7411eaa35352017e12db40fbab9d020415b26fc5a602db676eba79ee7456dbf2f8c SHA512 7d74537d36fdb322c4b6182ab1cb5f39a2cb3d2ac8c92e38c5443fd4391a8ceaceed9a93b09a327482912efa96e09fef4dcc5e2587c74c3da503983db754ffd9 +AUX coreboot-utils-4.18-musl.patch 1976 BLAKE2B 5c21560002ad47ebbfe874381a394d44a1b025b3f371fd51d5abe60b6691ca1c206c04c7d1ed52fe8ed02e2b9d99a1f6a18008b45b241f639b5a59626d3a83ec SHA512 64e02911a64200bb434f9c01accc1680074af349844ce3fff42983ba3d1549b694870bd1cb4beac96ef9d47177ca2c05b4e23be1b80c88571baa6bec3261e802 DIST coreboot-4.18.tar.xz 57868424 BLAKE2B 981d8c1cf007be15a85d5860dcfcfa6fa637f66438ff4ef6619491aaf0192e622bfbe9608deb13a975d899c94430bc3d1f0eb3a5a3dc6598f49a726b8ff641e1 SHA512 b363850d31074950bc710bd0a47a896a6c6ef23c53d720ae90ec2257697a3eeeb211e163199064b5e532e5b1e86cdecf997276d742435deeaaacfb19b83f4e6d -EBUILD coreboot-utils-4.18-r1.ebuild 1508 BLAKE2B 6c064d97ed7a1802ab0927beee970151c3b5e5769f03be1d7e6b0403ba61a6b12b84d494ef62cf2c096c20082906b5ad5b93c49f471467902322c304a78a4d7e SHA512 e05ff2b230bb975b6d5070ac840efcba942daf2748b20d4443d445ed095c08ba9e7b35f7f1e5900eea636e3a7f50a6177cc2232164ee59ab27434d94c06cbebc +EBUILD coreboot-utils-4.18-r2.ebuild 1650 BLAKE2B 5da01b5f79bdbaca42b9fdda45b80fe47ab4179cb50e8cc5e771522cf652985eb434dbb27e22ebbc4986e1c25eefbdac288db86d4cc9f52447b39a3f15ee892c SHA512 38dbc4c4b2d5dec6fa48d3468bec6b306d77a7b83c65a68413cb82e5ea05096a6fdb3bd8d3917cb4cc884276b5d474aab756eb365a69d02b48f8a56264ab9616 MISC metadata.xml 223 BLAKE2B 3ade38574009f425c0670f7c377386f6263f08ab222c58e1f433bc81159209e56e52a6709d1858760529606c21c55ec68d24c45358d6f525a9ef6ac1474f80c9 SHA512 4cd7de2eb60e5be6f2eebb7169ffdb9e5255362755527921ba60781640766b58e4ce47da81134ded62746a2f95b7b5591933e4510cec7e94a69f16377bd2bae4 diff --git a/app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild b/app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild deleted file mode 100644 index f50dd5d15b0a..000000000000 --- a/app-admin/coreboot-utils/coreboot-utils-4.18-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="A selection from coreboot/utils useful in general" -HOMEPAGE="https://www.coreboot.org/" -SRC_URI="https://coreboot.org/releases/coreboot-${PV}.tar.xz" - -LICENSE="GPL-2+ GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="sys-apps/pciutils - sys-libs/zlib" -RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/coreboot-${PV}" -PATCHES=( - "${FILESDIR}"/${PN}-4.18-musl.patch - "${FILESDIR}"/${PN}-4.18-flags.patch -) - -coreboot_utils=( - #cbfstool has textrels and is not really necessary outside coreboot - cbmem - ifdtool - intelmetool - inteltool - me_cleaner - nvramtool - pmh7tool - superiotool -) - -src_prepare() { - default - # drop some CFLAGS that hurt compilation on modern toolchains or - # force optimisation - # can't do this in one sed, because it all happens back-to-back - for e in '-O[01234567s]' '-g' '-Werror' '-ansi' '-pendantic' ; do - sed -i -e 's/\( \|=\)'"${e}"'\( \|$\)/\1/g' util/*/Makefile{.inc,} \ - || die - done -} - -src_compile() { - # selection from README.md that seem useful outside coreboot - - tc-export CC - export HOSTCFLAGS="${CFLAGS}" - for tool in ${coreboot_utils[*]} ; do - [[ -f util/${tool}/Makefile ]] || continue - emake -C util/${tool} V=1 - done -} - -src_install() { - exeinto /usr/sbin - for tool in ${coreboot_utils[*]} ; do - [[ -e util/${tool}/${tool} ]] && doexe util/${tool}/${tool} - [[ -e util/${tool}/${tool}.py ]] && doexe util/${tool}/${tool}.py - done -} diff --git a/app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild b/app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild new file mode 100644 index 000000000000..0f0e5b47fd02 --- /dev/null +++ b/app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A selection from coreboot/utils useful in general" +HOMEPAGE="https://www.coreboot.org/" +SRC_URI="https://coreboot.org/releases/coreboot-${PV}.tar.xz" + +LICENSE="GPL-2+ GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="sys-apps/pciutils + sys-libs/zlib" +RDEPEND="${DEPEND}" +BDEPEND="" + +S="${WORKDIR}/coreboot-${PV}" +PATCHES=( + "${FILESDIR}"/${PN}-4.18-musl.patch + "${FILESDIR}"/${PN}-4.18-flags.patch +) + +# selection from README.md that seem useful outside coreboot +coreboot_utils=( + #cbfstool has textrels and is not really necessary outside coreboot + cbmem + ifdtool + intelmetool + inteltool + me_cleaner + nvramtool + pmh7tool + superiotool +) + +src_prepare() { + default + # drop some CFLAGS that hurt compilation on modern toolchains or + # force optimisation + # can't do this in one sed, because it all happens back-to-back + for e in '-O[01234567s]' '-g' '-Werror' '-ansi' '-pendantic' ; do + sed -i -e 's/\( \|=\)'"${e}"'\( \|$\)/\1/g' util/*/Makefile{.inc,} \ + || die + done +} + +src_compile() { + tc-export CC + export HOSTCFLAGS="${CFLAGS}" + for tool in ${coreboot_utils[*]} ; do + [[ -f util/${tool}/Makefile ]] || continue + emake -C util/${tool} V=1 + done +} + +src_install() { + exeinto /usr/sbin + for tool in ${coreboot_utils[*]} ; do + [[ -e util/${tool}/${tool} ]] && doexe util/${tool}/${tool} + [[ -e util/${tool}/${tool}.py ]] && doexe util/${tool}/${tool}.py + [[ -e util/${tool}/${tool}.8 ]] && doman util/${tool}/${tool}.8 + [[ -d util/${tool}/man ]] && doman util/${tool}/man/*.[12345678] + done +} diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch index 435977ac9c0b..a92936f008cd 100644 --- a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch +++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch @@ -34,22 +34,17 @@ diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c index ed18c13e62..fa2c6ce35d 100644 --- a/util/superiotool/superiotool.c +++ b/util/superiotool/superiotool.c -@@ -320,6 +320,7 @@ int main(int argc, char *argv[]) - } - } - -+#if 0 - #if defined(__FreeBSD__) +@@ -324,8 +324,8 @@ if ((io_fd = open("/dev/io", O_RDWR)) < 0) { perror("/dev/io"); -@@ -330,6 +331,7 @@ int main(int argc, char *argv[]) + #else +- if (iopl(3) < 0) { +- perror("iopl"); ++ if (ioperm(0, 6000, 1) < 0) { ++ perror("ioperm"); + #endif printf("Superiotool must be run as root.\n"); exit(1); - } -+#endif - - print_version(); - diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h index a621ae5274..d5f44fece4 100644 --- a/util/superiotool/superiotool.h -- cgit v1.2.3