CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: jmcneill
Date: Sat Jul 24 16:13:45 UTC 2021
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile spec.emuimage
Added Files:
src/distrib/amd64/liveimage/emuimage: rc.conf.emuimage
Removed Files:
src/distrib/amd64/liveimage/emuimage: dhcpcd ec2_init resize_disklabel
resize_root sshd
Log Message:
amd64: liveimage: use RC_CONF_EXTRA instead of rc.conf.d
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/amd64/liveimage/emuimage/dhcpcd \
src/distrib/amd64/liveimage/emuimage/resize_disklabel \
src/distrib/amd64/liveimage/emuimage/resize_root \
src/distrib/amd64/liveimage/emuimage/sshd
cvs rdiff -u -r1.4 -r0 src/distrib/amd64/liveimage/emuimage/ec2_init
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage
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/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.8 src/distrib/amd64/liveimage/emuimage/Makefile:1.9
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.8 Wed Aug 5 01:35:18 2020
+++ src/distrib/amd64/liveimage/emuimage/Makefile Sat Jul 24 16:13:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/08/05 01:35:18 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
@@ -10,13 +10,9 @@ IMAGEHOSTNAME= netbsd
FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
SPEC_EXTRA= ${.CURDIR}/spec.emuimage
+RC_CONF_EXTRA= ${.CURDIR}/rc.conf.emuimage
IMGFILE_EXTRA=\
${FILESDIR}/ec2_init etc/rc.d/ec2_init \
- ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel \
- ${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \
- ${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \
- ${.CURDIR}/resize_disklabel etc/rc.conf.d/resize_disklabel \
- ${.CURDIR}/resize_root etc/rc.conf.d/resize_root \
- ${.CURDIR}/sshd etc/rc.conf.d/sshd
+ ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.1 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.1 Wed Aug 5 01:35:18 2020
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Sat Jul 24 16:13:44 2021
@@ -1,8 +1,3 @@
-# $NetBSD: spec.emuimage,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
-./etc/rc.conf.d/dhcpcd type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/ec2_init type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/resize_disklabel type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/resize_root type=file mode=0644 uname=root gname=wheel
-./etc/rc.conf.d/sshd type=file mode=0644 uname=root gname=wheel
+# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $
./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel
./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel
Added files:
Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.1
--- /dev/null Sat Jul 24 16:13:45 2021
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Sat Jul 24 16:13:44 2021
@@ -0,0 +1,36 @@
+# $NetBSD: rc.conf.emuimage,v 1.1 2021/07/24 16:13:44 jmcneill Exp $
+
+is_ec2() {
+ val=NO
+ # Look for the string "amazon" in one of these sysctl nodes
+ for node in machdep.dmi.system-vendor \
+ machdep.dmi.system-version \
+ machdep.dmi.bios-version \
+ machdep.xen.version ; do
+ if /sbin/sysctl -q $node; then
+ nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')"
+ case "$nodeval" in
+ *amazon*)
+val=YES
+;;
+ # OpenStack is not EC2 but it does have a metadata service.
+ *openstack*)
+val=YES
+;;
+ esac
+ fi
+ done
+ printf $val
+}
+
+resize_disklabel=YES
+resize_root=YES
+resize_root_flags="-p"
+resize_root_postcmd="/sbin/reboot -n"
+dhcpcd=YES
+sshd=YES
+ec2_init=$(is_ec2)
+
+if checkyesno ec2_init; then
+ dhcpcd_flags="$dhcpcd_flags -w"
+fi
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: rhialto
Date: Tue Jul 20 19:27:51 UTC 2021
Modified Files:
src/distrib/amd64/liveimage/emuimage: ec2_init
Log Message:
Don't override /etc/rc.conf if it sets ec2_init.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/liveimage/emuimage/ec2_init
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/liveimage/emuimage/ec2_init
diff -u src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 src/distrib/amd64/liveimage/emuimage/ec2_init:1.4
--- src/distrib/amd64/liveimage/emuimage/ec2_init:1.3 Thu Jul 15 17:20:25 2021
+++ src/distrib/amd64/liveimage/emuimage/ec2_init Tue Jul 20 19:27:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ec2_init,v 1.3 2021/07/15 17:20:25 rhialto Exp $
+# $NetBSD: ec2_init,v 1.4 2021/07/20 19:27:51 rhialto Exp $
is_ec2() {
val=NO
@@ -23,4 +23,9 @@ is_ec2() {
printf $val
}
-ec2_init=$(is_ec2)
+# Don't override /etc/rc.conf
+if [ -z "$ec2_init" ]
+then
+ ec2_init=$(is_ec2)
+fi
+
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: rhialto
Date: Thu Jul 15 17:20:25 UTC 2021
Modified Files:
src/distrib/amd64/liveimage/emuimage: ec2_init
Log Message:
Recognize OpenStack too (it also has a metadata service).
Typical values for machdep.dmi are:
machdep.dmi.system-vendor = OpenStack Foundation
machdep.dmi.system-product = OpenStack Nova
machdep.dmi.system-version = 17.0.12
machdep.dmi.system-serial = c46130fb-a56e-43f2-9d98-492d24656b9c
machdep.dmi.system-uuid = 680b8119-0d74-4f78-a6fd-e79dfede905c
machdep.dmi.bios-vendor = SeaBIOS
machdep.dmi.bios-version = 1.10.2-1ubuntu1
machdep.dmi.bios-date = 20140401
machdep.dmi.chassis-vendor = QEMU
machdep.dmi.chassis-type = QEMU
machdep.dmi.chassis-version = pc-i440fx-2.8
machdep.dmi.processor-vendor = QEMU
machdep.dmi.processor-version = pc-i440fx-2.8
machdep.dmi.processor-frequency = 2000 MHz
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/ec2_init
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/liveimage/emuimage/ec2_init
diff -u src/distrib/amd64/liveimage/emuimage/ec2_init:1.2 src/distrib/amd64/liveimage/emuimage/ec2_init:1.3
--- src/distrib/amd64/liveimage/emuimage/ec2_init:1.2 Wed Sep 9 13:25:48 2020
+++ src/distrib/amd64/liveimage/emuimage/ec2_init Thu Jul 15 17:20:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ec2_init,v 1.2 2020/09/09 13:25:48 jmcneill Exp $
+# $NetBSD: ec2_init,v 1.3 2021/07/15 17:20:25 rhialto Exp $
is_ec2() {
val=NO
@@ -13,6 +13,10 @@ is_ec2() {
*amazon*)
val=YES
;;
+ # OpenStack is not EC2 but it does have a metadata service.
+ *openstack*)
+val=YES
+;;
esac
fi
done
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Wed Jun 2 16:07:33 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
The install image grew again - update size
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/amd64/installimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.16 src/distrib/amd64/installimage/Makefile:1.17
--- src/distrib/amd64/installimage/Makefile:1.16 Mon Apr 26 14:08:11 2021
+++ src/distrib/amd64/installimage/Makefile Wed Jun 2 16:07:33 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2021/04/26 14:08:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.17 2021/06/02 16:07:33 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1700 # for all installation binaries
+INSTIMAGEMB?= 1800 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Mon Apr 26 14:08:11 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
The image, with all sorts of MK*DEBUG* turned on, has once again grown.
This time probably as a result of the move to gcc-10.
Bump size to accomodate.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/amd64/installimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.15 src/distrib/amd64/installimage/Makefile:1.16
--- src/distrib/amd64/installimage/Makefile:1.15 Fri Mar 26 21:18:29 2021
+++ src/distrib/amd64/installimage/Makefile Mon Apr 26 14:08:11 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2021/03/26 21:18:29 pgoyette Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/26 14:08:11 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1600 # for all installation binaries
+INSTIMAGEMB?= 1700 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Fri Mar 26 21:18:29 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
The install-image has grown a bit recently, and at least amd64 has
outgrown the previous size specification when the system was built
with all of MKDEBUG, MKKDEBUG, and MKDEBUGLIB set to "yes" (and
also when in-tree X11 is included).
So, bump the size a bit.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/installimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.14 src/distrib/amd64/installimage/Makefile:1.15
--- src/distrib/amd64/installimage/Makefile:1.14 Mon Jan 18 03:35:11 2021
+++ src/distrib/amd64/installimage/Makefile Fri Mar 26 21:18:29 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2021/01/18 03:35:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.15 2021/03/26 21:18:29 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1590 # for all installation binaries
+INSTIMAGEMB?= 1600 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
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/installimage
Module Name:src
Committed By: pgoyette
Date: Mon Jan 18 03:35:11 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
Oooppss we need another size bump
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/amd64/installimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.13 src/distrib/amd64/installimage/Makefile:1.14
--- src/distrib/amd64/installimage/Makefile:1.13 Fri Jan 15 21:14:53 2021
+++ src/distrib/amd64/installimage/Makefile Mon Jan 18 03:35:11 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2021/01/15 21:14:53 pgoyette Exp $
+# $NetBSD: Makefile,v 1.14 2021/01/18 03:35:11 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1580 # for all installation binaries
+INSTIMAGEMB?= 1590 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Fri Jan 15 21:14:53 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
Install image built with all of MKDEBUG, MKKDEBUG, and MKDEBUGLIB all
set to "yes" is a bit larger, so bump the image size accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/amd64/installimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.12 src/distrib/amd64/installimage/Makefile:1.13
--- src/distrib/amd64/installimage/Makefile:1.12 Thu May 28 15:13:21 2020
+++ src/distrib/amd64/installimage/Makefile Fri Jan 15 21:14:53 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2020/05/28 15:13:21 jmcneill Exp $
+# $NetBSD: Makefile,v 1.13 2021/01/15 21:14:53 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1550 # for all installation binaries
+INSTIMAGEMB?= 1580 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: jmcneill
Date: Wed Sep 9 13:25:48 UTC 2020
Modified Files:
src/distrib/amd64/liveimage/emuimage: ec2_init
Log Message:
Look for the string "amazon" in a few different sysctl nodes. There doesn't
seem to be a single spot to check that works with both XenPVHVM and KVM
instances.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/liveimage/emuimage/ec2_init
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/liveimage/emuimage/ec2_init
diff -u src/distrib/amd64/liveimage/emuimage/ec2_init:1.1 src/distrib/amd64/liveimage/emuimage/ec2_init:1.2
--- src/distrib/amd64/liveimage/emuimage/ec2_init:1.1 Wed Aug 5 01:35:18 2020
+++ src/distrib/amd64/liveimage/emuimage/ec2_init Wed Sep 9 13:25:48 2020
@@ -1,15 +1,22 @@
-# $NetBSD: ec2_init,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
+# $NetBSD: ec2_init,v 1.2 2020/09/09 13:25:48 jmcneill Exp $
is_ec2() {
- dmi_vendor="$(/sbin/sysctl -qn machdep.dmi.system-vendor | tr '[A-Z]' '[a-z]')"
- case "$dmi_vendor" in
- amazon*)
- printf YES
- ;;
- *)
- printf NO
- ;;
- esac
+ val=NO
+ # Look for the string "amazon" in one of these sysctl nodes
+ for node in machdep.dmi.system-vendor \
+ machdep.dmi.system-version \
+ machdep.dmi.bios-version \
+ machdep.xen.version ; do
+ if /sbin/sysctl -q $node; then
+ nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')"
+ case "$nodeval" in
+ *amazon*)
+val=YES
+;;
+ esac
+ fi
+ done
+ printf $val
}
ec2_init=$(is_ec2)
CVS commit: src/distrib/amd64
Module Name:src
Committed By: maya
Date: Wed May 27 22:27:58 UTC 2020
Modified Files:
src/distrib/amd64: Makefile
src/distrib/amd64/installimage: Makefile
Removed Files:
src/distrib/amd64/uefi-installimage: Makefile Makefile.bootimage
Makefile.installimage boot.cfg.in etc.rc etc.ttys install.sh
spec.inst
Log Message:
rename amd64 uefi-installimage to be just installimage.
Works for both purposes, no confusing name.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/amd64/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.7 -r0 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.13 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.3 -r0 \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.2 -r0 src/distrib/amd64/uefi-installimage/boot.cfg.in \
src/distrib/amd64/uefi-installimage/etc.rc
cvs rdiff -u -r1.1 -r0 src/distrib/amd64/uefi-installimage/etc.ttys \
src/distrib/amd64/uefi-installimage/install.sh \
src/distrib/amd64/uefi-installimage/spec.inst
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/Makefile
diff -u src/distrib/amd64/Makefile:1.13 src/distrib/amd64/Makefile:1.14
--- src/distrib/amd64/Makefile:1.13 Sun May 21 15:28:37 2017
+++ src/distrib/amd64/Makefile Wed May 27 22:27:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/05/21 15:28:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/27 22:27:58 maya Exp $
.include
@@ -14,7 +14,6 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
-SUBDIR+= uefi-installimage
TARGETS+= release
iso_image:
@@ -25,6 +24,5 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
- ${MAKEDIRTARGET} uefi-installimage install_image
.include
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.10 src/distrib/amd64/installimage/Makefile:1.11
--- src/distrib/amd64/installimage/Makefile:1.10 Sat Dec 15 18:03:16 2018
+++ src/distrib/amd64/installimage/Makefile Wed May 27 22:27:58 2020
@@ -1,16 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2018/12/15 18:03:16 gson Exp $
+# $NetBSD: Makefile,v 1.11 2020/05/27 22:27:58 maya Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1450 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
+EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
+#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
+#EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi
USE_MBR= yes
+USE_GPT= yes
CLEANFILES+= boot.cfg
@@ -35,4 +40,4 @@ IMGFILE_EXTRA=\
${SYSINSTDIR}/sysinstmsgs.pl .\
${SYSINSTDIR}/sysinst .
-.include "${DISTRIBDIR}/common/bootimage/Makefile.installimage"
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
CVS commit: src/distrib/amd64/ramdisks/ramdisk-zfsroot
Module Name:src
Committed By: roy
Date: Mon Mar 2 16:04:49 UTC 2020
Modified Files:
src/distrib/amd64/ramdisks/ramdisk-zfsroot: Makefile
Log Message:
ramdisk-zfsroot: Build with -D_REENTRANT
zpool(8) requires libhack built with it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/ramdisks/ramdisk-zfsroot/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/ramdisks/ramdisk-zfsroot/Makefile
diff -u src/distrib/amd64/ramdisks/ramdisk-zfsroot/Makefile:1.1 src/distrib/amd64/ramdisks/ramdisk-zfsroot/Makefile:1.2
--- src/distrib/amd64/ramdisks/ramdisk-zfsroot/Makefile:1.1 Sat Feb 22 09:53:47 2020
+++ src/distrib/amd64/ramdisks/ramdisk-zfsroot/Makefile Mon Mar 2 16:04:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/02/22 09:53:47 roy Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/02 16:04:49 roy Exp $
IMAGE= ramdisk-zfsroot.fs
IMAGESIZE= 5000k
@@ -7,6 +7,9 @@ MAKEDEVTARGETS= all
CRUNCHENV= INIT_CHROOT=1
SMALLPROG_INET6= 1
+# Build as re-entrant because zpool requires libhack built this way.
+CPPFLAGS+= -D_REENTRANT
+
LISTS+= ${DISTRIBDIR}/common/list.zfsroot
.include "${.CURDIR}/../common/Makefile.ramdisk"
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: tsutsui
Date: Fri Feb 22 22:20:18 UTC 2019
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Explicitly use ${TOOL_AWK} instead of system's awk.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
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/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.10 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.10 Fri Feb 22 22:13:58 2019
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Feb 22 22:20:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.10 2019/02/22 22:13:58 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.11 2019/02/22 22:20:18 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -211,8 +211,8 @@ BSDPARTSECTORS!= expr ${IMAGESECTORS} -
FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS}
SWAPOFFSET!= expr ${LABELSECTORS} + ${FSSECTORS} + ${EFISECTORS}
-BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 2 | awk '/^GUID/ {print $$2}'`
-SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 3 | awk '/^GUID/ {print $$2}'`
+BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 2 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
+SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 3 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
.endif
#
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src Committed By: dholland Date: Sun Jan 27 04:22:46 UTC 2019 Modified Files: src/distrib/amd64/ramdisks/common: Makefile.ramdisk Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/amd64/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/amd64/ramdisks/common/Makefile.ramdisk diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.13 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14 --- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.13 Sun Jan 27 02:08:33 2019 +++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Sun Jan 27 04:22:46 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.13 2019/01/27 02:08:33 pgoyette Exp $ - -NOSANITIZER= # defined +# $NetBSD: Makefile.ramdisk,v 1.14 2019/01/27 04:22:46 dholland Exp $ NOSANITIZER= # defined
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: gson
Date: Sun Dec 16 08:58:21 UTC 2018
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile
Log Message:
Fix previous: set EMUIMAGEMB, not USBIMAGEMB.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/liveimage/emuimage/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/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.4 src/distrib/amd64/liveimage/emuimage/Makefile:1.5
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.4 Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/liveimage/emuimage/Makefile Sun Dec 16 08:58:21 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2018/12/15 18:03:17 gson Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/16 08:58:21 gson Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
-USBIMAGEMB?= 1536 # 2GB USB flash memories aren't 2GiB
+EMUIMAGEMB?= 1536 # 2GB USB flash memories aren't 2GiB
LIVEIMAGEMB= ${EMUIMAGEMB}
.include "${.CURDIR}/../Makefile.liveimage"
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: martin
Date: Sun Oct 7 10:33:44 UTC 2018
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Support .tar.xz format for sets.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
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/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.6 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.7
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.6 Thu Feb 16 03:47:23 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Sun Oct 7 10:33:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.6 2017/02/16 03:47:23 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.7 2018/10/07 10:33:44 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -228,6 +228,7 @@ SETS_DEFAULT+= xbase xcomp xetc xfont xs
.endif
KERN_SET?= kern-GENERIC
+TAR_SUFF= ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
SETS?= ${SETS_DEFAULT}
IMG_SETS= ${KERN_SET} ${SETS}
SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
@@ -257,12 +258,12 @@ ${TARGETFS}: prepare_md_post pre-targetf
fi;
@${MKDIR} ${MKDIRPERM} ${WORKDIR}
.for set in ${IMG_SETS}
- @if [ ! -f ${SETS_DIR}/${set}.tgz ]; then \
- echo "Missing ${SETS_DIR}/${set}.tgz, aborting"; \
+ @if [ ! -f ${SETS_DIR}/${set}.${TAR_SUFF} ]; then \
+ echo "Missing ${SETS_DIR}/${set}.${TAR_SUFF}, aborting";\
false; \
fi
- @echo Extracting ${set}.tgz ...
- @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.tgz .)
+ @echo Extracting ${set}.${TAR_SUFF} ...
+ @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.${TAR_SUFF} .)
.endfor
.if defined(SECONDARY_BOOT)
@echo Copying secondary boot...
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src
Committed By: kamil
Date: Thu Jun 21 11:48:05 UTC 2018
Modified Files:
src/distrib/amd64/ramdisks/common: Makefile.ramdisk
Log Message:
Specify NOSANITIZER in distrib/amd64/ramdisks/common
This option cannot be set in distrib/common/Makefile.distrib as it's too
late, after including that will set MKSANITIZER.
This makes generation of ramdisk for amd64 with MKSANITIZER=yes successful.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/amd64/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/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.12
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11 Wed Oct 7 14:09:04 2015
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Thu Jun 21 11:48:05 2018
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.ramdisk,v 1.11 2015/10/07 14:09:04 martin Exp $
+# $NetBSD: Makefile.ramdisk,v 1.12 2018/06/21 11:48:05 kamil Exp $
+
+NOSANITIZER= # defined
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: joerg
Date: Wed Mar 28 22:38:48 UTC 2018
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile
Log Message:
Bump image to 1550MB to unbreak the LLVM build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/uefi-installimage/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/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.4 src/distrib/amd64/uefi-installimage/Makefile:1.5
--- src/distrib/amd64/uefi-installimage/Makefile:1.4 Fri Jan 5 01:33:11 2018
+++ src/distrib/amd64/uefi-installimage/Makefile Wed Mar 28 22:38:47 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2018/01/05 01:33:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/28 22:38:47 joerg Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
BOOTDISK= dk1 # unused (use GUID)
-INSTIMAGEMB?= 1500 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: pgoyette
Date: Fri Jan 5 01:33:11 UTC 2018
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile
Log Message:
Bump size of uefi image - we've outgrown the old size
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/uefi-installimage/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/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.3 src/distrib/amd64/uefi-installimage/Makefile:1.4
--- src/distrib/amd64/uefi-installimage/Makefile:1.3 Mon Sep 18 14:42:16 2017
+++ src/distrib/amd64/uefi-installimage/Makefile Fri Jan 5 01:33:11 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2017/09/18 14:42:16 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/05 01:33:11 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
BOOTDISK= dk1 # unused (use GUID)
-INSTIMAGEMB?= 1450 # for all installation binaries
+INSTIMAGEMB?= 1500 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64
Module Name:src
Committed By: martin
Date: Thu May 11 10:49:19 UTC 2017
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/uefi-installimage: Makefile
Log Message:
Try to make images big enough for debug sets
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/uefi-installimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.6 src/distrib/amd64/installimage/Makefile:1.7
--- src/distrib/amd64/installimage/Makefile:1.6 Sun Jan 24 15:30:05 2016
+++ src/distrib/amd64/installimage/Makefile Thu May 11 10:49:18 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2016/01/24 15:30:05 christos Exp $
+# $NetBSD: Makefile,v 1.7 2017/05/11 10:49:18 martin Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
BOOTDISK= sd0 # for USB flash etc.
-INSTIMAGEMB?= 1200 # for all installation binaries
+INSTIMAGEMB?= 1300 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
Index: src/distrib/amd64/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.1 src/distrib/amd64/uefi-installimage/Makefile:1.2
--- src/distrib/amd64/uefi-installimage/Makefile:1.1 Tue Jan 24 11:16:50 2017
+++ src/distrib/amd64/uefi-installimage/Makefile Thu May 11 10:49:18 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2017/01/24 11:16:50 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2017/05/11 10:49:18 martin Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
BOOTDISK= dk1 # unused (use GUID)
-INSTIMAGEMB?= 1280 # for all installation binaries
+INSTIMAGEMB?= 1380 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: christos
Date: Thu Feb 16 03:47:23 UTC 2017
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Add ${GPT_TIMESTAMP}
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
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/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.5 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.6
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.5 Sat Feb 11 03:14:05 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Wed Feb 15 22:47:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.5 2017/02/11 08:14:05 pgoyette Exp $
+# $NetBSD: Makefile.bootimage,v 1.6 2017/02/16 03:47:23 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -138,6 +138,7 @@
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+GPT_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
.endif
@@ -214,8 +215,8 @@ BSDPARTSECTORS!= expr ${IMAGESECTORS} -
FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS}
SWAPOFFSET!= expr ${LABELSECTORS} + ${FSSECTORS} + ${EFISECTORS}
-BOOTDISK_UUID=`${TOOL_GPT} ${WORKMBR} show -i 2 | awk '/^GUID/ {print $$2}'`
-SWAPDISK_UUID=`${TOOL_GPT} ${WORKMBR} show -i 3 | awk '/^GUID/ {print $$2}'`
+BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 2 | awk '/^GUID/ {print $$2}'`
+SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 3 | awk '/^GUID/ {print $$2}'`
.endif
#
@@ -397,11 +398,11 @@ pre-targetfs:
@echo creating GPT header and partition entries...
${RM} -f ${WORKMBR}
${DD} if=/dev/zero of=${WORKMBR} seek=$$((${IMAGESECTORS} - 1)) count=1
- ${TOOL_GPT} ${WORKMBR} create
- ${TOOL_GPT} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
- ${TOOL_GPT} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} create
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs
.if ${OMIT_SWAPIMG} == "no"
- ${TOOL_GPT} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
.endif
${IMGBASE}.img: ${TARGETFS}
@@ -423,9 +424,9 @@ ${IMGBASE}.img: ${TARGETFS}
count=2048
${DD} if=${WORKMBR} count=${LABELSECTORS} | \
${CAT} - ${WORKEFI} ${TARGETFS} ${WORKGPT} > ${WORKIMG}
- ${TOOL_GPT} ${WORKIMG} biosboot -i 2\
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2\
-c ${.OBJDIR}/${WORKDIR}/usr/mdec/gptmbr.bin
- ${TOOL_GPT} ${WORKIMG} set -a bootme -i 2
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} set -a bootme -i 2
.else # USE_GPT == "no"
${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
.if ${USE_MBR} != "no"
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: pgoyette
Date: Sat Feb 11 08:14:05 UTC 2017
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Clean up another extraneous -f option
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
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/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.4 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.5
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.4 Sat Feb 11 03:07:06 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Sat Feb 11 08:14:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.4 2017/02/11 03:07:06 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.5 2017/02/11 08:14:05 pgoyette Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -409,7 +409,7 @@ ${IMGBASE}.img: ${TARGETFS}
@${MKDIR} ${MKDIRPERM} ${EFIWORKDIR}/EFI/boot
.if !empty(EFIBOOT)
.for f in ${EFIBOOT}
- ${INSTALL} ${COPY} -m 0644 -f ${f} ${EFIWORKDIR}/EFI/boot/`basename ${f}`
+ ${INSTALL} ${COPY} -m 0644 ${f} ${EFIWORKDIR}/EFI/boot/`basename ${f}`
.endfor
.endif
${RM} -f ${WORKEFI}
CVS commit: src/distrib/amd64
Module Name:src
Committed By: christos
Date: Fri Feb 10 16:53:51 UTC 2017
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
MKREPRO_TIMESTAMP fixes for efiboot
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.2 -r1.3 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
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.22 src/distrib/amd64/cdroms/Makefile.cdrom:1.23
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.22 Fri Feb 10 11:43:59 2017
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Feb 10 11:53:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.22 2017/02/10 16:43:59 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.23 2017/02/10 16:53:51 christos Exp $
.include
.include
@@ -7,6 +7,9 @@ SYSINSTDIR!= cd ${.CURDIR}/../../../../u
EFIBOOTIMG= efiboot.img
CLEANFILES+= ${EFIBOOTIMG}
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+.endif
# Need multidot for the boot loader to read kernel modules as it doesn't
# understand rockridge.
@@ -24,7 +27,7 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${RM} -rf efiboot/EFI/boot
${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
- ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} \
+ ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
image_md_pre: ${EFIBOOTIMG}
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.3
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2 Fri Feb 10 11:43:59 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Feb 10 11:53:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.2 2017/02/10 16:43:59 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.3 2017/02/10 16:53:51 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -136,8 +136,8 @@
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-.if ${MKREPRO:Uno} == "yes"
-TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
.endif
.if empty(IMGBASE)
@@ -341,7 +341,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE} \
-B ${TARGET_ENDIANNESS} \
-F ${WORKSPEC} -N ${WORKDIR}/etc\
- ${TIMESTAMP} \
+ ${MAKEFS_TIMESTAMP} \
${IMGMAKEFSOPTIONS} \
${WORKFS} ${WORKDIR}
.if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} == "no"
@@ -414,7 +414,7 @@ ${IMGBASE}.img: ${TARGETFS}
${RM} -f ${WORKEFI}
${TOOL_MAKEFS} -M ${EFIMB}m -m ${EFIMB}m \
-B ${TARGET_ENDIANNESS} \
- ${TIMESTAMP} \
+ ${MAKEFS_TIMESTAMP} \
-t msdos -o F=32,c=1 \
${WORKEFI} ${EFIWORKDIR}
@echo create GPT image...
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
Module Name:src
Committed By: nonaka
Date: Tue Jan 24 11:16:50 UTC 2017
Modified Files:
src/distrib/amd64: Makefile
Added Files:
src/distrib/amd64/uefi-installimage: Makefile Makefile.bootimage
Makefile.installimage boot.cfg.in etc.rc etc.ttys install.sh
spec.inst
Log Message:
make amd64 EFI install image
XXX merge to installimage?
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/amd64/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/uefi-installimage/Makefile \
src/distrib/amd64/uefi-installimage/Makefile.bootimage \
src/distrib/amd64/uefi-installimage/Makefile.installimage \
src/distrib/amd64/uefi-installimage/boot.cfg.in \
src/distrib/amd64/uefi-installimage/etc.rc \
src/distrib/amd64/uefi-installimage/etc.ttys \
src/distrib/amd64/uefi-installimage/install.sh \
src/distrib/amd64/uefi-installimage/spec.inst
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/Makefile
diff -u src/distrib/amd64/Makefile:1.11 src/distrib/amd64/Makefile:1.12
--- src/distrib/amd64/Makefile:1.11 Thu Jun 30 12:56:27 2016
+++ src/distrib/amd64/Makefile Tue Jan 24 11:16:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/06/30 12:56:27 pgoyette Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/24 11:16:50 nonaka Exp $
.include
@@ -16,6 +16,7 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
+SUBDIR+= uefi-installimage
TARGETS+= release
iso_image:
@@ -26,5 +27,6 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
+ ${MAKEDIRTARGET} uefi-installimage install_image
.include
Added files:
Index: src/distrib/amd64/uefi-installimage/Makefile
diff -u /dev/null src/distrib/amd64/uefi-installimage/Makefile:1.1
--- /dev/null Tue Jan 24 11:16:50 2017
+++ src/distrib/amd64/uefi-installimage/Makefile Tue Jan 24 11:16:50 2017
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.1 2017/01/24 11:16:50 nonaka Exp $
+
+.include
+
+INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
+
+BOOTDISK= dk1 # unused (use GUID)
+INSTIMAGEMB?= 1280 # for all installation binaries
+
+PRIMARY_BOOT= bootxx_ffsv1
+SECONDARY_BOOT= boot
+SECONDARY_BOOT_ARG= # unnecessary
+EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
+#EFIBOOT= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
+#EFIBOOT+= ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootia32/bootia32.efi
+
+USE_MBR= yes
+USE_GPT= yes
+
+CLEANFILES+= boot.cfg
+
+prepare_md_post:
+ ${TOOL_SED} \
+ -e "s/@@MACHINE@@/${MACHINE}/"\
+ -e "s/@@VERSION@@/${DISTRIBVER}/"\
+ < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc\
+ ${.CURDIR}/install.sh .\
+ ${.OBJDIR}/boot.cfg .\
+ ${SYSINSTDIR}/sysinstmsgs.de .\
+ ${SYSINSTDIR}/sysinstmsgs.es .\
+ ${SYSINSTDIR}/sysinstmsgs.fr .\
+ ${SYSINSTDIR}/sysinstmsgs.pl .\
+ ${SYSINSTDIR}/sysinst .
+
+.include "${.CURDIR}/Makefile.installimage"
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u /dev/null src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.1
--- /dev/null Tue Jan 24 11:16:50 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Tue Jan 24 11:16:50 2017
@@ -0,0 +1,499 @@
+# $NetBSD: Makefile.bootimage,v 1.1 2017/01/24 11:16:50 nonaka Exp $
+#
+# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. 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.
+#
+# 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
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: christos
Date: Sun Jan 24 15:30:05 UTC 2016
Modified Files:
src/distrib/amd64/installimage: Makefile
Log Message:
Grow!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/installimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.5 src/distrib/amd64/installimage/Makefile:1.6
--- src/distrib/amd64/installimage/Makefile:1.5 Sat Sep 13 06:18:24 2014
+++ src/distrib/amd64/installimage/Makefile Sun Jan 24 10:30:05 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2014/09/13 10:18:24 roy Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/24 15:30:05 christos Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
BOOTDISK= sd0 # for USB flash etc.
-INSTIMAGEMB?= 550 # for all installation binaries
+INSTIMAGEMB?= 1200 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64
Module Name:src
Committed By: snj
Date: Mon Jan 12 19:40:48 UTC 2015
Added Files:
src/distrib/amd64: Makefile
Log Message:
Restore unintentionally deleted file, which prevented building of any
install media. PR port-amd64/49558.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.9 src/distrib/amd64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/distrib/amd64/Makefile
diff -u /dev/null src/distrib/amd64/Makefile:1.9
--- /dev/null Mon Jan 12 19:40:48 2015
+++ src/distrib/amd64/Makefile Mon Jan 12 19:40:48 2015
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.9 2015/01/12 19:40:48 snj Exp $
+
+SUBDIR=
+SUBDIR+= ramdisks
+SUBDIR+= .WAIT
+SUBDIR+= instkernel
+SUBDIR+= kmod
+SUBDIR+= kmod-cgdroot
+SUBDIR+= .WAIT
+SUBDIR+= cdroms
+SUBDIR+= liveimage
+SUBDIR+= installimage
+TARGETS+= release
+
+iso_image:
+ ${MAKEDIRTARGET} cdroms iso_image
+
+live_image:
+ ${MAKEDIRTARGET} liveimage live_image
+
+install_image:
+ ${MAKEDIRTARGET} installimage install_image
+
+.include bsd.subdir.mk
CVS commit: src/distrib/amd64/ramdisks
Module Name:src
Committed By: khorben
Date: Mon Jul 15 00:22:10 UTC 2013
Modified Files:
src/distrib/amd64/ramdisks: Makefile
Added Files:
src/distrib/amd64/ramdisks/ramdisk-cgdroot: Makefile list
Log Message:
Build the cgdroot ramdisk by default (for full-disk encryption support). It
currently contains the same utilities found in an amd64 sysinst ramdisk, which
should be useful in case of emergency.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/ramdisks/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile \
src/distrib/amd64/ramdisks/ramdisk-cgdroot/list
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/ramdisks/Makefile
diff -u src/distrib/amd64/ramdisks/Makefile:1.1 src/distrib/amd64/ramdisks/Makefile:1.2
--- src/distrib/amd64/ramdisks/Makefile:1.1 Fri Jun 2 22:11:52 2006
+++ src/distrib/amd64/ramdisks/Makefile Mon Jul 15 00:22:10 2013
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2006/06/02 22:11:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2013/07/15 00:22:10 khorben Exp $
SUBDIR=
SUBDIR+= ramdisk
+SUBDIR+= ramdisk-cgdroot
TARGETS+= release
Added files:
Index: src/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile
diff -u /dev/null src/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile:1.1
--- /dev/null Mon Jul 15 00:22:10 2013
+++ src/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile Mon Jul 15 00:22:10 2013
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2013/07/15 00:22:10 khorben Exp $
+
+IMAGE= ramdisk-cgdroot.fs
+IMAGESIZE= 5000k
+IMAGEDEPENDS=
+CRUNCHENV= INIT_CHROOT=1
+SMALLPROG_INET6=1
+
+.include ${.CURDIR}/../common/Makefile.ramdisk
+
+LISTS+= ${DISTRIBDIR}/common/list.cgdroot
+MTREECONF+= ${DISTRIBDIR}/common/mtree.cgdroot
+
+.if ${USE_INET6} != no
+LISTS+= ${DISTRIBDIR}/common/list.inet6
+.endif
Index: src/distrib/amd64/ramdisks/ramdisk-cgdroot/list
diff -u /dev/null src/distrib/amd64/ramdisks/ramdisk-cgdroot/list:1.1
--- /dev/null Mon Jul 15 00:22:10 2013
+++ src/distrib/amd64/ramdisks/ramdisk-cgdroot/list Mon Jul 15 00:22:10 2013
@@ -0,0 +1,32 @@
+# $NetBSD: list,v 1.1 2013/07/15 00:22:10 khorben Exp $
+
+PROG bin/chio
+PROG bin/dd
+PROG bin/df
+PROG bin/ed
+PROG bin/mt
+PROG bin/rcmd
+PROG bin/sync
+
+PROG libexec/lfs_cleanerd
+
+PROG sbin/dkctl
+PROG sbin/fdisk
+PROG sbin/mbrlabel
+PROG sbin/mount_ext2fs
+PROG sbin/mount_lfs
+PROG sbin/mount_ntfs
+PROG sbin/newfs_lfs
+PROG sbin/raidctl
+PROG sbin/restore sbin/rrestore
+PROG sbin/scsictl
+PROG sbin/shutdown
+PROG sbin/slattach
+PROG sbin/sysctl
+
+PROG usr/bin/less usr/bin/more
+PROG usr/bin/tip
+
+PROG usr/sbin/installboot
+
+PROG usr/sbin/wiconfig
CVS commit: src/distrib/amd64
Module Name:src Committed By: khorben Date: Mon Jul 15 00:29:49 UTC 2013 Modified Files: src/distrib/amd64: Makefile Added Files: src/distrib/amd64/kmod-cgdroot: Makefile Log Message: Enabled building the kernel module containing the ramdisk required for full-disk encryption support by default. This should be the last part necessary on the amd64 port. XXX reproduce and test on the i386 port XXX implement support for full-disk encryption installs in sysinst To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/amd64/kmod-cgdroot/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/Makefile diff -u src/distrib/amd64/Makefile:1.6 src/distrib/amd64/Makefile:1.7 --- src/distrib/amd64/Makefile:1.6 Sun Jan 22 03:53:32 2012 +++ src/distrib/amd64/Makefile Mon Jul 15 00:29:49 2013 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2012/01/22 03:53:32 tsutsui Exp $ +# $NetBSD: Makefile,v 1.7 2013/07/15 00:29:49 khorben Exp $ SUBDIR= SUBDIR+= ramdisks SUBDIR+= .WAIT SUBDIR+= instkernel SUBDIR+= kmod +SUBDIR+= kmod-cgdroot SUBDIR+= .WAIT SUBDIR+= cdroms SUBDIR+= floppies Added files: Index: src/distrib/amd64/kmod-cgdroot/Makefile diff -u /dev/null src/distrib/amd64/kmod-cgdroot/Makefile:1.1 --- /dev/null Mon Jul 15 00:29:49 2013 +++ src/distrib/amd64/kmod-cgdroot/Makefile Mon Jul 15 00:29:49 2013 @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.1 2013/07/15 00:29:49 khorben Exp $ + +MINIROOT= cgdroot +RAMDISK= ramdisk-cgdroot + +.include ../../common/Makefile.minirootkmod
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/ramdisks/common
Module Name:src Committed By: riz Date: Wed Aug 15 16:48:41 UTC 2012 Modified Files: src/distrib/amd64/ramdisks/common: list.ramdisk Log Message: Add sbin/gpt to amd64 install ramdisk. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/amd64/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/amd64/ramdisks/common/list.ramdisk diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.17 src/distrib/amd64/ramdisks/common/list.ramdisk:1.18 --- src/distrib/amd64/ramdisks/common/list.ramdisk:1.17 Sun Jun 17 14:59:15 2012 +++ src/distrib/amd64/ramdisks/common/list.ramdisk Wed Aug 15 16:48:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.17 2012/06/17 14:59:15 martin Exp $ +# $NetBSD: list.ramdisk,v 1.18 2012/08/15 16:48:41 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/amd64/ramdisks/ramdisk
Module Name:src Committed By: sborrill Date: Mon Jan 9 17:45:03 UTC 2012 Modified Files: src/distrib/amd64/ramdisks/ramdisk: list Log Message: Add dkctl to install ramdisk so that you can enable disk writecaches before install, if necessary. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/amd64/ramdisks/ramdisk/list 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/ramdisks/ramdisk/list diff -u src/distrib/amd64/ramdisks/ramdisk/list:1.13 src/distrib/amd64/ramdisks/ramdisk/list:1.14 --- src/distrib/amd64/ramdisks/ramdisk/list:1.13 Sun Feb 13 04:14:58 2011 +++ src/distrib/amd64/ramdisks/ramdisk/list Mon Jan 9 17:45:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.13 2011/02/13 04:14:58 jym Exp $ +# $NetBSD: list,v 1.14 2012/01/09 17:45:03 sborrill Exp $ PROG bin/chio PROG bin/dd @@ -10,6 +10,7 @@ PROG bin/sync PROG libexec/lfs_cleanerd +PROG sbin/dkctl PROG sbin/fdisk PROG sbin/mbrlabel PROG sbin/mount_ext2fs
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src
Committed By: tsutsui
Date: Sun Jun 19 02:19:34 UTC 2011
Modified Files:
src/distrib/amd64/ramdisks/common: list.ramdisk
Log Message:
Fix indent.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/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/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.14 src/distrib/amd64/ramdisks/common/list.ramdisk:1.15
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.14 Sun Jun 19 02:18:30 2011
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Sun Jun 19 02:19:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.14 2011/06/19 02:18:30 tsutsui Exp $
+# $NetBSD: list.ramdisk,v 1.15 2011/06/19 02:19:34 tsutsui Exp $
SRCDIRS usr.bin/less
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -69,7 +69,7 @@
COPY ${NETBSDSRCDIR}/etc/group etc/group
COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
-COPY ${DISTRIBDIR}/common/protocols etc/protocols
+COPY ${DISTRIBDIR}/common/protocols etc/protocols
COPY ${DISTRIBDIR}/common/services etc/services
# we need the boot block in /usr/mdec + the MBR copy
CVS commit: src/distrib/amd64/floppies/common
Module Name:src
Committed By: jym
Date: Tue Feb 8 12:25:36 UTC 2011
Modified Files:
src/distrib/amd64/floppies/common: Makefile.bootfloppy
Log Message:
FLOPPYPAD + ${MACHINE} instead of hardcoding amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/distrib/amd64/floppies/common/Makefile.bootfloppy
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/floppies/common/Makefile.bootfloppy
diff -u src/distrib/amd64/floppies/common/Makefile.bootfloppy:1.10 src/distrib/amd64/floppies/common/Makefile.bootfloppy:1.11
--- src/distrib/amd64/floppies/common/Makefile.bootfloppy:1.10 Tue Nov 4 23:02:52 2008
+++ src/distrib/amd64/floppies/common/Makefile.bootfloppy Tue Feb 8 12:25:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootfloppy,v 1.10 2008/11/04 23:02:52 dbj Exp $
+# $NetBSD: Makefile.bootfloppy,v 1.11 2011/02/08 12:25:36 jym Exp $
#
# Makefile snippet to create a set of USTAR floppies
#
@@ -31,9 +31,10 @@
FLOPPYKERNOBJ!= cd ${.CURDIR}/../../${FLOPPYKERNDIR} ${PRINTOBJDIR}
FLOPPY_BOOT?= ${MDEC}/boot
-FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/amd64/floppies/common/boot.cfg
+FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/${MACHINE}/floppies/common/boot.cfg
FLOPPY_NETBSD= ${FLOPPYKERNOBJ}/${FLOPPYKERNEL}
FLOPPYFILES= boot boot.cfg ${FLOPPYMETAFILE} netbsd
+FLOPPYPAD= 1
FLOPPY_RELEASEDIR= installation/floppy
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:
CVS commit: src/distrib/amd64/floppies/common
Module Name:src Committed By: njoly Date: Wed Sep 23 11:17:59 UTC 2009 Modified Files: src/distrib/amd64/floppies/common: boot.cfg Log Message: Update boot.cfg banner/menu to reflect that installation floppies have ACPI support. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/floppies/common/boot.cfg 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/floppies/common/boot.cfg diff -u src/distrib/amd64/floppies/common/boot.cfg:1.2 src/distrib/amd64/floppies/common/boot.cfg:1.3 --- src/distrib/amd64/floppies/common/boot.cfg:1.2 Sun Mar 8 05:39:19 2009 +++ src/distrib/amd64/floppies/common/boot.cfg Wed Sep 23 11:17:58 2009 @@ -1,11 +1,11 @@ banner=NetBSD floppy diskette installation banner banner= -banner=These diskettes do not have support for ACPI and may not work on some -banner=modern hardware. If the floppy disk installation does not work, please -banner=try installing using a CD-ROM image. +banner=ACPI should work on all modern and legacy hardware, however if you have +banner=problems, please try disabling it. banner= menu=Install NetBSD:boot netbsd -menu=Install NetBSD (no SMP):boot netbsd -12 +menu=Install NetBSD (no ACPI):boot netbsd -2 +menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12 menu=Drop to boot prompt:prompt timeout=10
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src Committed By: tsutsui Date: Wed Apr 29 18:07:01 UTC 2009 Modified Files: src/distrib/amd64/ramdisks/common: list.ramdisk Log Message: Remove unnecessary gnu/usr.bin from SRCDIRS. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/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/amd64/ramdisks/common/list.ramdisk diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.6 src/distrib/amd64/ramdisks/common/list.ramdisk:1.7 --- src/distrib/amd64/ramdisks/common/list.ramdisk:1.6 Sun Jan 25 22:08:37 2009 +++ src/distrib/amd64/ramdisks/common/list.ramdisk Wed Apr 29 18:07:01 2009 @@ -1,6 +1,6 @@ -# $NetBSD: list.ramdisk,v 1.6 2009/01/25 22:08:37 abs Exp $ +# $NetBSD: list.ramdisk,v 1.7 2009/04/29 18:07:01 tsutsui Exp $ -SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin libexec +SRCDIRS bin sbin usr.bin usr.sbin libexec # init invokes the shell as -sh ARGVLN sh -sh
