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

Rename AZB_KERNEL* to AZB_GIT_KERNEL*

Browse Source
pull/23/head
Jesus Alvarez 11 years ago
parent 1a37ffa7b3
commit 049334dcc3
5 changed files with 50 additions and 44 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. 26
      build.sh
  2. 40
      conf.sh
  3. 20
      lib.sh
  4. 4
      push.sh
  5. 4
      repo.sh

26
build.sh
Unescape View File

@ -88,22 +88,22 @@ sign_packages() {
get_new_pkgver() { get_new_pkgver() {
# Sets NEW_{SPL,ZFS}_PKGVER with an updated PKGVER pulled from the git repo # Sets NEW_{SPL,ZFS}_PKGVER with an updated PKGVER pulled from the git repo
full_kernel_version full_kernel_git_version
# Get SPL version # Get SPL version
cd $AZB_SPL_GIT_PATH cd $AZB_SPL_GIT_PATH
AZB_NEW_SPL_X32_PKGVER=$(echo $(git describe --long | \ AZB_NEW_SPL_X32_PKGVER=$(echo $(git describe --long | \
sed -r 's/^spl-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_KERNEL_X32_VERSION_CLEAN}) sed -r 's/^spl-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_GIT_KERNEL_X32_VERSION_CLEAN})
AZB_NEW_SPL_X64_PKGVER=$(echo $(git describe --long | \ AZB_NEW_SPL_X64_PKGVER=$(echo $(git describe --long | \
sed -r 's/^spl-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_KERNEL_X64_VERSION_CLEAN}) sed -r 's/^spl-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_GIT_KERNEL_X64_VERSION_CLEAN})
cd - > /dev/null cd - > /dev/null
# Get ZFS version # Get ZFS version
cd $AZB_ZFS_GIT_PATH cd $AZB_ZFS_GIT_PATH
AZB_NEW_ZFS_X32_PKGVER=$(echo $(git describe --long | \ AZB_NEW_ZFS_X32_PKGVER=$(echo $(git describe --long | \
sed -r 's/^zfs-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_KERNEL_X32_VERSION_CLEAN}) sed -r 's/^zfs-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_GIT_KERNEL_X32_VERSION_CLEAN})
AZB_NEW_ZFS_X64_PKGVER=$(echo $(git describe --long | \ AZB_NEW_ZFS_X64_PKGVER=$(echo $(git describe --long | \
sed -r 's/^zfs-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_KERNEL_X64_VERSION_CLEAN}) sed -r 's/^zfs-//;s/([^-]*-g)/r\1/;s/-/_/g')_${AZB_GIT_KERNEL_X64_VERSION_CLEAN})
cd - > /dev/null cd - > /dev/null
} }
@ -143,24 +143,24 @@ update_git_pkgbuilds() {
debug "AZB_CURRENT_X32_KERNEL_VERSION_FULL: $AZB_CURRENT_X32_KERNEL_VERSION_FULL" debug "AZB_CURRENT_X32_KERNEL_VERSION_FULL: $AZB_CURRENT_X32_KERNEL_VERSION_FULL"
debug "AZB_CURRENT_X64_KERNEL_VERSION_FULL: $AZB_CURRENT_X64_KERNEL_VERSION_FULL" debug "AZB_CURRENT_X64_KERNEL_VERSION_FULL: $AZB_CURRENT_X64_KERNEL_VERSION_FULL"
# Change the top level AZB_PKGREL # Change the top level AZB_GIT_PKGREL
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \"s/pkgrel=$AZB_CURRENT_PKGREL/pkgrel=$AZB_PKGREL/g\"" run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \"s/pkgrel=$AZB_CURRENT_PKGREL/pkgrel=$AZB_GIT_PKGREL/g\""
# Change _kernel_version_* # Change _kernel_version_*
run_cmd "find *-git -iname \"PKGBUILD\" -print | xargs sed -i \ 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\"" \"s/_kernel_version_x32=\\\"$AZB_CURRENT_X32_KERNEL_VERSION\\\"/_kernel_version_x32=\\\"$AZB_GIT_KERNEL_X32_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_x64=\\\"$AZB_CURRENT_X64_KERNEL_VERSION\\\"/_kernel_version_x64=\\\"$AZB_KERNEL_X64_VERSION\\\"/g\"" \"s/_kernel_version_x64=\\\"$AZB_CURRENT_X64_KERNEL_VERSION\\\"/_kernel_version_x64=\\\"$AZB_GIT_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\"" \"s/_kernel_version_x32_clean=\\\"$AZB_CURRENT_X32_KERNEL_VERSION_CLEAN\\\"/_kernel_version_x32_clean=\\\"$AZB_GIT_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\"" \"s/_kernel_version_x64_clean=\\\"$AZB_CURRENT_X64_KERNEL_VERSION_CLEAN\\\"/_kernel_version_x64_clean=\\\"$AZB_GIT_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\"" \"s/_kernel_version_x32_full=\\\"$AZB_CURRENT_X32_KERNEL_VERSION_FULL\\\"/_kernel_version_x32_full=\\\"$AZB_GIT_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\"" \"s/_kernel_version_x64_full=\\\"$AZB_CURRENT_X64_KERNEL_VERSION_FULL\\\"/_kernel_version_x64_full=\\\"$AZB_GIT_KERNEL_X64_VERSION_FULL\\\"/g\""
# Replace the linux version in the top level PKGVER # Replace the linux version in the top level PKGVER
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_PKGVER/pkgver=$AZB_NEW_SPL_X64_PKGVER/g\" spl-git/PKGBUILD"

40
conf.sh
Unescape View File

@ -1,25 +1,24 @@
# Version information # Kernel version for GIT packages
AZB_PKGREL="1" # The pkgrel of all the archzfs packages AZB_GIT_PKGREL="1"
AZB_GIT_KERNEL_VERSION="3.14.1"
# Core repo Linux version dependencies AZB_GIT_KERNEL_X32_PKGREL="1"
AZB_KERNEL_VERSION="3.14.1" AZB_GIT_KERNEL_X64_PKGREL="1"
AZB_KERNEL_X32_PKGREL="1" AZB_GIT_KERNEL_X32_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X32_PKGREL}"
AZB_KERNEL_X64_PKGREL="1" AZB_GIT_KERNEL_X64_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X64_PKGREL}"
AZB_KERNEL_X32_VERSION="${AZB_KERNEL_VERSION}-${AZB_KERNEL_X32_PKGREL}"
AZB_KERNEL_X64_VERSION="${AZB_KERNEL_VERSION}-${AZB_KERNEL_X64_PKGREL}" # Kernel versions for LTS packages
AZB_LTS_PKGREL="1"
AZB_LTS_KERNEL_VERSION="3.10.37"
AZB_LTS_KERNEL_X32_PKGREL="1"
AZB_LTS_KERNEL_X64_PKGREL="1"
AZB_LTS_KERNEL_X32_VERSION="${AZB_LTS_KERNEL_VERSION}-${AZB_LTS_KERNEL_X32_PKGREL}"
AZB_LTS_KERNEL_X64_VERSION="${AZB_LTS_KERNEL_VERSION}-${AZB_LTS_KERNEL_X64_PKGREL}"
# Archiso Configuration # Archiso Configuration
AZB_ARCHISO_PKGREL="1" AZB_ARCHISO_PKGREL="1"
AZB_KERNEL_ARCHISO_VERSION="3.13.7" AZB_KERNEL_ARCHISO_VERSION="3.13.7"
AZB_KERNEL_ARCHISO_PKGREL="1" AZB_KERNEL_ARCHISO_PKGREL="1"
# ZFSonLinux stable version (LTS packages)
AZB_ZOL_VERSION="0.6.2"
# The paths to the ZOL git repos
AZB_ZFS_GIT_PATH="/home/demizer/src/c/zfs"
AZB_SPL_GIT_PATH="/home/demizer/src/c/spl"
# Testing repo Linux version dependencies # Testing repo Linux version dependencies
# AZB_KERNEL_TEST_VERSION="3.13.8" # AZB_KERNEL_TEST_VERSION="3.13.8"
# AZB_KERNEL_TEST_X32_PKGREL="1" # AZB_KERNEL_TEST_X32_PKGREL="1"
@ -27,7 +26,14 @@ AZB_SPL_GIT_PATH="/home/demizer/src/c/spl"
# AZB_KERNEL_TEST_X32_VERSION="${AZB_KERNEL_TEST_VERSION}-${AZB_KERNEL_TEST_X32_PKGREL}" # AZB_KERNEL_TEST_X32_VERSION="${AZB_KERNEL_TEST_VERSION}-${AZB_KERNEL_TEST_X32_PKGREL}"
# AZB_KERNEL_TEST_X64_VERSION="${AZB_KERNEL_TEST_VERSION}-${AZB_KERNEL_TEST_X64_PKGREL}" # AZB_KERNEL_TEST_X64_VERSION="${AZB_KERNEL_TEST_VERSION}-${AZB_KERNEL_TEST_X64_PKGREL}"
# AZB_KERNEL_TEST_PKG_VERSION="${AZB_ZOL_VERSION}_${AZB_KERNEL_TEST_VERSION}" # AZB_KERNEL_TEST_PKG_VERSION="${AZB_ZOL_VERSION}_${AZB_KERNEL_TEST_VERSION}"
# AZB_KERNEL_TEST_FULL_VERSION="${AZB_KERNEL_TEST_PKG_VERSION}-${AZB_PKGREL}" # AZB_KERNEL_TEST_FULL_VERSION="${AZB_KERNEL_TEST_PKG_VERSION}-${AZB_GIT_PKGREL}"
# ZFSonLinux stable version (LTS packages)
AZB_ZOL_VERSION="0.6.2"
# The paths to the ZOL git repos
AZB_ZFS_GIT_PATH="/home/demizer/src/c/zfs"
AZB_SPL_GIT_PATH="/home/demizer/src/c/spl"
# Notification address # Notification address
AZB_EMAIL="jeezusjr@gmail.com" AZB_EMAIL="jeezusjr@gmail.com"

20
lib.sh
Unescape View File

@ -124,20 +124,20 @@ package_version_from_syncdb() {
return $? return $?
} }
full_kernel_version() { full_kernel_git_version() {
# Determine if the kernel version has the format 3.14 or 3.14.1 # Determine if the kernel version has the format 3.14 or 3.14.1
[[ ${AZB_KERNEL_VERSION} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:digit:]]+) ]] [[ ${AZB_GIT_KERNEL_VERSION} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:digit:]]+) ]]
if [[ ${BASH_REMATCH[1]} != "" ]]; then if [[ ${BASH_REMATCH[1]} != "" ]]; then
AZB_KERNEL_X32_VERSION_FULL=${AZB_KERNEL_X32_VERSION} AZB_GIT_KERNEL_X32_VERSION_FULL=${AZB_GIT_KERNEL_X32_VERSION}
AZB_KERNEL_X32_VERSION_CLEAN=$(echo ${AZB_KERNEL_X32_VERSION} | sed s/-/_/g) AZB_GIT_KERNEL_X32_VERSION_CLEAN=$(echo ${AZB_GIT_KERNEL_X32_VERSION} | sed s/-/_/g)
AZB_KERNEL_X64_VERSION_FULL=${AZB_KERNEL_X64_VERSION} AZB_GIT_KERNEL_X64_VERSION_FULL=${AZB_GIT_KERNEL_X64_VERSION}
AZB_KERNEL_X64_VERSION_CLEAN=$(echo ${AZB_KERNEL_X64_VERSION} | sed s/-/_/g) AZB_GIT_KERNEL_X64_VERSION_CLEAN=$(echo ${AZB_GIT_KERNEL_X64_VERSION} | sed s/-/_/g)
else else
# Kernel version has the format 3.14, so add a 0. # Kernel version has the format 3.14, so add a 0.
AZB_KERNEL_X32_VERSION_FULL=${AZB_KERNEL_VERSION}.0-${AZB_KERNEL_X32_PKGREL} AZB_GIT_KERNEL_X32_VERSION_FULL=${AZB_GIT_KERNEL_VERSION}.0-${AZB_GIT_KERNEL_X32_PKGREL}
AZB_KERNEL_X32_VERSION_CLEAN=${AZB_KERNEL_VERSION}.0_${AZB_KERNEL_X32_PKGREL} AZB_GIT_KERNEL_X32_VERSION_CLEAN=${AZB_GIT_KERNEL_VERSION}.0_${AZB_GIT_KERNEL_X32_PKGREL}
AZB_KERNEL_X64_VERSION_FULL=${AZB_KERNEL_VERSION}.0-${AZB_KERNEL_X64_PKGREL} AZB_GIT_KERNEL_X64_VERSION_FULL=${AZB_GIT_KERNEL_VERSION}.0-${AZB_GIT_KERNEL_X64_PKGREL}
AZB_KERNEL_X64_VERSION_CLEAN=${AZB_KERNEL_VERSION}.0_${AZB_KERNEL_X64_PKGREL} AZB_GIT_KERNEL_X64_VERSION_CLEAN=${AZB_GIT_KERNEL_VERSION}.0_${AZB_GIT_KERNEL_X64_PKGREL}
fi fi
} }

4
push.sh
Unescape View File

@ -10,9 +10,9 @@ source ./conf.sh
msg "Pushing the package sources to AUR..." msg "Pushing the package sources to AUR..."
full_kernel_version full_kernel_git_version
FILES=$(find . -iname "*${AZB_ZOL_VERSION}*${AZB_KERNEL_X64_VERSION_CLEAN}-${AZB_PKGREL}*.src.tar.gz") FILES=$(find . -iname "*${AZB_ZOL_VERSION}*${AZB_GIT_KERNEL_X64_VERSION_CLEAN}-${AZB_GIT_PKGREL}*.src.tar.gz")
burp -c modules $FILES -v burp -c modules $FILES -v

4
repo.sh
Unescape View File

@ -107,7 +107,7 @@ if [[ $AZB_REPO != "" ]]; then
pkg_list=() pkg_list=()
# Set the AZB_KERNEL_*_VERSION variables # Set the AZB_KERNEL_*_VERSION variables
full_kernel_version full_kernel_git_version
full_kernel_archiso_version full_kernel_archiso_version
# Add packages to the pkg_list # Add packages to the pkg_list
@ -125,7 +125,7 @@ if [[ $AZB_REPO != "" ]]; then
if [[ $AZB_REPO == "demz-repo-archiso" ]]; then if [[ $AZB_REPO == "demz-repo-archiso" ]]; then
[[ $vers =~ ${AZB_ZOL_VERSION}.*${AZB_KERNEL_ARCHISO_VERSION_CLEAN}-${AZB_ARCHISO_PKGREL} ]] && version_match=1 [[ $vers =~ ${AZB_ZOL_VERSION}.*${AZB_KERNEL_ARCHISO_VERSION_CLEAN}-${AZB_ARCHISO_PKGREL} ]] && version_match=1
elif [[ $AZB_REPO == "demz-repo-core" ]]; then elif [[ $AZB_REPO == "demz-repo-core" ]]; then
[[ $vers =~ ${AZB_ZOL_VERSION}.*${AZB_KERNEL_X64_VERSION_CLEAN}-${AZB_PKGREL} ]] && version_match=1 [[ $vers =~ ${AZB_ZOL_VERSION}.*${AZB_GIT_KERNEL_X64_VERSION_CLEAN}-${AZB_GIT_PKGREL} ]] && version_match=1
fi fi
if [[ $version_match -eq 0 ]]; then if [[ $version_match -eq 0 ]]; then

Write Preview
Loading…
Cancel
Save