From 86b1428fd1b67fdde666a4f09a95f49c4f281aab Mon Sep 17 00:00:00 2001 From: Jan Houben Date: Sat, 15 Jul 2017 13:01:52 +0200 Subject: [PATCH 1/4] small fixes --- .gitmodules | 47 ++++++++++--------- conf.sh | 2 +- lib.sh | 2 +- packages/common/spl-utils-common | 1 + packages/common/spl-utils-common-git | 1 + packages/common/zfs-utils-common | 1 + packages/common/zfs-utils-common-git | 1 + .../linux-hardened/spl-linux-hardened-git | 1 + .../linux-hardened/zfs-linux-hardened-git | 1 + src/kernels/archiso.sh | 4 +- src/kernels/linux-hardened.sh | 9 ++-- src/spl/PKGBUILD.sh | 2 +- src/zfs/PKGBUILD.sh | 2 +- 13 files changed, 40 insertions(+), 34 deletions(-) create mode 160000 packages/common/spl-utils-common create mode 160000 packages/common/spl-utils-common-git create mode 160000 packages/common/zfs-utils-common create mode 160000 packages/common/zfs-utils-common-git create mode 160000 packages/linux-hardened/spl-linux-hardened-git create mode 160000 packages/linux-hardened/zfs-linux-hardened-git diff --git a/.gitmodules b/.gitmodules index d8ce536..7a89d4e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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"] path = packages/archiso/zfs-archiso-linux url = ssh+git://aur@aur.archlinux.org/zfs-archiso-linux.git @@ -33,3 +10,27 @@ [submodule "packages/linux-hardened/zfs-linux-hardened"] path = packages/linux-hardened/zfs-linux-hardened 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 diff --git a/conf.sh b/conf.sh index 549978c..6b46630 100644 --- a/conf.sh +++ b/conf.sh @@ -6,7 +6,7 @@ zfs_src_hash="136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d" spl_src_hash="ebab87a064985f93122ad82721ca54569a5ef20dc3579f84d18075210cf316ac" zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540" zfs_initcpio_install_hash="aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca" -zfs_initcpio_hook_hash="90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038" +zfs_initcpio_hook_hash="2bb533db561992c861bb9acad64a127f81cf0e4bf39cb4308ac7a73a17db55a7" # Notification address email="jeezusjr@gmail.com" diff --git a/lib.sh b/lib.sh index 841ad41..fc0e641 100644 --- a/lib.sh +++ b/lib.sh @@ -357,7 +357,7 @@ package_version_from_syncdb() { kernel_version_has_minor_version() { # $1: the kernel version # 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!" return 0 fi diff --git a/packages/common/spl-utils-common b/packages/common/spl-utils-common new file mode 160000 index 0000000..693ec25 --- /dev/null +++ b/packages/common/spl-utils-common @@ -0,0 +1 @@ +Subproject commit 693ec252069a7dbecfd2efae6723be4ae80501de diff --git a/packages/common/spl-utils-common-git b/packages/common/spl-utils-common-git new file mode 160000 index 0000000..4b47296 --- /dev/null +++ b/packages/common/spl-utils-common-git @@ -0,0 +1 @@ +Subproject commit 4b47296c79cb243a5cb397d368a01285d3c8cfb2 diff --git a/packages/common/zfs-utils-common b/packages/common/zfs-utils-common new file mode 160000 index 0000000..b42834e --- /dev/null +++ b/packages/common/zfs-utils-common @@ -0,0 +1 @@ +Subproject commit b42834e09b463b4e5e52583c40a16b78a378b16f diff --git a/packages/common/zfs-utils-common-git b/packages/common/zfs-utils-common-git new file mode 160000 index 0000000..02105c5 --- /dev/null +++ b/packages/common/zfs-utils-common-git @@ -0,0 +1 @@ +Subproject commit 02105c5d156f5b09ce0df770b80f77ac1149f54b diff --git a/packages/linux-hardened/spl-linux-hardened-git b/packages/linux-hardened/spl-linux-hardened-git new file mode 160000 index 0000000..685852d --- /dev/null +++ b/packages/linux-hardened/spl-linux-hardened-git @@ -0,0 +1 @@ +Subproject commit 685852db1bc3c3b09b2cbdb9076e8d7631f706af diff --git a/packages/linux-hardened/zfs-linux-hardened-git b/packages/linux-hardened/zfs-linux-hardened-git new file mode 160000 index 0000000..71b3f0c --- /dev/null +++ b/packages/linux-hardened/zfs-linux-hardened-git @@ -0,0 +1 @@ +Subproject commit 71b3f0c031406fc6320afd502557668a9af38816 diff --git a/src/kernels/archiso.sh b/src/kernels/archiso.sh index eedc771..4e9aec3 100644 --- a/src/kernels/archiso.sh +++ b/src/kernels/archiso.sh @@ -36,9 +36,9 @@ update_archiso_linux_pkgbuilds() { zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} spl_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel} - spl_utils_pkgname="spl-utils-linux-common" + spl_utils_pkgname="spl-utils-common" spl_pkgname="spl-archiso-linux" - zfs_utils_pkgname="zfs-utils-linux-common" + zfs_utils_pkgname="zfs-utils-common" zfs_pkgname="zfs-archiso-linux" spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}" zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}" diff --git a/src/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh index 27a6994..85cbe42 100644 --- a/src/kernels/linux-hardened.sh +++ b/src/kernels/linux-hardened.sh @@ -15,7 +15,6 @@ zfs_git_url="https://github.com/zfsonlinux/zfs.git" spl_git_url="https://github.com/zfsonlinux/spl.git" header="\ -# Maintainer: Jan Houben # Maintainer: Jesus Alvarez # # 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_pkgver=$(kernel_version_full_no_hyphen ${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" spl_pkgver=${zol_version}_${kernel_version_full_pkgver} zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} spl_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel} 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_conflicts="'zfs-linux-hardened-git'" spl_utils_pkgname="spl-utils-common" @@ -70,14 +69,14 @@ update_linux_hardened_pkgbuilds() { # kernel_version_full=$(kernel_version_full ${kernel_version_git}) # kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${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" # 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'" -# 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_conflicts="'zfs-linux-hardened'" # spl_utils_pkgname="spl-utils-common-git" diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh index 00e17de..fe6d394 100755 --- a/src/spl/PKGBUILD.sh +++ b/src/spl/PKGBUILD.sh @@ -12,6 +12,7 @@ url="http://zfsonlinux.org/" source=("${spl_src_target}") sha256sums=("${spl_src_hash}") license=("GPL") +depends=("${spl_utils_pkgname}" "kmod" ${linux_depends}) build() { cd "${spl_workdir}" @@ -25,7 +26,6 @@ build() { 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}") diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh index 20450c4..e1dd15d 100755 --- a/src/zfs/PKGBUILD.sh +++ b/src/zfs/PKGBUILD.sh @@ -12,6 +12,7 @@ url="http://zfsonlinux.org/" source=("${zfs_src_target}") sha256sums=("${zfs_src_hash}") license=("CDDL") +depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends}) build() { cd "${zfs_workdir}" @@ -26,7 +27,6 @@ build() { 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}") From 1c52c9332939797cf2c0e6a19e99bad65c4ae7ea Mon Sep 17 00:00:00 2001 From: Jan Houben Date: Sat, 15 Jul 2017 13:03:04 +0200 Subject: [PATCH 2/4] build zfs-git for linux-hardened + update to latest version --- .gitmodules | 6 +++ src/kernels/linux-hardened.sh | 88 +++++++++++++++++------------------ 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7a89d4e..9d47aeb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,9 @@ [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 diff --git a/src/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh index 85cbe42..b6d9e4a 100644 --- a/src/kernels/linux-hardened.sh +++ b/src/kernels/linux-hardened.sh @@ -4,7 +4,7 @@ mode_desc="Select and use the packages for the linux-hardened kernel" # Kernel versions for hardened packages pkgrel="1" -kernel_version="4.12.e-1" +kernel_version="4.12.1.b-1" # Kernel version for GIT packages pkgrel_git="${pkgrel}" @@ -63,46 +63,46 @@ update_linux_hardened_pkgbuilds() { zfs_makedepends="\"${spl_pkgname}-headers\"" } -# update_linux_hardened_git_pkgbuilds() { -# pkg_list=("spl-linux-hardened-git" "zfs-linux-hardened-git") -# kernel_version=${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_major=${kernel_version_git%-*} -# 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'" -# 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_conflicts="'zfs-linux-hardened'" -# spl_utils_pkgname="spl-utils-common-git" -# spl_pkgname="spl-linux-hardened-git" -# zfs_utils_pkgname="zfs-utils-common-git" -# 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}" -# if [[ ${spl_git_commit} != "" ]]; then -# spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}" -# fi -# spl_src_hash="SKIP" -# linux_depends="\"linux-hardened=${kernel_version}\"" -# linux_headers_depends="\"linux-hardened-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_src_hash="SKIP" -# zfs_makedepends="\"git\" \"${spl_pkgname}-headers\"" -# spl_workdir="\${srcdir}/spl" -# zfs_workdir="\${srcdir}/zfs" -# if have_command "update"; then -# git_check_repo -# git_calc_pkgver -# fi -# } +update_linux_hardened_git_pkgbuilds() { + pkg_list=("spl-linux-hardened-git" "zfs-linux-hardened-git") + kernel_version=${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_major=${kernel_version_git%-*} + 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'" + 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_conflicts="'zfs-linux-hardened'" + spl_utils_pkgname="spl-utils-common-git" + spl_pkgname="spl-linux-hardened-git" + zfs_utils_pkgname="zfs-utils-common-git" + 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}" + if [[ ${spl_git_commit} != "" ]]; then + spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}" + fi + spl_src_hash="SKIP" + linux_depends="\"linux-hardened=${kernel_version}\"" + linux_headers_depends="\"linux-hardened-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_src_hash="SKIP" + zfs_makedepends="\"git\" \"${spl_pkgname}-headers\"" + spl_workdir="\${srcdir}/spl" + zfs_workdir="\${srcdir}/zfs" + if have_command "update"; then + git_check_repo + git_calc_pkgver + fi +} From 989ca5b031f41b6030c43a6d0d54767668b2525a Mon Sep 17 00:00:00 2001 From: Jan Houben Date: Sat, 15 Jul 2017 13:03:59 +0200 Subject: [PATCH 3/4] Update lts packages for kernel 4.9.37-1 --- src/kernels/linux-lts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh index 3607a85..cb97ef1 100644 --- a/src/kernels/linux-lts.sh +++ b/src/kernels/linux-lts.sh @@ -4,7 +4,7 @@ mode_desc="Select and use the packages for the linux-lts kernel" # Kernel versions for LTS packages pkgrel="1" -kernel_version="4.9.36-1" +kernel_version="4.9.37-1" # Kernel version for GIT packages pkgrel_git="${pkgrel}" From 92b9fb891ec0e63fa62ecc12f0bb9fc2f1fb9125 Mon Sep 17 00:00:00 2001 From: Jan Houben Date: Sat, 15 Jul 2017 13:41:06 +0200 Subject: [PATCH 4/4] update submodules --- .gitmodules | 12 ++++++++++++ packages/linux-hardened/spl-linux-hardened-git | 2 +- packages/linux-hardened/zfs-linux-hardened-git | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9d47aeb..19c47a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,15 @@ [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 diff --git a/packages/linux-hardened/spl-linux-hardened-git b/packages/linux-hardened/spl-linux-hardened-git index 685852d..837fff9 160000 --- a/packages/linux-hardened/spl-linux-hardened-git +++ b/packages/linux-hardened/spl-linux-hardened-git @@ -1 +1 @@ -Subproject commit 685852db1bc3c3b09b2cbdb9076e8d7631f706af +Subproject commit 837fff903cd191f11e614570d9c3482c15b70f1c diff --git a/packages/linux-hardened/zfs-linux-hardened-git b/packages/linux-hardened/zfs-linux-hardened-git index 71b3f0c..42399bc 160000 --- a/packages/linux-hardened/zfs-linux-hardened-git +++ b/packages/linux-hardened/zfs-linux-hardened-git @@ -1 +1 @@ -Subproject commit 71b3f0c031406fc6320afd502557668a9af38816 +Subproject commit 42399bcf60a0f8ea1085d2ed898637b50197a715