diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-28 01:45:34 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-28 01:46:30 -0500 |
| commit | 42705a922c064806f229ddb2e20123a0f67f0372 (patch) | |
| tree | 4591fc2fb9e10318640d2daa778c643b03ea4e86 | |
| parent | 52091e4a3afcc3f9e6d9fd174833611070b404fd (diff) | |
| download | packages-42705a922c064806f229ddb2e20123a0f67f0372.tar.gz packages-42705a922c064806f229ddb2e20123a0f67f0372.tar.bz2 packages-42705a922c064806f229ddb2e20123a0f67f0372.tar.xz packages-42705a922c064806f229ddb2e20123a0f67f0372.zip | |
user/efi*: fix up
| -rw-r--r-- | user/efibootmgr/APKBUILD | 2 | ||||
| -rw-r--r-- | user/efivar/APKBUILD | 4 | ||||
| -rw-r--r-- | user/efivar/musl-strndupa.patch | 13 |
3 files changed, 2 insertions, 17 deletions
diff --git a/user/efibootmgr/APKBUILD b/user/efibootmgr/APKBUILD index 507f6935a..0cde72c5a 100644 --- a/user/efibootmgr/APKBUILD +++ b/user/efibootmgr/APKBUILD @@ -9,7 +9,7 @@ arch="pmmx x86_64 arm64 ia64" options="!check" # Dangerous. license="GPL-2.0-only" depends="" -makedepends="efivar-dev gettext-dev" +makedepends="efivar-dev" subpackages="$pkgname-doc" source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2" diff --git a/user/efivar/APKBUILD b/user/efivar/APKBUILD index bc1088b10..c9283bbdb 100644 --- a/user/efivar/APKBUILD +++ b/user/efivar/APKBUILD @@ -14,7 +14,6 @@ makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2 0001-makeguids-Ensure-compatibility-with-other-libcs.patch - musl-strndupa.patch " build() { @@ -28,5 +27,4 @@ package() { } sha512sums="951feabe2d238826fdd6e74e8f7a24f04d705f9ef925cfcfb852944d2d7a4f04e3a6c23f276c40e5564da42614558941dbe7aaf21efa6a722a616e4d165aba2d efivar-36.tar.bz2 -8a47abad5d6d2ceffb5effdd177d3e678256961294ff66df1158084e3f45f0bcb07105a1c3df35b3a5c503742c4e59148df740c40fa3b7149b1f609f8b51ebd3 0001-makeguids-Ensure-compatibility-with-other-libcs.patch -4dd340861cac6d6617b2547db14aa85140f1d2cf8d7e4b709b4b01671170d4ebc66439d91ade926ad5eb67300696226f1382731ff2aaa728511abef6e83f0cf6 musl-strndupa.patch" +8a47abad5d6d2ceffb5effdd177d3e678256961294ff66df1158084e3f45f0bcb07105a1c3df35b3a5c503742c4e59148df740c40fa3b7149b1f609f8b51ebd3 0001-makeguids-Ensure-compatibility-with-other-libcs.patch" diff --git a/user/efivar/musl-strndupa.patch b/user/efivar/musl-strndupa.patch deleted file mode 100644 index fc32d9740..000000000 --- a/user/efivar/musl-strndupa.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- efivar-31/src/linux.c 2017-02-13 17:52:14.000000000 +0100 -+++ efivar-31/src/linux.c 2017-02-18 04:42:13.893911649 +0100 -@@ -44,6 +44,10 @@ - #include <efivar.h> - #include <efiboot.h> - -+#if !defined(__GLIBC__) -+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) -+#endif -+ - #include "dp.h" - #include "linux.h" - #include "util.h" |