From 1c345197a4eec04107aa61737a9a1254a97cd9a1 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Oct 23 2018 13:51:23 +0000
Subject: grubby-bls: use ~debug instead of -debug as suffix to sort correctly


For the debug BLS entries a -debug suffix was added so they are sorted after
the kernel entries, but that only works with version sort and not rpm sort.

So instead use ~debug prefix so rpm sort algorithm could sort it correctly.

Related: rhbz#1638103

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

---

diff --git a/grubby-bls b/grubby-bls
index 5ac7c6a..2eb27bb 100755
--- a/grubby-bls
+++ b/grubby-bls
@@ -317,13 +317,12 @@ add_bls_fragment() {
     fi
 
     if [[ $MAKEDEBUG = "yes" ]]; then
-        arch="$(uname -m)"
-        bls_debug="$(echo ${bls_target} | sed -e "s/\.${arch}/-debug.${arch}/")"
+        bls_debug="$(echo ${bls_target} | sed -e "s/${kernelver}/${kernelver}~debug/")"
         cp -aT  "${bls_target}" "${bls_debug}"
         append_bls_value "${bls_debug}" "title" "${LINUX_DEBUG_TITLE_POSTFIX}"
         append_bls_value "${bls_debug}" "version" "${LINUX_DEBUG_VERSION_POSTFIX}"
         append_bls_value "${bls_debug}" "options" "${CMDLINE_LINUX_DEBUG}"
-        blsid="$(get_bls_value ${bls_debug} "id" | sed -e "s/\.${arch}/-debug.${arch}/")"
+        blsid="$(get_bls_value ${bls_debug} "id" | sed -e "s/${kernelver}/${kernelver}~debug/")"
         set_bls_value "${bls_debug}" "id" "${blsid}"
     fi