CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: dbj
Date: Sun Mar 7 03:55:47 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
distrib/amd64/cdroms: honor CDBOOTOPTIONS when installing EFI bootloader
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/cdroms/bootcd-com/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/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.25 src/distrib/amd64/cdroms/Makefile.cdrom:1.26
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.25 Wed Feb 17 08:49:54 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Mar 7 03:55:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.25 2021/02/17 08:49:54 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.26 2021/03/07 03:55:47 dbj Exp $
.include
.include
@@ -27,6 +27,12 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${RM} -rf efiboot/EFI/boot
${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
+.if defined(CDBOOTOPTIONS)
+ ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+ ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi
+ ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi
+ ${CHMOD} -w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+.endif
${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
Index: src/distrib/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.9
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8 Wed Feb 17 08:49:55 2021
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Sun Mar 7 03:55:47 2021
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2021/02/17 08:49:55 dbj Exp $
+# $NetBSD: Makefile,v 1.9 2021/03/07 03:55:47 dbj Exp $
#
+# HP Proliant iLO serial console is on com1
+CDBOOTOPTIONS= -o console=com0
+
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
-# HP Proliant iLO serial console is on com1
-CDBOOTOPTIONS= -o console=com0
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: dbj
Date: Wed Feb 17 08:49:55 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
Revert "distrib/amd64/cdroms: honor CDBOOTOPTIONS when installing EFI
bootloader"
https://mail-index.netbsd.org/current-users/2021/02/17/msg040358.html
I think this change had unexpected side effects and needs further review
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.7 -r1.8 src/distrib/amd64/cdroms/bootcd-com/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/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.24 src/distrib/amd64/cdroms/Makefile.cdrom:1.25
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.24 Sat Feb 6 16:02:43 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Wed Feb 17 08:49:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.24 2021/02/06 16:02:43 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.25 2021/02/17 08:49:54 dbj Exp $
.include
.include
@@ -27,12 +27,6 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${RM} -rf efiboot/EFI/boot
${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
-.if defined(CDBOOTOPTIONS)
- ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
- ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi
- ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi
- ${CHMOD} -w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
-.endif
${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
Index: src/distrib/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.7 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.7 Sat Feb 6 16:02:43 2021
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Wed Feb 17 08:49:55 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2021/02/06 16:02:43 dbj Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/17 08:49:55 dbj Exp $
#
-# HP Proliant iLO serial console is on com1
-CDBOOTOPTIONS= -o console=com0
-
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
+# HP Proliant iLO serial console is on com1
+CDBOOTOPTIONS= -o console=com0
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: dbj
Date: Sat Feb 6 16:02:43 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
distrib/amd64/cdroms: honor CDBOOTOPTIONS when installing EFI bootloader
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/cdroms/bootcd-com/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/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.23 src/distrib/amd64/cdroms/Makefile.cdrom:1.24
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.23 Fri Feb 10 16:53:51 2017
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Feb 6 16:02:43 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.23 2017/02/10 16:53:51 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.24 2021/02/06 16:02:43 dbj Exp $
.include
.include
@@ -27,6 +27,12 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${RM} -rf efiboot/EFI/boot
${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
+.if defined(CDBOOTOPTIONS)
+ ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+ ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi
+ ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi
+ ${CHMOD} -w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+.endif
${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
Index: src/distrib/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.6 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.7
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.6 Wed May 15 13:47:41 2019
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Sat Feb 6 16:02:43 2021
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2019/05/15 13:47:41 christos Exp $
+# $NetBSD: Makefile,v 1.7 2021/02/06 16:02:43 dbj Exp $
#
+# HP Proliant iLO serial console is on com1
+CDBOOTOPTIONS= -o console=com0
+
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= boot-com # gives ${CDBASE}.iso
-# HP Proliant iLO serial console is on com1
-CDBOOTOPTIONS= -o console=com0
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: nonaka
Date: Tue Jan 24 11:27:55 UTC 2017
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Log Message:
amd64: make BIOS and UEFI dual bootable iso image.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/amd64/cdroms/Makefile.cdrom
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.20 src/distrib/amd64/cdroms/Makefile.cdrom:1.21
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.20 Sun Jul 19 10:16:55 2015
+++ src/distrib/amd64/cdroms/Makefile.cdrom Tue Jan 24 11:27:55 2017
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile.cdrom,v 1.20 2015/07/19 10:16:55 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.21 2017/01/24 11:27:55 nonaka Exp $
.include
+.include
SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+EFIBOOTIMG= efiboot.img
+CLEANFILES+= ${EFIBOOTIMG}
+
# Need multidot for the boot loader to read kernel modules as it doesn't
# understand rockridge.
-CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
+CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot,bootimage=i386;${EFIBOOTIMG},platformid=efi,no-emul-boot
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
@@ -15,7 +19,15 @@ CD_SETS= base etc
CD_SETS+= modules
.endif
-image_md_pre:
+${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
+ ${RM} -f ${EFIBOOTIMG}
+ ${RM} -rf efiboot/EFI/boot
+ ${MKDIR} efiboot/EFI/boot
+ ${CP} ${.ALLSRC} efiboot/EFI/boot/
+ ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} \
+ -t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
+
+image_md_pre: ${EFIBOOTIMG}
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: christos
Date: Fri Dec 21 18:11:11 UTC 2012
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Log Message:
PR/47276: ftp has https support now
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/amd64/cdroms/Makefile.cdrom
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.7 src/distrib/amd64/cdroms/Makefile.cdrom:1.8
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.7 Sun Jun 3 19:19:09 2012
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Dec 21 13:11:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.7 2012/06/03 23:19:09 joerg Exp $
+# $NetBSD: Makefile.cdrom,v 1.8 2012/12/21 18:11:10 christos Exp $
.include bsd.own.mk
@@ -47,6 +47,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/amd64/cdroms
Module Name:src
Committed By: jym
Date: Sat Jan 29 01:54:33 UTC 2011
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Log Message:
Mirror a change that was made on i386 by gdt@.
XXX i386 and amd64 distrib have lots in common, maybe more files/logic
could/should be shared.
Message log reads:
Use ${INSTALL} ${COPY} instead of ${CP}.
This avoids a problem where files with mode 0400 (CVSREAD=t) are
copied to OBJDIR and then can't be re-copied on a subsequent build.
ok joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/Makefile.cdrom
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.2 src/distrib/amd64/cdroms/Makefile.cdrom:1.3
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.2 Tue Jan 18 00:16:13 2011
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Jan 29 01:54:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.2 2011/01/18 00:16:13 jym Exp $
+# $NetBSD: Makefile.cdrom,v 1.3 2011/01/29 01:54:33 jym Exp $
.include bsd.own.mk
@@ -55,15 +55,15 @@
image_md_pre:
${MKDIR} cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
+ ${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
+ ${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
- ${CP} ${SYSINSTDIR}/sysinst cdrom
+ ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinst cdrom
${CHMOD} ugo+rx cdrom/sysinst
- ${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+ ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
${MKDIR} cdrom/var
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: jym
Date: Tue Jan 18 00:16:14 UTC 2011
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd: Makefile boot.cfg.in
src/distrib/amd64/cdroms/bootcd-com: Makefile
src/distrib/amd64/cdroms/installcd: Makefile boot.cfg.in
Added Files:
src/distrib/amd64/cdroms: etc.rc etc.ttys install.sh
Log Message:
Bring amd64 installation ISO to same state as the i386 one:
- GENERIC kernel for booting
- root is now cd0a
- use the same scripts and conf files as the i386 install ISO.
See also http://mail-index.netbsd.org/port-i386/2011/01/14/msg002247.html
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/etc.rc \
src/distrib/amd64/cdroms/etc.ttys src/distrib/amd64/cdroms/install.sh
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/bootcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/bootcd/boot.cfg.in
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/bootcd-com/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/cdroms/installcd/boot.cfg.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.1 src/distrib/amd64/cdroms/Makefile.cdrom:1.2
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.1 Tue Mar 6 21:52:44 2007
+++ src/distrib/amd64/cdroms/Makefile.cdrom Tue Jan 18 00:16:13 2011
@@ -1,4 +1,69 @@
-# $NetBSD: Makefile.cdrom,v 1.1 2007/03/06 21:52:44 bouyer Exp $
+# $NetBSD: Makefile.cdrom,v 1.2 2011/01/18 00:16:13 jym Exp $
-CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot
-CDINSTKERNEL= ../../instkernel
+.include bsd.own.mk
+
+SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
+
+# Need multidot for the boot loader to read kernel modules as it doesn't
+# understand rockridge.
+CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
+CDINSTKERNEL= ../../instkernel
+CDKERNELS= netbsd-GENERIC.gz netbsd
+CDRELEASE_NOISOS= true
+
+CDRUNTIME+= ./bin
+CDRUNTIME+= ./dev/MAKEDEV
+CDRUNTIME+= ./etc
+CDRUNTIME+= ./lib
+CDRUNTIME+= ./libdata
+CDRUNTIME+= ./libexec/ld.elf_so
+CDRUNTIME+= ./libexec/lfs_cleanerd
+CDRUNTIME+= ./libexec/dhcpcd-run-hooks
+CDRUNTIME+= ./libexec/resolvconf/
+CDRUNTIME+= ./mnt
+CDRUNTIME+= ./sbin
+CDRUNTIME+= ./stand
+CDRUNTIME+= ./tmp
+CDRUNTIME+= ./usr/bin/ftp
+CDRUNTIME+= ./usr/bin/grep
+CDRUNTIME+= ./usr/bin/gzip
+CDRUNTIME+= ./usr/bin/less
+CDRUNTIME+= ./usr/bin/more
+CDRUNTIME+= ./usr/bin/netstat
+CDRUNTIME+= ./usr/bin/progress
+CDRUNTIME+= ./usr/bin/sed
+CDRUNTIME+= ./usr/bin/sort
+CDRUNTIME+= ./usr/bin/tip
+CDRUNTIME+= ./usr/bin/vmstat
+CDRUNTIME+= ./usr/lib/libbz2.so*
+CDRUNTIME+= ./usr/lib/libc.so*
+CDRUNTIME+= ./usr/lib/libcurses.so*
+CDRUNTIME+= ./usr/lib/libedit.so*
+CDRUNTIME+= ./usr/lib/libintl.so*
+CDRUNTIME+= ./usr/lib/libkvm.so*
+CDRUNTIME+= ./usr/lib/libterminfo.so*
+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/chroot
+CDRUNTIME+= ./usr/sbin/installboot
+CDRUNTIME+= ./usr/sbin/wiconfig
+CDRUNTIME+= ./usr/share/misc/terminfo.db
+CDRUNTIME+= ./usr/share/locale
+
+image_md_pre:
+ ${MKDIR} cdrom/libexec/dhcpcd-hooks
+ ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
+ ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
+ ${MKDIR} cdrom/etc
+ ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
+ ${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
+ ${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
+ ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
+ ${MKDIR} cdrom/mnt2 cdrom/targetroot
+ ${CP} ${SYSINSTDIR}/sysinst cdrom
+ ${CHMOD} ugo+rx cdrom/sysinst
+ ${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+ ${MKDIR} cdrom/var
Index: src/distrib/amd64/cdroms/bootcd/Makefile
diff -u src/distrib/amd64/cdroms/bootcd/Makefile:1.3 src/distrib/amd64/cdroms/bootcd/Makefile:1.4
--- src/distrib/amd64/cdroms/bootcd/Makefile:1.3 Wed Oct 22 11:59:24 2008
+++ src/distrib/amd64/cdroms/bootcd/Makefile Tue Jan 18 00:16:13 2011
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/10/22 11:59:24 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2011/01/18 00:16:13 jym Exp $
#
.include ${.CURDIR}/../Makefile.cdrom
CDBASE= boot # gives ${CDBASE}.iso
-CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
Index: src/distrib/amd64/cdroms/bootcd/boot.cfg.in
diff -u src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.2 src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.3
---
CVS commit: src/distrib/amd64/cdroms/bootcd-com
Module Name:src
Committed By: yamt
Date: Wed Oct 21 02:31:45 UTC 2009
Modified Files:
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
fix a typo in a comment
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/bootcd-com/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/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.3 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.4
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.3 Wed Oct 22 11:59:24 2008
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Wed Oct 21 02:31:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/22 11:59:24 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/21 02:31:44 yamt Exp $
#
.include ${.CURDIR}/../Makefile.cdrom
@@ -7,7 +7,7 @@
CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDBOOTOPTIONS= -o console=com0
-CDBUILDEXTRA+= boot.cfg # Add boot..cfg file
+CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
prepare_md_post:
