CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: tsutsui
Date: Sat Dec 22 17:51:19 UTC 2012
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Sync with amd64 and i386 installcds:
>> PR/47276: ftp has https support now
(i.e. now libcrypto and libssl are required in non-crunched installcd)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.15 src/distrib/sparc64/cdroms/installcd/Makefile:1.16
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.15 Sun Jun 3 23:19:10 2012
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sat Dec 22 17:51:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/06/03 23:19:10 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2012/12/22 17:51:19 tsutsui Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -48,6 +48,10 @@ CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
+.if (${MKCRYPTO} != "no")
+CDRUNTIME+= ./usr/lib/libcrypto.so*
+CDRUNTIME+= ./usr/lib/libssl.so*
+.endif
CDRUNTIME+= ./usr/libexec/ld.elf_so
CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: martin
Date: Wed Jun 22 14:05:38 UTC 2011
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Include liblzma to unbreak gzip on the install CD. (Hi Joerg!)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.12 src/distrib/sparc64/cdroms/installcd/Makefile:1.13
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.12 Sun Jun 19 10:52:08 2011
+++ src/distrib/sparc64/cdroms/installcd/Makefile Wed Jun 22 14:05:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/06/19 10:52:08 martin Exp $
+# $NetBSD: Makefile,v 1.13 2011/06/22 14:05:38 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -44,6 +44,7 @@
CDRUNTIME+= ./usr/lib/libgcc_s.so*
CDRUNTIME+= ./usr/lib/libintl.so*
CDRUNTIME+= ./usr/lib/libkvm.so*
+CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: martin
Date: Sun Jun 19 10:52:08 UTC 2011
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Apply Joerg's changes to x86 CDs here alos:
Include libgcc_s.so symlinks in /usr/lib, so that binaries in /usr
linked against it actually work.
We realy should split this into MD and MI lists and share the MI one.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.11 src/distrib/sparc64/cdroms/installcd/Makefile:1.12
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.11 Sun Apr 17 12:18:20 2011
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Jun 19 10:52:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/04/17 12:18:20 martin Exp $
+# $NetBSD: Makefile,v 1.12 2011/06/19 10:52:08 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -41,6 +41,7 @@
CDRUNTIME+= ./usr/lib/libc.so*
CDRUNTIME+= ./usr/lib/libcurses.so*
CDRUNTIME+= ./usr/lib/libedit.so*
+CDRUNTIME+= ./usr/lib/libgcc_s.so*
CDRUNTIME+= ./usr/lib/libintl.so*
CDRUNTIME+= ./usr/lib/libkvm.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: martin
Date: Sun Mar 20 09:04:53 UTC 2011
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Add /usr/bin/getopt, it is needed by /usr/mdec/binstall.
Noticed by Jaime Fournier.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.9 src/distrib/sparc64/cdroms/installcd/Makefile:1.10
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.9 Fri Jan 14 10:26:36 2011
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Mar 20 09:04:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/01/14 10:26:36 tsutsui Exp $
+# $NetBSD: Makefile,v 1.10 2011/03/20 09:04:53 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -23,9 +23,10 @@
# CDRUNTIME+= ./stand
CDRUNTIME+= ./tmp
CDRUNTIME+= ./usr/bin/ftp
+CDRUNTIME+= ./usr/bin/getopt
+CDRUNTIME+= ./usr/bin/gunzip
CDRUNTIME+= ./usr/bin/gzcat
CDRUNTIME+= ./usr/bin/gzip
-CDRUNTIME+= ./usr/bin/gunzip
CDRUNTIME+= ./usr/bin/grep
CDRUNTIME+= ./usr/bin/less
CDRUNTIME+= ./usr/bin/more
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: martin
Date: Sun Apr 18 16:10:03 UTC 2010
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Ooops, do not try to create a symlink in a not-yet existing directory
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.4 src/distrib/sparc64/cdroms/installcd/Makefile:1.5
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.4 Sun Apr 18 12:58:57 2010
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Apr 18 16:10:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/04/18 12:58:57 martin Exp $
+# $NetBSD: Makefile,v 1.5 2010/04/18 16:10:03 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -58,8 +58,8 @@
${RM} -rf cdrom/libexec/dhcpcd-hooks/*
${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
- ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${MKDIR} cdrom/etc
+ ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${CP} ${.CURDIR}/etc.ttys cdrom/etc/ttys
${CP} ${.CURDIR}/etc.rc cdrom/etc/rc
${CP} ${.CURDIR}/install.sh cdrom/install.sh
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src
Committed By: martin
Date: Sun Apr 18 12:58:57 UTC 2010
Modified Files:
src/distrib/sparc64/cdroms/installcd: Makefile
Added Files:
src/distrib/sparc64/cdroms/installcd: etc.rc etc.ttys install.sh
Removed Files:
src/distrib/sparc64/cdroms/installcd: dot.profile
Log Message:
Change the install CD to go to full multiuser mode. This clearly
separates the setup done by /etc/rc once, and the repeated stuff
(install.sh invoking sysinst).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/sparc64/cdroms/installcd/dot.profile
cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/installcd/etc.rc \
src/distrib/sparc64/cdroms/installcd/etc.ttys \
src/distrib/sparc64/cdroms/installcd/install.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.3 src/distrib/sparc64/cdroms/installcd/Makefile:1.4
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.3 Sun Apr 4 23:02:23 2010
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Apr 18 12:58:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/04/04 23:02:23 martin Exp $
+# $NetBSD: Makefile,v 1.4 2010/04/18 12:58:57 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -16,10 +16,7 @@
CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
-CDRUNTIME+= ./libexec/ld.elf_so
-CDRUNTIME+= ./libexec/lfs_cleanerd
-CDRUNTIME+= ./libexec/dhcpcd-run-hooks
-CDRUNTIME+= ./libexec/resolvconf/
+CDRUNTIME+= ./libexec
CDRUNTIME+= ./mnt
CDRUNTIME+= ./sbin
# CDRUNTIME+= ./stand
@@ -46,6 +43,7 @@
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
CDRUNTIME+= ./usr/libexec/ld.elf_so
+CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
CDRUNTIME+= ./usr/sbin/chat
CDRUNTIME+= ./usr/sbin/chown
@@ -57,11 +55,15 @@
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${MKDIR} cdrom/libexec/dhcpcd-hooks
+ ${RM} -rf cdrom/libexec/dhcpcd-hooks/*
${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
+ ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${MKDIR} cdrom/etc
- ${CP} ${.CURDIR}/dot.profile cdrom/etc/rc
+ ${CP} ${.CURDIR}/etc.ttys cdrom/etc/ttys
+ ${CP} ${.CURDIR}/etc.rc cdrom/etc/rc
+ ${CP} ${.CURDIR}/install.sh cdrom/install.sh
+ ${CHMOD} 0555 cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
${CP} ${SYSINSTDIR}/sysinst cdrom
${CHMOD} ugo+rx cdrom/sysinst
Added files:
Index: src/distrib/sparc64/cdroms/installcd/etc.rc
diff -u /dev/null src/distrib/sparc64/cdroms/installcd/etc.rc:1.1
--- /dev/null Sun Apr 18 12:58:57 2010
+++ src/distrib/sparc64/cdroms/installcd/etc.rc Sun Apr 18 12:58:57 2010
@@ -0,0 +1,57 @@
+# $NetBSD: etc.rc,v 1.1 2010/04/18 12:58:57 martin Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#must display the following acknowledgement:
+# This product includes software developed for the
+# NetBSD Project. See http://www.NetBSD.org/ for
+# information about NetBSD.
+# 4. The name of the author may not be used to endorse or promote products
+#derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# <>
+
+PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
+export PATH
+
+# hack to get around bugs in kernfs's rootdev/rroo
CVS commit: src/distrib/sparc64/cdroms/installcd
Module Name:src Committed By: martin Date: Fri Apr 2 21:58:47 UTC 2010 Modified Files: src/distrib/sparc64/cdroms/installcd: dot.profile Log Message: Ooops, remove leftovers from the ramdisk / To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installcd/dot.profile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sparc64/cdroms/installcd/dot.profile diff -u src/distrib/sparc64/cdroms/installcd/dot.profile:1.1 src/distrib/sparc64/cdroms/installcd/dot.profile:1.2 --- src/distrib/sparc64/cdroms/installcd/dot.profile:1.1 Fri Apr 2 21:29:30 2010 +++ src/distrib/sparc64/cdroms/installcd/dot.profile Fri Apr 2 21:58:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.1 2010/04/02 21:29:30 martin Exp $ +# $NetBSD: dot.profile,v 1.2 2010/04/02 21:58:46 martin Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -92,9 +92,6 @@ # hack to get around bugs in kernfs's rootdev/rrootdev lookup. ls -l /dev/* > /dev/null 2>&1 - # mount the ramdisk read write - mount -t -r cd9660 -u /kern/rootdev / - # mount a few tempfs to allow modifications over the CD contents mount -t tmpfs tmpfs /tmp mount -t tmpfs tmpfs /var
