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

Remove compat spl-x.y.z from the distribution 

This was added in 93ce2b4ca5 ("Update
build system and packaging"), which merged the SPL and ZFS trees,
and included in 0.8.0; "the next major release" was 2.0.0

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб 2022-04-06 00:20:16 +02:00 committed by Brian Behlendorf
parent 5fc332ae4b
commit ea532b0e6e
3 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.am
View File

@ -82,25 +82,6 @@ dist-hook:
$(SED) ${ac_inplace} -e 's/Release:[[:print:]]*/Release: $(RELEASE)/' \ $(SED) ${ac_inplace} -e 's/Release:[[:print:]]*/Release: $(RELEASE)/' \
$(distdir)/META $(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 PHONY += codecheck
codecheck: cstyle shellcheck checkbashisms flake8 mancheck testscheck vcscheck zstdcheck codecheck: cstyle shellcheck checkbashisms flake8 mancheck testscheck vcscheck zstdcheck

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

@ -89,4 +89,3 @@ rm -rf $RPM_BUILD_ROOT
%files -n kmod-%{kmod_name}-devel %files -n kmod-%{kmod_name}-devel
%{_usrsrc}/%{kmod_name}-%{version} %{_usrsrc}/%{kmod_name}-%{version}
%{_usrsrc}/spl-%{version}

9
scripts/kmodtool
View File

@ -263,16 +263,10 @@ the ${kmodname}-devel-<kernel> objects for the newest kernel.
%defattr(644,root,root,755) %defattr(644,root,root,755)
%{_usrsrc}/${kmodname}-%{version} %{_usrsrc}/${kmodname}-%{version}
EOF EOF
if [ -n "${obsolete_name}" ]; then
echo "%{_usrsrc}/${obsolete_name}-%{version}"
fi
for kernel in ${1}; do for kernel in ${1}; do
local kernel_uname_r=${kernel} local kernel_uname_r=${kernel}
echo "%exclude %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r}" echo "%exclude %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r}"
if [ -n "${obsolete_name}" ]; then
echo "%exclude %{_usrsrc}/${obsolete_name}-%{version}/${kernel_uname_r}"
fi
done done
echo echo
@ -328,9 +322,6 @@ kernel ${kernel_uname_r} for the %{_target_cpu} family of processors.
%defattr(644,root,root,755) %defattr(644,root,root,755)
%{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r} %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r}
EOF EOF
if [ -n "${obsolete_name}" ]; then
echo "%{_usrsrc}/${obsolete_name}-%{version}/${kernel_uname_r}"
fi
} }
print_rpmtemplate_kmodmetapkg () print_rpmtemplate_kmodmetapkg ()