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

Merge pull request #253 from minextu/remove-spl-git

Browse Source 
Remove all spl-git packages
pull/261/head
Jesus Alvarez 7 years ago committed by GitHub
parent 47c3d29218 f051de0b44
commit c847457ccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 116 additions and 284 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. 18
      .gitmodules
  2. 49
      build.sh
  3. 2
      conf.sh
  4. 20
      lib.sh
  5. 1
      packages/common-git/spl-utils-common-git
  6. 34
      packages/dkms/spl-dkms-git/.SRCINFO
  7. 5
      packages/dkms/spl-dkms-git/.gitignore
  8. 12
      packages/dkms/spl-dkms-git/60-spl-dkms-install.hook
  9. 44
      packages/dkms/spl-dkms-git/PKGBUILD
  10. 28
      packages/dkms/spl-dkms-git/spl-dkms-alpm-hook
  11. 1
      packages/linux-hardened/spl-linux-hardened-git
  12. 1
      packages/linux-lts/spl-linux-lts-git
  13. 1
      packages/linux-vfio/spl-linux-vfio-git
  14. 1
      packages/linux-zen/spl-linux-zen-git
  15. 1
      packages/linux/spl-linux-git
  16. 17
      repo.sh
  17. 16
      src/kernels/common-git.sh
  18. 18
      src/kernels/dkms.sh
  19. 19
      src/kernels/linux-hardened.sh
  20. 23
      src/kernels/linux-lts.sh
  21. 28
      src/kernels/linux-vfio.sh
  22. 20
      src/kernels/linux-zen.sh
  23. 21
      src/kernels/linux.sh
  24. 8
      src/zfs-dkms/PKGBUILD.sh
  25. 4
      src/zfs-utils/zfs-utils.initcpio.install
  26. 8
      src/zfs/PKGBUILD.sh

18
.gitmodules vendored
Unescape View File

@ -13,9 +13,6 @@
[submodule "packages/linux/zfs-linux-git"]
path = packages/linux/zfs-linux-git
url = ssh+git://aur@aur.archlinux.org/zfs-linux-git.git
[submodule "packages/linux/spl-linux-git"]
path = packages/linux/spl-linux-git
url = ssh+git://aur@aur.archlinux.org/spl-linux-git.git
[submodule "packages/linux/zfs-linux"]
path = packages/linux/zfs-linux
url = ssh+git://aur@aur.archlinux.org/zfs-linux.git
@ -28,18 +25,12 @@
[submodule "packages/linux-lts/spl-linux-lts"]
path = packages/linux-lts/spl-linux-lts
url = ssh+git://aur@aur.archlinux.org/spl-linux-lts.git
[submodule "packages/linux-lts/spl-linux-lts-git"]
path = packages/linux-lts/spl-linux-lts-git
url = ssh+git://aur@aur.archlinux.org/spl-linux-lts-git.git
[submodule "packages/linux-lts/zfs-linux-lts-git"]
path = packages/linux-lts/zfs-linux-lts-git
url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts-git.git
[submodule "packages/linux-hardened/zfs-linux-hardened-git"]
path = packages/linux-hardened/zfs-linux-hardened-git
url = ssh+git://aur@aur.archlinux.org/zfs-linux-hardened-git.git
[submodule "packages/linux-hardened/spl-linux-hardened-git"]
path = packages/linux-hardened/spl-linux-hardened-git
url = ssh+git://aur@aur.archlinux.org/spl-linux-hardened-git.git
[submodule "packages/common/spl-utils-common"]
path = packages/common/spl-utils-common
url = ssh+git://aur@aur.archlinux.org/spl-utils-common.git
@ -49,15 +40,9 @@
[submodule "packages/common-git/zfs-utils-common-git"]
path = packages/common-git/zfs-utils-common-git
url = ssh+git://aur@aur.archlinux.org/zfs-utils-common-git.git
[submodule "packages/common-git/spl-utils-common-git"]
path = packages/common-git/spl-utils-common-git
url = ssh+git://aur@aur.archlinux.org/spl-utils-common-git.git
[submodule "packages/linux-zen/spl-linux-zen"]
path = packages/linux-zen/spl-linux-zen
url = ssh+git://aur@aur.archlinux.org/spl-linux-zen.git
[submodule "packages/linux-zen/spl-linux-zen-git"]
path = packages/linux-zen/spl-linux-zen-git
url = ssh+git://aur@aur.archlinux.org/spl-linux-zen-git.git
[submodule "packages/linux-zen/zfs-linux-zen-git"]
path = packages/linux-zen/zfs-linux-zen-git
url = ssh+git://aur@aur.archlinux.org/zfs-linux-zen-git.git
@ -70,9 +55,6 @@
[submodule "packages/linux-vfio/zfs-linux-vfio-git"]
path = packages/linux-vfio/zfs-linux-vfio-git
url = ssh://aur@aur.archlinux.org/zfs-linux-vfio-git.git
[submodule "packages/linux-vfio/spl-linux-vfio-git"]
path = packages/linux-vfio/spl-linux-vfio-git
url = ssh://aur@aur.archlinux.org/spl-linux-vfio-git.git
[submodule "packages/linux-vfio/spl-linux-vfio"]
path = packages/linux-vfio/spl-linux-vfio
url = ssh://aur@aur.archlinux.org/spl-linux-vfio.git

49
build.sh
Unescape View File

@ -138,14 +138,18 @@ generate_package_files() {
fi
# Finally, generate the update packages ...
if [[ "${kernel_name}" == "common" ]] || [[ "${kernel_name}" == "common-git" ]]; then
# skip spl for common-git
if [[ "${kernel_name}" == "common" ]]; then
msg2 "Removing old spl-utils patches (if any)"
run_cmd_no_output "rm -f ${spl_utils_pkgbuild_path}/*.patch"
msg2 "Copying spl-utils patches (if any)"
run_cmd_no_output "find ${script_dir}/src/spl-utils -name \*.patch -exec cp {} ${spl_utils_pkgbuild_path} \;"
msg2 "Creating spl-utils PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/spl-utils/PKGBUILD.sh"
fi
if [[ "${kernel_name}" == "common" ]] || [[ "${kernel_name}" == "common-git" ]]; then
msg2 "Removing old zfs-utils patches (if any)"
run_cmd_no_output "rm -f ${zfs_utils_pkgbuild_path}/*.patch"
msg2 "Copying zfs-utils patches (if any)"
@ -161,17 +165,19 @@ generate_package_files() {
msg2 "Copying zfs-utils.initcpio.install"
run_cmd_no_output "cp ${script_dir}/src/zfs-utils/zfs-utils.initcpio.install ${zfs_utils_pkgbuild_path}/zfs-utils.initcpio.install"
elif [[ "${kernel_name}" == "dkms" ]]; then
msg2 "Removing old spl patches (if any)"
run_cmd_no_output "rm -f ${spl_dkms_pkgbuild_path}/*.patch"
msg2 "Copying spl patches (if any)"
run_cmd_no_output "find ${script_dir}/src/spl-dkms -name \*.patch -exec cp {} ${spl_dkms_pkgbuild_path} \;"
msg2 "Copying 60-spl-dkms-install.hook"
run_cmd_no_output "cp ${script_dir}/src/spl-dkms/60-spl-dkms-install.hook ${spl_dkms_pkgbuild_path}/"
msg2 "Copying spl-dkms-alpm-hook"
run_cmd_no_output "cp ${script_dir}/src/spl-dkms/spl-dkms-alpm-hook ${spl_dkms_pkgbuild_path}/"
msg2 "Creating spl-dkms PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/spl-dkms/PKGBUILD.sh"
# skip spl for git packages
if [[ ! ${archzfs_package_group} =~ -git$ ]]; then
msg2 "Removing old spl patches (if any)"
run_cmd_no_output "rm -f ${spl_dkms_pkgbuild_path}/*.patch"
msg2 "Copying spl patches (if any)"
run_cmd_no_output "find ${script_dir}/src/spl-dkms -name \*.patch -exec cp {} ${spl_dkms_pkgbuild_path} \;"
msg2 "Copying 60-spl-dkms-install.hook"
run_cmd_no_output "cp ${script_dir}/src/spl-dkms/60-spl-dkms-install.hook ${spl_dkms_pkgbuild_path}/"
msg2 "Copying spl-dkms-alpm-hook"
run_cmd_no_output "cp ${script_dir}/src/spl-dkms/spl-dkms-alpm-hook ${spl_dkms_pkgbuild_path}/"
msg2 "Creating spl-dkms PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/spl-dkms/PKGBUILD.sh"
fi
msg2 "Removing old zfs patches (if any)"
run_cmd_no_output "rm -f ${zfs_dkms_pkgbuild_path}/*.patch"
msg2 "Copying zfs patches (if any)"
@ -183,14 +189,17 @@ generate_package_files() {
zfs_headers_conflicts=${zfs_headers_conflicts_all/"'${zfs_pkgname}-headers'"}
spl_headers_conflicts=${spl_headers_conflicts_all/"'${spl_pkgname}-headers'"}
msg2 "Removing old spl patches (if any)"
run_cmd_no_output "rm -f ${spl_pkgbuild_path}/*.patch"
msg2 "Copying spl patches (if any)"
run_cmd_no_output "find ${script_dir}/src/spl -name \*.patch -exec cp {} ${spl_pkgbuild_path} \;"
msg2 "Creating spl PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/spl/PKGBUILD.sh"
msg2 "Creating spl.install"
run_cmd_no_output "source ${script_dir}/src/spl/spl.install.sh"
# skip spl for git packages
if [[ ! ${archzfs_package_group} =~ -git$ ]]; then
msg2 "Removing old spl patches (if any)"
run_cmd_no_output "rm -f ${spl_pkgbuild_path}/*.patch"
msg2 "Copying spl patches (if any)"
run_cmd_no_output "find ${script_dir}/src/spl -name \*.patch -exec cp {} ${spl_pkgbuild_path} \;"
msg2 "Creating spl PKGBUILD"
run_cmd_no_output "source ${script_dir}/src/spl/PKGBUILD.sh"
msg2 "Creating spl.install"
run_cmd_no_output "source ${script_dir}/src/spl/spl.install.sh"
fi
msg2 "Removing old zfs patches (if any)"
run_cmd_no_output "rm -f ${zfs_pkgbuild_path}/*.patch"

2
conf.sh
Unescape View File

@ -9,7 +9,7 @@ spl_src_hash="49832e446a5abce0b55ba245c9b5f94959604d44378320fdffae0233bf1e8c00"
zfs_src_hash="f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a"
zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
zfs_initcpio_install_hash="e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4"
zfs_initcpio_install_hash="335e309ebf5b74fd8956f5e8805939c37d4008b0bcc3b00be6e7ef1d5b7c1669"
zfs_initcpio_hook_hash="3eb874cf2cbb6c6a0e1c11a98af54f682d6225667af944b43435aeabafa0112f"
# Notification address

20
lib.sh
Unescape View File

@ -403,8 +403,28 @@ source_safe() {
kernel_version=""
zfs_pkgver=""
spl_pkgver=""
spl_pkgrel=""
zfs_pkgrel=""
zfs_makedepends=""
spl_makedepends=""
spl_src_hash=${spl_src_hash_conf}
zfs_src_hash=${zfs_src_hash_conf}
spl_conflicts=""
zfs_conflicts=""
spl_pkgname=""
spl_utils_pkgname=""
zfs_pkgname=""
zfs_utils_pkgname=""
spl_pkgbuild_path=""
zfs_pkgbuild_path=""
spl_src_target=""
zfs_src_target=""
spl_workdir=""
zfs_workdir=""
linux_depends=""
linux_headers_depends=""
spl_replaces=""
zfs_replaces=""
export script_dir mode kernel_name
shopt -u extglob

1
packages/common-git/spl-utils-common-git

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

34
packages/dkms/spl-dkms-git/.SRCINFO
Unescape View File

@ -1,34 +0,0 @@
pkgbase = spl-dkms-git
pkgdesc = Solaris Porting Layer kernel modules.
pkgver = 2018.05.07.r1074.g1149b62
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
groups = archzfs-dkms-git
license = GPL
makedepends = git
depends = spl-utils-common-git=2018.05.07.r1074.g1149b62
depends = dkms
provides = spl
conflicts = spl-dkms
conflicts = spl-archiso-linux
conflicts = spl-archiso-linux-git
conflicts = spl-linux-hardened
conflicts = spl-linux-hardened-git
conflicts = spl-linux-lts
conflicts = spl-linux-lts-git
conflicts = spl-linux
conflicts = spl-linux-git
conflicts = spl-linux-vfio
conflicts = spl-linux-vfio-git
conflicts = spl-linux-zen
conflicts = spl-linux-zen-git
source = git+https://github.com/zfsonlinux/spl.git#commit=1149b62d20b7ed9d8ae25d5da7a06213d79b7602
source = 60-spl-dkms-install.hook
source = spl-dkms-alpm-hook
sha256sums = SKIP
sha256sums = 15f71a9ceccf795cdac65743bee338e9987ec77e217721f32d55099be6ecf3d7
sha256sums = 836002f310b9e1d4b1a0e5c30d5b0ac5aa120d335b3ea223228a0b9f037ef8b8
pkgname = spl-dkms-git

5
packages/dkms/spl-dkms-git/.gitignore vendored
Unescape View File

@ -1,5 +0,0 @@
*.tar.xz
*.tar.gz
*.sig
*.log
spl/

12
packages/dkms/spl-dkms-git/60-spl-dkms-install.hook
Unescape View File

@ -1,12 +0,0 @@
[Trigger]
Operation = Install
Operation = Upgrade
Type = File
Target = usr/src/spl-*/dkms.conf
Target = usr/lib/modules/*/build/include/
[Action]
Description = Installing SPL
Depends = dkms
When = PostTransaction
Exec = /usr/lib/dkms/spl-dkms-alpm-hook

44
packages/dkms/spl-dkms-git/PKGBUILD
Unescape View File

@ -1,44 +0,0 @@
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
#
# This PKGBUILD was generated by the archzfs build scripts located at
#
# http://github.com/archzfs/archzfs
#
#
pkgname="spl-dkms-git"
pkgdesc="Solaris Porting Layer kernel modules."
pkgver=2018.05.07.r1074.g1149b62
pkgrel=1
makedepends=("git")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/spl.git#commit=1149b62d20b7ed9d8ae25d5da7a06213d79b7602"
"60-spl-dkms-install.hook"
"spl-dkms-alpm-hook")
sha256sums=("SKIP"
"15f71a9ceccf795cdac65743bee338e9987ec77e217721f32d55099be6ecf3d7"
"836002f310b9e1d4b1a0e5c30d5b0ac5aa120d335b3ea223228a0b9f037ef8b8")
license=("GPL")
depends=("spl-utils-common-git=2018.05.07.r1074.g1149b62" "dkms")
provides=("spl")
groups=("archzfs-dkms-git")
conflicts=('spl-dkms' 'spl-archiso-linux' 'spl-archiso-linux-git' 'spl-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-lts' 'spl-linux-lts-git' 'spl-linux' 'spl-linux-git' 'spl-linux-vfio' 'spl-linux-vfio-git' 'spl-linux-zen' 'spl-linux-zen-git' )
build() {
cd "${srcdir}/spl"
./autogen.sh
}
package() {
# install alpm hook
install -D -m 644 ${srcdir}/60-spl-dkms-install.hook ${pkgdir}/usr/share/libalpm/hooks/60-spl-dkms-install.hook
install -D -m 755 ${srcdir}/spl-dkms-alpm-hook ${pkgdir}/usr/lib/dkms/spl-dkms-alpm-hook
dkmsdir="${pkgdir}/usr/src/spl-git"
install -d "${dkmsdir}"
cp -a ${srcdir}/spl/. ${dkmsdir}
cd "${dkmsdir}"
find . -name ".git*" -print0 | xargs -0 rm -fr --
scripts/dkms.mkconf -v git -f dkms.conf -n spl
chmod g-w,o-w -R .
}

28
packages/dkms/spl-dkms-git/spl-dkms-alpm-hook
Unescape View File

@ -1,28 +0,0 @@
#!/bin/bash
# display what to run and run it quietly
run() {
echo "==> $*"
"$@" > /dev/null
}
# compile spl for the given kernel
install_spl() {
local kernel="${1}"
for m in $(ls /usr/src); do
if [[ "${m}" =~ ^spl-(.*)$ ]]; then
run dkms install "spl/${BASH_REMATCH[1]}" -k "${kernel}"
fi
done
}
# go through all kernels and run install_spl()
main() {
for kernel in $(ls /usr/lib/modules); do
if [[ -d "/usr/lib/modules/${kernel}/kernel" ]]; then
install_spl "${kernel}"
fi
done
}
main

1
packages/linux-hardened/spl-linux-hardened-git

@ -1 +0,0 @@
Subproject commit 13ff76e1e262d130ab4650c74065b4d50e92821b

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

@ -1 +0,0 @@
Subproject commit 191d4462bd5b1812bdc166e568e6b32ddb13196c

1
packages/linux-vfio/spl-linux-vfio-git

@ -1 +0,0 @@
Subproject commit 73b86d0ef8b36bd7bf7a1b4b06a512561ffaa2e3

1
packages/linux-zen/spl-linux-zen-git

@ -1 +0,0 @@
Subproject commit 9222dd11a604898d6f29560075a5473eed270001

1
packages/linux/spl-linux-git

@ -1 +0,0 @@
Subproject commit 5bd720649b2224f77ad137004ada2b812d43cc4f

17
repo.sh
Unescape View File

@ -119,9 +119,14 @@ repo_package_list() {
package_list=()
local pkgs=()
if [[ ${#pkg_list[@]} -eq 1 ]]; then
local pkg_list_find=${pkg_list[0]}
else
local pkg_list_find="{$(printf '%s,' ${pkg_list[@]} | cut -d ',' -f 1-${#pkg_list[@]})}"
fi
# Get packages from the backup directory
path="packages/${kernel_name}/{$(printf '%s,' ${pkg_list[@]} | cut -d ',' -f 1-${#pkg_list[@]})}/"
path="packages/${kernel_name}/${pkg_list_find}/"
if [[ ! -z ${kernel_version_full_pkgver} ]]; then
debug "kernel_version_full_pkgver: ${kernel_version_full_pkgver}"
fcmd="find ${path} -iname '*${kernel_version_full_pkgver}-${spl_pkgrel}*.pkg.tar.xz' -o -iname '*${kernel_version_full_pkgver}-${zfs_pkgrel}*.pkg.tar.xz' "
@ -220,6 +225,13 @@ repo_package_backup() {
pkgs+=("$o -regextype egrep -regex '.*${name}-[a-z0-9\.\_]+-[0-9]+-x86_64.pkg.tar.xz'")
done
# backup old spl-git packages
local o=""
if [[ ${#pkgs[@]} -ne 0 ]]; then
local o="-o"
fi
pkgs+=("$o -regextype egrep -regex '.*spl-[a-z\-]+-git-[a-z0-9\.\_]+-[0-9]+-x86_64.pkg.tar.xz'")
# only run find, if new packages will be copied
if [[ ! ${#pkgs[@]} -eq 0 ]]; then
run_cmd_show_and_capture_output_no_dry_run "find ${repo_target} -type f ${pkgs[@]}"
@ -307,6 +319,9 @@ repo_add() {
fi
run_cmd_no_output "sudo rsync --chown=${makepkg_nonpriv_user}: -ax ${repo_root}/repo/ $(realpath ${repo_root}/../)/${makepkg_nonpriv_user}/repo/"
else
# remove old spl-git packages
run_cmd "repo-remove -k ${gpg_sign_key} -s -v ${repo_target}/${arch}/${repo_name}.db.tar.xz spl-utils-common-git spl-linux-git spl-linux-git-headers spl-linux-lts-git spl-linux-lts-git-headers spl-linux-hardened-git spl-linux-hardened-git-headers spl-linux-zen-git spl-linux-zen-git-headers spl-linux-vfio-git spl-linux-vfio-git-headers spl-dkms-git"
run_cmd "repo-add -k ${gpg_sign_key} -s -v ${repo_target}/${arch}/${repo_name}.db.tar.xz ${pkg_add_list[@]}"
fi

16
src/kernels/common-git.sh
Unescape View File

@ -19,34 +19,24 @@ header="\
#"
update_common_git_pkgbuilds() {
pkg_list=("spl-utils-common-git" "zfs-utils-common-git")
pkg_list=("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_conflicts="'zfs-utils-common' '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}"
spl_src_hash="SKIP"
spl_makedepends="\"git\""
zfs_src_target="git+${zfs_git_url}"
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")'
zfs_utils_replaces='replaces=("spl-utils-common-git")'
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
}

18
src/kernels/dkms.sh
Unescape View File

@ -46,35 +46,25 @@ update_dkms_pkgbuilds() {
}
update_dkms_git_pkgbuilds() {
pkg_list=("spl-dkms-git" "zfs-dkms-git")
pkg_list=("zfs-dkms-git")
archzfs_package_group="archzfs-dkms-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_conflicts="'spl-dkms'"
zfs_conflicts="'zfs-dkms'"
spl_pkgname="spl-dkms-git"
zfs_conflicts="'zfs-dkms' 'spl-dkms-git'"
spl_pkgname=""
zfs_pkgname="zfs-dkms-git"
spl_dkms_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_dkms_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="git+${spl_git_url}"
spl_src_hash="SKIP"
spl_makedepends="\"git\""
zfs_src_target="git+${zfs_git_url}"
zfs_src_hash="SKIP"
zfs_makedepends="\"git\""
spl_workdir="\${srcdir}/spl"
zfs_replaces='replaces=("spl-dkms-git")'
zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
spl_mod_ver="git"
zfs_mod_ver="git"
spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
}

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

@ -63,39 +63,30 @@ update_linux_hardened_pkgbuilds() {
}
update_linux_hardened_git_pkgbuilds() {
pkg_list=("spl-linux-hardened-git" "zfs-linux-hardened-git")
pkg_list=("zfs-linux-hardened-git")
kernel_version=${kernel_version_git}
kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*}
kernel_mod_path="${kernel_version_full/\.[a-z]/}-hardened"
archzfs_package_group="archzfs-linux-hardened-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_conflicts="'spl-linux-hardened'"
zfs_conflicts="'zfs-linux-hardened'"
spl_pkgname="spl-linux-hardened-git"
zfs_conflicts="'zfs-linux-hardened' 'spl-linux-hardened-git'"
spl_pkgname=""
zfs_pkgname="zfs-linux-hardened-git"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="git+${spl_git_url}"
spl_src_hash="SKIP"
linux_depends="\"linux-hardened=${kernel_version}\""
linux_headers_depends="\"linux-hardened-headers=${kernel_version}\""
spl_makedepends="\"git\""
zfs_replaces='replaces=("spl-linux-hardened-git")'
zfs_src_target="git+${zfs_git_url}"
zfs_src_hash="SKIP"
zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl"
zfs_makedepends="\"git\""
zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
}

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

@ -60,44 +60,33 @@ update_linux_lts_pkgbuilds() {
zfs_workdir="\${srcdir}/zfs-${zol_version}"
linux_depends="\"linux-lts=${kernel_version}\""
linux_headers_depends="\"linux-lts-headers=${kernel_version}\""
spl_makedepends="\"libelf\""
zfs_makedepends="\"libelf\" \"${spl_pkgname}-headers\""
zfs_makedepends="\"${spl_pkgname}-headers\""
}
update_linux_lts_git_pkgbuilds() {
pkg_list=("spl-linux-lts-git" "zfs-linux-lts-git")
pkg_list=("zfs-linux-lts-git")
kernel_version=${kernel_version_git}
kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*}
kernel_mod_path="${kernel_version_full}-lts"
archzfs_package_group="archzfs-linux-lts-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_conflicts="'spl-linux-lts'"
zfs_conflicts="'zfs-linux-lts'"
spl_pkgname="spl-linux-lts-git"
zfs_conflicts="'zfs-linux-lts' 'spl-linux-lts-git'"
spl_pkgname=""
zfs_pkgname="zfs-linux-lts-git"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="git+${spl_git_url}"
spl_src_hash="SKIP"
linux_depends="\"linux-lts=${kernel_version}\""
linux_headers_depends="\"linux-lts-headers=${kernel_version}\""
spl_makedepends="\"libelf\" \"git\""
zfs_src_target="git+${zfs_git_url}"
zfs_replaces='replaces=("spl-linux-lts-git")'
zfs_src_hash="SKIP"
zfs_makedepends="\"libelf\" \"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl"
zfs_makedepends="\"git\""
zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
}

28
src/kernels/linux-vfio.sh
Unescape View File

@ -63,43 +63,29 @@ update_linux_pkgbuilds() {
}
update_linux_git_pkgbuilds() {
pkg_list=("spl-linux-vfio-git" "zfs-linux-vfio-git")
pkg_list=("zfs-linux-vfio-git")
kernel_version=${kernel_version_git}
kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*}
kernel_mod_path="${kernel_version_full}-vfio"
archzfs_package_group="archzfs-linux-vfio-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_conflicts="'spl-linux-vfio'"
zfs_conflicts="'zfs-linux-vfio'"
spl_pkgname="spl-linux-vfio-git"
zfs_conflicts="'zfs-linux-vfio' 'spl-linux-vfio-git'"
spl_pkgname=""
zfs_pkgname="zfs-linux-vfio-git"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_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"
linux_depends="\"linux-vfio=${kernel_version}\""
linux_headers_depends="\"linux-vfio-headers=${kernel_version}\""
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_replaces='replaces=("spl-linux-vfio-git")'
zfs_src_hash="SKIP"
zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl"
zfs_makedepends="\"git\""
zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
}

20
src/kernels/linux-zen.sh
Unescape View File

@ -63,39 +63,29 @@ update_linux_pkgbuilds() {
}
update_linux_git_pkgbuilds() {
pkg_list=("spl-linux-zen-git" "zfs-linux-zen-git")
pkg_list=("zfs-linux-zen-git")
kernel_version=${kernel_version_git}
kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*}
kernel_mod_path="${kernel_version_full}-zen"
archzfs_package_group="archzfs-linux-zen-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_conflicts="'spl-linux-zen'"
zfs_conflicts="'zfs-linux-zen'"
spl_pkgname="spl-linux-zen-git"
zfs_conflicts="'zfs-linux-zen' 'spl-linux-zen-git'"
spl_pkgname=""
zfs_pkgname="zfs-linux-zen-git"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="git+${spl_git_url}"
spl_src_hash="SKIP"
linux_depends="\"linux-zen=${kernel_version}\""
linux_headers_depends="\"linux-zen-headers=${kernel_version}\""
spl_makedepends="\"git\""
zfs_src_target="git+${zfs_git_url}"
zfs_replaces='replaces=("spl-linux-zen-git")'
zfs_src_hash="SKIP"
zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl"
zfs_makedepends="\"git\""
zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
}

21
src/kernels/linux.sh
Unescape View File

@ -65,40 +65,29 @@ update_linux_pkgbuilds() {
}
update_linux_git_pkgbuilds() {
pkg_list=("spl-linux-git" "zfs-linux-git")
pkg_list=("zfs-linux-git")
kernel_version=${kernel_version_git}
kernel_version_full=$(kernel_version_full ${kernel_version})
kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
kernel_version_major=${kernel_version%-*}
kernel_mod_path="${kernel_version_full}-ARCH"
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_conflicts="'spl-linux'"
zfs_conflicts="'zfs-linux'"
spl_pkgname="spl-linux-git"
zfs_conflicts="'zfs-linux' 'spl-linux-git'"
spl_pkgname=""
zfs_pkgname="zfs-linux-git"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
spl_src_target="git+${spl_git_url}"
spl_src_hash="SKIP"
linux_depends="\"linux=${kernel_version}\""
linux_headers_depends="\"linux-headers=${kernel_version}\""
spl_makedepends="\"git\""
zfs_src_target="git+${zfs_git_url}"
zfs_replaces='replaces=("spl-linux-git")'
zfs_src_hash="SKIP"
zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl"
zfs_makedepends="\"git\""
zfs_workdir="\${srcdir}/zfs"
if have_command "update"; then
git_check_repo
git_calc_pkgver
fi
spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
}

8
src/zfs-dkms/PKGBUILD.sh
Unescape View File

@ -1,5 +1,11 @@
#!/bin/bash
# remove spl from git packages workaround
spl_dependency=""
if [[ -n "${spl_pkgname}" ]]; then
spl_dependency="'${spl_pkgname}' "
fi
cat << EOF > ${zfs_dkms_pkgbuild_path}/PKGBUILD
${header}
pkgname="${zfs_pkgname}"
@ -12,7 +18,7 @@ url="http://zfsonlinux.org/"
source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}")
license=("CDDL")
depends=("${spl_pkgname}" "${zfs_utils_pkgname}")
depends=(${spl_dependency}"${zfs_utils_pkgname}" "lsb-release")
provides=("zfs")
groups=("${archzfs_package_group}")
conflicts=(${zfs_conflicts} ${zfs_conflicts_all} ${zfs_headers_conflicts_all})

4
src/zfs-utils/zfs-utils.initcpio.install
Unescape View File

@ -7,8 +7,7 @@ build() {
zunicode \
zcommon \
zfs \
spl \
splat
spl
map add_binary \
arcstat.py \
@ -24,7 +23,6 @@ build() {
zpool \
zstreamdump \
ztest \
splat \
/lib/udev/vdev_id \
/lib/udev/zvol_id \
findmnt

8
src/zfs/PKGBUILD.sh
Unescape View File

@ -1,5 +1,11 @@
#!/bin/bash
# remove spl from git packages workaround
spl_dependency=""
if [[ -n "${spl_pkgname}" ]]; then
spl_dependency="'${spl_pkgname}' "
fi
cat << EOF > ${zfs_pkgbuild_path}/PKGBUILD
${header}
pkgbase="${zfs_pkgname}"
@ -12,7 +18,7 @@ url="http://zfsonlinux.org/"
source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}")
license=("CDDL")
depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
depends=("kmod" ${spl_dependency}"${zfs_utils_pkgname}" ${linux_depends})
build() {
cd "${zfs_workdir}"

Write Preview
Loading…
Cancel
Save