[src/trunk]: src Adapt to new config file naming convention.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Adapt to new config file naming convention.
From: sekiya <sekiya%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 14:02:29 +0000
details:   https://anonhg.NetBSD.org/src/rev/c3b44f64fe19
branches:  trunk
changeset: 555267:c3b44f64fe19
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Thu Nov 13 02:33:39 2003 +0000

description:
Adapt to new config file naming convention.

diffstat:

 distrib/sgimips/instkernel/Makefile          |  12 ++++++------
 distrib/sgimips/instkernel/list              |   4 ++--
 distrib/sgimips/miniroot/Makefile.inc.xxx    |   8 ++++----
 distrib/sgimips/ramdisk/Makefile             |   7 ++++---
 distrib/utils/sysinst/arch/sgimips/md.c      |   6 +++---
 distrib/utils/sysinst/arch/sgimips/md.h      |   6 +++---
 distrib/utils/sysinst/arch/sgimips/msg.md.en |   6 +++---
 distrib/utils/sysinst/arch/sgimips/msg.md.fr |   6 +++---
 distrib/utils/sysinst/arch/sgimips/msg.md.pl |   6 +++---
 etc/etc.sgimips/Makefile.inc                 |   6 +++---
 10 files changed, 34 insertions(+), 33 deletions(-)

diffs (222 lines):

diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/sgimips/instkernel/Makefile
--- a/distrib/sgimips/instkernel/Makefile       Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/sgimips/instkernel/Makefile       Thu Nov 13 02:33:39 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2002/05/21 20:54:17 rafal Exp $
+#      $NetBSD: Makefile,v 1.2 2003/11/13 02:33:39 sekiya Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,21 +6,21 @@
 .include <bsd.kernobj.mk>
 
 IMAGE=         diskimage
-IMAGESIZE=     3m
+IMAGESIZE=     4m
 LISTS=         ${.CURDIR}/list
 MTREECONF=     ${DISTRIBDIR}/common/mtree.dot
 IMAGEENDIAN=   be
-IMAGEDEPENDS=  netbsd-INSTALL.gz netbsd-INDY_INSTALL.gz 
+IMAGEDEPENDS=  netbsd-INSTALL32_IP2x.gz netbsd-INSTALL32_IP3x.gz 
 
 RAMDISKDIR!=   cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
 RAMDISK=       ${RAMDISKDIR}/ramdisk.fs
 
-MDSETTARGETS=          RAMDISK ${RAMDISK} netbsd-INSTALL       \
-                       RAMDISK_INDY ${RAMDISK} netbsd-INDY_INSTALL
+MDSETTARGETS=          INSTALL32_IP2x ${RAMDISK} netbsd-INSTALL32_IP2x \
+                       INSTALL32_IP3x ${RAMDISK} netbsd-INSTALL32_IP3x
 
 MDSET_RELEASEDIR=      binary/kernel
 
-MDSET_SUFFIXES.netbsd-INDY_INSTALL=ecoff create-ecoff
+MDSET_SUFFIXES.netbsd-INSTALL32_IP2x=ecoff create-ecoff
 create-ecoff=                  ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
 
 IMAGE_RELEASEDIR=      installation/diskimage
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/sgimips/instkernel/list
--- a/distrib/sgimips/instkernel/list   Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/sgimips/instkernel/list   Thu Nov 13 02:33:39 2003 +0000
@@ -1,3 +1,3 @@
-#      $NetBSD: list,v 1.1 2002/05/21 20:54:17 rafal Exp $
+#      $NetBSD: list,v 1.2 2003/11/13 02:33:39 sekiya Exp $
 
-COPY   ${OBJDIR}/netbsd-INSTALL.gz     netbsd
+COPY   ${OBJDIR}/netbsd-INSTALL_IP2x.gz        netbsd
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/sgimips/miniroot/Makefile.inc.xxx
--- a/distrib/sgimips/miniroot/Makefile.inc.xxx Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/sgimips/miniroot/Makefile.inc.xxx Thu Nov 13 02:33:39 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc.xxx,v 1.2 2002/12/30 14:55:28 pooka Exp $
+#      $NetBSD: Makefile.inc.xxx,v 1.3 2003/11/13 02:33:39 sekiya Exp $
 
 DBG=           -Os -Wa,-xgot # XXX -xgot workaround for objcopy-crunchide
 
@@ -11,9 +11,9 @@
 IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.iris-ansi \
                ${DESTDIR}/.profile \
                ${DESTDIR}/etc/disktab \
-               ${KERNOBJDIR}/GENERIC_INDY/netbsd.ecoff \
-               ${KERNOBJDIR}/GENERIC_INDY/netbsd
-#              ${KERNOBJDIR}/NETBOOT_INDY/netbsd \
+               ${KERNOBJDIR}/GENERIC32_IP2x/netbsd.ecoff \
+               ${KERNOBJDIR}/GENERIC32_IP2x/netbsd \
+               ${KERNOBJDIR}/GENERIC32_IP3x/netbsd
 
 # Write preliminary Label so that newfs succeeds when updating label.
 PRELABEL=${DESTDIR}/sbin/disklabel -w ${VND} ${DISKTYPE} ; \
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/sgimips/ramdisk/Makefile
--- a/distrib/sgimips/ramdisk/Makefile  Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/sgimips/ramdisk/Makefile  Thu Nov 13 02:33:39 2003 +0000
@@ -1,15 +1,15 @@
-#      $NetBSD: Makefile,v 1.3 2003/02/01 05:03:43 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.4 2003/11/13 02:33:39 sekiya Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 IMAGE=         ramdisk.fs
 IMAGETAR=      diskimage.tgz
-IMAGESIZE=     3m
+IMAGESIZE=     4m
 MAKEFS_FLAGS=  -f 15 -o density=4k
 
 WARNS=         1
-DBG=           -Os
+DBG=           -Os -fno-gcse
 
 CRUNCHBIN=     ramdiskbin
 CRUNCHGEN_FLAGS= -d "${DBG}"
@@ -21,6 +21,7 @@
                disktab.preinstall dot.hdprofile dot.profile \
                ${.CURDIR}/../miniroot/termcap.iris-ansi \
                ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/boot.elf \
+               ${DESTDIR}/usr/mdec/boot.ip32 \
                ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
                ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \
                ${NETBSDSRCDIR}/etc/services
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/utils/sysinst/arch/sgimips/md.c
--- a/distrib/utils/sysinst/arch/sgimips/md.c   Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/utils/sysinst/arch/sgimips/md.c   Thu Nov 13 02:33:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.11 2003/10/19 20:17:33 dsl Exp $      */
+/*     $NetBSD: md.c,v 1.12 2003/11/13 02:33:39 sekiya Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -113,7 +113,7 @@
 md_post_disklabel(void)
 {
        set_swap(diskdev, bsdlabel);
-        if (strstr(instsys.version, "(INSTALL_IP32)"))   
+        if (strstr(instsys.version, "(INSTALL32_IP3x)"))   
                return run_prog(RUN_DISPLAY, MSG_cmdfail,
                        "%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/boot.ip32",
                        diskdev);
@@ -190,7 +190,7 @@
          * enable the installation of the corresponding GENERIC kernel.
          */
         uname(&instsys);
-        if (strstr(instsys.version, "(INSTALL_IP32)"))
+        if (strstr(instsys.version, "(INSTALL32_IP3x)"))
                 sets_selected = (sets_selected & ~SET_KERNEL) | SET_KERNEL_2;
         else
                 sets_selected = (sets_selected & ~SET_KERNEL) | SET_KERNEL_1;
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/utils/sysinst/arch/sgimips/md.h
--- a/distrib/utils/sysinst/arch/sgimips/md.h   Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/utils/sysinst/arch/sgimips/md.h   Thu Nov 13 02:33:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.13 2003/10/17 10:58:16 sekiya Exp $   */
+/*     $NetBSD: md.h,v 1.14 2003/11/13 02:33:39 sekiya Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -76,8 +76,8 @@
  *      base, etc, comp, games, man, misc, text,
  *      xbase, xfont, xserver, xcontrib, xcomp.
  */
-#define SET_KERNEL_1_NAME      "kern-GENERIC_IP22"
-#define SET_KERNEL_2_NAME      "kern-GENERIC_IP32"
+#define SET_KERNEL_1_NAME      "kern-GENERIC32_IP2x"
+#define SET_KERNEL_2_NAME      "kern-GENERIC32_IP3x"
 #define MD_SETS_SELECTED (SET_KERNEL_1 | SET_SYSTEM)
 
 /*
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/utils/sysinst/arch/sgimips/msg.md.en
--- a/distrib/utils/sysinst/arch/sgimips/msg.md.en      Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/utils/sysinst/arch/sgimips/msg.md.en      Thu Nov 13 02:33:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.en,v 1.4 2003/10/17 10:58:16 sekiya Exp $       */
+/*     $NetBSD: msg.md.en,v 1.5 2003/11/13 02:33:39 sekiya Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -55,7 +55,7 @@
 }
 
 message set_kernel_1
-{Kernel (GENERIC_IP22)}
+{Kernel (GENERIC32_IP2x)}
 
 message set_kernel_2
-{Kernel (GENERIC_IP32)}
+{Kernel (GENERIC32_IP3x)}
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/utils/sysinst/arch/sgimips/msg.md.fr
--- a/distrib/utils/sysinst/arch/sgimips/msg.md.fr      Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/utils/sysinst/arch/sgimips/msg.md.fr      Thu Nov 13 02:33:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.fr,v 1.4 2003/10/17 10:58:16 sekiya Exp $       */
+/*     $NetBSD: msg.md.fr,v 1.5 2003/11/13 02:33:39 sekiya Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -56,7 +56,7 @@
 }
 
 message set_kernel_1
-{Kernel (GENERIC_IP22)}
+{Kernel (GENERIC32_IP2x)}
 
 message set_kernel_2
-{Kernel (GENERIC_IP32)}
+{Kernel (GENERIC32_IP3x)}
diff -r b0263d9ea5a9 -r c3b44f64fe19 distrib/utils/sysinst/arch/sgimips/msg.md.pl
--- a/distrib/utils/sysinst/arch/sgimips/msg.md.pl      Thu Nov 13 02:31:46 2003 +0000
+++ b/distrib/utils/sysinst/arch/sgimips/msg.md.pl      Thu Nov 13 02:33:39 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.pl,v 1.5 2003/10/17 10:58:16 sekiya Exp $       */
+/*     $NetBSD: msg.md.pl,v 1.6 2003/11/13 02:33:39 sekiya Exp $       */
 /* Based on english version: */
 /*     NetBSD: msg.md.en,v 1.1 2001/11/20 15:53:24 soren Exp */
 
@@ -58,7 +58,7 @@
 }
 
 message set_kernel_1
-{Kernel (GENERIC_IP22)}
+{Kernel (GENERIC32_IP2x)}
 
 message set_kernel_2
-{Kernel (GENERIC_IP32)}
+{Kernel (GENERIC32_IP3x)}
diff -r b0263d9ea5a9 -r c3b44f64fe19 etc/etc.sgimips/Makefile.inc
--- a/etc/etc.sgimips/Makefile.inc      Thu Nov 13 02:31:46 2003 +0000
+++ b/etc/etc.sgimips/Makefile.inc      Thu Nov 13 02:33:39 2003 +0000
@@ -1,14 +1,14 @@
-#      $NetBSD: Makefile.inc,v 1.7 2002/12/02 13:18:12 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2003/11/13 02:33:39 sekiya Exp $
 #
 #      etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
 #
 
-KERNEL_SETS=           GENERIC GENERIC_INDY
+KERNEL_SETS=           GENERIC32_IP2x GENERIC32_IP3x
 KERNEL_SUFFIXES=       ecoff
 
 #EXTRA_KERNELS=                NETBOOT
 
-BUILD_KERNELS=         RAMDISK RAMDISK_INDY
+BUILD_KERNELS=         INSTALL32_IP2x INSTALL32_IP3x
 
 INSTALLATION_DIRS+=    installation/netboot \
                        installation/diskimage
Prev by Date: [src/trunk]: src/sys/arch/i386/i386 add noop wrapper functions for i386
Next by Date: [src/trunk]: src/sys Add m_tag_delete_nonpesrsistent(), for deleting all pack...
Previous by Thread: [src/trunk]: src/sys/arch/i386/i386 add noop wrapper functions for i386
Next by Thread: [src/trunk]: src/sys Add m_tag_delete_nonpesrsistent(), for deleting all pack...
Indexes:
Home | Main Index | Thread Index | Old Index