NetBSD Problem Report #60412

From gson@gson.org  Sun Jul  5 08:45:36 2026
Return-Path: <gson@gson.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits)
	 client-signature RSA-PSS (2048 bits))
	(Client CN "mail.netbsd.org", Issuer "YR2" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 2F0EE1A923A
	for <gnats-bugs@gnats.NetBSD.org>; Sun,  5 Jul 2026 08:45:36 +0000 (UTC)
Message-Id: <20260705084531.64257254542@guava.gson.org>
Date: Sun,  5 Jul 2026 11:45:31 +0300 (EEST)
From: gson@gson.org (Andreas Gustafsson)
Reply-To: gson@gson.org (Andreas Gustafsson)
To: gnats-bugs@NetBSD.org
Subject: Sysinst shows wrong kernel names for evbmips-mips64
X-Send-Pr-Version: 3.95
X-From4GNATS: "Andreas Gustafsson via gnats" <gnats-admin@NetBSD.org>

>Number:         60412
>Category:       port-evbmips
>Synopsis:       Sysinst shows wrong kernel names for evbmips-mips64
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    port-evbmips-maintainer
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 05 08:50:00 +0000 2026
>Closed-Date:    Sun Aug 09 11:48:03 +0000 2026
>Last-Modified:  Sun Aug 09 11:48:03 +0000 2026
>Originator:     Andreas Gustafsson
>Release:        NetBSD 9.2
>Organization:

>Environment:
System: NetBSD
Architecture: evbmips
Machine: mips64eb
>Description:

When running sysinst on evbmips-mips64eb, the names of the kernel sets
shown in the set selection menu don't match the actual filenames that
are installed when you select them.  For example, the set selection
menu shows "a: Kernel (ALCHEMY)", but if you select it, sysinst will
actually attempt to install kern-XLSATX64.

This is because different evbmips variants have different kernel set
names selected by conditional compilation in sysinst/arch/evbmips/md.h,
but sysinst/arch/evbmips/msg.md.* only define a single set of display
strings shared by all variants.

>How-To-Repeat:

If you have an erlite3 whose flash drive contents you don't mind
losing, netboot the INSTALL_OCTEON kernel on it and attempt an install
(which is expected to fail for reasons not limited to the present PR).
Choose any kernel set, and then watch sysinst install a different one
that wasn't even among the choices.

>Fix:

>Release-Note:

>Audit-Trail:
From: Martin Husemann <martin@duskware.de>
To: gnats-bugs@netbsd.org
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
 +
 +

From: "Martin Husemann" <martin@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/60412 CVS commit: src/usr.sbin/sysinst/arch/evbmips
Date: Sun, 12 Jul 2026 15:39:07 +0000

 Module Name:	src
 Committed By:	martin
 Date:		Sun Jul 12 15:39:07 UTC 2026

 Modified Files:
 	src/usr.sbin/sysinst/arch/evbmips: Makefile md.h msg.md.de msg.md.en
 	    msg.md.es msg.md.fr msg.md.pl

 Log Message:
 PR 60412: provide defines for the message files to adapt kernel names
 to the various evbmips variants, so the texts can match what the
 conditionalized code does.
 With lots of help from gson@, thanks!


 To generate a diff of this commit:
 cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbmips/Makefile
 cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/evbmips/md.h
 cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbmips/msg.md.de \
     src/usr.sbin/sysinst/arch/evbmips/msg.md.en \
     src/usr.sbin/sysinst/arch/evbmips/msg.md.es \
     src/usr.sbin/sysinst/arch/evbmips/msg.md.fr \
     src/usr.sbin/sysinst/arch/evbmips/msg.md.pl

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed
State-Changed-By: gson@NetBSD.org
State-Changed-When: Sun, 09 Aug 2026 11:48:03 +0000
State-Changed-Why:
Fixed, thanks martin@.


>Unformatted:

Home	PR Database Search