Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Propagate KERNEL_* to *.spec 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Authored-by: Damian Szuberski <szuberskidamian@gmail.com>
Signed-off-by: Peter Levine <plevine457@gmail.com>
Closes #13046
This commit is contained in:
Damian Szuberski 2022-02-08 17:17:37 -05:00 committed by Tony Hutter
parent c7fcf00917
commit 2681f8a5b8
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/zfs-build.m4
View File

@ -368,6 +368,9 @@ AC_DEFUN([ZFS_AC_RPM], [
RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kernels $(LINUX_VERSION)"' 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 "ksrc $(LINUX)"'
RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kobj $(LINUX_OBJ)"' RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kobj $(LINUX_OBJ)"'
RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kernel_cc KERNEL_CC=$(KERNEL_CC)"'
RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kernel_ld KERNEL_LD=$(KERNEL_LD)"'
RPM_DEFINE_KMOD=${RPM_DEFINE_KMOD}' --define "kernel_llvm KERNEL_LLVM=$(KERNEL_LLVM)"'
]) ])
RPM_DEFINE_DKMS='' RPM_DEFINE_DKMS=''

5
rpm/generic/zfs-kmod.spec.in
View File

@ -140,7 +140,10 @@ for kernel_version in %{?kernel_versions}; do
--with-linux=%{ksrc} \ --with-linux=%{ksrc} \
--with-linux-obj=%{kobj} \ --with-linux-obj=%{kobj} \
%{debug} \ %{debug} \
%{debuginfo} %{debuginfo} \
%{?kernel_cc} \
%{?kernel_ld} \
%{?kernel_llvm}
make %{?_smp_mflags} make %{?_smp_mflags}
cd .. cd ..
done done

5
rpm/redhat/zfs-kmod.spec.in
View File

@ -69,7 +69,10 @@ fi
--with-linux=%{ksrc} \ --with-linux=%{ksrc} \
--with-linux-obj=%{kobj} \ --with-linux-obj=%{kobj} \
%{debug} \ %{debug} \
%{debuginfo} %{debuginfo} \
%{?kernel_cc} \
%{?kernel_ld} \
%{?kernel_llvm}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install