From b40a77aefca3d0832396edd35f597100d152f163 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 17 Jan 2012 16:19:43 -0800 Subject: [PATCH] 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 --- Makefile.am | 6 +++--- Makefile.in | 6 +++--- config/kernel.m4 | 4 ++-- configure | 8 ++++---- include/Makefile.am | 2 +- include/Makefile.in | 2 +- include/linux/Makefile.am | 2 +- include/linux/Makefile.in | 2 +- include/sys/Makefile.am | 2 +- include/sys/Makefile.in | 2 +- include/sys/fm/Makefile.am | 2 +- include/sys/fm/Makefile.in | 2 +- include/sys/fm/fs/Makefile.am | 2 +- include/sys/fm/fs/Makefile.in | 2 +- include/sys/fs/Makefile.am | 2 +- include/sys/fs/Makefile.in | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3ab5cb3eb1..17a6a26e7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,9 +33,9 @@ distclean-local:: if CONFIG_KERNEL install-data-local: - destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ - instdest=$(DESTDIR)/usr/src/$$destname; \ - echo "$(ZFS_META_VERSION)" >$$instdest/zfs.release; \ + release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ + instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ + echo "$$release" >$$instdest/zfs.release; \ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ done diff --git a/Makefile.in b/Makefile.in index 37c813cd3d..680c6ba802 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1072,9 +1072,9 @@ distclean-local:: -type f -print | xargs $(RM) @CONFIG_KERNEL_TRUE@install-data-local: -@CONFIG_KERNEL_TRUE@ destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ -@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/$$destname; \ -@CONFIG_KERNEL_TRUE@ echo "$(ZFS_META_VERSION)" >$$instdest/zfs.release; \ +@CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ +@CONFIG_KERNEL_TRUE@ echo "$$release" >$$instdest/zfs.release; \ @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ @CONFIG_KERNEL_TRUE@ done diff --git a/config/kernel.m4 b/config/kernel.m4 index 45e9b149aa..b986fe41b2 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -270,9 +270,9 @@ AC_DEFUN([ZFS_AC_SPL], [ fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [ splsrcver=`(echo "#include "; - echo "splsrcver=SPL_META_VERSION") | + echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") | cpp -I $splbuild | - grep "^splsrcver=" | cut -d \" -f 2` + grep "^splsrcver=" | tr -d \" | cut -d= -f2` ]) AS_IF([test -z "$splsrcver"], [ diff --git a/configure b/configure index 4659124f10..f51e79e6b1 100755 --- a/configure +++ b/configure @@ -12322,9 +12322,9 @@ $as_echo_n "checking spl source version... " >&6; } splsrcver=`(echo "#include "; - echo "splsrcver=SPL_META_VERSION") | + echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") | cpp -I $splbuild | - grep "^splsrcver=" | cut -d \" -f 2` + grep "^splsrcver=" | tr -d \" | cut -d= -f2` fi @@ -17449,9 +17449,9 @@ $as_echo_n "checking spl source version... " >&6; } splsrcver=`(echo "#include "; - echo "splsrcver=SPL_META_VERSION") | + echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") | cpp -I $splbuild | - grep "^splsrcver=" | cut -d \" -f 2` + grep "^splsrcver=" | tr -d \" | cut -d= -f2` fi diff --git a/include/Makefile.am b/include/Makefile.am index 1d7493bb5c..8f9c8d7292 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif 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) endif diff --git a/include/Makefile.in b/include/Makefile.in index 18e235722d..ec15bcfa3e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -382,7 +382,7 @@ USER_H = \ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs @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) all: all-recursive diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am index 44ffb411f2..6e481a136a 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif 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) endif diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in index 030437b442..0d6d17e096 100644 --- a/include/linux/Makefile.in +++ b/include/linux/Makefile.in @@ -317,7 +317,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux @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) all: all-am diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index 24cc0dfe16..083e1217b5 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -88,6 +88,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif 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) endif diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in index 012ffe9f7e..21892116f4 100644 --- a/include/sys/Makefile.in +++ b/include/sys/Makefile.in @@ -567,7 +567,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys @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) all: all-recursive diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am index 91b3d7b8a5..900ed9310e 100644 --- a/include/sys/fm/Makefile.am +++ b/include/sys/fm/Makefile.am @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif 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) endif diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in index 932e5e7329..fa7966a8d8 100644 --- a/include/sys/fm/Makefile.in +++ b/include/sys/fm/Makefile.in @@ -354,7 +354,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm @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) all: all-recursive diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am index a296f1d934..d82d076127 100644 --- a/include/sys/fm/fs/Makefile.am +++ b/include/sys/fm/fs/Makefile.am @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif 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) endif diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in index bbcb1c258e..c9048db096 100644 --- a/include/sys/fm/fs/Makefile.in +++ b/include/sys/fm/fs/Makefile.in @@ -312,7 +312,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs @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) all: all-am diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am index 3074f2fdef..b702679a87 100644 --- a/include/sys/fs/Makefile.am +++ b/include/sys/fs/Makefile.am @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif 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) endif diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in index da86a6fbc2..dbd54a3d69 100644 --- a/include/sys/fs/Makefile.in +++ b/include/sys/fs/Makefile.in @@ -312,7 +312,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs @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) all: all-am