mirror
/
archzfs
mirror of https://github.com/archzfs/archzfs
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #129 from minextu/simultaneous

Browse Source 
Simultaneous installation of multiple zfs modules
pull/131/head
Jesus Alvarez 8 years ago committed by GitHub
parent ecf431dff5 73a1e6b4f7
commit 1243ee73a8
24 changed files with 239 additions and 161 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 33
      .gitmodules
  2. 61
      build.sh
  3. 19
      lib.sh
  4. 1
      packages/archiso/spl-utils-archiso-linux
  5. 1
      packages/archiso/zfs-utils-archiso-linux
  6. 1
      packages/linux-hardened/spl-utils-linux-hardened
  7. 1
      packages/linux-hardened/zfs-utils-linux-hardened
  8. 1
      packages/linux-lts/spl-utils-linux-lts
  9. 1
      packages/linux-lts/spl-utils-linux-lts-git
  10. 1
      packages/linux-lts/zfs-utils-linux-lts
  11. 1
      packages/linux-lts/zfs-utils-linux-lts-git
  12. 1
      packages/linux/spl-utils-linux
  13. 1
      packages/linux/spl-utils-linux-git
  14. 1
      packages/linux/zfs-utils-linux
  15. 1
      packages/linux/zfs-utils-linux-git
  16. 9
      src/kernels/archiso.sh
  17. 81
      src/kernels/common.sh
  18. 35
      src/kernels/linux-hardened.sh
  19. 39
      src/kernels/linux-lts.sh
  20. 37
      src/kernels/linux.sh
  21. 2
      src/spl-utils/PKGBUILD.sh
  22. 34
      src/spl/PKGBUILD.sh
  23. 4
      src/zfs-utils/PKGBUILD.sh
  24. 34
      src/zfs/PKGBUILD.sh

33
.gitmodules vendored
Unescape View File

@ -6,25 +6,10 @@
path = packages/linux-lts/zfs-linux-lts path = packages/linux-lts/zfs-linux-lts
url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts.git url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts.git
branch = master branch = master
[submodule "zfs-utils-linux-lts"]
path = packages/linux-lts/zfs-utils-linux-lts
url = ssh+git://aur@aur.archlinux.org/zfs-utils-linux-lts.git
branch = master
[submodule "zfs-utils-linux-git"]
path = packages/linux/zfs-utils-linux-git
url = ssh+git://aur@aur.archlinux.org/zfs-utils-linux-git.git
branch = master
[submodule "spl-linux-git"] [submodule "spl-linux-git"]
path = packages/linux/spl-linux-git path = packages/linux/spl-linux-git
url = ssh+git://aur@aur.archlinux.org/spl-linux-git.git url = ssh+git://aur@aur.archlinux.org/spl-linux-git.git
branch = master branch = master
[submodule "spl-utils-linux-git"]
path = packages/linux/spl-utils-linux-git
url = ssh+git://aur@aur.archlinux.org/spl-utils-linux-git.git
branch = master
[submodule "spl-utils-linux-lts"]
path = packages/linux-lts/spl-utils-linux-lts
url = ssh+git://aur@aur.archlinux.org/spl-utils-linux-lts.git
branch = master branch = master
[submodule "spl-linux-lts"] [submodule "spl-linux-lts"]
path = packages/linux-lts/spl-linux-lts path = packages/linux-lts/spl-linux-lts
@ -33,36 +18,18 @@
[submodule "zfs-linux"] [submodule "zfs-linux"]
path = packages/linux/zfs-linux path = packages/linux/zfs-linux
url = ssh+git://aur@aur.archlinux.org/zfs-linux.git url = ssh+git://aur@aur.archlinux.org/zfs-linux.git
[submodule "zfs-utils-linux"]
path = packages/linux/zfs-utils-linux
url = ssh+git://aur@aur.archlinux.org/zfs-utils-linux.git
[submodule "spl-utils-linux"]
path = packages/linux/spl-utils-linux
url = ssh+git://aur@aur.archlinux.org/spl-utils-linux.git
[submodule "spl-linux"] [submodule "spl-linux"]
path = packages/linux/spl-linux path = packages/linux/spl-linux
url = ssh+git://aur@aur.archlinux.org/spl-linux.git url = ssh+git://aur@aur.archlinux.org/spl-linux.git
[submodule "packages/archiso/zfs-archiso-linux"] [submodule "packages/archiso/zfs-archiso-linux"]
path = packages/archiso/zfs-archiso-linux path = packages/archiso/zfs-archiso-linux
url = ssh+git://aur@aur.archlinux.org/zfs-archiso-linux.git url = ssh+git://aur@aur.archlinux.org/zfs-archiso-linux.git
[submodule "packages/archiso/zfs-utils-archiso-linux"]
path = packages/archiso/zfs-utils-archiso-linux
url = ssh+git://aur@aur.archlinux.org/zfs-utils-archiso-linux.git
[submodule "packages/archiso/spl-utils-archiso-linux"]
path = packages/archiso/spl-utils-archiso-linux
url = ssh+git://aur@aur.archlinux.org/spl-utils-archiso-linux.git
[submodule "packages/archiso/spl-archiso-linux"] [submodule "packages/archiso/spl-archiso-linux"]
path = packages/archiso/spl-archiso-linux path = packages/archiso/spl-archiso-linux
url = ssh+git://aur@aur.archlinux.org/spl-archiso-linux.git url = ssh+git://aur@aur.archlinux.org/spl-archiso-linux.git
[submodule "packages/linux-hardened/spl-linux-hardened"] [submodule "packages/linux-hardened/spl-linux-hardened"]
path = packages/linux-hardened/spl-linux-hardened path = packages/linux-hardened/spl-linux-hardened
url = ssh+git://aur@aur.archlinux.org/spl-linux-hardened.git url = ssh+git://aur@aur.archlinux.org/spl-linux-hardened.git
[submodule "packages/linux-hardened/spl-utils-linux-hardened"]
path = packages/linux-hardened/spl-utils-linux-hardened
url = ssh+git://aur@aur.archlinux.org/spl-utils-linux-hardened.git
[submodule "packages/linux-hardened/zfs-utils-linux-hardened"]
path = packages/linux-hardened/zfs-utils-linux-hardened
url = ssh+git://aur@aur.archlinux.org/zfs-utils-linux-hardened.git
[submodule "packages/linux-hardened/zfs-linux-hardened"] [submodule "packages/linux-hardened/zfs-linux-hardened"]
path = packages/linux-hardened/zfs-linux-hardened path = packages/linux-hardened/zfs-linux-hardened
url = ssh+git://aur@aur.archlinux.org/zfs-linux-hardened.git url = ssh+git://aur@aur.archlinux.org/zfs-linux-hardened.git

61
build.sh
Unescape View File

@ -121,35 +121,42 @@ generate_package_files() {
debug "zfs_initcpio_hook_hash: ${zfs_initcpio_hook_hash}" debug "zfs_initcpio_hook_hash: ${zfs_initcpio_hook_hash}"
# Make sure our target directory exists # Make sure our target directory exists
run_cmd_no_output "[[ -d "${spl_utils_pkgbuild_path}" ]] || mkdir -p ${spl_utils_pkgbuild_path}" if [[ ! -z ${zfs_utils_pkgbuild_path} ]]; then
run_cmd_no_output "[[ -d "${spl_pkgbuild_path}" ]] || mkdir -p ${spl_pkgbuild_path}" run_cmd_no_output "[[ -d "${spl_utils_pkgbuild_path}" ]] || mkdir -p ${spl_utils_pkgbuild_path}"
run_cmd_no_output "[[ -d "${zfs_utils_pkgbuild_path}" ]] || mkdir -p ${zfs_utils_pkgbuild_path}" run_cmd_no_output "[[ -d "${zfs_utils_pkgbuild_path}" ]] || mkdir -p ${zfs_utils_pkgbuild_path}"
run_cmd_no_output "[[ -d "${zfs_pkgbuild_path}" ]] || mkdir -p ${zfs_pkgbuild_path}" fi
if [[ ! -z ${zfs_pkgbuild_path} ]]; then
run_cmd_no_output "[[ -d "${spl_pkgbuild_path}" ]] || mkdir -p ${spl_pkgbuild_path}"
run_cmd_no_output "[[ -d "${zfs_pkgbuild_path}" ]] || mkdir -p ${zfs_pkgbuild_path}"
fi
# Finally, generate the update packages ... # Finally, generate the update packages ...
msg2 "Creating spl-utils PKGBUILD" if [[ ! -z ${zfs_utils_pkgbuild_path} ]]; then
run_cmd_no_output "source ${script_dir}/src/spl-utils/PKGBUILD.sh" msg2 "Creating spl-utils PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/spl-utils/PKGBUILD.sh"
msg2 "Creating spl PKGBUILD" msg2 "Creating zfs-utils PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/spl/PKGBUILD.sh" run_cmd_no_output "source ${script_dir}/src/zfs-utils/PKGBUILD.sh"
msg2 "Creating spl.install" msg2 "Copying zfs-utils.install"
run_cmd_no_output "source ${script_dir}/src/spl/spl.install.sh" run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.install ${zfs_utils_pkgbuild_path}/zfs-utils.install"
msg2 "Copying zfs-utils.bash-completion"
msg2 "Creating zfs-utils PKGBUILD" run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.bash-completion-r1 ${zfs_utils_pkgbuild_path}/zfs-utils.bash-completion-r1"
run_cmd_no_output "source ${script_dir}/src/zfs-utils/PKGBUILD.sh" msg2 "Copying zfs-utils.initcpio.hook"
msg2 "Copying zfs-utils.install" run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.initcpio.hook ${zfs_utils_pkgbuild_path}/zfs-utils.initcpio.hook"
run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.install ${zfs_utils_pkgbuild_path}/zfs-utils.install" msg2 "Copying zfs-utils.initcpio.install"
msg2 "Copying zfs-utils.bash-completion" run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.initcpio.install ${zfs_utils_pkgbuild_path}/zfs-utils.initcpio.install"
run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.bash-completion-r1 ${zfs_utils_pkgbuild_path}/zfs-utils.bash-completion-r1" fi
msg2 "Copying zfs-utils.initcpio.hook"
run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.initcpio.hook ${zfs_utils_pkgbuild_path}/zfs-utils.initcpio.hook" if [[ ! -z ${zfs_pkgbuild_path} ]]; then
msg2 "Copying zfs-utils.initcpio.install" msg2 "Creating spl PKGBUILD"
run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.initcpio.install ${zfs_utils_pkgbuild_path}/zfs-utils.initcpio.install" run_cmd_no_output "source ${script_dir}/src/spl/PKGBUILD.sh"
msg2 "Creating spl.install"
msg2 "Creating zfs PKGBUILD" run_cmd_no_output "source ${script_dir}/src/spl/spl.install.sh"
run_cmd_no_output "source ${script_dir}/src/zfs/PKGBUILD.sh"
msg2 "Creating zfs.install" msg2 "Creating zfs PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/zfs/zfs.install.sh" run_cmd_no_output "source ${script_dir}/src/zfs/PKGBUILD.sh"
msg2 "Creating zfs.install"
run_cmd_no_output "source ${script_dir}/src/zfs/zfs.install.sh"
fi
msg "Update diffs ..." msg "Update diffs ..."
run_cmd "cd ${script_dir}/${spl_utils_pkgbuild_path} && git --no-pager diff" run_cmd "cd ${script_dir}/${spl_utils_pkgbuild_path} && git --no-pager diff"

19
lib.sh
Unescape View File

@ -744,8 +744,14 @@ git_calc_pkgver() {
if [[ ${repo} =~ ^zfs ]]; then if [[ ${repo} =~ ^zfs ]]; then
sha=${zfs_git_commit} sha=${zfs_git_commit}
fi fi
pkg=$(eval "echo \${${repo}_pkgname}") # use utils package, if no kernel version is set
if [ -z "${kernvers}" ]; then
pkg=$(eval "echo \${${repo}_utils_pkgname}")
else
pkg=$(eval "echo \${${repo}_pkgname}")
fi
debug "Using package '${pkg}'" debug "Using package '${pkg}'"
# Checkout the git repo to a work directory # Checkout the git repo to a work directory
@ -760,7 +766,14 @@ git_calc_pkgver() {
# Get the version number past the last tag # Get the version number past the last tag
msg2 "Calculating PKGVER" msg2 "Calculating PKGVER"
cmd="cd temp/${repo} && " cmd="cd temp/${repo} && "
cmd+="echo \$(git describe --long | sed -r 's/^${repo}-//;s/([^-]*-g)/r\1/;s/-/_/g')_${kernvers}"
# append kernel version if set
if [ ! -z "${kernvers}" ]; then
cmd+="echo \$(git describe --long | sed -r 's/^${repo}-//;s/([^-]*-g)/r\1/;s/-/_/g')_${kernvers}"
else
cmd+="echo \$(git describe --long | sed -r 's/^${repo}-//;s/([^-]*-g)/r\1/;s/-/_/g')"
fi
run_cmd_no_output_no_dry_run "${cmd}" run_cmd_no_output_no_dry_run "${cmd}"
if [[ ${repo} =~ ^spl ]]; then if [[ ${repo} =~ ^spl ]]; then

1
packages/archiso/spl-utils-archiso-linux

@ -1 +0,0 @@
Subproject commit 3bd931e9da00c7b57d0e43fcba0291ba89971a16

1
packages/archiso/zfs-utils-archiso-linux

@ -1 +0,0 @@
Subproject commit 19ddc605e1dd5138d146f40e2532ea25c1643093

1
packages/linux-hardened/spl-utils-linux-hardened

@ -1 +0,0 @@
Subproject commit c5e532ba76ade631a57c932bd23d3c79707b1bb4

1
packages/linux-hardened/zfs-utils-linux-hardened

@ -1 +0,0 @@
Subproject commit 8a75fcf3ee1fe67b6ccf8f6532bda7879f1337dd

1
packages/linux-lts/spl-utils-linux-lts

@ -1 +0,0 @@
Subproject commit 9d71972efe42974b9b3c636c87d83aa93e78ced8

1
packages/linux-lts/spl-utils-linux-lts-git

@ -1 +0,0 @@
Subproject commit b0356a20ea0a6c7fb70be264d353a9450576ec95

1
packages/linux-lts/zfs-utils-linux-lts

@ -1 +0,0 @@
Subproject commit dbb2c066cdd513c5059891707e254806d436c11a

1
packages/linux-lts/zfs-utils-linux-lts-git

@ -1 +0,0 @@
Subproject commit c756f821bead31af8796cda52368417eedf40a4e

1
packages/linux/spl-utils-linux

@ -1 +0,0 @@
Subproject commit a5f6c29c29c4f4ff17f8ad10c1c00bb338fc7357

1
packages/linux/spl-utils-linux-git

@ -1 +0,0 @@
Subproject commit 79906f7ede7727705e3f6d812e660ab81171825e

1
packages/linux/zfs-utils-linux

@ -1 +0,0 @@
Subproject commit 26e6309fa4537c6dd1bd6001d25f31452de89827

1
packages/linux/zfs-utils-linux-git

@ -1 +0,0 @@
Subproject commit d2923c84dce4a540df35d460d434f40b4ca334d1

9
src/kernels/archiso.sh
Unescape View File

@ -26,7 +26,7 @@ header="\
#" #"
update_archiso_linux_pkgbuilds() { update_archiso_linux_pkgbuilds() {
pkg_list=("spl-utils-archiso-linux" "spl-archiso-linux" "zfs-utils-archiso-linux" "zfs-archiso-linux") pkg_list=("spl-archiso-linux" "zfs-archiso-linux")
kernel_version_full=$(kernel_version_full ${kernel_version}) kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version}) kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*} kernel_version_major=${kernel_version%-*}
@ -36,13 +36,11 @@ update_archiso_linux_pkgbuilds() {
zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
spl_pkgrel=${pkgrel} spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel}
spl_utils_pkgname="spl-utils-archiso-linux" spl_utils_pkgname="spl-utils-linux-common"
spl_pkgname="spl-archiso-linux" spl_pkgname="spl-archiso-linux"
zfs_utils_pkgname="zfs-utils-archiso-linux" zfs_utils_pkgname="zfs-utils-linux-common"
zfs_pkgname="zfs-archiso-linux" zfs_pkgname="zfs-archiso-linux"
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz" spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz"
@ -50,4 +48,5 @@ update_archiso_linux_pkgbuilds() {
zfs_workdir="\${srcdir}/zfs-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}"
linux_depends="\"linux=${kernel_version_major}\"" linux_depends="\"linux=${kernel_version_major}\""
linux_headers_depends="\"linux-headers=${kernel_version_major}\"" linux_headers_depends="\"linux-headers=${kernel_version_major}\""
zfs_makedepends="\"${spl_pkgname}-headers\""
} }

81
src/kernels/common.sh
Unescape View File

@ -0,0 +1,81 @@
# For build.sh
mode_name="common"
mode_desc="Select and use the packages that are common between all kernels"
# version
pkgrel="1"
# Version for GIT packages
pkgrel_git="${pkgrel}"
zfs_git_commit=""
spl_git_commit=""
zfs_git_url="https://github.com/zfsonlinux/zfs.git"
spl_git_url="https://github.com/zfsonlinux/spl.git"
header="\
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
#
# This PKGBUILD was generated by the archzfs build scripts located at
#
# http://github.com/archzfs/archzfs
#
#"
update_common_pkgbuilds() {
pkg_list=("spl-utils-common" "zfs-utils-common")
archzfs_package_group="archzfs-linux"
spl_pkgver=${zol_version}
zfs_pkgver=${zol_version}
spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel}
spl_utils_conflicts="'spl-utils-common-git' 'spl-utils-linux-git' 'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'"
zfs_utils_conflicts="'zfs-utils-common-git' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git'"
spl_utils_pkgname="spl-utils-common"
zfs_utils_pkgname="zfs-utils-common"
# Paths are relative to build.sh
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz"
spl_workdir="\${srcdir}/spl-${zol_version}"
zfs_workdir="\${srcdir}/zfs-${zol_version}"
spl_utils_replaces='replaces=("spl-utils-linux", "spl-utils-linux-lts")'
zfs_utils_replaces='replaces=("zfs-utils-linux", "zfs-utils-linux-lts")'
}
update_common_git_pkgbuilds() {
pkg_list=("spl-utils-common-git" "zfs-utils-common-git")
archzfs_package_group="archzfs-linux-git"
spl_pkgver="" # Set later by call to git_calc_pkgver
zfs_pkgver="" # Set later by call to git_calc_pkgver
spl_pkgrel=${pkgrel_git}
zfs_pkgrel=${pkgrel_git}
spl_utils_conflicts="'spl-utils-common' 'spl-utils-linux-git' 'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'"
zfs_utils_conflicts="'zfs-utils-common' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git'"
spl_utils_pkgname="spl-utils-common-git"
zfs_utils_pkgname="zfs-utils-common-git"
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
spl_src_target="git+${spl_git_url}"
if [[ ${spl_git_commit} != "" ]]; then
spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
fi
spl_src_hash="SKIP"
spl_makedepends="\"git\""
zfs_src_target="git+${zfs_git_url}"
if [[ ${zfs_git_commit} != "" ]]; then
zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
fi
zfs_src_hash="SKIP"
zfs_makedepends="\"git\""
spl_workdir="\${srcdir}/spl"
zfs_workdir="\${srcdir}/zfs"
spl_utils_replaces='replaces=("spl-utils-linux", "spl-utils-linux-lts")'
zfs_utils_replaces='replaces=("zfs-utils-linux", "zfs-utils-linux-lts")'
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
}

35
src/kernels/linux-hardened.sh
Unescape View File

@ -35,7 +35,7 @@ header="\
#" #"
update_linux_hardened_pkgbuilds() { update_linux_hardened_pkgbuilds() {
pkg_list=("spl-utils-linux-hardened" "spl-linux-hardened" "zfs-utils-linux-hardened" "zfs-linux-hardened") pkg_list=("spl-linux-hardened" "zfs-linux-hardened")
kernel_version_full=$(kernel_version_full ${kernel_version}) kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version}) kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*} kernel_version_major=${kernel_version%-*}
@ -45,17 +45,15 @@ update_linux_hardened_pkgbuilds() {
zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
spl_pkgrel=${pkgrel} spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel}
spl_utils_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git' 'spl-utils-linux-hardened-git'" spl_conflicts="'spl-linux-hardened-git'"
spl_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git' 'spl-linux-hardened-git'" spl_headers_conflicts="'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_utils_conflicts="'zfs-utils-linux' 'zfs-utils-linux-git' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git' 'zfs-utils-linux-hardened-git'" zfs_headers_conflicts="'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
zfs_conflicts="'zfs-linux' 'zfs-linux-git' 'zfs-linux-lts' 'zfs-linux-lts-git' 'zfs-linux-hardened-git'" zfs_conflicts="'zfs-linux-hardened-git'"
spl_utils_pkgname="spl-utils-linux-hardened" spl_utils_pkgname="spl-utils-common"
spl_pkgname="spl-linux-hardened" spl_pkgname="spl-linux-hardened"
zfs_utils_pkgname="zfs-utils-linux-hardened" zfs_utils_pkgname="zfs-utils-common"
zfs_pkgname="zfs-linux-hardened" zfs_pkgname="zfs-linux-hardened"
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz" spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz"
@ -63,10 +61,11 @@ update_linux_hardened_pkgbuilds() {
zfs_workdir="\${srcdir}/zfs-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}"
linux_depends="\"linux-hardened=${kernel_version}\"" linux_depends="\"linux-hardened=${kernel_version}\""
linux_headers_depends="\"linux-hardened-headers=${kernel_version}\"" linux_headers_depends="\"linux-hardened-headers=${kernel_version}\""
zfs_makedepends="\"${spl_pkgname}-headers\""
} }
# update_linux_hardened_git_pkgbuilds() { # update_linux_hardened_git_pkgbuilds() {
# pkg_list=("spl-utils-linux-hardened-git" "spl-linux-hardened-git" "zfs-utils-linux-hardened-git" "zfs-linux-hardened-git") # pkg_list=("spl-linux-hardened-git" "zfs-linux-hardened-git")
# kernel_version=${kernel_version_git} # kernel_version=${kernel_version_git}
# kernel_version_full=$(kernel_version_full ${kernel_version_git}) # kernel_version_full=$(kernel_version_full ${kernel_version_git})
# kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git}) # kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git})
@ -77,17 +76,15 @@ update_linux_hardened_pkgbuilds() {
# zfs_pkgver="" # Set later by call to git_calc_pkgver # zfs_pkgver="" # Set later by call to git_calc_pkgver
# spl_pkgrel=${pkgrel_git} # spl_pkgrel=${pkgrel_git}
# zfs_pkgrel=${pkgrel_git} # zfs_pkgrel=${pkgrel_git}
# spl_utils_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git' 'spl-utils-linux-hardened'" # spl_conflicts="'spl-linux-hardened'"
# spl_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git' 'spl-utils-linux-hardened'" # spl_headers_conflicts="'spl-linux-hardened-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
# zfs_utils_conflicts="'zfs-utils-linux' 'zfs-utils-linux-git' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git' 'zfs-utils-linux-hardened'" # zfs_headers_conflicts="'zfs-linux-hardened-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
# zfs_conflicts="'zfs-linux' 'zfs-linux-git' 'zfs-linux-lts' 'zfs-linux-lts-git' 'zfs-git' 'zfs-linux-hardened'" # zfs_conflicts="'zfs-linux-hardened'"
# spl_utils_pkgname="spl-utils-linux-hardened-git" # spl_utils_pkgname="spl-utils-common-git"
# spl_pkgname="spl-linux-hardened-git" # spl_pkgname="spl-linux-hardened-git"
# zfs_utils_pkgname="zfs-utils-linux-hardened-git" # zfs_utils_pkgname="zfs-utils-common-git"
# zfs_pkgname="zfs-linux-hardened-git" # zfs_pkgname="zfs-linux-hardened-git"
# spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
# spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" # spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
# zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
# zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" # zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
# spl_src_target="git+${spl_git_url}" # spl_src_target="git+${spl_git_url}"
# if [[ ${spl_git_commit} != "" ]]; then # if [[ ${spl_git_commit} != "" ]]; then
@ -102,7 +99,7 @@ update_linux_hardened_pkgbuilds() {
# zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}" # zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
# fi # fi
# zfs_src_hash="SKIP" # zfs_src_hash="SKIP"
# zfs_makedepends="\"git\"" # zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
# spl_workdir="\${srcdir}/spl" # spl_workdir="\${srcdir}/spl"
# zfs_workdir="\${srcdir}/zfs" # zfs_workdir="\${srcdir}/zfs"
# if have_command "update"; then # if have_command "update"; then

39
src/kernels/linux-lts.sh
Unescape View File

@ -34,7 +34,7 @@ header="\
#" #"
update_linux_lts_pkgbuilds() { update_linux_lts_pkgbuilds() {
pkg_list=("spl-utils-linux-lts" "spl-linux-lts" "zfs-utils-linux-lts" "zfs-linux-lts") pkg_list=("spl-linux-lts" "zfs-linux-lts")
kernel_version_full=$(kernel_version_full ${kernel_version}) kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version}) kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*} kernel_version_major=${kernel_version%-*}
@ -44,17 +44,16 @@ update_linux_lts_pkgbuilds() {
zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
spl_pkgrel=${pkgrel} spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel}
spl_utils_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-utils-linux-lts-git'" spl_conflicts="'spl-linux-lts-git'"
spl_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-linux-lts-git'" spl_headers_conflicts="'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_utils_conflicts="'zfs-utils-linux' 'zfs-utils-linux-git' 'zfs-utils-linux-lts-git'" zfs_headers_conflicts="'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux' 'zfs-linux-git' 'zfs-linux-lts-git'" zfs_conflicts="'zfs-linux-lts-git'"
spl_utils_pkgname="spl-utils-linux-lts"
spl_pkgname="spl-linux-lts" spl_pkgname="spl-linux-lts"
zfs_utils_pkgname="zfs-utils-linux-lts" spl_utils_pkgname="spl-utils-common"
zfs_pkgname="zfs-linux-lts" zfs_pkgname="zfs-linux-lts"
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}" zfs_utils_pkgname="zfs-utils-common"
# Paths are relative to build.sh
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz" spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz"
@ -62,10 +61,12 @@ update_linux_lts_pkgbuilds() {
zfs_workdir="\${srcdir}/zfs-${zol_version}" zfs_workdir="\${srcdir}/zfs-${zol_version}"
linux_depends="\"linux-lts=${kernel_version_major}\"" linux_depends="\"linux-lts=${kernel_version_major}\""
linux_headers_depends="\"linux-lts-headers=${kernel_version_major}\"" linux_headers_depends="\"linux-lts-headers=${kernel_version_major}\""
spl_makedepends="\"libelf\""
zfs_makedepends="\"libelf\" \"${spl_pkgname}-headers\""
} }
update_linux_lts_git_pkgbuilds() { update_linux_lts_git_pkgbuilds() {
pkg_list=("spl-utils-linux-lts-git" "spl-linux-lts-git" "zfs-utils-linux-lts-git" "zfs-linux-lts-git") pkg_list=("spl-linux-lts-git" "zfs-linux-lts-git")
kernel_version=${kernel_version_git} kernel_version=${kernel_version_git}
kernel_version_full=$(kernel_version_full ${kernel_version_git}) kernel_version_full=$(kernel_version_full ${kernel_version_git})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git}) kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git})
@ -76,17 +77,15 @@ update_linux_lts_git_pkgbuilds() {
zfs_pkgver="" # Set later by call to git_calc_pkgver zfs_pkgver="" # Set later by call to git_calc_pkgver
spl_pkgrel=${pkgrel_git} spl_pkgrel=${pkgrel_git}
zfs_pkgrel=${pkgrel_git} zfs_pkgrel=${pkgrel_git}
spl_utils_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-utils-linux-lts'" spl_conflicts="'spl-linux-lts'"
spl_conflicts="'spl-utils-linux' 'spl-utils-linux-git' 'spl-utils-linux-lts'" spl_headers_conflicts="'spl-linux-lts-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_utils_conflicts="'zfs-utils-linux' 'zfs-utils-linux-git' 'zfs-utils-linux-lts'" zfs_headers_conflicts="'zfs-linux-lts-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux' 'zfs-linux' 'zfs-git' 'zfs-linux-lts'" zfs_conflicts="'zfs-linux-lts'"
spl_utils_pkgname="spl-utils-linux-lts-git"
spl_pkgname="spl-linux-lts-git" spl_pkgname="spl-linux-lts-git"
zfs_utils_pkgname="zfs-utils-linux-lts-git" spl_utils_pkgname="spl-utils-common-git"
zfs_pkgname="zfs-linux-lts-git" zfs_pkgname="zfs-linux-lts-git"
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}" zfs_utils_pkgname="zfs-utils-common-git"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="git+${spl_git_url}" spl_src_target="git+${spl_git_url}"
if [[ ${spl_git_commit} != "" ]]; then if [[ ${spl_git_commit} != "" ]]; then
@ -95,13 +94,13 @@ update_linux_lts_git_pkgbuilds() {
spl_src_hash="SKIP" spl_src_hash="SKIP"
linux_depends="\"linux-lts=${kernel_version_full}\"" linux_depends="\"linux-lts=${kernel_version_full}\""
linux_headers_depends="\"linux-lts-headers=${kernel_version_full}\"" linux_headers_depends="\"linux-lts-headers=${kernel_version_full}\""
spl_makedepends="\"git\"" spl_makedepends="\"libelf\" \"git\""
zfs_src_target="git+${zfs_git_url}" zfs_src_target="git+${zfs_git_url}"
if [[ ${zfs_git_commit} != "" ]]; then if [[ ${zfs_git_commit} != "" ]]; then
zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}" zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
fi fi
zfs_src_hash="SKIP" zfs_src_hash="SKIP"
zfs_makedepends="\"git\"" zfs_makedepends="\"libelf\" \"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl" spl_workdir="\${srcdir}/spl"
zfs_workdir="\${srcdir}/zfs" zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then if have_command "update"; then

37
src/kernels/linux.sh
Unescape View File

@ -33,7 +33,7 @@ header="\
#" #"
update_linux_pkgbuilds() { update_linux_pkgbuilds() {
pkg_list=("spl-utils-linux" "spl-linux" "zfs-utils-linux" "zfs-linux") pkg_list=("spl-linux" "zfs-linux")
kernel_version_full=$(kernel_version_full ${kernel_version}) kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version}) kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*} kernel_version_major=${kernel_version%-*}
@ -43,18 +43,16 @@ update_linux_pkgbuilds() {
zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
spl_pkgrel=${pkgrel} spl_pkgrel=${pkgrel}
zfs_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel}
spl_utils_conflicts="'spl-utils-linux-git' 'spl-utils-linux-lts'" spl_conflicts="'spl-linux-git'"
spl_conflicts="'spl-utils-linux-git' 'spl-utils-linux-lts'" spl_headers_conflicts="'spl-linux-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_utils_conflicts="'zfs-utils-linux-git' 'zfs-utils-linux-lts'" zfs_headers_conflicts="'zfs-linux-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux-git' 'zfs-linux-lts'" zfs_conflicts="'zfs-linux-git'"
spl_utils_pkgname="spl-utils-linux"
spl_pkgname="spl-linux" spl_pkgname="spl-linux"
zfs_utils_pkgname="zfs-utils-linux" spl_utils_pkgname="spl-utils-common"
zfs_pkgname="zfs-linux" zfs_pkgname="zfs-linux"
zfs_utils_pkgname="zfs-utils-common"
# Paths are relative to build.sh # Paths are relative to build.sh
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz" spl_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/spl-${zol_version}.tar.gz"
zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz" zfs_src_target="https://github.com/zfsonlinux/zfs/releases/download/zfs-${zol_version}/zfs-${zol_version}.tar.gz"
@ -63,13 +61,12 @@ update_linux_pkgbuilds() {
linux_depends="\"linux=${kernel_version_full}\"" linux_depends="\"linux=${kernel_version_full}\""
linux_headers_depends="\"linux-headers=${kernel_version_full}\"" linux_headers_depends="\"linux-headers=${kernel_version_full}\""
spl_replaces='replaces=("spl-git")' spl_replaces='replaces=("spl-git")'
spl_utils_replaces='replaces=("spl-utils-git")'
zfs_replaces='replaces=("zfs-git")' zfs_replaces='replaces=("zfs-git")'
zfs_utils_replaces='replaces=("zfs-utils-git")' zfs_makedepends="\"${spl_pkgname}-headers\""
} }
update_linux_git_pkgbuilds() { update_linux_git_pkgbuilds() {
pkg_list=("spl-utils-linux-git" "spl-linux-git" "zfs-utils-linux-git" "zfs-linux-git") pkg_list=("spl-linux-git" "zfs-linux-git")
kernel_version=${kernel_version_git} kernel_version=${kernel_version_git}
kernel_version_full=$(kernel_version_full ${kernel_version_git}) kernel_version_full=$(kernel_version_full ${kernel_version_git})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git}) kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git})
@ -80,17 +77,15 @@ update_linux_git_pkgbuilds() {
zfs_pkgver="" # Set later by call to git_calc_pkgver zfs_pkgver="" # Set later by call to git_calc_pkgver
spl_pkgrel=${pkgrel_git} spl_pkgrel=${pkgrel_git}
zfs_pkgrel=${pkgrel_git} zfs_pkgrel=${pkgrel_git}
spl_utils_conflicts="'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'" spl_conflicts="'spl-linux'"
spl_conflicts="'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'" spl_headers_conflicts="'spl-linux-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
zfs_utils_conflicts="'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git'" zfs_headers_conflicts="'zfs-linux-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
zfs_conflicts="'zfs-linux' 'zfs-linux-lts' 'zfs-linux-lts-git'" zfs_conflicts="'zfs-linux'"
spl_utils_pkgname="spl-utils-linux-git"
spl_pkgname="spl-linux-git" spl_pkgname="spl-linux-git"
zfs_utils_pkgname="zfs-utils-linux-git" spl_utils_pkgname="spl-utils-common-git"
zfs_pkgname="zfs-linux-git" zfs_pkgname="zfs-linux-git"
spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}" zfs_utils_pkgname="zfs-utils-common-git"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="git+${spl_git_url}" spl_src_target="git+${spl_git_url}"
if [[ ${spl_git_commit} != "" ]]; then if [[ ${spl_git_commit} != "" ]]; then
@ -105,7 +100,7 @@ update_linux_git_pkgbuilds() {
zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}" zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
fi fi
zfs_src_hash="SKIP" zfs_src_hash="SKIP"
zfs_makedepends="\"git\"" zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl" spl_workdir="\${srcdir}/spl"
zfs_workdir="\${srcdir}/zfs" zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then if have_command "update"; then

2
src/spl-utils/PKGBUILD.sh
Unescape View File

@ -13,7 +13,7 @@ sha256sums=("${spl_src_hash}")
groups=("${archzfs_package_group}") groups=("${archzfs_package_group}")
license=("GPL") license=("GPL")
provides=("spl-utils") provides=("spl-utils")
makedepends=(${linux_headers_depends} ${spl_makedepends}) makedepends=(${spl_makedepends})
conflicts=(${spl_utils_conflicts}) conflicts=(${spl_utils_conflicts})
${spl_utils_replaces} ${spl_utils_replaces}

34
src/spl/PKGBUILD.sh
Unescape View File

@ -2,22 +2,16 @@
cat << EOF > ${spl_pkgbuild_path}/PKGBUILD cat << EOF > ${spl_pkgbuild_path}/PKGBUILD
${header} ${header}
pkgname="${spl_pkgname}" pkgbase="${spl_pkgname}"
pkgname=("${spl_pkgname}" "${spl_pkgname}-headers")
pkgver=${spl_pkgver} pkgver=${spl_pkgver}
pkgrel=${spl_pkgrel} pkgrel=${spl_pkgrel}
pkgdesc="Solaris Porting Layer kernel modules."
depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
makedepends=(${linux_headers_depends} ${spl_makedepends}) makedepends=(${linux_headers_depends} ${spl_makedepends})
arch=("x86_64") arch=("x86_64")
url="http://zfsonlinux.org/" url="http://zfsonlinux.org/"
source=("${spl_src_target}") source=("${spl_src_target}")
sha256sums=("${spl_src_hash}") sha256sums=("${spl_src_hash}")
groups=("${archzfs_package_group}")
license=("GPL") license=("GPL")
install=spl.install
provides=("spl")
conflicts=(${spl_conflicts})
${spl_replaces}
build() { build() {
cd "${spl_workdir}" cd "${spl_workdir}"
@ -29,13 +23,35 @@ build() {
make make
} }
package() { package_${spl_pkgname}() {
pkgdesc="Solaris Porting Layer kernel modules."
depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
install=spl.install
provides=("spl")
groups=("${archzfs_package_group}")
conflicts=(${spl_conflicts})
${spl_replaces}
cd "${spl_workdir}" cd "${spl_workdir}"
make DESTDIR="\${pkgdir}" install make DESTDIR="\${pkgdir}" install
mv "\${pkgdir}/lib" "\${pkgdir}/usr/" mv "\${pkgdir}/lib" "\${pkgdir}/usr/"
# Remove src dir
rm -r "\${pkgdir}"/usr/src
}
package_${spl_pkgname}-headers() {
pkgdesc="Solaris Porting Layer kernel headers."
conflicts=(${spl_headers_conflicts})
cd "${spl_workdir}"
make DESTDIR="\${pkgdir}" install
rm -r "\${pkgdir}/lib"
# Remove reference to \${srcdir} # Remove reference to \${srcdir}
sed -i "s+\${srcdir}++" \${pkgdir}/usr/src/spl-*/${kernel_mod_path}/Module.symvers sed -i "s+\${srcdir}++" \${pkgdir}/usr/src/spl-*/${kernel_mod_path}/Module.symvers
} }
EOF EOF
pkgbuild_cleanup "${spl_pkgbuild_path}/PKGBUILD" pkgbuild_cleanup "${spl_pkgbuild_path}/PKGBUILD"

4
src/zfs-utils/PKGBUILD.sh
Unescape View File

@ -6,8 +6,8 @@ pkgname="${zfs_utils_pkgname}"
pkgver=${zfs_pkgver} pkgver=${zfs_pkgver}
pkgrel=${zfs_pkgrel} pkgrel=${zfs_pkgrel}
pkgdesc="Kernel module support files for the Zettabyte File System." pkgdesc="Kernel module support files for the Zettabyte File System."
depends=("${spl_pkgname}" ${linux_depends}) depends=("${spl_pkgname}")
makedepends=(${linux_headers_depends} ${zfs_makedepends}) makedepends=(${zfs_makedepends})
arch=("x86_64") arch=("x86_64")
url="http://zfsonlinux.org/" url="http://zfsonlinux.org/"
source=("${zfs_src_target}" source=("${zfs_src_target}"

34
src/zfs/PKGBUILD.sh
Unescape View File

@ -2,22 +2,16 @@
cat << EOF > ${zfs_pkgbuild_path}/PKGBUILD cat << EOF > ${zfs_pkgbuild_path}/PKGBUILD
${header} ${header}
pkgname="${zfs_pkgname}" pkgbase="${zfs_pkgname}"
pkgname=("${zfs_pkgname}" "${zfs_pkgname}-headers")
pkgver=${zfs_pkgver} pkgver=${zfs_pkgver}
pkgrel=${zfs_pkgrel} pkgrel=${zfs_pkgrel}
pkgdesc="Kernel modules for the Zettabyte File System."
depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
makedepends=(${linux_headers_depends} ${zfs_makedepends}) makedepends=(${linux_headers_depends} ${zfs_makedepends})
arch=("x86_64") arch=("x86_64")
url="http://zfsonlinux.org/" url="http://zfsonlinux.org/"
source=("${zfs_src_target}") source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}") sha256sums=("${zfs_src_hash}")
groups=("${archzfs_package_group}")
license=("CDDL") license=("CDDL")
install=zfs.install
provides=("zfs")
conflicts=(${zfs_conflicts})
${zfs_replaces}
build() { build() {
cd "${zfs_workdir}" cd "${zfs_workdir}"
@ -30,14 +24,36 @@ build() {
make make
} }
package() { package_${zfs_pkgname}() {
pkgdesc="Kernel modules for the Zettabyte File System."
depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
install=zfs.install
provides=("zfs")
groups=("${archzfs_package_group}")
conflicts=(${zfs_conflicts})
${zfs_replaces}
cd "${zfs_workdir}" cd "${zfs_workdir}"
make DESTDIR="\${pkgdir}" install make DESTDIR="\${pkgdir}" install
cp -r "\${pkgdir}"/{lib,usr} cp -r "\${pkgdir}"/{lib,usr}
rm -r "\${pkgdir}"/lib rm -r "\${pkgdir}"/lib
# Remove src dir
rm -r "\${pkgdir}"/usr/src
}
package_${zfs_pkgname}-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
conflicts=(${zfs_headers_conflicts})
cd "${zfs_workdir}"
make DESTDIR="\${pkgdir}" install
rm -r "\${pkgdir}/lib"
# Remove reference to \${srcdir} # Remove reference to \${srcdir}
sed -i "s+\${srcdir}++" \${pkgdir}/usr/src/zfs-*/${kernel_mod_path}/Module.symvers sed -i "s+\${srcdir}++" \${pkgdir}/usr/src/zfs-*/${kernel_mod_path}/Module.symvers
} }
EOF EOF
pkgbuild_cleanup "${zfs_pkgbuild_path}/PKGBUILD" pkgbuild_cleanup "${zfs_pkgbuild_path}/PKGBUILD"

Write Preview
Loading…
Cancel
Save