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

Fix pkgver generation

Browse Source
pull/23/head
Jesus Alvarez 11 years ago
parent b5b7eb34c2
commit da3ea809da
4 changed files with 29 additions and 35 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. 32
      build.sh
  2. 2
      spl-utils-git/PKGBUILD
  3. 2
      zfs-git/PKGBUILD
  4. 2
      zfs-utils-git/PKGBUILD

32
build.sh
Unescape View File

@ -160,7 +160,9 @@ update_git_pkgbuilds() {
# Get variables from the existing PKGBUILDs
AZB_CURRENT_SPL_PKGVER=$(grep "pkgver=" spl-git/PKGBUILD | cut -d= -f2)
AZB_CURRENT_ZFS_PKGVER=$(grep "pkgver=" zfs-utils-git/PKGBUILD | cut -d= -f2)
AZB_CURRENT_SPL_UTILS_PKGVER=$(grep "pkgver=" spl-utils-git/PKGBUILD | cut -d= -f2)
AZB_CURRENT_ZFS_PKGVER=$(grep "pkgver=" zfs-git/PKGBUILD | cut -d= -f2)
AZB_CURRENT_ZFS_UTILS_PKGVER=$(grep "pkgver=" zfs-utils-git/PKGBUILD | cut -d= -f2)
AZB_CURRENT_PKGREL=$(grep "pkgrel=" spl-git/PKGBUILD | cut -d= -f2)
AZB_CURRENT_SPL_DEPVER=$(grep "spl-git=" zfs-git/PKGBUILD | cut -d\" -f2 | cut -d= -f2)
AZB_CURRENT_ZFS_UTILS_DEPVER=$(grep "zfs-utils-git=" zfs-git/PKGBUILD | cut -d\" -f2 | cut -d= -f2)
@ -178,7 +180,9 @@ update_git_pkgbuilds() {
debug "AZB_NEW_SPL_PKGVER: $AZB_NEW_SPL_PKGVER"
debug "AZB_NEW_ZFS_PKGVER: $AZB_NEW_ZFS_PKGVER"
debug "AZB_CURRENT_SPL_PKGVER: $AZB_CURRENT_SPL_PKGVER"
debug "AZB_CURRENT_SPL_UTILS_PKGVER: $AZB_CURRENT_SPL_UTILS_PKGVER"
debug "AZB_CURRENT_ZFS_PKGVER: $AZB_CURRENT_ZFS_PKGVER"
debug "AZB_CURRENT_ZFS_UTILS_PKGVER: $AZB_CURRENT_ZFS_UTILS_PKGVER"
debug "AZB_CURRENT_PKGREL: $AZB_CURRENT_PKGREL"
debug "AZB_CURRENT_SPL_DEPVER: $AZB_CURRENT_SPL_DEPVER"
debug "AZB_CURRENT_ZFS_UTILS_DEPVER: $AZB_CURRENT_ZFS_UTILS_DEPVER"
@ -192,37 +196,27 @@ update_git_pkgbuilds() {
# Change the top level AZB_PKGREL
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \"s/pkgrel=$AZB_CURRENT_PKGREL/pkgrel=$AZB_PKGREL/g\""
# Change the version numbers for the dependencies
run_cmd "sed -i \"s/spl-git=$AZB_CURRENT_SPL_DEPVER/spl-git=$AZB_NEW_SPL_X64_PKGVER/g\" zfs-utils-git/PKGBUILD"
run_cmd "sed -i \"s/spl-git=$AZB_CURRENT_SPL_DEPVER/spl-git=$AZB_NEW_SPL_X64_PKGVER/g\" zfs-git/PKGBUILD"
run_cmd "sed -i \"s/zfs-utils-git=$AZB_CURRENT_ZFS_UTILS_DEPVER/zfs-utils-git=$AZB_NEW_ZFS_X64_PKGVER/g\" zfs-git/PKGBUILD"
if [[ $AZB_UPDATE_PKGBUILDS ]]; then
# Change _kernel_version_*
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/_kernel_version_x32=\\\"$AZB_CURRENT_X32_KERNEL_VERSION\\\"/_kernel_version_x32=\\\"$AZB_KERNEL_X32_VERSION\\\"/g\""
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/_kernel_version_x64=\\\"$AZB_CURRENT_X64_KERNEL_VERSION\\\"/_kernel_version_x64=\\\"$AZB_KERNEL_X64_VERSION\\\"/g\""
run_cmd "find ./*-git -iname \"PKGBUILD\" -print | xargs sed -i \
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/_kernel_version_x32_clean=\\\"$AZB_CURRENT_X32_KERNEL_VERSION_CLEAN\\\"/_kernel_version_x32_clean=\\\"$AZB_KERNEL_X32_VERSION_CLEAN\\\"/g\""
run_cmd "find ./*-git -iname \"PKGBUILD\" -print | xargs sed -i \
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/_kernel_version_x64_clean=\\\"$AZB_CURRENT_X64_KERNEL_VERSION_CLEAN\\\"/_kernel_version_x64_clean=\\\"$AZB_KERNEL_X64_VERSION_CLEAN\\\"/g\""
run_cmd "find ./*-git -iname \"PKGBUILD\" -print | xargs sed -i \
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/_kernel_version_x32_full=\\\"$AZB_CURRENT_X32_KERNEL_VERSION_FULL\\\"/_kernel_version_x32_full=\\\"$AZB_KERNEL_X32_VERSION_FULL\\\"/g\""
run_cmd "find ./*-git -iname \"PKGBUILD\" -print | xargs sed -i \
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/_kernel_version_x64_full=\\\"$AZB_CURRENT_X64_KERNEL_VERSION_FULL\\\"/_kernel_version_x64_full=\\\"$AZB_KERNEL_X64_VERSION_FULL\\\"/g\""
# Replace the linux version in the top level PKGVER
run_cmd "find ./spl*git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/pkgver=$AZB_CURRENT_SPL_PKGVER/pkgver=$AZB_NEW_SPL_X64_PKGVER/g\""
run_cmd "find ./zfs*git -iname \"PKGBUILD\" -print | xargs sed -i \
\"s/pkgver=$AZB_CURRENT_ZFS_PKGVER/pkgver=$AZB_NEW_ZFS_X64_PKGVER/g\""
fi
run_cmd "sed -i \"s/pkgver=$AZB_CURRENT_SPL_PKGVER/pkgver=$AZB_NEW_SPL_X64_PKGVER/g\" spl-git/PKGBUILD"
run_cmd "sed -i \"s/pkgver=$AZB_CURRENT_SPL_UTILS_PKGVER/pkgver=$AZB_NEW_SPL_X64_PKGVER/g\" spl-utils-git/PKGBUILD"
run_cmd "sed -i \"s/pkgver=$AZB_CURRENT_ZFS_PKGVER/pkgver=$AZB_NEW_ZFS_X64_PKGVER/g\" zfs-git/PKGBUILD"
run_cmd "sed -i \"s/pkgver=$AZB_CURRENT_ZFS_UTILS_PKGVER/pkgver=$AZB_NEW_ZFS_X64_PKGVER/g\" zfs-utils-git/PKGBUILD"
# Update the sums of the files
for PKG in $AZB_GIT_PKG_LIST; do

2
spl-utils-git/PKGBUILD
Unescape View File

@ -8,7 +8,7 @@
# The build script generates and updates the pkgver and _kernel* variables.
#
pkgname="spl-utils-git"
pkgver=0.6.2_r33_g89aa970_3.14.1_10.6.2.r28.g3ceb71e_3.14.0_4
pkgver=0.6.2_r33_g89aa970_3.14.1_1
pkgrel=1
# Used incase the i686 and x86_64 linux packages get out of sync with the

2
zfs-git/PKGBUILD
Unescape View File

@ -8,7 +8,7 @@
# The build script generates and updates the pkgver and _kernel* variables.
#
pkgname="zfs-git"
pkgver=0.6.2_r254_g0b75bdb_3.14.1_1
pkgver=0.6.2_r256_gb066274_3.14.1_1
pkgrel=1
# Used incase the i686 and x86_64 linux packages get out of sync with the

2
zfs-utils-git/PKGBUILD
Unescape View File

@ -8,7 +8,7 @@
# The build script generates and updates the pkgver and _kernel* variables.
#
pkgname="zfs-utils-git"
pkgver=0.6.2_r254_g0b75bdb_3.14.1_1
pkgver=0.6.2_r256_gb066274_3.14.1_1
pkgrel=1
# Used incase the i686 and x86_64 linux packages get out of sync with the

Write Preview
Loading…
Cancel
Save