[src/trunk]: src/distrib/rescue - use an improved heuristics for determining ...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/10a6d186084c
branches:  trunk
changeset: 535425:10a6d186084c
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Aug 18 12:39:42 2002 +0000

description:
- use an improved heuristics for determining if certain special
  "for specific platform only" programs are to be included
- add pdisk to the list of specially handled programs
- use ../common/mtree.dot instead of local duplicate

diffstat:

 distrib/rescue/Makefile   |  45 +++++++++++----------------------------------
 distrib/rescue/list.pdisk |   3 +++
 distrib/rescue/mtree.conf |   3 ---
 3 files changed, 14 insertions(+), 37 deletions(-)

diffs (79 lines):

diff -r 483992321a29 -r 10a6d186084c distrib/rescue/Makefile
--- a/distrib/rescue/Makefile   Sun Aug 18 08:57:07 2002 +0000
+++ b/distrib/rescue/Makefile   Sun Aug 18 12:39:42 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2002/05/02 18:20:58 lukem Exp $
+#      $NetBSD: Makefile,v 1.2 2002/08/18 12:39:42 lukem Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,45 +9,22 @@
 CRUNCHBIN=     rescue
 CRUNCHENV=     # empty - don't want SMALLPROG defined
 LISTS=         ${.CURDIR}/list
-MTREECONF=     ${.CURDIR}/mtree.conf
+MTREECONF=     ${DISTRIBDIR}/common/mtree.dot
 IMAGEDEPENDS=  ${CRUNCHBIN}
 
-.if (${MACHINE} == "pc532")
-LISTS+=                ${.CURDIR}/list.bim
-.endif
-
-.if (${MACHINE} == "atari")    || (${MACHINE} == "mvme68k")    || \
-    (${MACHINE} == "sparc")    || (${MACHINE} == "sparc64")    || \
-    (${MACHINE} == "sun2")     || (${MACHINE} == "sun3")       || \
-    (${MACHINE} == "sun3x")
-LISTS+=                ${.CURDIR}/list.edlabel
-.endif
-
-.if (${MACHINE} == "arc")              || (${MACHINE} == "bebox")      || \
-    (${MACHINE} == "cobalt")           || (${MACHINE} == "hpcmips")    || \
-    (${MACHINE} == "i386")             || (${MACHINE} == "mvmeppc")    || \
-    (${MACHINE} == "netwinder")                || (${MACHINE} == "ofppc")      || \
-    (${MACHINE} == "playstation2")     || (${MACHINE} == "prep")
-LISTS+=                ${.CURDIR}/list.fdisk
+.for f in bim edlabel fdisk ldconfig pdisk
+PROG_${f}!=    cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
+.if (${PROG_${f}} != "")
+LISTS+=                ${.CURDIR}/list.${f}
 .endif
-
-.if (${OBJECT_FMT} == "ELF")                                   # {
-
-PARSELISTENV=  LDD_CMD=ldd_elf
+.endfor
 
-.if (${MACHINE_ARCH} == "arm") || (${MACHINE_ARCH} == "i386")  || \
-    (${MACHINE_ARCH} == "m68k")        || (${MACHINE_ARCH} == "sparc") || \
-    (${MACHINE_ARCH} == "vax")
-LISTS+=                ${.CURDIR}/list.ldconfig
+.if (${OBJECT_FMT} == "ELF")
+PARSELISTENV+= LDD_CMD=ldd_elf
+.else
+PARSELISTENV+= LDD_CMD=ldd_aout
 .endif
 
-.else  # OBJECT_FMT != "ELF"                                   # } {
-
-PARSELISTENV=  LDD_CMD=ldd_aout
-LISTS+=                ${.CURDIR}/list.ldconfig
-
-.endif # OBJECT_FMT != "ELF"                                   # }
-
 
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.image"
diff -r 483992321a29 -r 10a6d186084c distrib/rescue/list.pdisk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/rescue/list.pdisk Sun Aug 18 12:39:42 2002 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: list.pdisk,v 1.1 2002/08/18 12:39:42 lukem Exp $
+
+PROG   pdisk
diff -r 483992321a29 -r 10a6d186084c distrib/rescue/mtree.conf
--- a/distrib/rescue/mtree.conf Sun Aug 18 08:57:07 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#      $NetBSD: mtree.conf,v 1.1 2002/05/02 18:21:00 lukem Exp $
-
-.      type=dir uname=root gname=wheel mode=0755