Fix for std and zen without minor kernel version

pull/444/head
Jan Houben 3 years ago
parent 7e6d86b35a
commit 85fbf62865
No known key found for this signature in database
GPG Key ID: 22C69579E1123CE6
  1. 2
      src/kernels/linux-zen.sh
  2. 2
      src/kernels/linux.sh
  3. 1
      src/zfs/PKGBUILD.sh

@ -40,7 +40,7 @@ get_kernel_options() {
kernel_version_pkgver=$(kernel_version_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*}
# convert 1.2.3.zen4-5 to 1.2.3-zen4-5-zen
kernel_mod_path="\${_kernelver/.zen/-zen}-zen"
kernel_mod_path="\${_kernelver_full/.zen/-zen}-zen"
linux_depends="\"linux-zen=\${_kernelver}\""
linux_headers_depends="\"linux-zen-headers=\${_kernelver}\""
}

@ -43,7 +43,7 @@ get_kernel_options() {
kernel_version_pkgver=$(kernel_version_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*}
# convert 1.2.3.arch4-5 to 1.2.3-arch4-5
kernel_mod_path=\${_kernelver/.arch/-arch}
kernel_mod_path=\${_kernelver_full/.arch/-arch}
linux_depends="\"linux=\${_kernelver}\""
linux_headers_depends="\"linux-headers=\${_kernelver}\""
}

@ -12,6 +12,7 @@ pkgname=("${zfs_pkgname}" "${zfs_pkgname}-headers")
${zfs_set_commit}
_zfsver="${zfs_pkgver}"
_kernelver="${kernel_version}"
_kernelver_full="${kernel_version_full}"
_extramodules="${kernel_mod_path}"
pkgver="\${_zfsver}_\$(echo \${_kernelver} | sed s/-/./g)"

Loading…
Cancel
Save