c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-05-03 15:32:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change spl-kmod-devel install path

Browse Source 
Install the common spl kernel development headers under
/usr/src/spl-<version>/ rather than in a kernel specific
directory.  The kernel specific build products such as
spl_config.h and Modules.symvers are left installed under
/usr/src/spl-<version>/<kernel>.

This was done to be consistent with where dkms expects
kernel module source to be packaged.  It also allows for
a common spl-kmod-devel package which includes the headers,
and per-kernel spl-kmod-devel-<kernel> packages.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2013-02-20 13:58:05 -08:00
parent 5c30c47a45
commit 4a6d8d2c3e
12 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -8,13 +8,18 @@ SUBDIRS += lib cmd scripts
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
SUBDIRS += module SUBDIRS += module
extradir = /usr/src/spl-$(VERSION)
extra_HEADERS = spl.release.in spl_config.h.in
kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
endif endif
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = autogen.sh spl.spec.in spl-modules.spec.in META DISCLAIMER EXTRA_DIST = autogen.sh spl.spec.in spl-modules.spec.in META DISCLAIMER
EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
EXTRA_DIST += dkms.postinst copy-builtin EXTRA_DIST += dkms.postinst copy-builtin
noinst_HEADERS = spl_config.h spl.release
distclean-local:: distclean-local::
-$(RM) -R autom4te*.cache -$(RM) -R autom4te*.cache
@ -28,15 +33,6 @@ distclean-local::
-o -name '*.order' -o -name '*.markers' \) \ -o -name '*.order' -o -name '*.markers' \) \
-type f -print | xargs $(RM) -type f -print | xargs $(RM)
if CONFIG_KERNEL
install-data-local:
release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -m 644 -D $$instfile $$instdest/$$instfile; \
done
endif
ctags: ctags:
$(RM) $(top_srcdir)/tags $(RM) $(top_srcdir)/tags
find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags

2
include/Makefile.am
View File

@ -16,6 +16,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION) kerneldir = /usr/src/spl-$(VERSION)/include
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/fs/Makefile.am
View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/fs kerneldir = /usr/src/spl-$(VERSION)/include/fs
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/linux/Makefile.am
View File

@ -23,6 +23,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/linux kerneldir = /usr/src/spl-$(VERSION)/include/linux
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/rpc/Makefile.am
View File

@ -9,6 +9,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/rpc kerneldir = /usr/src/spl-$(VERSION)/include/rpc
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/sharefs/Makefile.am
View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sharefs kerneldir = /usr/src/spl-$(VERSION)/include/sharefs
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/sys/Makefile.am
View File

@ -104,7 +104,7 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys kerneldir = /usr/src/spl-$(VERSION)/include/sys
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/sys/fm/Makefile.am
View File

@ -9,6 +9,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys/fm kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/sys/fs/Makefile.am
View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys/fs kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/sys/sysevent/Makefile.am
View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys/sysevent kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/util/Makefile.am
View File

@ -9,6 +9,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/util kerneldir = /usr/src/spl-$(VERSION)/include/util
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

2
include/vm/Makefile.am
View File

@ -10,6 +10,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/vm kerneldir = /usr/src/spl-$(VERSION)/include/vm
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif