diff options
| author | Arvind Sankar <[email protected]> | 2020-07-13 19:20:27 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-07-14 17:32:21 -0700 |
| commit | bdb518c13abb9eca8d6f8f1d9e2096dc5163a9e7 (patch) | |
| tree | 52c23b500988b858afd31dd490f2b6ac74465d55 /config | |
| parent | e6c093dd94e7e6f221194e96095c0133662e3500 (diff) | |
Make RPM_DEFINE_KMOD conditional on CONFIG_KERNEL
The configure variables won't be defined if CONFIG_KERNEL is disabled
and defining empty macros causes errors. The spec files do provide some
defaults if the macros are undefined.
Remove config conditionals in the tgz Makefile.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10564
Diffstat (limited to 'config')
| -rw-r--r-- | config/tgz.am | 4 | ||||
| -rw-r--r-- | config/zfs-build.m4 | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/config/tgz.am b/config/tgz.am index 4a8491401..2499ba423 100644 --- a/config/tgz.am +++ b/config/tgz.am @@ -10,17 +10,14 @@ tgz-local: fi) tgz-kmod: tgz-local rpm-kmod -if CONFIG_KERNEL name=${PACKAGE}; \ version=${VERSION}-${RELEASE}; \ arch=`$(RPM) -qp $${name}-kmod-$${version}.src.rpm --qf %{arch} | tail -1`; \ pkg1=kmod-$${name}*$${version}.$${arch}.rpm; \ fakeroot $(ALIEN) --scripts --to-tgz $$pkg1; \ $(RM) $$pkg1 -endif tgz-utils: tgz-local rpm-utils -if CONFIG_USER name=${PACKAGE}; \ version=${VERSION}-${RELEASE}; \ arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ @@ -29,6 +26,5 @@ if CONFIG_USER pkg3=$${name}-test-$${version}.$${arch}.rpm; \ fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2 $$pkg3; \ $(RM) $$pkg1 $$pkg2 $$pkg3 -endif tgz: tgz-kmod tgz-utils diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 19625a7b0..dea3f6137 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -261,9 +261,9 @@ AC_DEFUN([ZFS_AC_RPM], [ ]) RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"' + RPM_DEFINE_COMMON=${RPM_DEFINE_COMMON}' --define "$(DEBUGINFO_ZFS) 1"' RPM_DEFINE_COMMON=${RPM_DEFINE_COMMON}' --define "$(DEBUG_KMEM_ZFS) 1"' RPM_DEFINE_COMMON=${RPM_DEFINE_COMMON}' --define "$(DEBUG_KMEM_TRACKING_ZFS) 1"' - RPM_DEFINE_COMMON=${RPM_DEFINE_COMMON}' --define "$(DEBUGINFO_ZFS) 1"' RPM_DEFINE_COMMON=${RPM_DEFINE_COMMON}' --define "$(ASAN_ZFS) 1"' RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"' @@ -303,10 +303,16 @@ AC_DEFUN([ZFS_AC_RPM], [ AC_SUBST(MULTIARCH_LIBDIR) ]) - RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"' - RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "ksrc $(LINUX)"' - RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kobj $(LINUX_OBJ)"' - RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "_wrong_version_format_terminate_build 0"' + dnl # Make RPM_DEFINE_KMOD additions conditional on CONFIG_KERNEL, + dnl # since the values will not be set otherwise. The spec files + dnl # provide defaults for them. + dnl # + RPM_DEFINE_KMOD='--define "_wrong_version_format_terminate_build 0"' + AM_COND_IF([CONFIG_KERNEL], [ + RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kernels $(LINUX_VERSION)"' + RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "ksrc $(LINUX)"' + RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kobj $(LINUX_OBJ)"' + ]) RPM_DEFINE_DKMS='' |