diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2022-05-14 17:05:49 +0300 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2022-05-14 17:05:49 +0300 |
| commit | 786154160dcd637c78c89cea118da27c2cf60d7d (patch) | |
| tree | dc037068a9a65f888401fedc988315d38ce4af46 | |
| parent | Update to 2.1.2 (diff) | |
| parent | Upstream 2.1.4 (diff) | |
| download | zfs-dkms-786154160dcd637c78c89cea118da27c2cf60d7d.tar.xz | |
Update to 2.1.4
| -rw-r--r-- | 0001-only-build-the-module-in-dkms.conf.patch | 34 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
2 files changed, 16 insertions, 24 deletions
diff --git a/0001-only-build-the-module-in-dkms.conf.patch b/0001-only-build-the-module-in-dkms.conf.patch index 0e162b5..c254dc1 100644 --- a/0001-only-build-the-module-in-dkms.conf.patch +++ b/0001-only-build-the-module-in-dkms.conf.patch @@ -11,32 +11,24 @@ diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf index 88c289383..5a859a0e0 100755 --- a/scripts/dkms.mkconf +++ b/scripts/dkms.mkconf -@@ -25,22 +25,7 @@ PACKAGE_CONFIG="${pkgcfg}" +@@ -28,14 +28,7 @@ PACKAGE_CONFIG="${pkgcfg}" PRE_BUILD="configure --prefix=/usr --with-config=kernel - --with-linux=\$( -- case \`lsb_release -is\` in -- (Debian|Devuan) -- if [[ -e \${kernel_source_dir/%build/source} ]] -- then -- echo \${kernel_source_dir/%build/source} -- else -- # A kpkg exception for Proxmox 2.0 -- echo \${kernel_source_dir} -- fi -- ;; -- (*) -- echo \${kernel_source_dir} -- ;; -- esac +- if [ -e "\${kernel_source_dir/%build/source}" ] +- then +- echo "\${kernel_source_dir/%build/source}" +- else +- echo "\${kernel_source_dir}" +- fi - ) -+ --with-linux=\${kernel_source_dir} - --with-linux-obj=\${kernel_source_dir} - --with-spl=\${source_tree}/spl-\${PACKAGE_VERSION} - --with-spl-obj=\${dkms_tree}/spl/\${PACKAGE_VERSION}/\${kernelver}/\${arch} -@@ -78,7 +63,7 @@ POST_BUILD="scripts/dkms.postbuild - BUILD_DEPENDS[0]="spl" ++ --with-linux="\${kernel_source_dir}" + --with-linux-obj="\${kernel_source_dir}" + \$( + [[ -n \"\${ICP_ROOT}\" ]] && \\ +@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild + " AUTOINSTALL="yes" REMAKE_INITRD="no" -MAKE[0]="make" @@ -2,7 +2,7 @@ # Contributor: Iacopo Isimbaldi <isiachi@rhye.it> pkgname=zfs-dkms -pkgver=2.1.2 +pkgver=2.1.4 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -15,9 +15,9 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -b2sums=('ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584' +b2sums=('be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200' 'SKIP' - '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') + '0e91cd2421b81c8ee517503059fb9ebc20e7c150801851cff2ffdfb64cbcd9a4e0657e7678c412a334fc37b589006ec78dca2ccc091b034a83a00966acba6f5b') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov> |