Re: port-evbmips/60412: Sysinst shows wrong kernel names for evbmips-mips64

To: port-evbmips-maintainer%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,netbsd-bugs%netbsd.org@localhost,gson%gson.org@localhost (Andreas Gustafsson)
Subject: Re: port-evbmips/60412: Sysinst shows wrong kernel names for evbmips-mips64
From: "Martin Husemann via gnats" <gnats-admin%NetBSD.org@localhost>
Date: Sun, 5 Jul 2026 17:00:01 +0000 (UTC)

The following reply was made to PR port-evbmips/60412; it has been noted by GNATS.

From: Martin Husemann <martin%duskware.de@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: port-evbmips/60412: Sysinst shows wrong kernel names for
 evbmips-mips64
Date: Sun, 5 Jul 2026 18:56:44 +0200

 Here is a very hackish way to fix this.
 
 I really hate the way kernel file names and descriptions are done,
 we should redo that into a simple table (with #ifdefs) and a
 countof size that can be used to get the number of options.
 
 Then redo the messages used to display it, so "kernel" can be
 translated, but the other parts of the message are constructed w/o any
 translations involved.
 
 Martin
 
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/sysinst/arch/evbmips/Makefile,v
 retrieving revision 1.2
 diff -u -p -r1.2 Makefile
 --- Makefile	12 Jun 2019 06:20:19 -0000	1.2
 +++ Makefile	5 Jul 2026 16:53:07 -0000
 @@ -7,4 +7,22 @@ MENUS_MD=	menus.md.${SYSINSTLANG}
  MSG_MD=		msg.md.${SYSINSTLANG} msg.mbr.${SYSINSTLANG}
  NO_MBR=no
  
 +# this is a hack to mimic the #ifdef cascade in md.h to select
 +# kernel names - keep them in sync!
 +# XXX we need defines for mipsn64
 +
 +.if (${MACHINE_ARCH} == mipsel) || (${MACHINE_ARCH} == mipseb)
 +MD_OPTIONS+=	KERNEL_NAMES_mipsel_or_mipseb
 +.endif
 +.if ${MACHINE_ARCH} == mipsel
 +MD_OPTIONS+=	KERNEL_NAMES_mipsel
 +.endif
 +.if (${MACHINE_ARCH} == mips64eb) || (${MACHINE_ARCH} == mips64el) || \
 +	(${MACHINE_ARCH} == mipsn64el) || (${MACHINE_ARCH} == mipsn64eb)
 +MD_OPTIONS+=	KERNEL_NAMES_mipsel64_or_mipseb64
 +.endif
 +.if ${MACHINE_ARCH} == mipsn64eb
 +MD_OPTIONS+=	KERNEL_NAMES_mipsn64eb
 +.endif
 +
  .include "../../Makefile.inc"
 Index: md.h
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/sysinst/arch/evbmips/md.h,v
 retrieving revision 1.3
 diff -u -p -r1.3 md.h
 --- md.h	2 Oct 2019 11:16:02 -0000	1.3
 +++ md.h	5 Jul 2026 16:53:07 -0000
 @@ -62,13 +62,18 @@
  #define SET_KERNEL_7_NAME	"kern-OMSAL400"
  #endif
  
 -#if defined(ARCH_mips64eb) || defined(ARCH_mips64el)
 +#if defined(ARCH_mips64eb) || defined(ARCH_mips64el) || \
 +	defined(ARCH_mipsn64eb) || defined(ARCH_mipsn64el)
  #define SET_KERNEL_4_NAME	"kern-MALTA32"
  #define SET_KERNEL_3_NAME	"kern-MALTA64"
  #define SET_KERNEL_2_NAME	"kern-XLSATX32"
  #define SET_KERNEL_1_NAME	"kern-XLSATX64"
  #endif
  
 +#if defined(ARCH_mipsn64eb
 +#define SET_KERNEL_5_NAME	"kern-OCTEON"
 +#endif
 +
  #undef evbmips
  #undef evbmips64
  
 Index: msg.md.de
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/sysinst/arch/evbmips/msg.md.de,v
 retrieving revision 1.1
 diff -u -p -r1.1 msg.md.de
 --- msg.md.de	26 Jul 2014 19:30:45 -0000	1.1
 +++ msg.md.de	5 Jul 2026 16:53:07 -0000
 @@ -51,6 +51,8 @@ message dobootblks
  {Installiere die Bootblöcke auf %s ...
  }
  
 +
 +.if KERNEL_NAMES_mipsel_or_mipseb
  message set_kernel_1
  {Kernel (ALCHEMY)}
  
 @@ -65,9 +67,33 @@ message set_kernel_4
  
  message set_kernel_5
  {Kernel (MALTA)}
 +.endif
  
 +.if KERNEL_NAMES_mipsel
  message set_kernel_6
  {Kernel (MTX-1)}
  
  message set_kernel_7
  {Kernel (OMSAL400)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsel64_or_mipseb64
 +message set_kernel_4
 +{Kernel (MALTA32)}
 +
 +message set_kernel_3
 +{Kernel (MALTA64)}
 +
 +message set_kernel_2
 +{Kernel (XLSATX32)}
 +
 +message set_kernel_1
 +{Kernel (XLSATX64)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsn64eb
 +message set_kernel_5
 +{Kernel (OCTEON)}
 +.endif
 +
 +
 Index: msg.md.en
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/sysinst/arch/evbmips/msg.md.en,v
 retrieving revision 1.1
 diff -u -p -r1.1 msg.md.en
 --- msg.md.en	26 Jul 2014 19:30:45 -0000	1.1
 +++ msg.md.en	5 Jul 2026 16:53:07 -0000
 @@ -50,6 +50,7 @@ message dobootblks
  {Installing boot blocks on %s....
  }
  
 +.if KERNEL_NAMES_mipsel_or_mipseb
  message set_kernel_1
  {Kernel (ALCHEMY)}
  
 @@ -64,9 +65,32 @@ message set_kernel_4
  
  message set_kernel_5
  {Kernel (MALTA)}
 +.endif
  
 +.if KERNEL_NAMES_mipsel
  message set_kernel_6
  {Kernel (MTX-1)}
  
  message set_kernel_7
  {Kernel (OMSAL400)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsel64_or_mipseb64
 +message set_kernel_4
 +{Kernel (MALTA32)}
 +
 +message set_kernel_3
 +{Kernel (MALTA64)}
 +
 +message set_kernel_2
 +{Kernel (XLSATX32)}
 +
 +message set_kernel_1
 +{Kernel (XLSATX64)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsn64eb
 +message set_kernel_5
 +{Kernel (OCTEON)}
 +.endif
 +
 Index: msg.md.es
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/sysinst/arch/evbmips/msg.md.es,v
 retrieving revision 1.1
 diff -u -p -r1.1 msg.md.es
 --- msg.md.es	26 Jul 2014 19:30:45 -0000	1.1
 +++ msg.md.es	5 Jul 2026 16:53:07 -0000
 @@ -50,6 +50,7 @@ message dobootblks
  {Instalando bloques de arranque en %s....
  }
  
 +.if KERNEL_NAMES_mipsel_or_mipseb
  message set_kernel_1
  {Núcleo (ALCHEMY)}
  
 @@ -64,9 +65,33 @@ message set_kernel_4
  
  message set_kernel_5
  {Núcleo (MALTA)}
 +.endif
  
 +.if KERNEL_NAMES_mipsel
  message set_kernel_6
  {Núcleo (MTX-1)}
  
  message set_kernel_7
  {Núcleo (OMSAL400)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsel64_or_mipseb64
 +message set_kernel_4
 +{Núcleo (MALTA32)}
 +
 +message set_kernel_3
 +{Núcleo (MALTA64)}
 +
 +message set_kernel_2
 +{Núcleo (XLSATX32)}
 +
 +message set_kernel_1
 +{Núcleo (XLSATX64)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsn64eb
 +message set_kernel_5
 +{Núcleo (OCTEON)}
 +.endif
 +
 +
 Index: msg.md.fr
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/sysinst/arch/evbmips/msg.md.fr,v
 retrieving revision 1.1
 diff -u -p -r1.1 msg.md.fr
 --- msg.md.fr	26 Jul 2014 19:30:45 -0000	1.1
 +++ msg.md.fr	5 Jul 2026 16:53:07 -0000
 @@ -50,6 +50,8 @@ message dobootblks
  {Installation des blocs de démarrage sur %s ...
  }
  
 +
 +.if KERNEL_NAMES_mipsel_or_mipseb
  message set_kernel_1
  {Kernel (ALCHEMY)}
  
 @@ -64,9 +66,33 @@ message set_kernel_4
  
  message set_kernel_5
  {Kernel (MALTA)}
 +.endif
  
 +.if KERNEL_NAMES_mipsel
  message set_kernel_6
  {Kernel (MTX-1)}
  
  message set_kernel_7
  {Kernel (OMSAL400)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsel64_or_mipseb64
 +message set_kernel_4
 +{Kernel (MALTA32)}
 +
 +message set_kernel_3
 +{Kernel (MALTA64)}
 +
 +message set_kernel_2
 +{Kernel (XLSATX32)}
 +
 +message set_kernel_1
 +{Kernel (XLSATX64)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsn64eb
 +message set_kernel_5
 +{Kernel (OCTEON)}
 +.endif
 +
 +
 Index: msg.md.pl
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/sysinst/arch/evbmips/msg.md.pl,v
 retrieving revision 1.1
 diff -u -p -r1.1 msg.md.pl
 --- msg.md.pl	26 Jul 2014 19:30:45 -0000	1.1
 +++ msg.md.pl	5 Jul 2026 16:53:07 -0000
 @@ -52,6 +52,8 @@ message dobootblks
  {Instalowanie bootblokow na %s....
  }
  
 +
 +.if KERNEL_NAMES_mipsel_or_mipseb
  message set_kernel_1
  {Kernel (ALCHEMY)}
  
 @@ -66,9 +68,33 @@ message set_kernel_4
  
  message set_kernel_5
  {Kernel (MALTA)}
 +.endif
  
 +.if KERNEL_NAMES_mipsel
  message set_kernel_6
  {Kernel (MTX-1)}
  
  message set_kernel_7
  {Kernel (OMSAL400)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsel64_or_mipseb64
 +message set_kernel_4
 +{Kernel (MALTA32)}
 +
 +message set_kernel_3
 +{Kernel (MALTA64)}
 +
 +message set_kernel_2
 +{Kernel (XLSATX32)}
 +
 +message set_kernel_1
 +{Kernel (XLSATX64)}
 +.endif
 +
 +.if KERNEL_NAMES_mipsn64eb
 +message set_kernel_5
 +{Kernel (OCTEON)}
 +.endif
 +
 +

Prev by Date: lib/60413: iconv_samples test crashes on sparc*
Next by Date: Re: bin/60403 (efi -v dumps core)
Previous by Thread: port-evbmips/60412: Sysinst shows wrong kernel names for evbmips-mips64
Next by Thread: PR/54932 CVS commit: [netbsd-11] src/usr.sbin/sysinst
Indexes:

Home | Main Index | Thread Index | Old Index