summaryrefslogtreecommitdiff
path: root/sys-kernel
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-07-04 19:26:41 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-07-04 19:26:41 +0100
commit53d283f13409958e4b63d9b13eafeef997163565 (patch)
treeeb5d254f321149ccc19083f28432c05f1f4508dd /sys-kernel
parentb4c4674dd5fddcb3a4cee8389665790ac7d39cf0 (diff)
sys-fs/zfs : version bump
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/spl-dkms/Manifest1
-rw-r--r--sys-kernel/spl-dkms/files/dkms.conf57
-rw-r--r--sys-kernel/spl-dkms/spl-dkms-0.7.13.ebuild53
-rw-r--r--sys-kernel/zfs-dkms/Manifest2
-rw-r--r--sys-kernel/zfs-dkms/files/dkms.conf39
-rw-r--r--sys-kernel/zfs-dkms/zfs-dkms-0.8.1.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-0.7.13.ebuild)0
6 files changed, 28 insertions, 124 deletions
diff --git a/sys-kernel/spl-dkms/Manifest b/sys-kernel/spl-dkms/Manifest
deleted file mode 100644
index bd3c7804..00000000
--- a/sys-kernel/spl-dkms/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST spl-0.7.13.tar.gz 554211 BLAKE2B 7c1c95beb23b9725b3552a5bdb2260743c72fbc96cbdda8353893b9b13299b8a30c64d22400bc37d35ee21389eec809ee6d7b85a181ce44f0065dff81cb2e2a4 SHA512 31b67dc2f88f5028b5994aef886e05aeb9e65661895bffa29c5a1ac84df5f1c8e9c715f8cd7b63cf271d651ab7278aa63f51c78000f333ff7a75f0f8eedb5998
diff --git a/sys-kernel/spl-dkms/files/dkms.conf b/sys-kernel/spl-dkms/files/dkms.conf
deleted file mode 100644
index 55b20971..00000000
--- a/sys-kernel/spl-dkms/files/dkms.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-PACKAGE_NAME="spl-dkms"
-PACKAGE_VERSION="0.7.13"
-PACKAGE_CONFIG="/etc/sysconfig/spl"
-PRE_BUILD="configure
- --prefix=/usr
- --with-config=kernel
- --with-linux=${kernel_source_dir}
- --with-linux-obj=${kernel_source_dir}
- $(
- [[ -r ${PACKAGE_CONFIG} ]] \
- && source ${PACKAGE_CONFIG} \
- && shopt -q -s extglob \
- && \
- {
- if [[ ${SPL_DKMS_ENABLE_DEBUG,,} == @(y|yes) ]]
- then
- echo --enable-debug
- fi
- if [[ ${SPL_DKMS_ENABLE_DEBUG_KMEM,,} == @(y|yes) ]]
- then
- echo --enable-debug-kmem
- fi
- if [[ ${SPL_DKMS_ENABLE_DEBUG_KMEM_TRACKING,,} == @(y|yes) ]]
- then
- echo --enable-debug-kmem-tracking
- fi
- if [[ ${SPL_DKMS_ENABLE_ATOMIC_SPINLOCKS,,} == @(y|yes) ]]
- then
- echo --enable-atomic-spinlocks
- fi
- }
- )
-"
-POST_BUILD="scripts/dkms.postbuild
- -n ${PACKAGE_NAME}
- -v ${PACKAGE_VERSION}
- -a ${arch}
- -k ${kernelver}
- -t ${dkms_tree}
-"
-AUTOINSTALL="yes"
-REMAKE_INITRD="no"
-MAKE[0]="make"
-STRIP[0]="$(
- [[ -r ${PACKAGE_CONFIG} ]] \
- && source ${PACKAGE_CONFIG} \
- && shopt -q -s extglob \
- && [[ ${SPL_DKMS_DISABLE_STRIP,,} == @(y|yes) ]] \
- && echo -n no
-)"
-STRIP[1]="${STRIP[0]}"
-BUILT_MODULE_NAME[0]="spl"
-BUILT_MODULE_LOCATION[0]="module/spl/"
-DEST_MODULE_LOCATION[0]="/extra/dkms"
-BUILT_MODULE_NAME[1]="splat"
-BUILT_MODULE_LOCATION[1]="module/splat/"
-DEST_MODULE_LOCATION[1]="/extra/dkms"
diff --git a/sys-kernel/spl-dkms/spl-dkms-0.7.13.ebuild b/sys-kernel/spl-dkms/spl-dkms-0.7.13.ebuild
deleted file mode 100644
index 092e2431..00000000
--- a/sys-kernel/spl-dkms/spl-dkms-0.7.13.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PN="spl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solaris Porting Layer sources for linux"
-HOMEPAGE="http://zfsonlinux.org/"
-SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE=""
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- :
-}
-
-src_configure() {
- :
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- cp "${FILESDIR}/dkms.conf" "${S}" || die
- dodir /usr/src/${P}
- insinto /usr/src/${P}
- doins -r ${S}/*
- fperms 0755 /usr/src/${P}/configure
- fperms 0755 /usr/src/${P}/scripts/dkms.mkconf
- fperms 0755 /usr/src/${P}/scripts/dkms.postbuild
-}
-
-pkg_postinst() {
- dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
- dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest
index 0f7ac23e..b532e6cf 100644
--- a/sys-kernel/zfs-dkms/Manifest
+++ b/sys-kernel/zfs-dkms/Manifest
@@ -1 +1 @@
-DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
+DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index fc99abf7..44661175 100644
--- a/sys-kernel/zfs-dkms/files/dkms.conf
+++ b/sys-kernel/zfs-dkms/files/dkms.conf
@@ -1,14 +1,26 @@
PACKAGE_NAME="zfs-dkms"
-PACKAGE_VERSION="0.7.13"
+PACKAGE_VERSION="0.8.1"
PACKAGE_CONFIG="/etc/sysconfig/zfs"
PRE_BUILD="configure
--prefix=/usr
--with-config=kernel
- --with-linux=${kernel_source_dir}
+ --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
+ )
--with-linux-obj=${kernel_source_dir}
- --with-spl=${source_tree}/spl-dkms-${PACKAGE_VERSION}
- --with-spl-obj=${dkms_tree}/spl-dkms/${PACKAGE_VERSION}/${kernelver}/${arch}
- --with-spl-timeout=300
$(
[[ -n \"${ICP_ROOT}\" ]] && \
{
@@ -25,9 +37,9 @@ PRE_BUILD="configure
then
echo --enable-debug
fi
- if [[ ${ZFS_DKMS_ENABLE_DMU_TX,,} == @(y|yes) ]]
+ if [[ ${ZFS_DKMS_ENABLE_DEBUGINFO,,} == @(y|yes) ]]
then
- echo --enable-debug-dmu-tx
+ echo --enable-debuginfo
fi
}
)
@@ -39,7 +51,6 @@ POST_BUILD="scripts/dkms.postbuild
-k ${kernelver}
-t ${dkms_tree}
"
-BUILD_DEPENDS[0]="spl-dkms"
AUTOINSTALL="yes"
REMAKE_INITRD="no"
MAKE[0]="make"
@@ -56,6 +67,7 @@ STRIP[3]="${STRIP[0]}"
STRIP[4]="${STRIP[0]}"
STRIP[5]="${STRIP[0]}"
STRIP[6]="${STRIP[0]}"
+STRIP[7]="${STRIP[0]}"
BUILT_MODULE_NAME[0]="zavl"
BUILT_MODULE_LOCATION[0]="module/avl/"
DEST_MODULE_LOCATION[0]="/extra/dkms"
@@ -71,9 +83,12 @@ DEST_MODULE_LOCATION[3]="/extra/dkms"
BUILT_MODULE_NAME[4]="zfs"
BUILT_MODULE_LOCATION[4]="module/zfs/"
DEST_MODULE_LOCATION[4]="/extra/dkms"
-BUILT_MODULE_NAME[5]="zpios"
-BUILT_MODULE_LOCATION[5]="module/zpios/"
+BUILT_MODULE_NAME[5]="icp"
+BUILT_MODULE_LOCATION[5]="module/icp/"
DEST_MODULE_LOCATION[5]="/extra/dkms"
-BUILT_MODULE_NAME[6]="icp"
-BUILT_MODULE_LOCATION[6]="module/icp/"
+BUILT_MODULE_NAME[6]="zlua"
+BUILT_MODULE_LOCATION[6]="module/lua/"
DEST_MODULE_LOCATION[6]="/extra/dkms"
+BUILT_MODULE_NAME[7]="spl"
+BUILT_MODULE_LOCATION[7]="module/spl/"
+DEST_MODULE_LOCATION[7]="/extra/dkms"
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-0.7.13.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-0.8.1.ebuild
index fdfb5728..fdfb5728 100644
--- a/sys-kernel/zfs-dkms/zfs-dkms-0.7.13.ebuild
+++ b/sys-kernel/zfs-dkms/zfs-dkms-0.8.1.ebuild