diff options
Diffstat (limited to 'sys-kernel/zfs-dkms')
| -rw-r--r-- | sys-kernel/zfs-dkms/Manifest | 2 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/files/dkms.conf | 61 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/zfs-dkms-2.2.2-r2.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-2.2.1.ebuild) | 12 |
3 files changed, 16 insertions, 59 deletions
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest index ed585cac..1bbb3796 100644 --- a/sys-kernel/zfs-dkms/Manifest +++ b/sys-kernel/zfs-dkms/Manifest @@ -1 +1 @@ -DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6 SHA512 05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31 +DIST zfs-2.2.2.tar.gz 33816541 BLAKE2B f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866 SHA512 bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332 diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf index 63714364..c4013881 100644 --- a/sys-kernel/zfs-dkms/files/dkms.conf +++ b/sys-kernel/zfs-dkms/files/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="zfs-dkms" -PACKAGE_VERSION="2.2.1" +PACKAGE_VERSION="2.2.2" PACKAGE_CONFIG="/etc/sysconfig/zfs" NO_WEAK_MODULES="yes" BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-6]\.)" # only build for kernels v5.x.x up to and including v6.6.x @@ -7,22 +7,14 @@ 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-obj=${kernel_source_dir} + --with-linux-obj="${kernel_source_dir}" $( [[ -n \"${ICP_ROOT}\" ]] && \ { @@ -54,7 +46,6 @@ POST_BUILD="scripts/dkms.postbuild -t ${dkms_tree} " AUTOINSTALL="yes" -REMAKE_INITRD="no" MAKE[0]="make" STRIP[0]="$( [[ -r ${PACKAGE_CONFIG} ]] \ @@ -64,37 +55,9 @@ STRIP[0]="$( && echo -n no )" STRIP[1]="${STRIP[0]}" -STRIP[2]="${STRIP[0]}" -STRIP[3]="${STRIP[0]}" -STRIP[4]="${STRIP[0]}" -STRIP[5]="${STRIP[0]}" -STRIP[6]="${STRIP[0]}" -STRIP[7]="${STRIP[0]}" -STRIP[8]="${STRIP[0]}" -BUILT_MODULE_NAME[0]="zavl" -BUILT_MODULE_LOCATION[0]="module/avl/" +BUILT_MODULE_NAME[0]="zfs" +BUILT_MODULE_LOCATION[0]="module/" DEST_MODULE_LOCATION[0]="/extra/dkms" -BUILT_MODULE_NAME[1]="znvpair" -BUILT_MODULE_LOCATION[1]="module/nvpair/" +BUILT_MODULE_NAME[1]="spl" +BUILT_MODULE_LOCATION[1]="module/" DEST_MODULE_LOCATION[1]="/extra/dkms" -BUILT_MODULE_NAME[2]="zunicode" -BUILT_MODULE_LOCATION[2]="module/unicode/" -DEST_MODULE_LOCATION[2]="/extra/dkms" -BUILT_MODULE_NAME[3]="zcommon" -BUILT_MODULE_LOCATION[3]="module/zcommon/" -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]="icp" -BUILT_MODULE_LOCATION[5]="module/icp/" -DEST_MODULE_LOCATION[5]="/extra/dkms" -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" -BUILT_MODULE_NAME[8]="zzstd" -BUILT_MODULE_LOCATION[8]="module/zstd/" -DEST_MODULE_LOCATION[8]="/extra/dkms" diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.2.1.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.2.2-r2.ebuild index 3caa2acb..11dda2c1 100644 --- a/sys-kernel/zfs-dkms/zfs-dkms-2.2.1.ebuild +++ b/sys-kernel/zfs-dkms/zfs-dkms-2.2.2-r2.ebuild @@ -31,15 +31,9 @@ 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 - fperms 0755 /usr/src/${P}/scripts/enum-extract.pl - fperms 0755 /usr/src/${P}/scripts/make_gitrev.sh + dodir usr/src/"${P}" + cp -ax "${FILESDIR}"/dkms.conf "${S}" || die + cp -ax "${S}"/* "${D}"usr/src/"${P}" || die } pkg_postinst() { |