commit: 8c844a0a39f4b19b09a03c0c79db38fa1b04f8cb Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Tue Aug 26 12:34:11 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Tue Aug 26 12:34:11 2025 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8c844a0a
sys-libs/efivar: treeclean ::gentoo works fine. Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> sys-libs/efivar/Manifest | 1 - sys-libs/efivar/efivar-32-r1.ebuild | 44 ---------------- sys-libs/efivar/files/0.23-musl.patch | 21 -------- sys-libs/efivar/files/27-strndupa.patch | 19 ------- .../files/efivar-32-efi_guid_ux_capsule.patch | 59 ---------------------- sys-libs/efivar/metadata.xml | 11 ---- 6 files changed, 155 deletions(-) diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest deleted file mode 100644 index 9116eb42..00000000 --- a/sys-libs/efivar/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST efivar-32.tar.gz 108102 BLAKE2B 7f9d27433b40ec6c044ab34ccc697001ad23e39a46862d2e04db0f9a3dfc26ae53b46a3c3a8c957bf76df0969710f78249f72f7bf38e67c0aa902034a07acf8f SHA512 e73eae182fd645183dfe587591a286670ee1123a113e3e19e4070fb910ab7794e320defdc0597540df7664947f2a0497abbb763a19b4dfa40511a512c7f3e490 diff --git a/sys-libs/efivar/efivar-32-r1.ebuild b/sys-libs/efivar/efivar-32-r1.ebuild deleted file mode 100644 index 710609bc..00000000 --- a/sys-libs/efivar/efivar-32-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Tools and library to manipulate EFI variables" -HOMEPAGE="https://github.com/rhinstaller/efivar"; -#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"; -SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-libs/popt" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-3.18 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-efi_guid_ux_capsule.patch" - "${FILESDIR}/0.23-musl.patch" - "${FILESDIR}/27-strndupa.patch" -) - -src_prepare() { - default - sed -i -e s/-Werror// gcc.specs || die -} - -src_configure() { - tc-export CC - tc-ld-disable-gold - export libdir="/usr/$(get_libdir)" - unset LIBS # Bug 562004 - - if [[ -n ${GCC_SPECS} ]]; then - # The environment overrides the command line. - GCC_SPECS+=":${S}/gcc.specs" - fi -} diff --git a/sys-libs/efivar/files/0.23-musl.patch b/sys-libs/efivar/files/0.23-musl.patch deleted file mode 100644 index f5549d68..00000000 --- a/sys-libs/efivar/files/0.23-musl.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur efivar-0.23.orig/src/makeguids.c efivar-0.23/src/makeguids.c ---- efivar-0.23.orig/src/makeguids.c 2016-02-15 11:38:42.000000000 -0800 -+++ efivar-0.23/src/makeguids.c 2016-02-16 17:48:09.605591260 -0800 -@@ -153,13 +153,13 @@ - #if BYTE_ORDER == BIG_ENDIAN\n\ - #define cpu_to_be32(n) (n)\n\ - #define cpu_to_be16(n) (n)\n\ --#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ --#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ -+#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ -+#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ - #else\n\ - #define cpu_to_le32(n) (n)\n\ - #define cpu_to_le16(n) (n)\n\ --#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ --#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ -+#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ -+#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ - #endif\n\ - """); - diff --git a/sys-libs/efivar/files/27-strndupa.patch b/sys-libs/efivar/files/27-strndupa.patch deleted file mode 100644 index 287b3bf3..00000000 --- a/sys-libs/efivar/files/27-strndupa.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur efivar-27.orig/src/linux.c efivar-27/src/linux.c ---- efivar-27.orig/src/linux.c 2016-08-19 12:28:16.782365757 -0700 -+++ efivar-27/src/linux.c 2016-08-19 12:30:12.852460305 -0700 -@@ -48,6 +48,15 @@ - #include "linux.h" - #include "util.h" - -+#ifndef strndupa -+#define strndupa(s, n) \ -+ (__extension__ ({const char *__in = (s); \ -+ size_t __len = strnlen (__in, (n)) + 1; \ -+ char *__out = (char *) alloca (__len); \ -+ __out[__len-1] = '\0'; \ -+ (char *) memcpy (__out, __in, __len-1);})) -+#endif -+ - int - __attribute__((__visibility__ ("hidden"))) - set_disk_and_part_name(struct disk_info *info) diff --git a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch deleted file mode 100644 index 8a5a72f6..00000000 --- a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch +++ /dev/null @@ -1,59 +0,0 @@ -From cd732494ba7685feaf71b9ee58619ca6aef39fc9 Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Tue, 12 Sep 2017 10:45:31 -0400 -Subject: [PATCH] Make efi_guid_ux_capsule actually work. - -Signed-off-by: Peter Jones <[email protected]> ---- - src/abignore | 11 ++++++++++- - src/guids.txt | 2 +- - src/libefivar.map.in | 4 ++++ - 3 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/abignore b/src/abignore -index 74b5160..479b5c3 100644 ---- a/src/abignore -+++ b/src/abignore -@@ -14,7 +14,16 @@ - # 'efidp_wifi __anonymous_union__::wifi' at efivar-dp.h:868:1 - # - [suppress_type] -- soname_regexp = libefi(var|boot)\\.so -+ soname_regexp = libefi(var|boot)\\.so\\..* - name = efidp_data - type_kind = typedef - has_data_member_inserted_at = end -+ -+# 1 Added variable: -+# -+# 'const __anonymous_struct__ efi_guid_ux_capsule' {efi_guid_ux_capsule@@LIBEFIVAR_1.32} -+# -+[suppress_variable] -+ soname_regexp = ^libefivar\\.so\\.[[:digit:]]+ -+ symbol_name_regexp = ^efi_guid_[[:alnum:]_]+$ -+ change_kind = add-variable -diff --git a/src/guids.txt b/src/guids.txt -index 87e2f61..06081ed 100644 ---- a/src/guids.txt -+++ b/src/guids.txt -@@ -3,7 +3,7 @@ - 0abba7dc-e516-4167-bbf5-4d9d1c739416 redhat Red Hat - 0b6e5233-a65c-44c9-9407-d9ab83bfc8bd sha224 SHA-224 - 126a762d-5758-4fca-8531-201a7f57f850 lenovo_boot_menu Lenovo Boot Menu --3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule_guid Firmware update localized text image -+3b8c8162-188c-46a4-aec9-be43f1d65697 ux_capsule Firmware update localized text image - 3bd2a492-96c0-4079-b420-fcf98ef103ed x509_sha256 SHA256 hash of X.509 Certificate - 3c5766e8-269c-4e34-aa14-ed776e85b3b6 rsa2048 RSA 2048 - 3CC24E96-22C7-41D8-8863-8E39DCDCC2CF lenovo Lenovo -diff --git a/src/libefivar.map.in b/src/libefivar.map.in -index ba51d55..a95a505 100644 ---- a/src/libefivar.map.in -+++ b/src/libefivar.map.in -@@ -110,3 +110,7 @@ LIBEFIVAR_1.30 { - efi_error_get; - efi_error_clear; - } LIBEFIVAR_1.29; -+ -+LIBEFIVAR_1.32 { -+ global: efi_guid_ux_capsule; -+} LIBEFIVAR_1.30; diff --git a/sys-libs/efivar/metadata.xml b/sys-libs/efivar/metadata.xml deleted file mode 100644 index 0a27d363..00000000 --- a/sys-libs/efivar/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Mike Gilbert</name> - </maintainer> - <upstream> - <remote-id type="github">rhinstaller/efivar</remote-id> - </upstream> -</pkgmetadata>
