1 --- zfs-zfs-0.8.1/config/zfs-build.m4.orig 2019-06-14 18:43:18.000000000 +0200
2 +++ zfs-zfs-0.8.1/config/zfs-build.m4 2019-07-17 16:03:44.885415916 +0200
4 [enable_debug_kmem=no])
6 AS_IF([test "x$enable_debug_kmem" = xyes], [
7 - KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM"
8 + KERNEL_DEBUG_CPPFLAGS="$KERNEL_DEBUG_CPPFLAGS -DDEBUG_KMEM"
9 DEBUG_KMEM_ZFS="_with_debug_kmem"
11 DEBUG_KMEM_ZFS="_without_debug_kmem"
13 [enable_debug_kmem_tracking=no])
15 AS_IF([test "x$enable_debug_kmem_tracking" = xyes], [
16 - KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM_TRACKING"
17 + KERNEL_DEBUG_CPPFLAGS="$KERNEL_DEBUG_CPPFLAGS -DDEBUG_KMEM_TRACKING"
18 DEBUG_KMEM_TRACKING_ZFS="_with_debug_kmem_tracking"
20 DEBUG_KMEM_TRACKING_ZFS="_without_debug_kmem_tracking"
24 RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
25 - RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_ZFS) 1"'
26 - RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING_ZFS) 1"'
27 - RPM_DEFINE_COMMON+=' --define "$(DEBUGINFO_ZFS) 1"'
28 - RPM_DEFINE_COMMON+=' --define "$(ASAN_ZFS) 1"'
29 + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUG_KMEM_ZFS) 1"'
30 + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUG_KMEM_TRACKING_ZFS) 1"'
31 + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUGINFO_ZFS) 1"'
32 + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(ASAN_ZFS) 1"'
34 RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"'
37 RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)"'
39 AS_IF([test -n "$udevdir" ], [
40 - RPM_DEFINE_UTIL+=' --define "_udevdir $(udevdir)"'
41 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_udevdir $(udevdir)"'
43 AS_IF([test -n "$udevruledir" ], [
44 - RPM_DEFINE_UTIL+=' --define "_udevdir $(udevruledir)"'
45 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_udevdir $(udevruledir)"'
47 - RPM_DEFINE_UTIL+=' $(DEFINE_INITRAMFS)'
48 - RPM_DEFINE_UTIL+=' $(DEFINE_SYSTEMD)'
49 - RPM_DEFINE_UTIL+=' $(DEFINE_PYZFS)'
50 - RPM_DEFINE_UTIL+=' $(DEFINE_PYTHON_VERSION)'
51 - RPM_DEFINE_UTIL+=' $(DEFINE_PYTHON_PKG_VERSION)'
52 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_INITRAMFS)'
53 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_SYSTEMD)'
54 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYZFS)'
55 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYTHON_VERSION)'
56 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYTHON_PKG_VERSION)'
58 dnl # Override default lib directory on Debian/Ubuntu systems. The
59 dnl # provided /usr/lib/rpm/platform/<arch>/macros files do not
62 AS_IF([test "$DEFAULT_PACKAGE" = "deb"], [
63 MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
64 - RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"'
65 + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_lib $(MULTIARCH_LIBDIR)"'
66 AC_SUBST(MULTIARCH_LIBDIR)
69 RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
70 - RPM_DEFINE_KMOD+=' --define "ksrc $(LINUX)"'
71 - RPM_DEFINE_KMOD+=' --define "kobj $(LINUX_OBJ)"'
72 - RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'
73 + RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "ksrc $(LINUX)"'
74 + RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "kobj $(LINUX_OBJ)"'
75 + RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "_wrong_version_format_terminate_build 0"'
79 From db0ad393b1bb7f83167e1cece1fd896dd0e63d73 Mon Sep 17 00:00:00 2001
80 From: "Andrew J. Hesford" <48421688+ahesford@users.noreply.github.com>
81 Date: Fri, 14 Feb 2020 11:30:29 -0500
82 Subject: [PATCH] Use POSIX stdout/stderr redirect in configure macro
84 This PR fixes an issue wherein redirecting stdout and stderr when
85 building kernel modules in configure tests relied on a bashism that
86 does not work as expected when /bin/sh is not bash.
88 Reviewed-by: George Melikov <mail@gmelikov.ru>
89 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
90 Reviewed-By: Richard Laager <rlaager@wiktel.com>
91 Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
95 config/kernel.m4 | 2 +-
96 1 file changed, 1 insertion(+), 1 deletion(-)
98 diff --git a/config/kernel.m4 b/config/kernel.m4
99 index 23643e0c3de..6bb37937cb4 100644
100 --- a/config/kernel.m4
101 +++ b/config/kernel.m4
102 @@ -566,7 +566,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE], [
104 KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6"
105 make modules -k -j$TEST_JOBS -C $LINUX_OBJ $ARCH_UM
106 - M=$PWD/$1 &>$1/build.log])
107 + M=$PWD/$1 >$1/build.log 2>&1])
108 AS_IF([AC_TRY_COMMAND([$2])], [$3], [$4])