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

Merge pull request #195 from minextu/fixed-common-utils-version-git

Browse Source 
Fix dependency for a fixed common-utils version (git packages)
pull/209/head
Jesus Alvarez 7 years ago committed by GitHub
parent 27f8d81a8e fbc5e19b18
commit 94afafbd54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 37 additions and 72 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. 16
      lib.sh
  2. 8
      src/kernels/common-git.sh
  3. 12
      src/kernels/dkms.sh
  4. 12
      src/kernels/linux-hardened.sh
  5. 12
      src/kernels/linux-lts.sh
  6. 12
      src/kernels/linux-zen.sh
  7. 13
      src/kernels/linux.sh
  8. 4
      src/spl-dkms/PKGBUILD.sh
  9. 4
      src/spl-utils/PKGBUILD.sh
  10. 4
      src/spl/PKGBUILD.sh
  11. 4
      src/zfs-dkms/PKGBUILD.sh
  12. 4
      src/zfs-utils/PKGBUILD.sh
  13. 4
      src/zfs/PKGBUILD.sh

16
lib.sh
Unescape View File

@ -561,7 +561,7 @@ check_zol_version() {
check_mode() {
# $1 the mode to check for
debug "check_mode: checking '$1'"
# add all available modes
if [[ "${1}" == "all" ]]; then
for m in "${mode_list[@]}"; do
@ -767,7 +767,7 @@ check_skip_build() {
return 0
fi
fi
return 1
}
@ -785,7 +785,7 @@ check_skip_src() {
msg "sources for ${pkg} have already been built"
return 0
fi
return 1
}
@ -925,6 +925,16 @@ git_calc_pkgver() {
debug "zfs_pkgver: ${zfs_pkgver}"
fi
# get latest commit sha
cmd="cd temp/${repo} && "
cmd+="git rev-parse HEAD"
run_cmd_no_output_no_dry_run "${cmd}"
if [[ ${repo} =~ ^zfs ]]; then
latest_zfs_git_commit=${run_cmd_output}
else
latest_spl_git_commit=${run_cmd_output}
fi
# Cleanup
msg2 "Removing working directory"
run_cmd_no_output_no_dry_run "rm -vrf temp"

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

@ -32,15 +32,9 @@ update_common_git_pkgbuilds() {
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"
@ -53,4 +47,6 @@ update_common_git_pkgbuilds() {
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}"
}

12
src/kernels/dkms.sh
Unescape View File

@ -59,15 +59,9 @@ update_dkms_git_pkgbuilds() {
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}"
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"
@ -77,8 +71,10 @@ update_dkms_git_pkgbuilds() {
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_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
spl_mod_ver=${spl_git_ver%%_*}
zfs_mod_ver=${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}"
}

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

@ -80,17 +80,11 @@ update_linux_hardened_git_pkgbuilds() {
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"
@ -99,6 +93,8 @@ update_linux_hardened_git_pkgbuilds() {
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_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}"
}

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

@ -82,17 +82,11 @@ update_linux_lts_git_pkgbuilds() {
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-lts=${kernel_version_full}\""
linux_headers_depends="\"linux-lts-headers=${kernel_version_full}\""
spl_makedepends="\"libelf\" \"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="\"libelf\" \"git\" \"${spl_pkgname}-headers\""
spl_workdir="\${srcdir}/spl"
@ -101,6 +95,8 @@ update_linux_lts_git_pkgbuilds() {
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_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}"
}

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

@ -80,17 +80,11 @@ update_linux_git_pkgbuilds() {
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-zen=${kernel_version_full}\""
linux_headers_depends="\"linux-zen-headers=${kernel_version_full}\""
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"
@ -99,6 +93,8 @@ update_linux_git_pkgbuilds() {
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_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}"
}

13
src/kernels/linux.sh
Unescape View File

@ -82,17 +82,12 @@ update_linux_git_pkgbuilds() {
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=${kernel_version_full}\""
linux_headers_depends="\"linux-headers=${kernel_version_full}\""
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"
@ -101,6 +96,8 @@ update_linux_git_pkgbuilds() {
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_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}"
}

4
src/spl-dkms/PKGBUILD.sh
Unescape View File

@ -41,8 +41,4 @@ package() {
EOF
if [[ ${archzfs_package_group} =~ -git$ ]]; then
sed -i "/^build()/i pkgver() { \n cd \"${spl_workdir}\" \n\ printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g' )\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${spl_dkms_pkgbuild_path}/PKGBUILD
fi
pkgbuild_cleanup "${spl_dkms_pkgbuild_path}/PKGBUILD"

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

@ -30,8 +30,4 @@ package() {
}
EOF
if [[ ${archzfs_package_group} =~ -git$ ]]; then
sed -i "/^build()/i pkgver() {\n cd \"${spl_workdir}\"\n printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${spl_utils_pkgbuild_path}/PKGBUILD
fi
pkgbuild_cleanup "${spl_utils_pkgbuild_path}/PKGBUILD"

4
src/spl/PKGBUILD.sh
Unescape View File

@ -54,9 +54,7 @@ package_${spl_pkgname}-headers() {
EOF
if [[ ${archzfs_package_group} =~ -git$ ]]; then
sed -i "/^build()/i pkgver() {\n cd \"${spl_workdir}\"\n printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g' )\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\".${kernel_version_full_pkgver} \n}" ${spl_pkgbuild_path}/PKGBUILD
else
if [[ ! ${archzfs_package_group} =~ -git$ ]]; then
sed -i "/^build()/i prepare() {\n cd \"${spl_workdir}\"\n patch -Np1 -i \${srcdir}/0001-Linux-4.14-compat-vfs_read-vfs_write.patch\n}" ${spl_pkgbuild_path}/PKGBUILD
fi

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

@ -44,8 +44,4 @@ package() {
EOF
if [[ ${archzfs_package_group} =~ -git$ ]]; then
sed -i "/^build()/i pkgver() {\n cd \"${zfs_workdir}\"\n printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${zfs_dkms_pkgbuild_path}/PKGBUILD
fi
pkgbuild_cleanup "${zfs_dkms_pkgbuild_path}/PKGBUILD"

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

@ -58,8 +58,4 @@ package() {
}
EOF
if [[ ${archzfs_package_group} =~ -git$ ]]; then
sed -i "/^build()/i pkgver() {\n cd \"${zfs_workdir}\"\n printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${zfs_utils_pkgbuild_path}/PKGBUILD
fi
pkgbuild_cleanup "${zfs_utils_pkgbuild_path}/PKGBUILD"

4
src/zfs/PKGBUILD.sh
Unescape View File

@ -56,8 +56,4 @@ package_${zfs_pkgname}-headers() {
EOF
if [[ ${archzfs_package_group} =~ -git$ ]]; then
sed -i "/^build()/i pkgver() {\n cd \"${zfs_workdir}\"\n printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\".${kernel_version_full_pkgver} \n}" ${zfs_pkgbuild_path}/PKGBUILD
fi
pkgbuild_cleanup "${zfs_pkgbuild_path}/PKGBUILD"

Write Preview
Loading…
Cancel
Save