public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: 0.6.3 -> 0.6.4

Browse Source
This commit is contained in:
William A. Kennington III 2015-04-09 13:14:29 -07:00
parent 983845d78a
commit d8bf90c8a0
5 changed files with 137 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/zfs/default.nix
View File

@ -1,17 +1,14 @@
{ callPackage, fetchFromGitHub, ... } @ args: { callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "0.6.3-1.3"; version = "0.6.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zfsonlinux"; owner = "zfsonlinux";
repo = "zfs"; repo = "zfs";
rev = "zfs-${version}"; rev = "zfs-${version}";
sha256 = "08m5ah8a6zp96djz2xj9rb94zq973dwwfpc26jy0adzdq2q20zb4"; sha256 = "0xlj2w6gadip3rr3f1lri1n93lkjpzyksnk01sbl5wsrbkry3xjq";
}; };
patches = [ patches = [ ./nix-build.patch ];
./mount_zfs_prefix.patch
./nix-build.patch # Remove in >=0.6.4
];
}) })

4
pkgs/os-specific/linux/zfs/git.nix
View File

@ -9,9 +9,7 @@ callPackage ./generic.nix (args // rec {
sha256 = "1yxpx7lylbbr6jlm8g2x6xsmh6wmzb8prfg7shks7sib750a4slx"; sha256 = "1yxpx7lylbbr6jlm8g2x6xsmh6wmzb8prfg7shks7sib750a4slx";
}; };
patches = [ patches = [ ./nix-build.patch ];
./nix-build-git.patch
];
spl = spl_git; spl = spl_git;
}) })

24
pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch
View File

@ -1,24 +0,0 @@
diff -crN '--exclude=.git' zfs-0.60-rc11/cmd/mount_zfs/Makefile.am zfs/cmd/mount_zfs/Makefile.am
*** zfs-0.60-rc11/cmd/mount_zfs/Makefile.am 2012-10-22 10:26:07.066205000 -0700
--- zfs/cmd/mount_zfs/Makefile.am 2012-10-22 11:16:21.859286000 -0700
***************
*** 7,14 ****
#
# Ignore the prefix for the mount helper. It must be installed in /sbin/
# because this path is hardcoded in the mount(8) for security reasons.
#
- sbindir=/sbin
sbin_PROGRAMS = mount.zfs
mount_zfs_SOURCES = \
--- 7,16 ----
#
# Ignore the prefix for the mount helper. It must be installed in /sbin/
# because this path is hardcoded in the mount(8) for security reasons.
+ #
+ # ... except on nixos, where it really is /var/run/current-system/sw/bin,
+ # which is where this will end up if we put it in ${out}/sbin.
#
sbin_PROGRAMS = mount.zfs
mount_zfs_SOURCES = \

133
pkgs/os-specific/linux/zfs/nix-build-git.patch
View File

@ -1,133 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 49b417a..f4af44d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,10 @@ endif
if CONFIG_KERNEL
SUBDIRS += module
-extradir = @prefix@/src/zfs-$(VERSION)
+extradir = @prefix@/libexec/zfs-$(VERSION)
extra_HEADERS = zfs.release.in zfs_config.h.in
-kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
+kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
endif
diff --git a/include/Makefile.am b/include/Makefile.am
index a94cad5..a160fe2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include
+kerneldir = @prefix@/include
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index d00b1c8..3242d2e 100644
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
+kerneldir = @prefix@/include/linux
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 7ddace0..8da3870 100644
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
+kerneldir = @prefix@/include/sys
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
index 8bca5d8..a5eafcd 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 = @prefix@/src/zfs-$(VERSION)/include/sys/fm
+kerneldir = @prefix@/include/sys/fm
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
index fdc9eb5..807c47c 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 = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
+kerneldir = @prefix@/include/sys/fm/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
index 0859b9f..b0c6eec 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 = @prefix@/src/zfs-$(VERSION)/include/sys/fs
+kerneldir = @prefix@/include/sys/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/module/Makefile.in b/module/Makefile.in
index 686402b..9cbf598 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -18,9 +18,9 @@ modules:
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
- /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+ cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
- /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+ cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
@@ -28,6 +28,8 @@ modules:
"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
exit 1; \
fi
+ @# when copying a file out of the nix store, we need to make it writable again.
+ chmod +w @SPL_SYMBOLS@
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
clean:
@@ -42,15 +44,15 @@ clean:
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
KERNELRELEASE=@LINUX_VERSION@
@# Remove extraneous build products when packaging
- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi

347
pkgs/os-specific/linux/zfs/nix-build.patch
View File

@ -1,214 +1,133 @@
diff -rc zfs-0.6.1.orig/include/linux/Makefile.am zfs-0.6.1/include/linux/Makefile.am diff --git a/Makefile.am b/Makefile.am
*** zfs-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:47.000000000 -0700 index 49b417a..f4af44d 100644
--- zfs-0.6.1/include/linux/Makefile.am 2013-03-28 11:07:10.099129000 -0700 --- a/Makefile.am
*************** +++ b/Makefile.am
*** 16,21 **** @@ -12,10 +12,10 @@ endif
endif if CONFIG_KERNEL
SUBDIRS += module
if CONFIG_KERNEL
! kerneldir = /usr/src/zfs-$(VERSION)/include/linux -extradir = @prefix@/src/zfs-$(VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) +extradir = @prefix@/libexec/zfs-$(VERSION)
endif extra_HEADERS = zfs.release.in zfs_config.h.in
--- 16,21 ----
endif -kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
+kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
if CONFIG_KERNEL nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
! kerneldir = @prefix@/include/linux endif
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif diff --git a/include/Makefile.am b/include/Makefile.am
diff -rc zfs-0.6.1.orig/include/Makefile.am zfs-0.6.1/include/Makefile.am index a94cad5..a160fe2 100644
*** zfs-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:47.000000000 -0700 --- a/include/Makefile.am
--- zfs-0.6.1/include/Makefile.am 2013-03-28 11:07:38.810870000 -0700 +++ b/include/Makefile.am
*************** @@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
*** 28,33 **** endif
endif
if CONFIG_KERNEL
if CONFIG_KERNEL -kerneldir = @prefix@/src/zfs-$(VERSION)/include
! kerneldir = /usr/src/zfs-$(VERSION)/include +kerneldir = @prefix@/include
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif
--- 28,33 ---- diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
endif index d00b1c8..3242d2e 100644
--- a/include/linux/Makefile.am
if CONFIG_KERNEL +++ b/include/linux/Makefile.am
! kerneldir = @prefix@/include @@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif
endif
diff -rc zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am zfs-0.6.1/include/sys/fm/fs/Makefile.am if CONFIG_KERNEL
*** zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 -kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
--- zfs-0.6.1/include/sys/fm/fs/Makefile.am 2013-03-28 11:07:36.074756000 -0700 +kerneldir = @prefix@/include/linux
*************** kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
*** 13,18 **** endif
endif diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 7ddace0..8da3870 100644
if CONFIG_KERNEL --- a/include/sys/Makefile.am
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs +++ b/include/sys/Makefile.am
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
--- 13,18 ----
endif if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
if CONFIG_KERNEL +kerneldir = @prefix@/include/sys
! kerneldir = @prefix@/include/sys/fm/fs kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif
endif diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
diff -rc zfs-0.6.1.orig/include/sys/fm/Makefile.am zfs-0.6.1/include/sys/fm/Makefile.am index 8bca5d8..a5eafcd 100644
*** zfs-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:47.000000000 -0700 --- a/include/sys/fm/Makefile.am
--- zfs-0.6.1/include/sys/fm/Makefile.am 2013-03-28 11:07:32.265896000 -0700 +++ b/include/sys/fm/Makefile.am
*************** @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
*** 16,21 **** endif
endif
if CONFIG_KERNEL
if CONFIG_KERNEL -kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm +kerneldir = @prefix@/include/sys/fm
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif
--- 16,21 ---- diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
endif index fdc9eb5..807c47c 100644
--- a/include/sys/fm/fs/Makefile.am
if CONFIG_KERNEL +++ b/include/sys/fm/fs/Makefile.am
! kerneldir = @prefix@/include/sys/fm @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif
endif
diff -rc zfs-0.6.1.orig/include/sys/fs/Makefile.am zfs-0.6.1/include/sys/fs/Makefile.am if CONFIG_KERNEL
*** zfs-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 -kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
--- zfs-0.6.1/include/sys/fs/Makefile.am 2013-03-28 11:07:27.592339000 -0700 +kerneldir = @prefix@/include/sys/fm/fs
*************** kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
*** 13,18 **** endif
endif diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
index 0859b9f..b0c6eec 100644
if CONFIG_KERNEL --- a/include/sys/fs/Makefile.am
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs +++ b/include/sys/fs/Makefile.am
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
--- 13,18 ----
endif if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
if CONFIG_KERNEL +kerneldir = @prefix@/include/sys/fs
! kerneldir = @prefix@/include/sys/fs kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif
endif diff --git a/module/Makefile.in b/module/Makefile.in
diff -rc zfs-0.6.1.orig/include/sys/Makefile.am zfs-0.6.1/include/sys/Makefile.am index 686402b..9cbf598 100644
*** zfs-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:47.000000000 -0700 --- a/module/Makefile.in
--- zfs-0.6.1/include/sys/Makefile.am 2013-03-28 11:07:19.045717000 -0700 +++ b/module/Makefile.in
*************** @@ -18,9 +18,9 @@ modules:
*** 91,96 **** @# installed devel headers, or they may be in the module
endif @# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
if CONFIG_KERNEL - /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys + cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
endif - /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
--- 91,96 ---- + cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
endif else \
echo -e "\n" \
if CONFIG_KERNEL "*** Missing spl symbols ensure you have built the spl:\n" \
! kerneldir = @prefix@/include/sys @@ -28,6 +28,8 @@ modules:
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
endif exit 1; \
diff -rc zfs-0.6.1.orig/Makefile.am zfs-0.6.1/Makefile.am fi
*** zfs-0.6.1.orig/Makefile.am 2013-03-26 09:37:47.000000000 -0700 + @# when copying a file out of the nix store, we need to make it writable again.
--- zfs-0.6.1/Makefile.am 2013-04-05 23:49:39.763623000 -0700 + chmod +w @SPL_SYMBOLS@
*************** $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
*** 9,18 ****
if CONFIG_KERNEL clean:
SUBDIRS += module @@ -42,15 +44,15 @@ clean:
modules_install:
! extradir = /usr/src/zfs-$(VERSION) @# Install the kernel modules
extra_HEADERS = zfs.release.in zfs_config.h.in $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
! kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION) + INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
endif KERNELRELEASE=@LINUX_VERSION@
@# Remove extraneous build products when packaging
--- 9,18 ---- - kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if CONFIG_KERNEL + kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
SUBDIRS += module if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
! extradir = @prefix@/libexec/zfs-$(VERSION) fi
extra_HEADERS = zfs.release.in zfs_config.h.in - sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
! kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION) if [ -f $$sysmap ]; then \
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) depmod -ae -F $$sysmap @LINUX_VERSION@; \
endif fi
diff -rc zfs-0.6.1.orig/module/Makefile.in zfs-0.6.1/module/Makefile.in
*** zfs-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/module/Makefile.in 2013-04-05 23:50:41.497876000 -0700
***************
*** 18,26 ****
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
--- 18,26 ----
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
***************
*** 28,33 ****
--- 28,35 ----
"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
exit 1; \
fi
+ @# when copying a file out of the nix store, we need to make it writable again.
+ chmod +w @SPL_SYMBOLS@
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
clean:
***************
*** 42,62 ****
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging
! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
list='$(subdir-m)'; for subdir in $$list; do \
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
done
--- 44,64 ----
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging
! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
list='$(subdir-m)'; for subdir in $$list; do \
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
done