From a62cbc209673632ec5124572304b5ee718ad1708 Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Mon, 11 May 2015 13:54:25 +0200 Subject: [PATCH] redhat: remove leftover legacy kmod code from spec Commit ec706b21530240d7fb66bad2f08513eff8f7c335 removed support for Linux 2.4 and legacy kernel modules, but missed a few more occurances of the latter. Remove those too. Change-Id: I449f0303ec916d597f65790c6f6a564d2f58ce48 Reviewed-on: https://gerrit.openafs.org/11866 Reviewed-by: Jeffrey Altman Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand Tested-by: BuildBot Reviewed-by: Marcio Brito Barbosa --- src/packaging/RedHat/openafs.spec.in | 104 ----------------------------------- 1 file changed, 104 deletions(-) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 4d2273c..2b0bebf 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -936,7 +936,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* %endif %if %{build_modules} -%if %{fedorakmod} for kvariant in %{kvariants} do if [ -n "$kvariant" ] ; then @@ -963,27 +962,6 @@ do mkdir -p ${dstdir} install -m 755 ${srcdir}/openafs.ko ${dstdir}/openafs.ko done -%else -# Install the kernel modules -for variation in %{kvariations} -do - if [ ${variation} = up ] - then - kvar=%{kxmoddir} - modname=openafs${kmodend} - else - kvar=%{kxmoddir}${variation} - modname=openafs${kmodend} - fi - - srcdir=${sysname}/dest/root.client/lib/modules/%{kverrel}${kvariant}/extra/openafs - dstdir=$RPM_BUILD_ROOT${kvar}/fs/openafs - - mkdir -p ${dstdir} - - install -m 755 ${srcdir}/${modname} ${dstdir}/openafs${kmodend} -done -%endif %endif ############################################################################## @@ -1109,51 +1087,6 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %endif %endif -%if %{build_modules} -%if !%{fedorakmod} -%if %{up_package} -%post kernel -%{depmod} -ae %{kernvers} - -%postun kernel -%{depmod} -ae %{kernvers} - -%endif - -%if %{smp_package} -%post kernel-smp -%{depmod} -ae %{kernvers}%{?smp_ext:%{smp_ext}} - -%postun kernel-smp -%{depmod} -ae %{kernvers}%{?smp_ext:%{smp_ext}} -%endif - -%if %{largesmp_package} -%post kernel-largesmp -%{depmod} -ae %{kernvers}%{?largesmp_ext:%{largesmp_ext}} - -%postun kernel-largesmp -%{depmod} -ae %{kernvers}%{?largesmp_ext:%{largesmp_ext}} -%endif - -%if %{bigmem_package} -%post kernel-bigmem -%{depmod} -ae %{kernvers}%{?bigmem_ext:%{bigmem_ext}} - -%postun kernel-bigmem -%{depmod} -ae %{kernvers}%{?bigmem_ext:%{bigmem_ext}} -%endif - -%if %{hugemem_package} -%post kernel-hugemem -%{depmod} -ae %{kernvers}%{?hugemem_ext:%{hugemem_ext}} - -%postun kernel-hugemem -%{depmod} -ae %{kernvers}%{?hugemem_ext:%{hugemem_ext}} -%endif -%endif -%endif - %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %triggerun -- openafs-client < 1.6.0-1 # Save the current service runlevel info @@ -1405,43 +1338,6 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %endif %endif - -%if %{build_modules} - -%if !%{fedorakmod} -%if %{up_package} -%files kernel -%defattr(-,root,root) -%{kxmoddir}/fs/openafs/openafs.* -%endif - -%if %{smp_package} -%files kernel-smp -%defattr(-,root,root) -%{kxmoddir}%{?smp_ext:%{smp_ext}}/fs/openafs/openafs.* -%endif - -%if %{largesmp_package} -%files kernel-largesmp -%defattr(-,root,root) -%{kxmoddir}%{?largesmp_ext:%{largesmp_ext}}/fs/openafs/openafs.* -%endif - -%if %{bigmem_package} -%files kernel-bigmem -%defattr(-,root,root) -%{kxmoddir}%{?bigmem_ext:%{bigmem_ext}}/fs/openafs/openafs.* -%endif - -%if %{hugemem_package} -%files kernel-hugemem -%defattr(-,root,root) -%{kxmoddir}%{?hugemem_ext:%{hugemem_ext}}/fs/openafs/openafs.* -%endif -%endif - -%endif - ############################################################################## ### ### openafs.spec change log -- 1.9.4