[src/trunk]: src s/ramdisk/xminiroot/

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

details:   https://anonhg.NetBSD.org/src/rev/94b04788653e
branches:  trunk
changeset: 501774:94b04788653e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jan 07 09:31:17 2001 +0000

description:
s/ramdisk/xminiroot/

diffstat:

 distrib/sparc64/Makefile           |   4 ++--
 distrib/sparc64/xminiroot/Makefile |  10 +++++-----
 etc/etc.sparc64/Makefile.inc       |  13 ++++++++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diffs (80 lines):

diff -r 11916f3ca237 -r 94b04788653e distrib/sparc64/Makefile
--- a/distrib/sparc64/Makefile  Sun Jan 07 09:30:12 2001 +0000
+++ b/distrib/sparc64/Makefile  Sun Jan 07 09:31:17 2001 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.1 2000/08/10 14:38:51 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2001/01/07 09:33:16 mrg Exp $
 
-SUBDIR=        ramdisk
+SUBDIR=        xminiroot
 
 .include <bsd.subdir.mk>
diff -r 11916f3ca237 -r 94b04788653e distrib/sparc64/xminiroot/Makefile
--- a/distrib/sparc64/xminiroot/Makefile        Sun Jan 07 09:30:12 2001 +0000
+++ b/distrib/sparc64/xminiroot/Makefile        Sun Jan 07 09:31:17 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2001/01/07 09:30:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2001/01/07 09:33:17 mrg Exp $
 
 TOP=           ${.CURDIR}/..
 MINIROOT=      ${TOP}/../miniroot
@@ -39,7 +39,7 @@
 VND_RDEV=      /dev/r${VND}c
 VND_CDEV=      /dev/${VND}${RAW_PART}
 VND_CRDEV=     /dev/r${VND}${RAW_PART}
-IMAGE?=                ramdisk.fs
+IMAGE?=                miniroot.fs
 CSIZE?=         3312
 MDEC=          ${DESTDIR}/usr/mdec
 
@@ -109,9 +109,9 @@
        @false
 .else
 release: $(IMAGE)
-       @mkdir -p $(RELEASEDIR)/installation/ramdisk
-       gzip -c -9 < $(.OBJDIR)/ramdisk.fs \
-               > $(RELEASEDIR)/installation/ramdisk/ramdisk.fs.gz
+       @mkdir -p $(RELEASEDIR)/installation/miniroot
+       gzip -c -9 < $(.OBJDIR)/miniroot.fs \
+               > $(RELEASEDIR)/installation/miniroot/miniroot.fs.gz
 .endif # RELEASEDIR check
 
 .include <bsd.own.mk>
diff -r 11916f3ca237 -r 94b04788653e etc/etc.sparc64/Makefile.inc
--- a/etc/etc.sparc64/Makefile.inc      Sun Jan 07 09:30:12 2001 +0000
+++ b/etc/etc.sparc64/Makefile.inc      Sun Jan 07 09:31:17 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.4 2000/08/20 14:50:02 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2001/01/07 09:31:17 mrg Exp $
 #
 #      etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets
 #
@@ -14,7 +14,7 @@
 
 # Add sparc64 installation directories
 MD_INSTALLATION_DIRS= \
-       installation/ramdisk installation/netboot installation/misc
+       installation/xminiroot installation/netboot installation/misc
 INSTALLATION_DIRS+=$(MD_INSTALLATION_DIRS) 
 
 snap_pre_md:
@@ -26,11 +26,18 @@
 # Install miniroot images and auxiliary scripts to the release tree
 #
 snap_md_post:
+.if exists($(XSRCDIR)/xc/Imakefile)
+       # build X11
+.ifndef XSRC_DONE
+       (cd $(XSRCDIR); $(MAKE) release)
+.endif
+.endif
+
        # make boot/miniroot images
        (cd $(TOP)/distrib; ${MAKE})
 
        # transfer images to release hierarchy
-.for dir in notes sparc64/ramdisk
+.for dir in notes sparc64/xminiroot
        (cd $(TOP)/distrib/$(dir); ${MAKE} release)
 .endfor