diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-12-03 17:14:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-12-03 17:16:02 +0000 |
| commit | a50dd3fddb618b7578c11e05808f3db09d871d7b (patch) | |
| tree | 92ac9f5dc270e14a338e07565742f252521e6f58 | |
| parent | d98dcd6ab15ed71a9d9321ed6986339e9fd33e68 (diff) | |
main/zfs-rpi: fix build with busybox mktemp
upstream report: https://github.com/openzfs/zfs/issues/11274
| -rw-r--r-- | main/zfs-rpi/APKBUILD | 7 | ||||
| -rw-r--r-- | main/zfs-rpi/fix-check-for-sed--in-place-with-busybox-mktemp.patch | 29 |
2 files changed, 34 insertions, 2 deletions
diff --git a/main/zfs-rpi/APKBUILD b/main/zfs-rpi/APKBUILD index 71f47bb20c2..2b3bfe9bac7 100644 --- a/main/zfs-rpi/APKBUILD +++ b/main/zfs-rpi/APKBUILD @@ -34,7 +34,9 @@ depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev makedepends="$depends_dev automake autoconf libtool linux-headers" install_if="zfs $_kpkg=$_kpkgver" subpackages="$pkgname-dev" -source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz" +source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz + fix-check-for-sed--in-place-with-busybox-mktemp.patch + " builddir="$srcdir/$_name-$_ver" for f in $_extra_flavors; do @@ -104,4 +106,5 @@ dev() { default_dev } -sha512sums="2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f zfs-2.0.0.tar.gz" +sha512sums="2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f zfs-2.0.0.tar.gz +ffee593eefb9472c0dd783b822dfb66938ccbb56f211b361c0d5bb61e36926a4f3d02ac50d0e4102168ab577b5aba6719a8ff918ae6bb3f4211a920300721590 fix-check-for-sed--in-place-with-busybox-mktemp.patch" diff --git a/main/zfs-rpi/fix-check-for-sed--in-place-with-busybox-mktemp.patch b/main/zfs-rpi/fix-check-for-sed--in-place-with-busybox-mktemp.patch new file mode 100644 index 00000000000..c65aa93fb67 --- /dev/null +++ b/main/zfs-rpi/fix-check-for-sed--in-place-with-busybox-mktemp.patch @@ -0,0 +1,29 @@ +From cc5f362cbf927d5b7f902c3a582f11ceb3f789ad Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 3 Dec 2020 11:16:47 +0100 +Subject: [PATCH] Fix check for sed --in-place with busybox mktemp + +Fix build on Alpine Linux which uses busybox, and busybox mktemp +requires 6 trailing Xes. + +Fixes commit 4313a5b4c51e (Detect if sed supports --in-place) + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +Closes #11274 +--- + config/always-sed.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/always-sed.m4 b/config/always-sed.m4 +index 19633e118ae..3d7ae285ba1 100644 +--- a/config/always-sed.m4 ++++ b/config/always-sed.m4 +@@ -4,7 +4,7 @@ dnl # + AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_SED], [ + AC_REQUIRE([AC_PROG_SED])dnl + AC_CACHE_CHECK([for sed --in-place], [ac_cv_inplace], [ +- tmpfile=$(mktemp conftest.XXX) ++ tmpfile=$(mktemp conftest.XXXXXX) + echo foo >$tmpfile + AS_IF([$SED --in-place 's#foo#bar#' $tmpfile 2>/dev/null], + [ac_cv_inplace="--in-place"], |