diff mbox series

[SRU,bionic/linux-meta-hwe-5.4,1/1] UBUNTU: [Packaging] Remove trailing '_18.04.x' from package version

Message ID 20200616074110.22392-2-juergh@canonical.com
State New
Headers show
Series Remove trailing '_18.04.x' from package version | expand

Commit Message

Juerg Haefliger June 16, 2020, 7:41 a.m. UTC 
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 update-version | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Kleber Sacilotto de Souza June 16, 2020, 8:44 a.m. UTC | #1 
On 2020-06-16 09:41, Juerg Haefliger wrote:
> Signed-off-by: Juerg Haefliger <juergh@canonical.com>

Makes sense to me.

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  update-version | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/update-version b/update-version
> index 8051cd21c6fa..22901b2084df 100755
> --- a/update-version
> +++ b/update-version
> @@ -62,8 +62,9 @@ done
>  # We need to ensure the ABI number matches our master source.
>  # extract both for comparison.
>  here_abi=${here_version%.*}
> -master_abi=$(echo ${master_version%.*} | sed -e 's/-/./g')
> -master_abi_human=${master_version%.*}
> +master_abi_human=${master_version%~*}
> +master_abi_human=${master_abi_human%.*}
> +master_abi=$(echo ${master_abi_human} | sed -e 's/-/./g')
>  
>  # Extract the upload number from the _previous_ upload and increment it.
>  here_upload=${here_version##*.}
>
diff mbox series

Patch

diff --git a/update-version b/update-version
index 8051cd21c6fa..22901b2084df 100755
--- a/update-version
+++ b/update-version
@@ -62,8 +62,9 @@  done
 # We need to ensure the ABI number matches our master source.
 # extract both for comparison.
 here_abi=${here_version%.*}
-master_abi=$(echo ${master_version%.*} | sed -e 's/-/./g')
-master_abi_human=${master_version%.*}
+master_abi_human=${master_version%~*}
+master_abi_human=${master_abi_human%.*}
+master_abi=$(echo ${master_abi_human} | sed -e 's/-/./g')
 
 # Extract the upload number from the _previous_ upload and increment it.
 here_upload=${here_version##*.}