CVS commit: src/distrib/i386/ramdisks/common

2018-03-12 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 02:22:43 UTC 2018

Modified Files:
src/distrib/i386/ramdisks/common: Makefile.ramdisk

Log Message:
clean up CRUNCHBIN.map


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/ramdisks/common/Makefile.ramdisk

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

Modified files:

Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.13
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12	Wed Oct  7 14:09:05 2015
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk	Tue Mar 13 02:22:43 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.12 2015/10/07 14:09:05 martin Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.13 2018/03/13 02:22:43 mrg Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -33,7 +33,8 @@ PARSELISTENV+=	BOOTMODEL=${BOOTMODEL:Q}
 # This propogates through to the link of ramdiskbin
 # The map file is useful when trying to prune the image
 LDFLAGS+=	-Wl,-Map,${CRUNCHBIN}.map,--cref
-CRUNCHENV += LDFLAGS=${LDFLAGS:Q}
+CRUNCHENV+=	LDFLAGS=${LDFLAGS:Q}
+CLEANFILES+=	${CRUNCHBIN}.map
 
 .if defined(USE_SYSINST)
 .if ${USE_SYSINST} != yes



CVS commit: src/distrib/i386/ramdisks/common

2012-10-16 Thread Alan Barrett
Module Name:src
Committed By:   apb
Date:   Tue Oct 16 08:28:14 UTC 2012

Modified Files:
src/distrib/i386/ramdisks/common: list.ramdisk

Log Message:
Make i386/ramdisks/common/list.ramdisk identical to
amd64/ramdisks/common/list.ramdisk.

Previously, the amd64 list.ramdisk used the small version of gzip from
distrib/utils/x_gzip, while the i386 list.ramdisk used the full version
of gzip built from usr.bin/gzip, and also used extra libraries needed to
make that work.  Now, they both use the small version.

The only other difference was in the order of some PROG lines.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/i386/ramdisks/common/list.ramdisk

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

Modified files:

Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.23 src/distrib/i386/ramdisks/common/list.ramdisk:1.24
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.23	Wed Aug 15 16:49:09 2012
+++ src/distrib/i386/ramdisks/common/list.ramdisk	Tue Oct 16 08:28:13 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.23 2012/08/15 16:49:09 riz Exp $
+#	$NetBSD: list.ramdisk,v 1.24 2012/10/16 08:28:13 apb Exp $
 
 SRCDIRS	external/bsd/less/bin
 SRCDIRS	bin sbin usr.bin usr.sbin libexec
@@ -28,8 +28,8 @@ PROG	sbin/ifconfig
 PROG	sbin/init
 PROG	sbin/mknod
 PROG	sbin/mount
-PROG	sbin/mount_ext2fs
 PROG	sbin/mount_cd9660
+PROG	sbin/mount_ext2fs
 PROG	sbin/mount_ffs
 # PROG	sbin/mount_kernfs
 PROG	sbin/mount_msdos
@@ -56,6 +56,7 @@ PROG	usr/bin/sed
 
 PROG	usr/sbin/chroot
 
+SPECIAL	gzip		srcdir	distrib/utils/x_gzip
 SPECIAL	ifconfig	srcdir	distrib/utils/x_ifconfig
 SPECIAL	ping		srcdir	distrib/utils/x_ping
 SPECIAL	route		srcdir	distrib/utils/x_route
@@ -65,7 +66,7 @@ SPECIAL	route		srcdir	distrib/utils/x_ro
 ARGVLN	sh -sh
 
 # libhack.o is built by Makefile & included Makefile.inc
-LIBS	libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
+LIBS	libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group



CVS commit: src/distrib/i386/ramdisks/common

2012-08-15 Thread Jeff Rizzo
Module Name:src
Committed By:   riz
Date:   Wed Aug 15 16:49:09 UTC 2012

Modified Files:
src/distrib/i386/ramdisks/common: list.ramdisk

Log Message:
Add sbin/gpt to i386 install ramdisk.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/i386/ramdisks/common/list.ramdisk

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

Modified files:

Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.22 src/distrib/i386/ramdisks/common/list.ramdisk:1.23
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.22	Sun Jun 17 14:59:15 2012
+++ src/distrib/i386/ramdisks/common/list.ramdisk	Wed Aug 15 16:49:09 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.22 2012/06/17 14:59:15 martin Exp $
+#	$NetBSD: list.ramdisk,v 1.23 2012/08/15 16:49:09 riz Exp $
 
 SRCDIRS	external/bsd/less/bin
 SRCDIRS	bin sbin usr.bin usr.sbin libexec
@@ -23,6 +23,7 @@ PROG	sbin/disklabel
 PROG	sbin/dmesg
 PROG	sbin/fsck
 PROG	sbin/fsck_ffs
+PROG	sbin/gpt
 PROG	sbin/ifconfig
 PROG	sbin/init
 PROG	sbin/mknod



CVS commit: src/distrib/i386/ramdisks/common

2011-06-19 Thread Juergen Hannken-Illjes
Module Name:src
Committed By:   hannken
Date:   Sun Jun 19 10:37:07 UTC 2011

Modified Files:
src/distrib/i386/ramdisks/common: list.ramdisk

Log Message:
Add library lzma to make it compile with recent gzip.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/i386/ramdisks/common/list.ramdisk

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

Modified files:

Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.19 src/distrib/i386/ramdisks/common/list.ramdisk:1.20
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.19	Sun Jun 19 06:48:07 2011
+++ src/distrib/i386/ramdisks/common/list.ramdisk	Sun Jun 19 10:37:07 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.19 2011/06/19 06:48:07 tsutsui Exp $
+#	$NetBSD: list.ramdisk,v 1.20 2011/06/19 10:37:07 hannken Exp $
 
 SRCDIRS	usr.bin/less
 SRCDIRS	bin sbin usr.bin usr.sbin libexec
@@ -62,7 +62,7 @@
 ARGVLN	sh -sh
 
 # libhack.o is built by Makefile & included Makefile.inc
-LIBS	libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS	libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group



CVS commit: src/distrib/i386/ramdisks/common

2011-04-10 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sun Apr 10 16:45:52 UTC 2011

Modified Files:
src/distrib/i386/ramdisks/common: Makefile.ramdisk

Log Message:
Extend LDFLAGS, don't replace it.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/i386/ramdisks/common/Makefile.ramdisk

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

Modified files:

Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.9 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.10
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.9	Thu Feb 11 09:06:48 2010
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk	Sun Apr 10 16:45:52 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.9 2010/02/11 09:06:48 roy Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.10 2011/04/10 16:45:52 joerg Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,8 @@
 
 # This propogates through to the link of ramdiskbin
 # The map file is useful when trying to prune the image
-CRUNCHENV += LDFLAGS='-Wl,-Map,${CRUNCHBIN}.map,--cref'
+LDFLAGS+=	-Wl,-Map,${CRUNCHBIN}.map,--cref
+CRUNCHENV += LDFLAGS=${LDFLAGS:Q}
 
 .if defined(USE_SYSINST)
 .if ${USE_SYSINST} != yes



CVS commit: src/distrib/i386/ramdisks/common

2011-02-11 Thread Jean-Yves Migeon
Module Name:src
Committed By:   jym
Date:   Fri Feb 11 23:56:17 UTC 2011

Modified Files:
src/distrib/i386/ramdisks/common: list.ramdisk

Log Message:
BOOTMODEL disappeared when CD ISOs switched from ramdisk to CD-ROM as
root file system 2 years ago.

CMD sed + MTREE is turned into COPY (as does amd64).


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/i386/ramdisks/common/list.ramdisk

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

Modified files:

Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.16 src/distrib/i386/ramdisks/common/list.ramdisk:1.17
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.16	Fri Jan 14 10:26:33 2011
+++ src/distrib/i386/ramdisks/common/list.ramdisk	Fri Feb 11 23:56:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.16 2011/01/14 10:26:33 tsutsui Exp $
+#	$NetBSD: list.ramdisk,v 1.17 2011/02/11 23:56:17 jym Exp $
 
 SRCDIRS	usr.bin/less
 SRCDIRS	bin sbin usr.bin usr.sbin
@@ -80,5 +80,4 @@
 COPY	${DESTDIR}/usr/mdec/mbr_bootsel		usr/mdec/mbr_bootsel
 
 # and the boot script
-CMD	sed -e "s/@BOOTMODEL@/${BOOTMODEL}/" < ${CURDIR}/../common/dot.profile > .profile
-MTREE	./.profile	type=file uname=root gname=wheel mode=0444
+COPY	${CURDIR}/../common/dot.profile		.profile



CVS commit: src/distrib/i386/ramdisks/common

2009-04-29 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed Apr 29 18:01:50 UTC 2009

Modified Files:
src/distrib/i386/ramdisks/common: list.ramdisk

Log Message:
Remove unneeded gnu/usr.bin from SRCDIRS.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/i386/ramdisks/common/list.ramdisk

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

Modified files:

Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.9 src/distrib/i386/ramdisks/common/list.ramdisk:1.10
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.9	Sun Jan 25 22:08:38 2009
+++ src/distrib/i386/ramdisks/common/list.ramdisk	Wed Apr 29 18:01:50 2009
@@ -1,7 +1,7 @@
-#	$NetBSD: list.ramdisk,v 1.9 2009/01/25 22:08:38 abs Exp $
+#	$NetBSD: list.ramdisk,v 1.10 2009/04/29 18:01:50 tsutsui Exp $
 
 SRCDIRS	usr.bin/less
-SRCDIRS	bin sbin usr.bin usr.sbin gnu/usr.bin
+SRCDIRS	bin sbin usr.bin usr.sbin
 
 # Programs for a minimal ramdisk image