[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     49b4ef0dbe58d3154b168e72a3c88b02294af38d
Author:     Damian Dudycz <damiandudycz <AT> yahoo <DOT> com>
AuthorDate: Tue Feb 18 09:38:06 2025 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 07:45:15 2025 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=49b4ef0d

Fix: Copy vmlinux if it was generated instead of vmlinuz

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/functions.sh | 4 ++++
 targets/support/kmerge.sh    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 4340a3c7..8f229d22 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -83,6 +83,10 @@ extract_kernels() {
                then
                        mv ${1}/vmlinuz-* ${1}/${x}
                fi
+               if [ -e ${1}/vmlinux-* ]
+               then
+                       mv ${1}/vmlinux-* ${1}/${x}
+               fi
 
                # change initrd name from "initrd" to "gentoo.igz", for example
                if [ -e ${1}/initrd-* ]

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 41fac810..49be3e9c 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -173,7 +173,7 @@ if [[ ${distkernel} = "yes" ]] ; then
 
   # Create minkernel package to mimic genkernel's behaviour
   cd /boot
-  tar jcvf /tmp/kerncache/${kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 
System.map* config* initramfs* vmlinuz*
+  tar jcvf /tmp/kerncache/${kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 
System.map* config* initramfs* vmlinuz* vmlinux*
   cd /
   tar jcvf /tmp/kerncache/${kname}-modules-${clst_version_stamp}.tar.bz2 
lib/modules