[src/trunk]: src/etc - consistency cleanup

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/etc - consistency cleanup
From: lukem <lukem%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 10:56:39 +0000
details:   https://anonhg.NetBSD.org/src/rev/c2824807ae7e
branches:  trunk
changeset: 526330:c2824807ae7e
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu May 02 15:09:40 2002 +0000

description:
- consistency cleanup
- ensure INSTALLATION_DIRS contains the appropriate extra directories
  for a given platform

diffstat:

 etc/Makefile                      |   5 ++---
 etc/etc.acorn26/Makefile.inc      |   3 ++-
 etc/etc.acorn32/Makefile.inc      |   9 +++++----
 etc/etc.amiga/Makefile.inc        |   4 ++--
 etc/etc.atari/Makefile.inc        |   4 ++--
 etc/etc.cats/Makefile.inc         |   4 ++--
 etc/etc.evbarm/Makefile.inc       |   4 ++--
 etc/etc.hp300/Makefile.inc        |   5 +++--
 etc/etc.hpcmips/Makefile.inc      |   4 +++-
 etc/etc.i386/Makefile.inc         |  12 +++++++-----
 etc/etc.mac68k/Makefile.inc       |   5 +++--
 etc/etc.macppc/Makefile.inc       |   4 ++--
 etc/etc.mipsco/Makefile.inc       |   8 ++++++++
 etc/etc.mvme68k/Makefile.inc      |  12 ++++++------
 etc/etc.netwinder/Makefile.inc    |   5 +++--
 etc/etc.news68k/Makefile.inc      |   4 +++-
 etc/etc.newsmips/Makefile.inc     |   4 +++-
 etc/etc.playstation2/Makefile.inc |   4 +++-
 etc/etc.pmax/Makefile.inc         |   6 +++---
 etc/etc.prep/Makefile.inc         |   4 ++--
 etc/etc.sandpoint/Makefile.inc    |   6 +++---
 etc/etc.sgimips/Makefile.inc      |   5 ++---
 etc/etc.sparc/Makefile.inc        |  13 +++++++------
 etc/etc.sparc64/Makefile.inc      |  11 ++++++-----
 etc/etc.sun2/Makefile.inc         |   6 +++++-
 etc/etc.sun3/Makefile.inc         |   6 +++++-
 etc/etc.vax/Makefile.inc          |  11 ++++++-----
 etc/etc.x68k/Makefile.inc         |   7 +++----
 28 files changed, 103 insertions(+), 72 deletions(-)

diffs (truncated from 540 to 300 lines):

diff -r 95df8b33c3b4 -r c2824807ae7e etc/Makefile
--- a/etc/Makefile      Thu May 02 14:58:36 2002 +0000
+++ b/etc/Makefile      Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.216 2002/04/26 16:23:14 lukem Exp $
+#      $NetBSD: Makefile,v 1.217 2002/05/02 15:09:40 lukem Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -66,8 +66,7 @@
 # Directories to build in ${RELEASEDIR}.   MD Makefile.inc files can
 # add to this.
 # NOTE: Parent directories must be listed before subdirectories.
-INSTALLATION_DIRS= \
-       binary binary/sets binary/kernel installation
+INSTALLATION_DIRS=     binary binary/sets binary/kernel installation
 
 .if exists(etc.${MACHINE}/Makefile.inc)
 .include "etc.${MACHINE}/Makefile.inc"
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.acorn26/Makefile.inc
--- a/etc/etc.acorn26/Makefile.inc      Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.acorn26/Makefile.inc      Thu May 02 15:09:40 2002 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.4 2002/04/19 00:05:25 bjh21 Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2002/05/02 15:09:41 lukem Exp $
 #
 #      etc.acorn26/Makefile.inc -- acorn26-specific etc Makefile targets
 #
 
 KERNEL_SETS=           GENERIC FOURMEG
+
 BUILD_KERNELS=         INSTALL
 
 INSTALLATION_DIRS+=    installation/misc
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.acorn32/Makefile.inc
--- a/etc/etc.acorn32/Makefile.inc      Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.acorn32/Makefile.inc      Thu May 02 15:09:40 2002 +0000
@@ -1,12 +1,13 @@
-#      $NetBSD: Makefile.inc,v 1.5 2002/03/31 16:07:54 bjh21 Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2002/05/02 15:09:41 lukem Exp $
 #
 #      etc.acorn32/Makefile.inc -- acorn32-specific etc Makefile targets
 #
 
-KERNEL_SETS=   GENERIC NC NC_WSCONS RPC_WSCONS
-BUILD_KERNELS= INSTALL
+KERNEL_SETS=           GENERIC NC NC_WSCONS RPC_WSCONS
 
-INSTALLATION_DIRS+=    installation/kernel \
+BUILD_KERNELS=         INSTALL
+
+INSTALLATION_DIRS+=    installation/kernel     \
                        installation/misc
 
 # Build the release notes and boot floppies and install them
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.amiga/Makefile.inc
--- a/etc/etc.amiga/Makefile.inc        Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.amiga/Makefile.inc        Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.17 2002/03/31 16:07:54 bjh21 Exp $
+#      $NetBSD: Makefile.inc,v 1.18 2002/05/02 15:09:42 lukem Exp $
 #
 #      etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
 #
@@ -7,7 +7,7 @@
 
 EXTRA_KERNELS=         INSTALL
 
-INSTALLATION_DIRS+=    installation/miniroot \
+INSTALLATION_DIRS+=    installation/miniroot   \
                        installation/misc
   
 snap_md_post:
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.atari/Makefile.inc
--- a/etc/etc.atari/Makefile.inc        Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.atari/Makefile.inc        Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.10 2002/04/16 13:39:19 leo Exp $
+#      $NetBSD: Makefile.inc,v 1.11 2002/05/02 15:09:42 lukem Exp $
 #
 #      etc.atari/Makefile.inc -- atari-specific etc Makefile targets
 #
@@ -7,7 +7,7 @@
 
 EXTRA_KERNELS=         ATARITT BOOTX FALCON
 
-INSTALLATION_DIRS+=    installation/miniroot \
+INSTALLATION_DIRS+=    installation/miniroot   \
                        installation/misc
   
 snap_md_post:
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.cats/Makefile.inc
--- a/etc/etc.cats/Makefile.inc Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.cats/Makefile.inc Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2002/04/12 09:31:01 skrll Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2002/05/02 15:09:42 lukem Exp $
 #
 #      etc.cats/Makefile.inc -- cats-specific etc Makefile targets
 #
@@ -8,7 +8,7 @@
 
 BUILD_KERNELS=         INSTALL
 
-INSTALLATION_DIRS+=    installation/kernel \
+INSTALLATION_DIRS+=    installation/kernel     \
                        installation/misc
 
 # Build the release notes and boot floppies and install them
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.8 2002/04/13 00:51:57 thorpej Exp $
+#      $NetBSD: Makefile.inc,v 1.9 2002/05/02 15:09:43 lukem Exp $
 #
 #      etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -8,7 +8,7 @@
 
 BUILD_KERNELS+=                TEAMASA_NPWR_INSTALL
 
-INSTALLATION_DIRS+=    binary/gzimg                            \
+INSTALLATION_DIRS+=    binary/gzimg            \
                        installation/instkernel
 
 snap_md_post:
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.hp300/Makefile.inc
--- a/etc/etc.hp300/Makefile.inc        Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.hp300/Makefile.inc        Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.15 2002/04/22 03:37:13 gmcgarry Exp $
+#      $NetBSD: Makefile.inc,v 1.16 2002/05/02 15:09:43 lukem Exp $
 #
 #      etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets
 #
@@ -7,7 +7,8 @@
 
 BUILD_KERNELS=         INSTALL RAMDISK
 
-INSTALLATION_DIRS+=    installation/misc
+INSTALLATION_DIRS+=    installation/miniroot   \
+                       installation/misc
 
 # Build the boot media and install notes and install them
 snap_md_post:
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.hpcmips/Makefile.inc
--- a/etc/etc.hpcmips/Makefile.inc      Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.hpcmips/Makefile.inc      Thu May 02 15:09:40 2002 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile.inc,v 1.5 2002/03/23 03:20:30 shin Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2002/05/02 15:09:43 lukem Exp $
 
 KERNEL_SETS=           GENERIC TX3912
 
 BUILD_KERNELS=         RAMDISK INSTALL_TX3912
 
+INSTALLATION_DIRS+=    installation/miniroot
+
 snap_md_post:
 .ifndef UPDATE
        cd ${.CURDIR}/../distrib && ${MAKE} cleandir
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.i386/Makefile.inc
--- a/etc/etc.i386/Makefile.inc Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.i386/Makefile.inc Thu May 02 15:09:40 2002 +0000
@@ -1,14 +1,16 @@
-#      $NetBSD: Makefile.inc,v 1.33 2002/04/13 00:00:20 tv Exp $
+#      $NetBSD: Makefile.inc,v 1.34 2002/05/02 15:09:43 lukem Exp $
 #
 #      etc.i386/Makefile.inc -- i386-specific etc Makefile targets
 #
 
-KERNEL_SETS=   GENERIC GENERIC_TINY GENERIC_LAPTOP GENERIC_DIAGNOSTIC \
-               GENERIC_PS2TINY
+KERNEL_SETS=           GENERIC GENERIC_TINY GENERIC_LAPTOP \
+                       GENERIC_DIAGNOSTIC GENERIC_PS2TINY
 
-BUILD_KERNELS= INSTALL INSTALL_SMALL INSTALL_TINY INSTALL_LAPTOP INSTALL_PS2
+BUILD_KERNELS=         INSTALL INSTALL_SMALL INSTALL_TINY \
+                       INSTALL_LAPTOP INSTALL_PS2
 
-INSTALLATION_DIRS += installation/misc
+INSTALLATION_DIRS+=    installation/misc       \
+                       installation/floppy
 
 # mkisofs arguments to generate bootable iso image
 MKISOFS_FLAGS+=        -b installation/floppy/boot-big.fs
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.mac68k/Makefile.inc
--- a/etc/etc.mac68k/Makefile.inc       Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.mac68k/Makefile.inc       Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.12 2002/03/31 16:07:55 bjh21 Exp $
+#      $NetBSD: Makefile.inc,v 1.13 2002/05/02 15:09:44 lukem Exp $
 #
 #      mac68k-specific release building goo
 #
@@ -7,7 +7,8 @@
 
 BUILD_KERNELS=         INSTALL INSTALLSBC
 
-INSTALLATION_DIRS+=    installation/instkernel
+INSTALLATION_DIRS+=    installation/miniroot   \
+                       installation/instkernel
 
 snap_md_post:
 .ifndef UPDATE
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.macppc/Makefile.inc
--- a/etc/etc.macppc/Makefile.inc       Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.macppc/Makefile.inc       Thu May 02 15:09:40 2002 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.3 2001/11/29 22:45:57 thorpej Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2002/05/02 15:09:44 lukem Exp $
 
 KERNEL_SETS=           GENERIC
 
 BUILD_KERNELS+=                INSTALL GENERIC_MD
 
-INSTALLATION_DIRS+=    installation
+INSTALLATION_DIRS+=    installation/floppy
 
 snap_md_post:
 .ifndef UPDATE
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.mipsco/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/etc.mipsco/Makefile.inc       Thu May 02 15:09:40 2002 +0000
@@ -0,0 +1,8 @@
+#      $NetBSD: Makefile.inc,v 1.1 2002/05/02 15:09:45 lukem Exp $
+#
+#      etc.mipsco/Makefile.inc -- mipsco-specific etc Makefile targets
+#
+#              
+
+INSTALLATION_DIRS+=    installation/diskimage  \
+                       installation/netboot
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.mvme68k/Makefile.inc
--- a/etc/etc.mvme68k/Makefile.inc      Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.mvme68k/Makefile.inc      Thu May 02 15:09:40 2002 +0000
@@ -1,15 +1,15 @@
-#      $NetBSD: Makefile.inc,v 1.4 2002/03/31 16:07:55 bjh21 Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2002/05/02 15:09:45 lukem Exp $
 #
 #      etc.mvme68k/Makefile.inc -- mvme68k-specific etc Makefile targets
 #
 
-KERNEL_SETS=   GENERIC VME147 VME162 VME167 VME172 VME177
+KERNEL_SETS=           GENERIC VME147 VME162 VME167 VME172 VME177
 
-BUILD_KERNELS= RAMDISK
+BUILD_KERNELS=         RAMDISK
 
-INSTALLATION_DIRS += installation/miniroot
-INSTALLATION_DIRS += installation/netboot
-INSTALLATION_DIRS += installation/tapeimage
+INSTALLATION_DIRS+=    installation/miniroot   \
+                       installation/netboot    \
+                       installation/tapeimage
 
 # Tar up extra kernel sets.
 # Build the boot floppies and install them
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.netwinder/Makefile.inc
--- a/etc/etc.netwinder/Makefile.inc    Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.netwinder/Makefile.inc    Thu May 02 15:09:40 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.4 2002/03/31 16:07:55 bjh21 Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2002/05/02 15:09:45 lukem Exp $
 #
 #      etc.netwinder/Makefile.inc -- netwinder-specific etc Makefile targets
 #
@@ -7,7 +7,8 @@
 
 #BUILD_KERNELS=                INSTALL
 
-#INSTALLATION_DIRS+=   installation/kernel installation/misc
+#INSTALLATION_DIRS+=   installation/kernel     \
+#                      installation/misc
 
 # Build the release notes and boot floppies and install them
 snap_md_post:
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.news68k/Makefile.inc
--- a/etc/etc.news68k/Makefile.inc      Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.news68k/Makefile.inc      Thu May 02 15:09:40 2002 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile.inc,v 1.3 2001/11/29 22:45:58 thorpej Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2002/05/02 15:09:46 lukem Exp $
 
 KERNEL_SETS=           GENERIC GENERIC_TINY
 
 BUILD_KERNELS=         INSTALL
 
+INSTALLATION_DIRS+=    installation/floppy
+
 snap_md_post:
 .ifndef UPDATE
        cd ${.CURDIR}/../distrib && ${MAKE} cleandir
diff -r 95df8b33c3b4 -r c2824807ae7e etc/etc.newsmips/Makefile.inc
--- a/etc/etc.newsmips/Makefile.inc     Thu May 02 14:58:36 2002 +0000
+++ b/etc/etc.newsmips/Makefile.inc     Thu May 02 15:09:40 2002 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile.inc,v 1.1 2002/02/03 11:23:45 tsutsui Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2002/05/02 15:09:46 lukem Exp $
Prev by Date: [src/trunk]: src/sys/arch/prep Use PLATFORM_*
Next by Date: [src/trunk]: src/distrib/sets/lists/comp Add /usr/include/dev/sun/sun_boot.h.
Previous by Thread: [src/trunk]: src/sys/arch/prep Use PLATFORM_*
Next by Thread: [src/trunk]: src/distrib/sets/lists/comp Add /usr/include/dev/sun/sun_boot.h.
Indexes:
Home | Main Index | Thread Index | Old Index