CVS commit: src/distrib/amd64/ramdisks
Module Name:src
Committed By: riastradh
Date: Wed Jun 5 16:37:44 UTC 2024
Modified Files:
src/distrib/amd64/ramdisks: Makefile
Log Message:
ramdisk-zfsroot: Only enable if zfs is enabled.
PR port-amd64/58316
PR port-amd64/57948 (followup pullup)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/ramdisks/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/Makefile
diff -u src/distrib/amd64/ramdisks/Makefile:1.5 src/distrib/amd64/ramdisks/Makefile:1.6
--- src/distrib/amd64/ramdisks/Makefile:1.5 Mon Feb 19 17:55:46 2024
+++ src/distrib/amd64/ramdisks/Makefile Wed Jun 5 16:37:44 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2024/02/19 17:55:46 riastradh Exp $
+# $NetBSD: Makefile,v 1.6 2024/06/05 16:37:44 riastradh Exp $
SUBDIR=
SUBDIR+= ramdisk
SUBDIR+= ramdisk-cgdroot
-SUBDIR+= ramdisk-zfsroot
+SUBDIR+= ${${MKZFS} != "no":?ramdisk-zfsroot:}
TARGETS+= release
CVS commit: src/distrib/amd64/ramdisks
Module Name:src Committed By: riastradh Date: Wed Jun 5 16:37:44 UTC 2024 Modified Files: src/distrib/amd64/ramdisks: Makefile Log Message: ramdisk-zfsroot: Only enable if zfs is enabled. PR port-amd64/58316 PR port-amd64/57948 (followup pullup) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/ramdisks/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: christos
Date: Tue May 14 14:58:41 UTC 2024
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Added Files:
src/distrib/amd64/cdroms: spec.in
Log Message:
Add the extra spec for the amd64 cdroms
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/spec.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.28 src/distrib/amd64/cdroms/Makefile.cdrom:1.29
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.28 Fri Apr 26 13:36:32 2024
+++ src/distrib/amd64/cdroms/Makefile.cdrom Tue May 14 10:58:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
+# $NetBSD: Makefile.cdrom,v 1.29 2024/05/14 14:58:41 christos Exp $
.include
.include
@@ -22,6 +22,8 @@ CD_SETS+= base etc gpufw
CD_SETS+= modules
.endif
+SPEC_EXTRA:=${.PARSEDIR}/spec.in
+
${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
${RM} -f ${EFIBOOTIMG}
${RM} -rf efiboot/EFI/boot
Added files:
Index: src/distrib/amd64/cdroms/spec.in
diff -u /dev/null src/distrib/amd64/cdroms/spec.in:1.1
--- /dev/null Tue May 14 10:58:41 2024
+++ src/distrib/amd64/cdroms/spec.in Tue May 14 10:58:41 2024
@@ -0,0 +1,6 @@
+./boot type=file uname=root gname=wheel mode=644
+./install.sh type=file uname=root gname=wheel mode=755
+./mnt2 type=dir uname=root gname=wheel mode=755
+./netbsd type=file uname=root gname=wheel mode=644
+./targetroot type=dir uname=root gname=wheel mode=755
+./etc/gettytab type=link uname=root gname=wheel mode=755
CVS commit: src/distrib/amd64/cdroms
Module Name:src Committed By: christos Date: Tue May 14 14:58:41 UTC 2024 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom Added Files: src/distrib/amd64/cdroms: spec.in Log Message: Add the extra spec for the amd64 cdroms To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/spec.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
maya@ wrote:
> Module Name: src
> Committed By: maya
> Date: Tue Apr 16 16:13:45 UTC 2024
>
> Modified Files:
> src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
> spec.emuimage
>
> Log Message:
> restore amd64 live image support for resize root after combined mbr/gpt commit
>
> we need to resize_gpt now, as it takes precedence over mbr/disklabel
> this change brings us to behave like the evbarm images.
>
> XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure
> whether
> that has any negative repercussions, maybe another system might regard MBR as
> the
> sole source of truth when GPT also exists.
Actually disklabel or MBR does NOT exist in USE_GPT=YES case.
In src/distrib/common/bootimage/Makefile.bootimage,
both ${TOOL_FDISK} and ${TOOL_DISKLABEL} are only invoked
inside .if ${USE_GPT} == "no".
"${TOOL_GPT} biosboot -c /usr/mdec/gptmbr.bin" by USE_GPTMBR=yes
does all the tricks, i.e. gptmbr.bin in the MBR sector just reads
the first sector of the specified GPT partition:
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/mbr/gptmbr.S
and the loaded pbr.S in the primary bootxx checks a GPT partition table
and loads the whole (~8KB) the primary bootxx:
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/bootxx/pbr.S#L134-L135
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/bootxx/pbr.S#L372-L380
Maybe this is the reason why some odd machines cannot boot UEFI images
(such ugly implemantations might assume MBR partition really exists).
---
Izumi Tsutsui
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: maya Date: Tue Apr 16 16:13:45 UTC 2024 Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage spec.emuimage Log Message: restore amd64 live image support for resize root after combined mbr/gpt commit we need to resize_gpt now, as it takes precedence over mbr/disklabel this change brings us to behave like the evbarm images. XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether that has any negative repercussions, maybe another system might regard MBR as the sole source of truth when GPT also exists. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage cvs rdiff -u -r1.2 -r1.3 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.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: maya
Date: Tue Apr 16 16:13:45 UTC 2024
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
spec.emuimage
Log Message:
restore amd64 live image support for resize root after combined mbr/gpt commit
we need to resize_gpt now, as it takes precedence over mbr/disklabel
this change brings us to behave like the evbarm images.
XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether
that has any negative repercussions, maybe another system might regard MBR as
the
sole source of truth when GPT also exists.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.2 -r1.3 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.9 src/distrib/amd64/liveimage/emuimage/Makefile:1.10
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.9 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/Makefile Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: Makefile,v 1.10 2024/04/16 16:13:44 maya Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
@@ -13,6 +13,6 @@ 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
+ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.4
--- src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 Wed Sep 27 00:24:12 2023
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf.emuimage,v 1.3 2023/09/27 00:24:12 riastradh Exp $
+# $NetBSD: rc.conf.emuimage,v 1.4 2024/04/16 16:13:44 maya Exp $
is_ec2() {
val=NO
@@ -25,7 +25,7 @@ is_ec2() {
}
certctl_init=YES
-resize_disklabel=YES
+resize_gpt=YES
resize_root=YES
resize_root_flags="-p"
resize_root_postcmd="/sbin/reboot -n"
Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.3
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Tue Apr 16 16:13:44 2024
@@ -1,3 +1,3 @@
-# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: spec.emuimage,v 1.3 2024/04/16 16:13:44 maya 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
+./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel
CVS commit: src/distrib/amd64/liveimage
Module Name:src
Committed By: maya
Date: Sat Apr 13 18:38:17 UTC 2024
Modified Files:
src/distrib/amd64/liveimage: Makefile.liveimage
Log Message:
amd64 live image: support EFI as well as BIOS boot
The biggest caveat is that there's a small number of machines that try to
EFI boot but fail, so would prefer a BIOS only image. I'm not adding a
separate BIOS only image because the live image is pretty niche.
(For regular installation images, we do create a separate BIOS-only version)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage
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/Makefile.liveimage
diff -u src/distrib/amd64/liveimage/Makefile.liveimage:1.2 src/distrib/amd64/liveimage/Makefile.liveimage:1.3
--- src/distrib/amd64/liveimage/Makefile.liveimage:1.2 Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/liveimage/Makefile.liveimage Sat Apr 13 18:38:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.liveimage,v 1.2 2018/12/15 18:03:17 gson Exp $
+# $NetBSD: Makefile.liveimage,v 1.3 2024/04/13 18:38:17 maya Exp $
.include
@@ -7,6 +7,11 @@ PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
SECONDARY_BOOT_ARG= # unnecessary
+EFIBOOT= ${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.efi
+
USE_MBR= yes
+USE_GPT= yes
+USE_GPTMBR= yes
.include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"
CVS commit: src/distrib/amd64/liveimage
Module Name:src Committed By: maya Date: Sat Apr 13 18:38:17 UTC 2024 Modified Files: src/distrib/amd64/liveimage: Makefile.liveimage Log Message: amd64 live image: support EFI as well as BIOS boot The biggest caveat is that there's a small number of machines that try to EFI boot but fail, so would prefer a BIOS only image. I'm not adding a separate BIOS only image because the live image is pretty niche. (For regular installation images, we do create a separate BIOS-only version) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/ramdisks
Module Name:src Committed By: riastradh Date: Mon Feb 19 17:55:46 UTC 2024 Modified Files: src/distrib/amd64/ramdisks: Makefile Log Message: ramdisk-zfsroot: Enable build by default on amd64. XXX Should maybe copy this to other ports like evbarm64 too. PR port-amd64/57948 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/ramdisks/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/ramdisks
Module Name:src Committed By: riastradh Date: Mon Feb 19 17:55:46 UTC 2024 Modified Files: src/distrib/amd64/ramdisks: Makefile Log Message: ramdisk-zfsroot: Enable build by default on amd64. XXX Should maybe copy this to other ports like evbarm64 too. PR port-amd64/57948 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/ramdisks/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/Makefile diff -u src/distrib/amd64/ramdisks/Makefile:1.4 src/distrib/amd64/ramdisks/Makefile:1.5 --- src/distrib/amd64/ramdisks/Makefile:1.4 Sun May 21 15:28:37 2017 +++ src/distrib/amd64/ramdisks/Makefile Mon Feb 19 17:55:46 2024 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2017/05/21 15:28:37 riastradh Exp $ +# $NetBSD: Makefile,v 1.5 2024/02/19 17:55:46 riastradh Exp $ SUBDIR= SUBDIR+= ramdisk SUBDIR+= ramdisk-cgdroot +SUBDIR+= ramdisk-zfsroot TARGETS+= release
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: gdt
Date: Mon Aug 14 13:54:05 UTC 2023
Modified Files:
src/distrib/amd64/installimage: installimage.mk
Log Message:
amd64 installimage: Reduce non-xz size slightly to fit 4GB flash drives
The installimage sizes were bumped in 2022 because of some growth, and
the case for not-xz sets went to 4000 (MiB). That's just over what a
lot of "4 GB" flash drives are, but seems obviously intended to fit.
The actual usage of the filesystem, from a current build from earlier
this year (with non-xz sets) is:
/dev/dk1 3.7G 833M 2.7G 23% /mnt
and similar for netbsd-10 built yesterday, so we can afford to shrink
slightly. Drop to 3800, which is still huge, but will make 4 GB flash
drives work.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/installimage.mk
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/installimage.mk
diff -u src/distrib/amd64/installimage/installimage.mk:1.3 src/distrib/amd64/installimage/installimage.mk:1.4
--- src/distrib/amd64/installimage/installimage.mk:1.3 Sat Jul 30 00:55:38 2022
+++ src/distrib/amd64/installimage/installimage.mk Mon Aug 14 13:54:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: installimage.mk,v 1.3 2022/07/30 00:55:38 pgoyette Exp $
+# $NetBSD: installimage.mk,v 1.4 2023/08/14 13:54:05 gdt Exp $
# common code between distrib/amd64/installimage/Makefile and
# distrib/amd64/installimage-bios/Makefile.
@@ -6,7 +6,7 @@
.if ${USE_XZ_SETS:Uno} != "no"
INSTIMAGEMB?= 2500 # for all installation binaries
.else
-INSTIMAGEMB?= 4000 # for all installation binaries
+INSTIMAGEMB?= 3800 # for all installation binaries
.endif
PRIMARY_BOOT= bootxx_ffsv1
CVS commit: src/distrib/amd64/installimage
Module Name:src Committed By: gdt Date: Mon Aug 14 13:54:05 UTC 2023 Modified Files: src/distrib/amd64/installimage: installimage.mk Log Message: amd64 installimage: Reduce non-xz size slightly to fit 4GB flash drives The installimage sizes were bumped in 2022 because of some growth, and the case for not-xz sets went to 4000 (MiB). That's just over what a lot of "4 GB" flash drives are, but seems obviously intended to fit. The actual usage of the filesystem, from a current build from earlier this year (with non-xz sets) is: /dev/dk1 3.7G 833M 2.7G 23% /mnt and similar for netbsd-10 built yesterday, so we can afford to shrink slightly. Drop to 3800, which is still huge, but will make 4 GB flash drives work. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/installimage.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/amd64
On Wed, Jan 18, 2023 at 11:54:57AM +, David Brownlee wrote: > Adding an explicit -E seemed like the simplest and smallest I missed the part that kre explained: this is not a login shell, so indeed your change is the most simple solution. Martin
Re: CVS commit: src/distrib/amd64
On Tue, 17 Jan 2023 at 08:57, Robert Elz wrote: > > Date:Tue, 17 Jan 2023 08:13:12 +0100 > From:Martin Husemann > Message-ID: <20230117071312.ga18...@mail.duskware.de> > > | what is missing in this > | environment so it does not work by default? > > The shell started this way is not a login shell, so does > not read any of the standard login scripts, and I assume > also does not have ENV set to a suitable startup script > either. Adding an explicit -E seemed like the simplest and smallest (not adding an additional file to the image) way to trigger this behaviour (and also clearest to anyone reading through). (Happy to be adjusted by someone with better sh fu :) So essentially I think there are two questions (referencing martin's reply) 1) Should this be amd64 only: No. I wanted to start with amd64 to establish a baseline, and then work towards ports with very limited install space & memory 2) Is this the best mechanism: There is an argument that any interactive shell should default to -E in the absence of some other trigger, whether login, single user, install sh (not -DSMALL), or just typing sh (or some subset, such as with an explicit '-i' or interactive with '-l') Some other systems (and shells) do this, but I feel there would need to be a clear and coherent way to not trigger the behaviour. David
Re: CVS commit: src/distrib/amd64
Date:Tue, 17 Jan 2023 08:13:12 +0100 From:Martin Husemann Message-ID: <20230117071312.ga18...@mail.duskware.de> | what is missing in this | environment so it does not work by default? The shell started this way is not a login shell, so does not read any of the standard login scripts, and I assume also does not have ENV set to a suitable startup script either. kre
Re: CVS commit: src/distrib/amd64
On Mon, Jan 16, 2023 at 03:00:03PM +, David Brownlee wrote: > Module Name: src > Committed By: abs > Date: Mon Jan 16 15:00:03 UTC 2023 > > Modified Files: > src/distrib/amd64/cdroms: install.sh > src/distrib/amd64/installimage: install.sh > src/distrib/amd64/installimage-bios: install.sh > > Log Message: > Enable basic command line editing in amd64 installer shells I like the intention of this commit, but I am not sure this is the right place to do it (besides restricting this to amd64 is just plain wrong). Why is this "set -E" needed? We had some discussion about enabling that by default some time ago and on the installed system it seems to be fine - what is missing in this environment so it does not work by default? Martin
CVS commit: src/distrib/amd64
Module Name:src Committed By: abs Date: Mon Jan 16 15:00:03 UTC 2023 Modified Files: src/distrib/amd64/cdroms: install.sh src/distrib/amd64/installimage: install.sh src/distrib/amd64/installimage-bios: install.sh Log Message: Enable basic command line editing in amd64 installer shells When a user selects "exist installer" or hits ^Z in sysinst, the calling install.sh runs a shell, plus shows a message indicating they can type "exit" to return to the installer. Add -E to the arguments to this shell, to enable command line editing, (primarily for arrow keys, but basic emacs sequences will also work) At this point this is only on amd64, as this is the port which is least likely to be installing on particularly esoteric terminal hardware, and is also likely to have the highest proportion of less experienced users To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/install.sh cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/install.sh cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/install.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src
Committed By: abs
Date: Mon Jan 16 15:00:03 UTC 2023
Modified Files:
src/distrib/amd64/cdroms: install.sh
src/distrib/amd64/installimage: install.sh
src/distrib/amd64/installimage-bios: install.sh
Log Message:
Enable basic command line editing in amd64 installer shells
When a user selects "exist installer" or hits ^Z in sysinst, the
calling install.sh runs a shell, plus shows a message indicating
they can type "exit" to return to the installer.
Add -E to the arguments to this shell, to enable command line editing,
(primarily for arrow keys, but basic emacs sequences will also work)
At this point this is only on amd64, as this is the port which is
least likely to be installing on particularly esoteric terminal
hardware, and is also likely to have the highest proportion of less
experienced users
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/install.sh
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage/install.sh
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/install.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/install.sh
diff -u src/distrib/amd64/cdroms/install.sh:1.4 src/distrib/amd64/cdroms/install.sh:1.5
--- src/distrib/amd64/cdroms/install.sh:1.4 Thu May 28 09:51:31 2015
+++ src/distrib/amd64/cdroms/install.sh Mon Jan 16 15:00:03 2023
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.4 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: install.sh,v 1.5 2023/01/16 15:00:03 abs Exp $
#
# -
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ do
tput clear
echo "You have stopped sysinst, return to it by" \
"typing 'exit' or ^D."
- ${SHELL} -i
+ ${SHELL} -i -E
cmd="fg"
else
cmd=""
@@ -112,4 +112,4 @@ done
echo "TERM=${TERM}" > ${termfile}
echo
echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
Index: src/distrib/amd64/installimage/install.sh
diff -u src/distrib/amd64/installimage/install.sh:1.3 src/distrib/amd64/installimage/install.sh:1.4
--- src/distrib/amd64/installimage/install.sh:1.3 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage/install.sh Mon Jan 16 15:00:03 2023
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.3 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: install.sh,v 1.4 2023/01/16 15:00:03 abs Exp $
#
# -
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ do
tput clear
echo "You have stopped sysinst, return to it by" \
"typing 'exit' or ^D."
- ${SHELL} -i
+ ${SHELL} -i -E
cmd="fg"
else
cmd=""
@@ -112,4 +112,4 @@ done
echo "TERM=${TERM}" > ${termfile}
echo
echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
Index: src/distrib/amd64/installimage-bios/install.sh
diff -u src/distrib/amd64/installimage-bios/install.sh:1.2 src/distrib/amd64/installimage-bios/install.sh:1.3
--- src/distrib/amd64/installimage-bios/install.sh:1.2 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage-bios/install.sh Mon Jan 16 15:00:03 2023
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.2 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: install.sh,v 1.3 2023/01/16 15:00:03 abs Exp $
#
# -
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ do
tput clear
echo "You have stopped sysinst, return to it by" \
"typing 'exit' or ^D."
- ${SHELL} -i
+ ${SHELL} -i -E
cmd="fg"
else
cmd=""
@@ -112,4 +112,4 @@ done
echo "TERM=${TERM}" > ${termfile}
echo
echo "To return to the installer, quit this shell by typing 'exit' or ^D."
-exec ${SHELL}
+exec ${SHELL} -E
CVS commit: src/distrib/amd64/installimage
Module Name:src Committed By: pgoyette Date: Sat Jul 30 00:55:38 UTC 2022 Modified Files: src/distrib/amd64/installimage: installimage.mk Log Message: The new drm modules made the image file grow again! Bump the size limit a bit. XXX Other $ARCH might also need this. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/installimage.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/installimage
Module Name:src
Committed By: pgoyette
Date: Sat Jul 30 00:55:38 UTC 2022
Modified Files:
src/distrib/amd64/installimage: installimage.mk
Log Message:
The new drm modules made the image file grow again! Bump the size
limit a bit.
XXX Other $ARCH might also need this.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/installimage.mk
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/installimage.mk
diff -u src/distrib/amd64/installimage/installimage.mk:1.2 src/distrib/amd64/installimage/installimage.mk:1.3
--- src/distrib/amd64/installimage/installimage.mk:1.2 Sun May 22 19:32:41 2022
+++ src/distrib/amd64/installimage/installimage.mk Sat Jul 30 00:55:38 2022
@@ -1,12 +1,12 @@
-# $NetBSD: installimage.mk,v 1.2 2022/05/22 19:32:41 jmcneill Exp $
+# $NetBSD: installimage.mk,v 1.3 2022/07/30 00:55:38 pgoyette Exp $
# common code between distrib/amd64/installimage/Makefile and
# distrib/amd64/installimage-bios/Makefile.
.if ${USE_XZ_SETS:Uno} != "no"
-INSTIMAGEMB?= 2250 # for all installation binaries
+INSTIMAGEMB?= 2500 # for all installation binaries
.else
-INSTIMAGEMB?= 3500 # for all installation binaries
+INSTIMAGEMB?= 4000 # for all installation binaries
.endif
PRIMARY_BOOT= bootxx_ffsv1
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: hgutch Date: Wed Jul 13 18:51:03 UTC 2022 Modified Files: src/distrib/amd64/liveimage/emuimage: rc.conf.emuimage Log Message: Check for right sysctl node to make live image work OOTB on OpenStack: machdep.dmi.system-product = OpenStack Compute To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: hgutch
Date: Wed Jul 13 18:51:03 UTC 2022
Modified Files:
src/distrib/amd64/liveimage/emuimage: rc.conf.emuimage
Log Message:
Check for right sysctl node to make live image work OOTB on OpenStack:
machdep.dmi.system-product = OpenStack Compute
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/distrib/amd64/liveimage/emuimage/rc.conf.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/rc.conf.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.1 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.2
--- src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.1 Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Wed Jul 13 18:51:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf.emuimage,v 1.1 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: rc.conf.emuimage,v 1.2 2022/07/13 18:51:03 hgutch Exp $
is_ec2() {
val=NO
@@ -6,6 +6,7 @@ is_ec2() {
for node in machdep.dmi.system-vendor \
machdep.dmi.system-version \
machdep.dmi.bios-version \
+ machdep.dmi.system-product \
machdep.xen.version ; do
if /sbin/sysctl -q $node; then
nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')"
CVS commit: src/distrib/amd64
Module Name:src
Committed By: jmcneill
Date: Sun May 22 19:32:42 UTC 2022
Modified Files:
src/distrib/amd64/installimage: Makefile installimage.mk
src/distrib/amd64/installimage-bios: Makefile
Log Message:
Restore Makefile.installimage include after variables are set. Makes amd64
USB install images bootable again.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/installimage.mk
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/installimage-bios/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.22 src/distrib/amd64/installimage/Makefile:1.23
--- src/distrib/amd64/installimage/Makefile:1.22 Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage/Makefile Sun May 22 19:32:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/22 19:32:41 jmcneill Exp $
.include
@@ -14,3 +14,5 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
USE_MBR= yes
USE_GPT= yes
USE_GPTMBR= yes
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
Index: src/distrib/amd64/installimage/installimage.mk
diff -u src/distrib/amd64/installimage/installimage.mk:1.1 src/distrib/amd64/installimage/installimage.mk:1.2
--- src/distrib/amd64/installimage/installimage.mk:1.1 Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage/installimage.mk Sun May 22 19:32:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: installimage.mk,v 1.1 2022/05/08 08:12:45 mrg Exp $
+# $NetBSD: installimage.mk,v 1.2 2022/05/22 19:32:41 jmcneill Exp $
# common code between distrib/amd64/installimage/Makefile and
# distrib/amd64/installimage-bios/Makefile.
@@ -29,5 +29,3 @@ IMGFILE_EXTRA=\
${.CURDIR}/etc.rc etc/rc\
${.CURDIR}/install.sh .\
${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.6 src/distrib/amd64/installimage-bios/Makefile:1.7
--- src/distrib/amd64/installimage-bios/Makefile:1.6 Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage-bios/Makefile Sun May 22 19:32:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/22 19:32:41 jmcneill Exp $
.include
@@ -7,3 +7,5 @@ INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-
.include "../installimage/installimage.mk"
USE_MBR= yes
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
CVS commit: src/distrib/amd64
Module Name:src Committed By: jmcneill Date: Sun May 22 19:32:42 UTC 2022 Modified Files: src/distrib/amd64/installimage: Makefile installimage.mk src/distrib/amd64/installimage-bios: Makefile Log Message: Restore Makefile.installimage include after variables are set. Makes amd64 USB install images bootable again. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/installimage.mk cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/installimage-bios/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src Committed By: mrg Date: Sun May 8 08:12:45 UTC 2022 Modified Files: src/distrib/amd64/installimage: Makefile src/distrib/amd64/installimage-bios: Makefile Added Files: src/distrib/amd64/installimage: installimage.mk Log Message: fix building amd64 with USE_XZ_SETS=no. bump the size of images if USE_XZ_SETS != no. consolidate a lot of the code between installimage/Makefile and installimage-bios/Makefile into installimage/installimage.mk. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage/installimage.mk cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/installimage-bios/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src
Committed By: mrg
Date: Sun May 8 08:12:45 UTC 2022
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile
Added Files:
src/distrib/amd64/installimage: installimage.mk
Log Message:
fix building amd64 with USE_XZ_SETS=no.
bump the size of images if USE_XZ_SETS != no. consolidate a lot of
the code between installimage/Makefile and installimage-bios/Makefile
into installimage/installimage.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage/installimage.mk
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/installimage-bios/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.21 src/distrib/amd64/installimage/Makefile:1.22
--- src/distrib/amd64/installimage/Makefile:1.21 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage/Makefile Sun May 8 08:12:45 2022
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2250 # for all installation binaries
+.include "installimage.mk"
-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
@@ -17,22 +14,3 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
USE_MBR= yes
USE_GPT= yes
USE_GPTMBR= 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
-
-SPEC_EXTRA= ${.CURDIR}/spec.inst
-IMGFILE_EXTRA=\
- ${.CURDIR}/etc.ttys etc/ttys \
- ${.CURDIR}/etc.rc etc/rc\
- ${.CURDIR}/install.sh .\
- ${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.5 src/distrib/amd64/installimage-bios/Makefile:1.6
--- src/distrib/amd64/installimage-bios/Makefile:1.5 Mon Jan 3 12:10:17 2022
+++ src/distrib/amd64/installimage-bios/Makefile Sun May 8 08:12:45 2022
@@ -1,32 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2250 # for all installation binaries
-
-PRIMARY_BOOT= bootxx_ffsv1
-SECONDARY_BOOT= boot
-SECONDARY_BOOT_ARG= # unnecessary
+.include "../installimage/installimage.mk"
USE_MBR= 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
-
-SPEC_EXTRA= ${.CURDIR}/spec.inst
-IMGFILE_EXTRA=\
- ${.CURDIR}/etc.ttys etc/ttys \
- ${.CURDIR}/etc.rc etc/rc\
- ${.CURDIR}/install.sh .\
- ${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Added files:
Index: src/distrib/amd64/installimage/installimage.mk
diff -u /dev/null src/distrib/amd64/installimage/installimage.mk:1.1
--- /dev/null Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage/installimage.mk Sun May 8 08:12:45 2022
@@ -0,0 +1,33 @@
+# $NetBSD: installimage.mk,v 1.1 2022/05/08 08:12:45 mrg Exp $
+
+# common code between distrib/amd64/installimage/Makefile and
+# distrib/amd64/installimage-bios/Makefile.
+
+.if ${USE_XZ_SETS:Uno} != "no"
+INSTIMAGEMB?= 2250 # for all installation binaries
+.else
+INSTIMAGEMB?= 3500 # for all installation binaries
+.endif
+
+PRIMARY_BOOT= bootxx_ffsv1
+SECONDARY_BOOT= boot
+SECONDARY_BOOT_ARG= # unnecessary
+
+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
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc\
+ ${.CURDIR}/install.sh .\
+ ${.OBJDIR}/boot.cfg .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src
Committed By: martin
Date: Sun Apr 10 11:56:28 UTC 2022
Modified Files:
src/distrib/amd64/ramdisks/common: Makefile.ramdisk list.ramdisk
Log Message:
Add missing EFI bootloaders to the install kernel ramdisk,
noticed by Lloyd Parkes.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.21 -r1.22 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/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.15 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.16
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.15 Sun Dec 29 18:26:16 2019
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Sun Apr 10 11:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.15 2019/12/29 18:26:16 christos Exp $
+# $NetBSD: Makefile.ramdisk,v 1.16 2022/04/10 11:56:28 martin Exp $
NOSANITIZER= # defined
@@ -27,6 +27,8 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \
${DESTDIR}/usr/mdec/mbr_ext \
${DESTDIR}/usr/mdec/mbr_bootsel \
${DESTDIR}/usr/mdec/gptmbr.bin \
+ ${DESTDIR}/usr/mdec/bootia32.efi \
+ ${DESTDIR}/usr/mdec/bootx64.efi \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 src/distrib/amd64/ramdisks/common/list.ramdisk:1.22
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 Mon Oct 1 17:50:08 2018
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Sun Apr 10 11:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
+# $NetBSD: list.ramdisk,v 1.22 2022/04/10 11:56:28 martin Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -81,6 +81,8 @@ COPY ${DESTDIR}/usr/mdec/bootxx_ffsv1 us
COPY ${DESTDIR}/usr/mdec/bootxx_ffsv2 usr/mdec/bootxx_ffsv2
COPY ${DESTDIR}/usr/mdec/bootxx_lfsv2 usr/mdec/bootxx_lfsv2
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+COPY ${DESTDIR}/usr/mdec/bootia32.efi usr/mdec/bootia32.efi
+COPY ${DESTDIR}/usr/mdec/bootx64.efi usr/mdec/bootx64.efi
COPY ${DESTDIR}/usr/mdec/mbr_ext usr/mdec/mbr_ext
COPY ${DESTDIR}/usr/mdec/mbr_bootsel usr/mdec/mbr_bootsel
COPY ${DESTDIR}/usr/mdec/gptmbr.bin usr/mdec/gptmbr.bin
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src Committed By: martin Date: Sun Apr 10 11:56:28 UTC 2022 Modified Files: src/distrib/amd64/ramdisks/common: Makefile.ramdisk list.ramdisk Log Message: Add missing EFI bootloaders to the install kernel ramdisk, noticed by Lloyd Parkes. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/distrib/amd64/ramdisks/common/Makefile.ramdisk cvs rdiff -u -r1.21 -r1.22 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.
CVS commit: src/distrib/amd64
Module Name:src
Committed By: martin
Date: Mon Jan 3 12:10:17 UTC 2022
Modified Files:
src/distrib/amd64/installimage: Makefile install.sh spec.inst
src/distrib/amd64/installimage-bios: Makefile install.sh spec.inst
Log Message:
There is no point in putting a second sysinst binary into the install
image's root filesystem.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/install.sh \
src/distrib/amd64/installimage/spec.inst
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/installimage-bios/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.20 src/distrib/amd64/installimage/Makefile:1.21
--- src/distrib/amd64/installimage/Makefile:1.20 Fri Dec 31 04:59:16 2021
+++ src/distrib/amd64/installimage/Makefile Mon Jan 3 12:10:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/12/31 04:59:16 pgoyette Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $
.include
@@ -27,18 +27,12 @@ prepare_md_post:
< ${.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 .
+ ${.OBJDIR}/boot.cfg .
.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage/install.sh
diff -u src/distrib/amd64/installimage/install.sh:1.2 src/distrib/amd64/installimage/install.sh:1.3
--- src/distrib/amd64/installimage/install.sh:1.2 Sun Jun 3 21:42:45 2012
+++ src/distrib/amd64/installimage/install.sh Mon Jan 3 12:10:17 2022
@@ -1,5 +1,5 @@
#! /bin/sh -m
-# $NetBSD: install.sh,v 1.2 2012/06/03 21:42:45 joerg Exp $
+# $NetBSD: install.sh,v 1.3 2022/01/03 12:10:17 martin Exp $
#
# -
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@ fi
# run the installation or upgrade script.
cd /
-cmd=./sysinst
+cmd=/usr/sbin/sysinst
while [ -n "${cmd}" ]
do
Index: src/distrib/amd64/installimage/spec.inst
diff -u src/distrib/amd64/installimage/spec.inst:1.2 src/distrib/amd64/installimage/spec.inst:1.3
--- src/distrib/amd64/installimage/spec.inst:1.2 Sat Sep 13 10:18:24 2014
+++ src/distrib/amd64/installimage/spec.inst Mon Jan 3 12:10:17 2022
@@ -1,13 +1,8 @@
-# $NetBSD: spec.inst,v 1.2 2014/09/13 10:18:24 roy Exp $
+# $NetBSD: spec.inst,v 1.3 2022/01/03 12:10:17 martin Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 uname=root gname=wheel
./install.sh type=file mode=0755 uname=root gname=wheel
-./sysinst type=file mode=0755 uname=root gname=wheel
-./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel
-./sysinstmsgs.es type=file mode=0444 uname=root gname=wheel
-./sysinstmsgs.fr type=file mode=0444 uname=root gname=wheel
-./sysinstmsgs.pl type=file mode=0444 uname=root gname=wheel
# for sysinst "install from local directory" default
./release type=link mode=0755 uname=root gname=wheel link=.
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.4 src/distrib/amd64/installimage-bios/Makefile:1.5
--- src/distrib/amd64/installimage-bios/Makefile:1.4 Fri Dec 31 04:59:15 2021
+++ src/distrib/amd64/installimage-bios/Makefile Mon Jan 3 12:10:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/12/31 04:59:15 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $
.include
@@ -21,18 +21,12 @@ prepare_md_post:
< ${.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 .
+ ${.OBJDIR}/boot.cfg .
.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/install.sh
diff -u src/distrib/amd64/installimage-bios/install.sh:1.1
CVS commit: src/distrib/amd64
Module Name:src Committed By: martin Date: Mon Jan 3 12:10:17 UTC 2022 Modified Files: src/distrib/amd64/installimage: Makefile install.sh spec.inst src/distrib/amd64/installimage-bios: Makefile install.sh spec.inst Log Message: There is no point in putting a second sysinst binary into the install image's root filesystem. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/install.sh \ src/distrib/amd64/installimage/spec.inst cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/installimage-bios/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage-bios/install.sh \ src/distrib/amd64/installimage-bios/spec.inst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src Committed By: pgoyette Date: Fri Dec 31 04:59:16 UTC 2021 Modified Files: src/distrib/amd64/installimage: Makefile src/distrib/amd64/installimage-bios: Makefile Log Message: Still not big enough - bump some more. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage-bios/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src
Committed By: pgoyette
Date: Fri Dec 31 04:59:16 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile
Log Message:
Still not big enough - bump some more.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage-bios/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.19 src/distrib/amd64/installimage/Makefile:1.20
--- src/distrib/amd64/installimage/Makefile:1.19 Thu Dec 30 15:01:55 2021
+++ src/distrib/amd64/installimage/Makefile Fri Dec 31 04:59:16 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2021/12/30 15:01:55 pgoyette Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/31 04:59:16 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2180 # for all installation binaries
+INSTIMAGEMB?= 2250 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.3 src/distrib/amd64/installimage-bios/Makefile:1.4
--- src/distrib/amd64/installimage-bios/Makefile:1.3 Thu Dec 30 15:01:55 2021
+++ src/distrib/amd64/installimage-bios/Makefile Fri Dec 31 04:59:15 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/12/30 15:01:55 pgoyette Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/31 04:59:15 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2180 # for all installation binaries
+INSTIMAGEMB?= 2250 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64
Module Name:src Committed By: pgoyette Date: Thu Dec 30 15:01:56 UTC 2021 Modified Files: src/distrib/amd64/installimage: Makefile src/distrib/amd64/installimage-bios: Makefile Log Message: With recent changees to debug kernel stuff from Christos we are once again pushing the size limit. Bump it again. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src
Committed By: pgoyette
Date: Thu Dec 30 15:01:56 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile
Log Message:
With recent changees to debug kernel stuff from Christos we are
once again pushing the size limit. Bump it again.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/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.18 src/distrib/amd64/installimage/Makefile:1.19
--- src/distrib/amd64/installimage/Makefile:1.18 Sun Dec 26 03:07:06 2021
+++ src/distrib/amd64/installimage/Makefile Thu Dec 30 15:01:55 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2021/12/26 03:07:06 pgoyette Exp $
+# $NetBSD: Makefile,v 1.19 2021/12/30 15:01:55 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2150 # for all installation binaries
+INSTIMAGEMB?= 2180 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.2 src/distrib/amd64/installimage-bios/Makefile:1.3
--- src/distrib/amd64/installimage-bios/Makefile:1.2 Sun Dec 26 03:07:06 2021
+++ src/distrib/amd64/installimage-bios/Makefile Thu Dec 30 15:01:55 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/12/26 03:07:06 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2021/12/30 15:01:55 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 2150 # for all installation binaries
+INSTIMAGEMB?= 2180 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64
Module Name:src
Committed By: pgoyette
Date: Sun Dec 26 03:07:06 UTC 2021
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile
Log Message:
Once again things have grown, so the install image allocation size
needs to be bumped.
XXX There's gotta be a better way to maintain this! :-)
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage-bios/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.17 src/distrib/amd64/installimage/Makefile:1.18
--- src/distrib/amd64/installimage/Makefile:1.17 Wed Jun 2 16:07:33 2021
+++ src/distrib/amd64/installimage/Makefile Sun Dec 26 03:07:06 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2021/06/02 16:07:33 pgoyette Exp $
+# $NetBSD: Makefile,v 1.18 2021/12/26 03:07:06 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1800 # for all installation binaries
+INSTIMAGEMB?= 2150 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.1 src/distrib/amd64/installimage-bios/Makefile:1.2
--- src/distrib/amd64/installimage-bios/Makefile:1.1 Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/Makefile Sun Dec 26 03:07:06 2021
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2021/10/08 20:24:06 maya Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/26 03:07:06 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1800 # for all installation binaries
+INSTIMAGEMB?= 2150 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64
Module Name:src Committed By: pgoyette Date: Sun Dec 26 03:07:06 UTC 2021 Modified Files: src/distrib/amd64/installimage: Makefile src/distrib/amd64/installimage-bios: Makefile Log Message: Once again things have grown, so the install image allocation size needs to be bumped. XXX There's gotta be a better way to maintain this! :-) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/amd64/installimage/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage-bios/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/amd64
Module Name:src
Committed By: maya
Date: Fri Oct 8 20:24:06 UTC 2021
Modified Files:
src/distrib/amd64: Makefile
Added Files:
src/distrib/amd64/installimage-bios: Makefile boot.cfg.in etc.rc
etc.ttys install.sh spec.inst
Log Message:
Restore having a BIOS-only amd64 USB image.
Several people reported having hardware that struggles booting the mix
EFI+BIOS image, and it's better to offer them a working image.
Keeping the EFI image as having the obvious name, this is going to become
more likely to work by default as newer hardware may not support BIOS boot.
(XXX pullup-9)
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage-bios/Makefile \
src/distrib/amd64/installimage-bios/boot.cfg.in \
src/distrib/amd64/installimage-bios/etc.rc \
src/distrib/amd64/installimage-bios/etc.ttys \
src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/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.14 src/distrib/amd64/Makefile:1.15
--- src/distrib/amd64/Makefile:1.14 Wed May 27 22:27:58 2020
+++ src/distrib/amd64/Makefile Fri Oct 8 20:24:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/05/27 22:27:58 maya Exp $
+# $NetBSD: Makefile,v 1.15 2021/10/08 20:24:06 maya Exp $
.include
@@ -14,6 +14,7 @@ SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
SUBDIR+= installimage
+SUBDIR+= installimage-bios
TARGETS+= release
iso_image:
@@ -24,5 +25,6 @@ live_image:
install_image:
${MAKEDIRTARGET} installimage install_image
+ ${MAKEDIRTARGET} installimage-bios install_image
.include
Added files:
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u /dev/null src/distrib/amd64/installimage-bios/Makefile:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/Makefile Fri Oct 8 20:24:06 2021
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2021/10/08 20:24:06 maya Exp $
+
+.include
+
+INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
+
+INSTIMAGEMB?= 1800 # for all installation binaries
+
+PRIMARY_BOOT= bootxx_ffsv1
+SECONDARY_BOOT= boot
+SECONDARY_BOOT_ARG= # unnecessary
+
+USE_MBR= 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 "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/boot.cfg.in
diff -u /dev/null src/distrib/amd64/installimage-bios/boot.cfg.in:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/boot.cfg.in Fri Oct 8 20:24:06 2021
@@ -0,0 +1,9 @@
+banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
+banner
+banner=
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
+menu=Install NetBSD:boot netbsd
+menu=Drop to boot prompt:prompt
+timeout=30
+clear=1
Index: src/distrib/amd64/installimage-bios/etc.rc
diff -u /dev/null src/distrib/amd64/installimage-bios/etc.rc:1.1
--- /dev/null Fri Oct 8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/etc.rc Fri Oct 8 20:24:06 2021
@@ -0,0 +1,49 @@
+# $NetBSD: etc.rc,v 1.1 2021/10/08 20:24:06 maya Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#must display the following acknowledgement:
+# This product includes software developed for the
+# NetBSD Project. See http://www.NetBSD.org/ for
CVS commit: src/distrib/amd64
Module Name:src Committed By: maya Date: Fri Oct 8 20:24:06 UTC 2021 Modified Files: src/distrib/amd64: Makefile Added Files: src/distrib/amd64/installimage-bios: Makefile boot.cfg.in etc.rc etc.ttys install.sh spec.inst Log Message: Restore having a BIOS-only amd64 USB image. Several people reported having hardware that struggles booting the mix EFI+BIOS image, and it's better to offer them a working image. Keeping the EFI image as having the obvious name, this is going to become more likely to work by default as newer hardware may not support BIOS boot. (XXX pullup-9) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/amd64/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/amd64/installimage-bios/Makefile \ src/distrib/amd64/installimage-bios/boot.cfg.in \ src/distrib/amd64/installimage-bios/etc.rc \ src/distrib/amd64/installimage-bios/etc.ttys \ src/distrib/amd64/installimage-bios/install.sh \ src/distrib/amd64/installimage-bios/spec.inst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
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: 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.
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.
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.
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.
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: 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.
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.
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: 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.
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.
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: 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.
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: 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.
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/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.
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.
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
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.
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/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.
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: gson
Date: Sun Aug 11 11:00:30 UTC 2019
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile
Log Message:
Live images built with MKDEBUG=yes fit in 2 GB since installing _pic.a
libraries was disabled in src/share/mk/bsd.own.mk 1.1150.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 src/distrib/amd64/liveimage/emuimage/Makefile:1.7
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.6 Wed Aug 7 07:59:35 2019
+++ src/distrib/amd64/liveimage/emuimage/Makefile Sun Aug 11 11:00:30 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2019/08/07 07:59:35 gson Exp $
+# $NetBSD: Makefile,v 1.7 2019/08/11 11:00:30 gson Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
-EMUIMAGEMB?= 3725 # 4GB USB flash memories aren't 4GiB
+EMUIMAGEMB?= 1907 # 2GB USB flash memories aren't 2GiB
LIVEIMAGEMB= ${EMUIMAGEMB}
.include "${.CURDIR}/../Makefile.liveimage"
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: gson Date: Sun Aug 11 11:00:30 UTC 2019 Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile Log Message: Live images built with MKDEBUG=yes fit in 2 GB since installing _pic.a libraries was disabled in src/share/mk/bsd.own.mk 1.1150. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 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.
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
Martin Husemann writes: > On Thu, Aug 08, 2019 at 08:09:19PM -0400, Greg Troxel wrote: >> In addition, I don't like it that images have stuff in /boot in the DOS >> partition that can't be found in some obvious place, like /usr/mdec. >> But I haven't gotten around to trying to fix it either so I get it that >> ENOPATCH. > > Yes, but in this case the bug is that sysinst does not know how to properly > fill the /boot things - which is on my TODO list. > > (and also, as you mention, that there is no obvious easy source for the > content) I was talking about the first bug, that these things aren't in the destdir of a build. The following belong on /usr/mdec/RPI, or similar, either for all arm build (or when MKRPI=yes if we want to split that out). -rwxr-xr-x 1 root wheel 1494 Oct 26 2017 LICENCE.broadcom -rwxr-xr-x 1 root wheel17932 Oct 26 2017 bootcode.bin -rwxr-xr-x 1 root wheel 105 Nov 9 2018 cmdline.txt -rwxr-xr-x 1 root wheel 6624 Oct 26 2017 fixup.dat -rwxr-xr-x 1 root wheel 2533 Oct 26 2017 fixup_cd.dat -rwxr-xr-x 1 root wheel 2823716 Oct 26 2017 start.elf -rwxr-xr-x 1 root wheel 634948 Oct 26 2017 start_cd.elf Arguably installboot should be taught to deal with this; it's a FAT partition instead of blocks 0-15, but it strikes me as the same thing logically.
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
Martin Husemann wrote: > However - the whole idea boils down to: > > - what purpose do others use the USB install images for? What others use the USB *install* image for is hardly relevant to the present discussion. The install image and the live image (aka "emuimage") are two separate things, and the commit being discussed affects only the latter: NetBSD-9.99.4-amd64-install.img1.4G NetBSD-9.99.4-amd64-live.img 3.6G I'm guessing almost no one uses the amd64 live image presently, simply because it is not included in the official binary releases - you have to build it yourself. But I think there is a clear trend away from the 1980's concept of "installing" an operating system towards simply running images - that's what ARM SBC users do, that's what you do on Amazon EC2, etc. Many other open source OSes distribute fully functional live images for amd64, and I think NetBSD should, too. -- Andreas Gustafsson, g...@netbsd.org
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
On Fri, Aug 09, 2019 at 05:44:12AM +, m...@netbsd.org wrote: > I guess not a lot of people use the amd64 .img files as an alternate > sysinst for remote setups. where you reboot to rescue, dd it to disk, > then reboot to a complete netbsd install. Sorry, I am not sure I get your point here. I have only ever used a virtual ISO for that (as that is trivial to add in most virtual machine setups, whereas the USB images often need some conversion and I always forget the details). On machines with enough RAM the ramdisk module (or on other architctures the monlithic ramdisk INSTALL kernel) is even better for simple recovery. However - the whole idea boils down to: - what purpose do others use the USB install images for? My proposition relied on the (obviously wrong) impression that it would be mostly for: 1) testing a new NetBSD version on some random (foreign) hardware (e.g. a Notebook at a shop before buying it) 2) quickly trying NetBSD (while usually running something else) 3) installing NetBSD None of this would require the ability to statically link code or realy debug binaries in this (limited) setup. If others use the images more broadly, the whole idea is moot, especially as USB stick sizes are not exactly limited anywhere close to the size we need right now. Martin
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
On Thu, Aug 08, 2019 at 08:09:19PM -0400, Greg Troxel wrote: > In addition, I don't like it that images have stuff in /boot in the DOS > partition that can't be found in some obvious place, like /usr/mdec. > But I haven't gotten around to trying to fix it either so I get it that > ENOPATCH. Yes, but in this case the bug is that sysinst does not know how to properly fill the /boot things - which is on my TODO list. (and also, as you mention, that there is no obvious easy source for the content) Martin
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
On Thu, Aug 08, 2019 at 08:22:21PM +0200, Martin Husemann wrote: > On Thu, Aug 08, 2019 at 09:13:37PM +0300, Andreas Gustafsson wrote: > > The image already has an empty /usr/libdata/debug. The increase in > > size when MKDEBUG is enabled is spread out over various other > > directories, notably /usr/lib. For example, > > > > /usr/lib 405182 kB -> 866276 kB > > /usr/bin 53426 kB -> 63140 kB > > > > The largest file in /usr/lib is libstdc++_pic.a, which grows from > > 4.3 MB to 27 MB. > > Heh - nice, didn't think about that. > > How about: remove all *.a files from those images? > Is there a tool to strip CTF from binaries? > > Martin I guess not a lot of people use the amd64 .img files as an alternate sysinst for remote setups. where you reboot to rescue, dd it to disk, then reboot to a complete netbsd install.
re: CVS commit: src/distrib/amd64/liveimage/emuimage
> Other libraries also have _pic.a files that are much larger than the > others versions. Is there a bug that causes them not to be CTF-converted, > or is this deliberate? the _pic.a libraries are special case we could choose to stop shipping. they're useful if someone wants to build a special case application for some reason (tm), but almost never used by the vast majority of people. they're created as part of create the .so, and the .so has its debug info moved out, but apparently we've never created any makefile or sets infrastructure to do this for _pic.a. perhaps we should choose not to install them by default. you can turn it off already with MKPICINSTALL=no. .mrg.
re: CVS commit: src/distrib/amd64/liveimage/emuimage
Martin Husemann writes: > On Thu, Aug 08, 2019 at 09:13:37PM +0300, Andreas Gustafsson wrote: > > The image already has an empty /usr/libdata/debug. The increase in > > size when MKDEBUG is enabled is spread out over various other > > directories, notably /usr/lib. For example, > > > > /usr/lib 405182 kB -> 866276 kB > > /usr/bin 53426 kB -> 63140 kB > > > > The largest file in /usr/lib is libstdc++_pic.a, which grows from > > 4.3 MB to 27 MB. > > Heh - nice, didn't think about that. > > How about: remove all *.a files from those images? start with *_pic.a? :) those are really rarely used, even on normal installs. .mrg.
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
Andreas Gustafsson writes: > I really don't like the general idea of introducing differences > between images and systems installed through sysinst. It's confusing > for users, and also means that testing of one is less likely to apply > to the other. Agreed strongly. In addition, I don't like it that images have stuff in /boot in the DOS partition that can't be found in some obvious place, like /usr/mdec. But I haven't gotten around to trying to fix it either so I get it that ENOPATCH.
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
Martin Husemann wrote: > How about: remove all *.a files from those images? > Is there a tool to strip CTF from binaries? I really don't like the general idea of introducing differences between images and systems installed through sysinst. It's confusing for users, and also means that testing of one is less likely to apply to the other. I see that libstdc++_pic.a is much larger than the other versions of the same library: # cd /usr/lib # ls -al libstdc* -r--r--r-- 1 root wheel 4539634 Aug 8 14:00 libstdc++.a lrwxr-xr-x 1 root wheel16 Aug 8 14:00 libstdc++.so -> libstdc++.so.9.0 lrwxr-xr-x 1 root wheel16 Aug 8 14:00 libstdc++.so.9 -> libstdc++.so.9.0 -r--r--r-- 1 root wheel 2030136 Aug 8 14:00 libstdc++.so.9.0 -r--r--r-- 1 root wheel 4787754 Aug 8 14:00 libstdc++_p.a -r--r--r-- 1 root wheel 28835160 Aug 8 14:00 libstdc++_pic.a and that it contains .debug_info sections, which the others don't: # size -A -d libstdc++_pic.a | fgrep .debug_info | wc -l 173 # size -A -d libstdc++.a | fgrep .debug_info | wc -l 0 Other libraries also have _pic.a files that are much larger than the others versions. Is there a bug that causes them not to be CTF-converted, or is this deliberate? -- Andreas Gustafsson, g...@netbsd.org
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
On Thu, Aug 08, 2019 at 09:13:37PM +0300, Andreas Gustafsson wrote: > The image already has an empty /usr/libdata/debug. The increase in > size when MKDEBUG is enabled is spread out over various other > directories, notably /usr/lib. For example, > > /usr/lib 405182 kB -> 866276 kB > /usr/bin 53426 kB -> 63140 kB > > The largest file in /usr/lib is libstdc++_pic.a, which grows from > 4.3 MB to 27 MB. Heh - nice, didn't think about that. How about: remove all *.a files from those images? Is there a tool to strip CTF from binaries? Martin
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
Martin Husemann wrote: > I would like to see this images created w/o /usr/libdata/debug/ (as we > do for ISO images, some of which we even strip more), but I have not > yet found an easy way to hack that into the image creation process. The image already has an empty /usr/libdata/debug. The increase in size when MKDEBUG is enabled is spread out over various other directories, notably /usr/lib. For example, /usr/lib 405182 kB -> 866276 kB /usr/bin 53426 kB -> 63140 kB The largest file in /usr/lib is libstdc++_pic.a, which grows from 4.3 MB to 27 MB. The largest file in /usr/bin is gdb, which grows from 7.8M to 12M. "size -A -d" shows most of the growth is CTF. Is there a corresponding tool to look at the sizes of sections in a ".a" library? In any case, the kernel has only grown from 23M to 26M, so this growth looks like it's mostly a userland issue and unrelated to the removal of "-U DEBUG" from etc/Makefile. -- Andreas Gustafsson, g...@netbsd.org
Re: CVS commit: src/distrib/amd64/liveimage/emuimage
On Wed, Aug 07, 2019 at 07:59:36AM +, Andreas Gustafsson wrote: > Module Name: src > Committed By: gson > Date: Wed Aug 7 07:59:36 UTC 2019 > > Modified Files: > src/distrib/amd64/liveimage/emuimage: Makefile > > Log Message: > The amd64 live image no longer fits in 2 GB when built with with > MKDEBUG, as releases are. Bump the size to just under 4 GB (as in > 4*10^9, not 4*2^30), the next larger common USB thumb drive size. I would like to see this images created w/o /usr/libdata/debug/ (as we do for ISO images, some of which we even strip more), but I have not yet found an easy way to hack that into the image creation process. Any pointers welcome ;-) Or does someone see a good use for the debug info on them (by default)? During testing I often gathererd cores on these images but could easily analyze them on another machine. Martin
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src
Committed By: gson
Date: Wed Aug 7 07:59:36 UTC 2019
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile
Log Message:
The amd64 live image no longer fits in 2 GB when built with with
MKDEBUG, as releases are. Bump the size to just under 4 GB (as in
4*10^9, not 4*2^30), the next larger common USB thumb drive size.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/distrib/amd64/liveimage/emuimage/Makefile:1.6
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.5 Sun Dec 16 08:58:21 2018
+++ src/distrib/amd64/liveimage/emuimage/Makefile Wed Aug 7 07:59:35 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2018/12/16 08:58:21 gson Exp $
+# $NetBSD: Makefile,v 1.6 2019/08/07 07:59:35 gson Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
-EMUIMAGEMB?= 1536 # 2GB USB flash memories aren't 2GiB
+EMUIMAGEMB?= 3725 # 4GB USB flash memories aren't 4GiB
LIVEIMAGEMB= ${EMUIMAGEMB}
.include "${.CURDIR}/../Makefile.liveimage"
CVS commit: src/distrib/amd64/liveimage/emuimage
Module Name:src Committed By: gson Date: Wed Aug 7 07:59:36 UTC 2019 Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile Log Message: The amd64 live image no longer fits in 2 GB when built with with MKDEBUG, as releases are. Bump the size to just under 4 GB (as in 4*10^9, not 4*2^30), the next larger common USB thumb drive size. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.
CVS commit: src/distrib/amd64/ramdisks/ramdisk
Module Name:src Committed By: bouyer Date: Sat Jul 20 15:55:40 UTC 2019 Modified Files: src/distrib/amd64/ramdisks/ramdisk: list Log Message: Add newfs_msdos to amd64 install media, proposed on port-amd64@ back in december. newfs_msdos is needed to make a UEFI bootable disk. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 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.
CVS commit: src/distrib/amd64/ramdisks/ramdisk
Module Name:src Committed By: bouyer Date: Sat Jul 20 15:55:40 UTC 2019 Modified Files: src/distrib/amd64/ramdisks/ramdisk: list Log Message: Add newfs_msdos to amd64 install media, proposed on port-amd64@ back in december. newfs_msdos is needed to make a UEFI bootable disk. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 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.14 src/distrib/amd64/ramdisks/ramdisk/list:1.15 --- src/distrib/amd64/ramdisks/ramdisk/list:1.14 Mon Jan 9 17:45:03 2012 +++ src/distrib/amd64/ramdisks/ramdisk/list Sat Jul 20 15:55:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2012/01/09 17:45:03 sborrill Exp $ +# $NetBSD: list,v 1.15 2019/07/20 15:55:40 bouyer Exp $ PROG bin/chio PROG bin/dd @@ -17,6 +17,7 @@ PROG sbin/mount_ext2fs PROG sbin/mount_lfs PROG sbin/mount_ntfs PROG sbin/newfs_lfs +PROG sbin/newfs_msdos PROG sbin/raidctl PROG sbin/restore sbin/rrestore PROG sbin/scsictl
Re: CVS commit: src/distrib/amd64/cdroms/bootcd-com
In article <21082.1558083...@splode.eterna.com.au>, matthew green wrote: >> Module Name: src >> Committed By:christos >> Date:Wed May 15 13:47:41 UTC 2019 >> >> Modified Files: >> src/distrib/amd64/cdroms/bootcd-com: Makefile >> >> Log Message: >> Add a comment about iLO > >+# HP Proliant iLO serial console is on com1 > >actually, HP, and others, tend to have this configurable. >you really have no idea what it will be by default but >you can usually set it to something specific. All the ones I possess, and the ones at work I've connected to, have it there by default. I have not looked hard how to change it, but then again, if I started changing them then I would cause more harm than good christos
re: CVS commit: src/distrib/amd64/cdroms/bootcd-com
> Module Name: src > Committed By: christos > Date: Wed May 15 13:47:41 UTC 2019 > > Modified Files: > src/distrib/amd64/cdroms/bootcd-com: Makefile > > Log Message: > Add a comment about iLO +# HP Proliant iLO serial console is on com1 actually, HP, and others, tend to have this configurable. you really have no idea what it will be by default but you can usually set it to something specific. .mrg.
CVS commit: src/distrib/amd64/cdroms/bootcd-com
Module Name:src Committed By: christos Date: Wed May 15 13:47:41 UTC 2019 Modified Files: src/distrib/amd64/cdroms/bootcd-com: Makefile Log Message: Add a comment about iLO To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.
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.
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/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.
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/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.
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/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.
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/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.
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: 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.
