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

Merge pull request #131 from minextu/fixes

Browse Source 
Some smaller fixes
pull/138/head
Jesus Alvarez 8 years ago committed by GitHub
parent 5c0c867273 92b9fb891e
commit 26cefcbaad
14 changed files with 101 additions and 77 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. 65
      .gitmodules
  2. 2
      conf.sh
  3. 2
      lib.sh
  4. 1
      packages/common/spl-utils-common
  5. 1
      packages/common/spl-utils-common-git
  6. 1
      packages/common/zfs-utils-common
  7. 1
      packages/common/zfs-utils-common-git
  8. 1
      packages/linux-hardened/spl-linux-hardened-git
  9. 1
      packages/linux-hardened/zfs-linux-hardened-git
  10. 4
      src/kernels/archiso.sh
  11. 93
      src/kernels/linux-hardened.sh
  12. 2
      src/kernels/linux-lts.sh
  13. 2
      src/spl/PKGBUILD.sh
  14. 2
      src/zfs/PKGBUILD.sh

65
.gitmodules vendored
Unescape View File

@ -1,26 +1,3 @@
[submodule "zfs-linux-git"]
path = packages/linux/zfs-linux-git
url = ssh+git://aur@aur.archlinux.org/zfs-linux-git.git
branch = master
[submodule "zfs-linux-lts"]
path = packages/linux-lts/zfs-linux-lts
url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts.git
branch = master
[submodule "spl-linux-git"]
path = packages/linux/spl-linux-git
url = ssh+git://aur@aur.archlinux.org/spl-linux-git.git
branch = master
branch = master
[submodule "spl-linux-lts"]
path = packages/linux-lts/spl-linux-lts
url = ssh+git://aur@aur.archlinux.org/spl-linux-lts.git
branch = master
[submodule "zfs-linux"]
path = packages/linux/zfs-linux
url = ssh+git://aur@aur.archlinux.org/zfs-linux.git
[submodule "spl-linux"]
path = packages/linux/spl-linux
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
@ -33,3 +10,45 @@
[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
[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
[submodule "packages/linux/spl-linux"]
path = packages/linux/spl-linux
url = ssh+git://aur@aur.archlinux.org/spl-linux.git
[submodule "packages/linux-lts/zfs-linux-lts"]
path = packages/linux-lts/zfs-linux-lts
url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts.git
[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
[submodule "packages/common/zfs-utils-common"]
path = packages/common/zfs-utils-common
url = ssh+git://aur@aur.archlinux.org/zfs-utils-common.git
[submodule "packages/common/zfs-utils-common-git"]
path = packages/common/zfs-utils-common-git
url = ssh+git://aur@aur.archlinux.org/zfs-utils-common-git.git
[submodule "packages/common/spl-utils-common-git"]
path = packages/common/spl-utils-common-git
url = ssh+git://aur@aur.archlinux.org/spl-utils-common-git.git

2
conf.sh
Unescape View File

@ -6,7 +6,7 @@ zfs_src_hash="136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d"
spl_src_hash="ebab87a064985f93122ad82721ca54569a5ef20dc3579f84d18075210cf316ac" spl_src_hash="ebab87a064985f93122ad82721ca54569a5ef20dc3579f84d18075210cf316ac"
zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540" zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
zfs_initcpio_install_hash="aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca" zfs_initcpio_install_hash="aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca"
zfs_initcpio_hook_hash="90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038" zfs_initcpio_hook_hash="2bb533db561992c861bb9acad64a127f81cf0e4bf39cb4308ac7a73a17db55a7"
# Notification address # Notification address
email="jeezusjr@gmail.com" email="jeezusjr@gmail.com"

2
lib.sh
Unescape View File

@ -357,7 +357,7 @@ package_version_from_syncdb() {
kernel_version_has_minor_version() { kernel_version_has_minor_version() {
# $1: the kernel version # $1: the kernel version
# returns: 0 if the version contains a minor version and 1 if it does not # returns: 0 if the version contains a minor version and 1 if it does not
if [[ ${1} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:alnum:]]+) ]]; then if [[ ${1} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:digit:]]+) ]]; then
debug "kernel_version_has_minor_version: Have kernel with minor version!" debug "kernel_version_has_minor_version: Have kernel with minor version!"
return 0 return 0
fi fi

1
packages/common/spl-utils-common

@ -0,0 +1 @@
Subproject commit 693ec252069a7dbecfd2efae6723be4ae80501de

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

@ -0,0 +1 @@
Subproject commit 4b47296c79cb243a5cb397d368a01285d3c8cfb2

1
packages/common/zfs-utils-common

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

1
packages/common/zfs-utils-common-git

@ -0,0 +1 @@
Subproject commit 02105c5d156f5b09ce0df770b80f77ac1149f54b

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

@ -0,0 +1 @@
Subproject commit 837fff903cd191f11e614570d9c3482c15b70f1c

1
packages/linux-hardened/zfs-linux-hardened-git

@ -0,0 +1 @@
Subproject commit 42399bcf60a0f8ea1085d2ed898637b50197a715

4
src/kernels/archiso.sh
Unescape View File

@ -36,9 +36,9 @@ 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-linux-common" spl_utils_pkgname="spl-utils-common"
spl_pkgname="spl-archiso-linux" spl_pkgname="spl-archiso-linux"
zfs_utils_pkgname="zfs-utils-linux-common" zfs_utils_pkgname="zfs-utils-common"
zfs_pkgname="zfs-archiso-linux" zfs_pkgname="zfs-archiso-linux"
spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"

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

@ -4,7 +4,7 @@ mode_desc="Select and use the packages for the linux-hardened kernel"
# Kernel versions for hardened packages # Kernel versions for hardened packages
pkgrel="1" pkgrel="1"
kernel_version="4.12.e-1" kernel_version="4.12.1.b-1"
# Kernel version for GIT packages # Kernel version for GIT packages
pkgrel_git="${pkgrel}" pkgrel_git="${pkgrel}"
@ -15,7 +15,6 @@ zfs_git_url="https://github.com/zfsonlinux/zfs.git"
spl_git_url="https://github.com/zfsonlinux/spl.git" spl_git_url="https://github.com/zfsonlinux/spl.git"
header="\ header="\
# Maintainer: Jan Houben <jan@nexttrex.de>
# Maintainer: Jesus Alvarez <jeezusjr at gmail dot com> # Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
# #
# This PKGBUILD was generated by the archzfs build scripts located at # This PKGBUILD was generated by the archzfs build scripts located at
@ -39,14 +38,14 @@ update_linux_hardened_pkgbuilds() {
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%-*}
kernel_mod_path="${kernel_version/[a-z]/0}-hardened" kernel_mod_path="${kernel_version_full/\.[a-z]/}-hardened"
archzfs_package_group="archzfs-linux-hardened" archzfs_package_group="archzfs-linux-hardened"
spl_pkgver=${zol_version}_${kernel_version_full_pkgver} spl_pkgver=${zol_version}_${kernel_version_full_pkgver}
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_conflicts="'spl-linux-hardened-git'" spl_conflicts="'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'" spl_headers_conflicts="'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers'"
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_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-hardened-git'" zfs_conflicts="'zfs-linux-hardened-git'"
spl_utils_pkgname="spl-utils-common" spl_utils_pkgname="spl-utils-common"
@ -64,46 +63,46 @@ update_linux_hardened_pkgbuilds() {
zfs_makedepends="\"${spl_pkgname}-headers\"" zfs_makedepends="\"${spl_pkgname}-headers\""
} }
# update_linux_hardened_git_pkgbuilds() { update_linux_hardened_git_pkgbuilds() {
# pkg_list=("spl-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})
# kernel_version_major=${kernel_version_git%-*} kernel_version_major=${kernel_version_git%-*}
# kernel_mod_path="${kernel_version/[a-z]/0}-hardened" kernel_mod_path="${kernel_version_full/\.[a-z]/}-hardened"
# archzfs_package_group="archzfs-linux-hardened-git" archzfs_package_group="archzfs-linux-hardened-git"
# spl_pkgver="" # Set later by call to git_calc_pkgver spl_pkgver="" # Set later by call to git_calc_pkgver
# 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_conflicts="'spl-linux-hardened'" spl_conflicts="'spl-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'" spl_headers_conflicts="'spl-linux-hardened-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers'"
# zfs_headers_conflicts="'zfs-linux-hardened-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'" 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-hardened'" zfs_conflicts="'zfs-linux-hardened'"
# spl_utils_pkgname="spl-utils-common-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-common-git" zfs_utils_pkgname="zfs-utils-common-git"
# zfs_pkgname="zfs-linux-hardened-git" zfs_pkgname="zfs-linux-hardened-git"
# spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" spl_pkgbuild_path="packages/${kernel_name}/${spl_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
# spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}" spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
# fi fi
# spl_src_hash="SKIP" spl_src_hash="SKIP"
# 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}\""
# spl_makedepends="\"git\"" spl_makedepends="\"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\" \"${spl_pkgname}-headers\"" 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
# git_check_repo git_check_repo
# git_calc_pkgver git_calc_pkgver
# fi fi
# } }

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

@ -4,7 +4,7 @@ mode_desc="Select and use the packages for the linux-lts kernel"
# Kernel versions for LTS packages # Kernel versions for LTS packages
pkgrel="1" pkgrel="1"
kernel_version="4.9.36-1" kernel_version="4.9.37-1"
# Kernel version for GIT packages # Kernel version for GIT packages
pkgrel_git="${pkgrel}" pkgrel_git="${pkgrel}"

2
src/spl/PKGBUILD.sh
Unescape View File

@ -12,6 +12,7 @@ url="http://zfsonlinux.org/"
source=("${spl_src_target}") source=("${spl_src_target}")
sha256sums=("${spl_src_hash}") sha256sums=("${spl_src_hash}")
license=("GPL") license=("GPL")
depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
build() { build() {
cd "${spl_workdir}" cd "${spl_workdir}"
@ -25,7 +26,6 @@ build() {
package_${spl_pkgname}() { package_${spl_pkgname}() {
pkgdesc="Solaris Porting Layer kernel modules." pkgdesc="Solaris Porting Layer kernel modules."
depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
install=spl.install install=spl.install
provides=("spl") provides=("spl")
groups=("${archzfs_package_group}") groups=("${archzfs_package_group}")

2
src/zfs/PKGBUILD.sh
Unescape View File

@ -12,6 +12,7 @@ url="http://zfsonlinux.org/"
source=("${zfs_src_target}") source=("${zfs_src_target}")
sha256sums=("${zfs_src_hash}") sha256sums=("${zfs_src_hash}")
license=("CDDL") license=("CDDL")
depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
build() { build() {
cd "${zfs_workdir}" cd "${zfs_workdir}"
@ -26,7 +27,6 @@ build() {
package_${zfs_pkgname}() { package_${zfs_pkgname}() {
pkgdesc="Kernel modules for the Zettabyte File System." pkgdesc="Kernel modules for the Zettabyte File System."
depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
install=zfs.install install=zfs.install
provides=("zfs") provides=("zfs")
groups=("${archzfs_package_group}") groups=("${archzfs_package_group}")

Write Preview
Loading…
Cancel
Save