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

Add the release component to headers 

When the original build system code was added the release
component was accidentally omited from the development header
install path.  This patch adds the missing path component so
it's always clear exactly what release your compiling against.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2012-01-17 16:19:43 -08:00
parent f783130a1f
commit b40a77aefc
16 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -33,9 +33,9 @@ distclean-local::
if CONFIG_KERNEL if CONFIG_KERNEL
install-data-local: install-data-local:
destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
instdest=$(DESTDIR)/usr/src/$$destname; \ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
echo "$(ZFS_META_VERSION)" >$$instdest/zfs.release; \ echo "$$release" >$$instdest/zfs.release; \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
done done

6
Makefile.in
View File

@ -1072,9 +1072,9 @@ distclean-local::
-type f -print | xargs $(RM) -type f -print | xargs $(RM)
@CONFIG_KERNEL_TRUE@install-data-local: @CONFIG_KERNEL_TRUE@install-data-local:
@CONFIG_KERNEL_TRUE@ destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/$$destname; \ @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
@CONFIG_KERNEL_TRUE@ echo "$(ZFS_META_VERSION)" >$$instdest/zfs.release; \ @CONFIG_KERNEL_TRUE@ echo "$$release" >$$instdest/zfs.release; \
@CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
@CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
@CONFIG_KERNEL_TRUE@ done @CONFIG_KERNEL_TRUE@ done

4
config/kernel.m4
View File

@ -270,9 +270,9 @@ AC_DEFUN([ZFS_AC_SPL], [
fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [ fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [
splsrcver=`(echo "#include <spl_config.h>"; splsrcver=`(echo "#include <spl_config.h>";
echo "splsrcver=SPL_META_VERSION") | echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") |
cpp -I $splbuild | cpp -I $splbuild |
grep "^splsrcver=" | cut -d \" -f 2` grep "^splsrcver=" | tr -d \" | cut -d= -f2`
]) ])
AS_IF([test -z "$splsrcver"], [ AS_IF([test -z "$splsrcver"], [

8
configure vendored
View File

@ -12322,9 +12322,9 @@ $as_echo_n "checking spl source version... " >&6; }
splsrcver=`(echo "#include <spl_config.h>"; splsrcver=`(echo "#include <spl_config.h>";
echo "splsrcver=SPL_META_VERSION") | echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") |
cpp -I $splbuild | cpp -I $splbuild |
grep "^splsrcver=" | cut -d \" -f 2` grep "^splsrcver=" | tr -d \" | cut -d= -f2`
fi fi
@ -17449,9 +17449,9 @@ $as_echo_n "checking spl source version... " >&6; }
splsrcver=`(echo "#include <spl_config.h>"; splsrcver=`(echo "#include <spl_config.h>";
echo "splsrcver=SPL_META_VERSION") | echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") |
cpp -I $splbuild | cpp -I $splbuild |
grep "^splsrcver=" | cut -d \" -f 2` grep "^splsrcver=" | tr -d \" | cut -d= -f2`
fi fi

2
include/Makefile.am
View File

@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION) kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

2
include/Makefile.in
View File

@ -382,7 +382,7 @@ USER_H = \
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
@CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs
@CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION) @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
@CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
all: all-recursive all: all-recursive

2
include/linux/Makefile.am
View File

@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/linux kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

2
include/linux/Makefile.in
View File

@ -317,7 +317,7 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
@CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux
@CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/linux @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux
@CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
all: all-am all: all-am

2
include/sys/Makefile.am
View File

@ -88,6 +88,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

2
include/sys/Makefile.in
View File

@ -567,7 +567,7 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
@CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys
@CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys
@CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
all: all-recursive all: all-recursive

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

@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fm kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

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

@ -354,7 +354,7 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
@CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm
@CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fm @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm
@CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
all: all-recursive all: all-recursive

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

@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fm/fs kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

2
include/sys/fm/fs/Makefile.in
View File

@ -312,7 +312,7 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
@CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs
@CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fm/fs @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs
@CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
all: all-am all: all-am

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

@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fs kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

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

@ -312,7 +312,7 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
@CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs
@CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fs @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs
@CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
all: all-am all: all-am