From 7fae30de90d6bf0d3e0e5a7d4e4ae2b49d9add6c Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Wed, 3 Apr 2024 09:52:45 +0200
Subject: [PATCH 1/2] Scripts, dpkg: Fix RC packages name

---
 scripts/dpkg/make_dpkg.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/dpkg/make_dpkg.sh b/scripts/dpkg/make_dpkg.sh
index f567e1149f0e..45ef6900e5b0 100755
--- a/scripts/dpkg/make_dpkg.sh
+++ b/scripts/dpkg/make_dpkg.sh
@@ -43,7 +43,8 @@ for control_file in "$myhome"/*control.in; do
   #
   dpkg_name=${OCTEZ_PKGNAME}-${pg}
   init_name=${OCTEZ_REALNAME}-${pg}
-  dpkg_dir="${dpkg_name}_${pkg_vers}-${OCTEZ_PKGREV}_${dpkg_arch}"
+  dpkg_vers=$(echo "${pkg_vers}" | tr '~' '-')
+  dpkg_dir="${dpkg_name}_${dpkg_vers}-${OCTEZ_PKGREV}_${dpkg_arch}"
   dpkg_fullname="${dpkg_dir}.deb"
 
   binaries=$(fixBinaryList "${common}/${pg}-binaries")
-- 
GitLab


From 61ca67136be1ac00951beb52085bdb8d2305c754 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Wed, 3 Apr 2024 09:53:02 +0200
Subject: [PATCH 2/2] Scripts, RPM: Fix RC packages name

---
 scripts/rpm/make_rpm.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/rpm/make_rpm.sh b/scripts/rpm/make_rpm.sh
index 979a7df20d46..1d218612c2ec 100755
--- a/scripts/rpm/make_rpm.sh
+++ b/scripts/rpm/make_rpm.sh
@@ -50,7 +50,8 @@ for specfile in "$myhome"/*spec.in; do
   #
   rpm_name=${OCTEZ_PKGNAME}-${pg}
   init_name=${OCTEZ_REALNAME}-${pg}
-  rpm_fullname="${rpm_name}-${pkg_vers}-${OCTEZ_PKGREV}.${rpm_arch}.rpm"
+  rpm_vers=$(echo "${pkg_vers}" | tr -d '~')
+  rpm_fullname="${rpm_name}-${rpm_vers}-${OCTEZ_PKGREV}.${rpm_arch}.rpm"
 
   binaries=$(fixBinaryList "${common}/${pg}-binaries")
 
@@ -59,7 +60,7 @@ for specfile in "$myhome"/*spec.in; do
     continue
   fi
 
-  tar_name=${rpm_name}-${pkg_vers}
+  tar_name=${rpm_name}-${rpm_vers}
   # Populate the staging directory with control scripts
   # binaries and configuration as appropriate
   #
@@ -106,7 +107,7 @@ for specfile in "$myhome"/*spec.in; do
   # Edit the spec file to contain real values
   #
   spec_file="${pg}.spec"
-  sed -e "s/@ARCH@/${rpm_arch}/g" -e "s/@VERSION@/$pkg_vers/g" \
+  sed -e "s/@ARCH@/${rpm_arch}/g" -e "s/@VERSION@/$rpm_vers/g" \
     -e "s/@REVISION@/${OCTEZ_PKGREV}/g" \
     -e "s/@MAINT@/${OCTEZ_PKGMAINTAINER}/g" \
     -e "s/@PKG@/${rpm_name}/g" \
-- 
GitLab