From de75c35ee8548017300c9f4cd9bc37710659bcd8 Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Mon, 18 Apr 2016 10:23:11 -0700 Subject: [PATCH] Fix return of full_kernel_version_no_hyphen() --- build.sh | 2 +- lib.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 2ad342e..1dbbffe 100755 --- a/build.sh +++ b/build.sh @@ -196,7 +196,7 @@ check_git_repo() { update_def_pkgbuilds() { # Calculate what the new pkgver would be for the git packages # local fkv=$(full_kernel_version ${AZB_DEF_KERNEL_VERSION} ${AZB_DEF_KERNEL_PKGREL_X32} ${AZB_DEF_KERNEL_PKGREL_X64}) - AZB_KERNEL_VERSION_FULL=${AZB_DEF_KERNEL_VERSION} + AZB_KERNEL_VERSION_FULL=$(full_kernel_version ${AZB_DEF_KERNEL_VERSION}) AZB_PKGVER=${AZB_ZOL_VERSION}_$(full_kernel_version_no_hyphen ${AZB_DEF_KERNEL_VERSION}) debug "AZB_PKGVER: ${AZB_PKGVER}" debug "AZB_ZOL_VERSION: ${AZB_ZOL_VERSION}" diff --git a/lib.sh b/lib.sh index 30a01a0..13071e8 100644 --- a/lib.sh +++ b/lib.sh @@ -287,8 +287,9 @@ full_kernel_version() { } +# Returns the full kernel version. If $1 is "3.14-1" then full_kernel_version returns "3.14.0_1". full_kernel_version_no_hyphen() { # $1: The full kernel version # returns: output is printed to stdout - echo $(echo ${1} | sed s/-/_/g) + echo $(full_kernel_version ${1} | sed s/-/_/g) }