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

Merge pull request #69810 from Mic92/zfs-cleanup

Browse Source 
zfsUnstable: drop build patches
This commit is contained in:
Franz Pletz 2019-09-28 12:16:34 +00:00 committed by GitHub
commit dc1cc4f3bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/os-specific/linux/zfs/build-fixes-0.8.patch
View File

@ -1,36 +0,0 @@
From b323e7a7ebb2327943851fa3fd139399eb24d3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 13 Aug 2018 22:58:21 +0200
Subject: [PATCH] build fixes needed for nixos
---
module/Makefile.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/module/Makefile.in b/module/Makefile.in
index 935bd2663..afb08df81 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -44,15 +44,15 @@ clean:
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ M=`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@; \
- if [ -n "$(DESTDIR)" ]; then \
+ kmoddir=@prefix@$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+ if [ -n "@prefix@" ]; 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
--
2.19.2

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

@ -19,7 +19,7 @@ let
common = { version
, sha256
, extraPatches
, extraPatches ? []
, rev ? "zfs-${version}"
, isUnstable ? false
, incompatibleKernelVersion ? null }:
@ -103,6 +103,7 @@ let
installFlags = [
"sysconfdir=\${out}/etc"
"DEFAULT_INITCONF_DIR=\${out}/default"
"INSTALL_MOD_PATH=\${out}"
];
postInstall = optionalString buildKernel ''
@ -157,10 +158,6 @@ in {
version = "0.8.2";
sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
extraPatches = [
./build-fixes-0.8.patch
];
};
zfsUnstable = common {
@ -172,9 +169,5 @@ in {
sha256 = "0miax0h2wg4b2kn8n93804faajy2n1sh25knyy2hg3k77nlr4pni";
isUnstable = true;
extraPatches = [
./build-fixes-0.8.patch
];
};
}