diff options
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rw-r--r-- | rpm/redhat/zfs-kmod.spec.in | 1 | ||||
| -rwxr-xr-x | scripts/kmodtool | 9 |
3 files changed, 0 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 81b3e69eb..8734431da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,25 +82,6 @@ dist-hook: $(SED) ${ac_inplace} -e 's/Release:[[:print:]]*/Release: $(RELEASE)/' \ $(distdir)/META -if BUILD_LINUX -# For compatibility, create a matching spl-x.y.z directly which contains -# symlinks to the updated header and object file locations. These -# compatibility links will be removed in the next major release. -if CONFIG_KERNEL -install-data-hook: - rm -rf $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \ - mkdir $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \ - cd $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \ - ln -s ../zfs-$(VERSION)/include/spl include && \ - ln -s ../zfs-$(VERSION)/$(LINUX_VERSION) $(LINUX_VERSION) && \ - ln -s ../zfs-$(VERSION)/zfs_config.h.in spl_config.h.in && \ - ln -s ../zfs-$(VERSION)/zfs.release.in spl.release.in && \ - cd $(DESTDIR)$(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION) && \ - ln -fs zfs_config.h spl_config.h && \ - ln -fs zfs.release spl.release -endif -endif - PHONY += codecheck codecheck: cstyle shellcheck checkbashisms flake8 mancheck testscheck vcscheck zstdcheck diff --git a/rpm/redhat/zfs-kmod.spec.in b/rpm/redhat/zfs-kmod.spec.in index 2cb0623aa..7ee04e234 100644 --- a/rpm/redhat/zfs-kmod.spec.in +++ b/rpm/redhat/zfs-kmod.spec.in @@ -89,4 +89,3 @@ rm -rf $RPM_BUILD_ROOT %files -n kmod-%{kmod_name}-devel %{_usrsrc}/%{kmod_name}-%{version} -%{_usrsrc}/spl-%{version} diff --git a/scripts/kmodtool b/scripts/kmodtool index afbb6ab3b..f66341196 100755 --- a/scripts/kmodtool +++ b/scripts/kmodtool @@ -263,16 +263,10 @@ the ${kmodname}-devel-<kernel> objects for the newest kernel. %defattr(644,root,root,755) %{_usrsrc}/${kmodname}-%{version} EOF - if [ -n "${obsolete_name}" ]; then - echo "%{_usrsrc}/${obsolete_name}-%{version}" - fi for kernel in ${1}; do local kernel_uname_r=${kernel} echo "%exclude %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r}" - if [ -n "${obsolete_name}" ]; then - echo "%exclude %{_usrsrc}/${obsolete_name}-%{version}/${kernel_uname_r}" - fi done echo @@ -328,9 +322,6 @@ kernel ${kernel_uname_r} for the %{_target_cpu} family of processors. %defattr(644,root,root,755) %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r} EOF - if [ -n "${obsolete_name}" ]; then - echo "%{_usrsrc}/${obsolete_name}-%{version}/${kernel_uname_r}" - fi } print_rpmtemplate_kmodmetapkg () |