CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: christos Date: Sat May 18 02:03:17 UTC 2024 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: include all extra flavors of the kernel and use the proper variable for the machine dependent installation directory. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/distrib/common/bootimage/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/common/bootimage
Module Name:src
Committed By: christos
Date: Sat May 18 02:03:17 UTC 2024
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
include all extra flavors of the kernel and use the proper variable for
the machine dependent installation directory.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/bootimage/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/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.36 src/distrib/common/bootimage/Makefile.bootimage:1.37
--- src/distrib/common/bootimage/Makefile.bootimage:1.36 Thu May 16 11:46:42 2024
+++ src/distrib/common/bootimage/Makefile.bootimage Fri May 17 22:03:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.36 2024/05/16 15:46:42 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.37 2024/05/18 02:03:17 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -433,12 +433,13 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
- if [ -f ${WORKDIR}/netbsd.gdb ]; then \
- echo "./netbsd.gdb type=file uname=root gname=wheel mode=0444" \
- >> ${WORKSPEC}; \
- fi
- if [ -d ${WORKDIR}/${MACHINE} ]; then \
- ${MAKESPEC} -d ${WORKDIR} ${MACHINE} >> ${WORKSPEC}; \
+ for i in ${WORKDIR}/netbsd.*; do \
+ if [ -e $$i ]; then \
+ echo "./$$(basename $$i) type=file uname=root gname=wheel mode=0444" >> ${WORKSPEC}; \
+ fi; \
+ done
+ if [ -d ${WORKDIR}/${RELEASEMACHINEDIR} ]; then \
+ ${MAKESPEC} -d ${WORKDIR} ${RELEASEMACHINEDIR} >> ${WORKSPEC}; \
fi
@echo Creating rootfs...
# XXX /var/spool/ftp/hidden is unreadable
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: christos
Date: Thu Feb 8 18:14:02 UTC 2024
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
PR/57910: Jan-Benedict Glaw: Fix typo preventing reproducible builds
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/common/bootimage/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/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.32 src/distrib/common/bootimage/Makefile.bootimage:1.33
--- src/distrib/common/bootimage/Makefile.bootimage:1.32 Sun Dec 3 02:20:23 2023
+++ src/distrib/common/bootimage/Makefile.bootimage Thu Feb 8 13:14:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.32 2023/12/03 07:20:23 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.33 2024/02/08 18:14:02 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -235,8 +235,8 @@ FSCYLINDERS!= expr ${FSSECTORS} / \( ${H
SWAPCYLINDERS!= expr ${SWAPSECTORS} / \( ${HEADS} \* ${SECTORS} \) || true
.if ${USE_GPT} != "no"
-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}'`
+BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} show -i 2 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
+SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} show -i 3 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
.endif
#
@@ -525,11 +525,11 @@ ${WORKMBR}:
@echo creating GPT header and partition entries...
${RM} -f ${WORKMBR}
${DD} if=/dev/zero of=${WORKMBR} seek=$$((${IMAGESECTORS} - 1)) count=1
- ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} create
- ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
- ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} create
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs
. if ${SWAPSECTORS} != 0
- ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
. endif
.elif ${USE_MBR} != "no"
@echo creating MBR labels...
@@ -584,10 +584,10 @@ ${IMGBASE}.img: ${TARGET_BLOCKS}
${CAT} ${TARGET_BLOCKS} > ${WORKIMG}
.if ${USE_GPT} != "no"
.if ${USE_GPTMBR} != "no"
- ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2 \
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKIMG} biosboot -i 2 \
-c ${.OBJDIR}/${WORKDIR}/usr/mdec/gptmbr.bin
.endif
- ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} set -a bootme -i 2
+ ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKIMG} set -a bootme -i 2
.endif # USE_GPT != "no"
.if ${USE_SUNLABEL} != "no"
@echo Creating sun disklabel...
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: christos Date: Thu Feb 8 18:14:02 UTC 2024 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: PR/57910: Jan-Benedict Glaw: Fix typo preventing reproducible builds To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/common/bootimage/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/common/bootimage
Module Name:src
Committed By: tsutsui
Date: Sun Dec 3 07:20:23 UTC 2023
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Use defined ${GPTSECTORS} rather than hardcoded 2048.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/common/bootimage/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/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.31 src/distrib/common/bootimage/Makefile.bootimage:1.32
--- src/distrib/common/bootimage/Makefile.bootimage:1.31 Sun Dec 3 07:17:11 2023
+++ src/distrib/common/bootimage/Makefile.bootimage Sun Dec 3 07:20:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.31 2023/12/03 07:17:11 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.32 2023/12/03 07:20:23 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -573,8 +573,8 @@ ${WORKMBR}:
${WORKGPT}: ${WORKMBR}
@echo create GPT image...
- ${DD} if=${WORKMBR} of=${WORKGPT} skip=$$((${IMAGESECTORS} - 2048)) \
- count=2048
+ ${DD} if=${WORKMBR} of=${WORKGPT} \
+ skip=$$((${IMAGESECTORS} - ${GPTSECTORS})) count=${GPTSECTORS}
.if ${USE_GPT} == "no"
${IMGBASE}.img: ${WORKLABEL}
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: tsutsui
Date: Sun Dec 3 07:20:23 UTC 2023
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Use defined ${GPTSECTORS} rather than hardcoded 2048.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/common/bootimage/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/common/bootimage
Module Name:src Committed By: tsutsui Date: Sun Dec 3 07:17:11 UTC 2023 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: Document USE_GPTMBR and GPTSECTORS. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/distrib/common/bootimage/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/common/bootimage/Makefile.bootimage diff -u src/distrib/common/bootimage/Makefile.bootimage:1.30 src/distrib/common/bootimage/Makefile.bootimage:1.31 --- src/distrib/common/bootimage/Makefile.bootimage:1.30 Sun May 15 00:05:24 2022 +++ src/distrib/common/bootimage/Makefile.bootimage Sun Dec 3 07:17:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootimage,v 1.30 2022/05/15 00:05:24 mrg Exp $ +# $NetBSD: Makefile.bootimage,v 1.31 2023/12/03 07:17:11 tsutsui Exp $ # # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved. # @@ -40,6 +40,10 @@ # USE_GPT # set yes if target disk image requires GPT partition # (default: no) +# USE_GPTMBR +# set yes if target disk image requires GPT partition +# with hybrid MBR boot code +# (default: no; valid only if USE_GPT=yes) # MBR_BOOTCODE # optional MBR bootcode which should be installed by fdisk(8) # (default: empty) @@ -66,6 +70,10 @@ # FATMB # FAT partition size in target image in MB # (default: 0) +# GPTSECTORS +# Size of a region reserved for the secondary GPT table/entry +# at the end of the target image in sectors +# (default: 2048 if USE_GPT=yes, otherwise 0) # KERN_SET # kernel set name which should be extracted into image # (default: kern-GENERIC)
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: tsutsui Date: Sun Dec 3 07:17:11 UTC 2023 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: Document USE_GPTMBR and GPTSECTORS. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/distrib/common/bootimage/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/common/bootimage
Module Name:src Committed By: maya Date: Sun Jan 29 22:12:25 UTC 2023 Modified Files: src/distrib/common/bootimage: fstab.in Log Message: Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/fstab.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/common/bootimage/fstab.in diff -u src/distrib/common/bootimage/fstab.in:1.3 src/distrib/common/bootimage/fstab.in:1.4 --- src/distrib/common/bootimage/fstab.in:1.3 Sat Dec 15 18:03:17 2018 +++ src/distrib/common/bootimage/fstab.in Sun Jan 29 22:12:25 2023 @@ -1,5 +1,6 @@ -ROOT.a / ffs rw 1 1 -ROOT.b none none sw 0 0 -ptyfs /dev/pts ptyfs rw 0 0 -kernfs /kern kernfs rw,noauto 0 0 -procfs /proc procfs rw,noauto 0 0 +ROOT.a / ffs rw 1 1 +ROOT.b none none sw 0 0 +ptyfs /dev/pts ptyfs rw 0 0 +kernfs /kern kernfs rw,noauto 0 0 +procfs /proc procfs rw,noauto 0 0 +tmpfs /var/shm tmpfs rw,-m1777,-sram%25 0 0
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: maya Date: Sun Jan 29 22:12:25 UTC 2023 Modified Files: src/distrib/common/bootimage: fstab.in Log Message: Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/fstab.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/common/bootimage
> > Module Name:src > > Committed By: mrg > > Date: Sun May 15 00:05:24 UTC 2022 > > > > Modified Files: > > src/distrib/common/bootimage: Makefile.bootimage > > > > Log Message: > > allow some invocations of expr(1) to "fail" - expr(1) returns "1" is > > the expression expands to "0" or empty, and sometimes these values end > > up correctly being 0. > > Several values (SWAPSECTORS, EFISECTORS, FATSECTORS, and SWAPCYLINDERS) > that couldbe zero already have '|| true'. Should they be consistent? > (I'm not sure if all should use strict '|| test $$? -eq 1 || exit 1') i use the test -eq 1 method to only match the case expr(1) exists due to "0" or "". manual says: The expr utility exits with one of the following values: 0 the expression is neither an empty string nor 0. 1 the expression is an empty string or 0. 2 the expression is invalid. >2 an error occurred (such as memory allocation failure). i kind of meant to fix the other uses too, thanks for reminding me i wasn't done here :) .mrg.
Re: CVS commit: src/distrib/common/bootimage
mrg@ wrote: > Module Name: src > Committed By: mrg > Date: Sun May 15 00:05:24 UTC 2022 > > Modified Files: > src/distrib/common/bootimage: Makefile.bootimage > > Log Message: > allow some invocations of expr(1) to "fail" - expr(1) returns "1" is > the expression expands to "0" or empty, and sometimes these values end > up correctly being 0. Several values (SWAPSECTORS, EFISECTORS, FATSECTORS, and SWAPCYLINDERS) that couldbe zero already have '|| true'. Should they be consistent? (I'm not sure if all should use strict '|| test $$? -eq 1 || exit 1') --- Izumi Tsutsui
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: mrg
Date: Sun May 15 00:05:24 UTC 2022
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
allow some invocations of expr(1) to "fail" - expr(1) returns "1" is
the expression expands to "0" or empty, and sometimes these values end
up correctly being 0.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/common/bootimage/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/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.29 src/distrib/common/bootimage/Makefile.bootimage:1.30
--- src/distrib/common/bootimage/Makefile.bootimage:1.29 Sat Sep 25 08:54:29 2021
+++ src/distrib/common/bootimage/Makefile.bootimage Sun May 15 00:05:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.29 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.bootimage,v 1.30 2022/05/15 00:05:24 mrg Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -201,8 +201,8 @@ LABELSECTORS?= 2048 # 1MB aligned for mo
.endif
FSSECTORS!= expr ${IMAGESECTORS} - ${SWAPSECTORS} - ${LABELSECTORS} \
- - ${EFISECTORS} - ${GPTSECTORS} - ${FATSECTORS}
-FSSIZE!= expr ${FSSECTORS} \* 512
+ - ${EFISECTORS} - ${GPTSECTORS} - ${FATSECTORS} || test $$? -eq 1 || exit 1
+FSSIZE!= expr ${FSSECTORS} \* 512 || test $$? -eq 1 || exit 1
# parameters for disklabel and MBR
HEADS= 64
@@ -217,9 +217,9 @@ MBRFAT?= 6 # 16-bit FAT, more than 32M
BSDPARTSECTORS!= expr ${IMAGESECTORS} - ${LABELSECTORS} \
- ${EFISECTORS} - ${GPTSECTORS} - ${FATSECTORS}
-FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS} + ${FATSECTORS}
+FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS} + ${FATSECTORS} || test $$? -eq 1 || exit 1
SWAPOFFSET!= expr ${LABELSECTORS} + ${FSSECTORS} \
- + ${EFISECTORS} + ${FATSECTORS}
+ + ${EFISECTORS} + ${FATSECTORS} || test $$? -eq 1 || exit 1
FATOFFSET= ${LABELSECTORS}
# parameters for sunlabel
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: mrg Date: Sun May 15 00:05:24 UTC 2022 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: allow some invocations of expr(1) to "fail" - expr(1) returns "1" is the expression expands to "0" or empty, and sometimes these values end up correctly being 0. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/common/bootimage/Makefile.bootimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/common/bootimage
> Makefile.installimage refers to it before including Makefile.bootimage and > this test was causing make to throw an error: > > > https://nxr.netbsd.org/xref/src/distrib/common/bootimage/Makefile.installimage#41 > > All other users (i386, amd64) of Makefile.installimage explicitly set > USE_MBR=yes. That's why it wasn't an issue before now. Ah, I see. Sorry for a stupid question. --- Izumi Tsutsui
Re: CVS commit: src/distrib/common/bootimage
On Fri, 29 May 2020, Izumi Tsutsui wrote: src/distrib/common/bootimage/Makefile.bootimage (included from Makefile.installimage) already has "USE_MBR?= no" line. Makefile.installimage refers to it before including Makefile.bootimage and this test was causing make to throw an error: https://nxr.netbsd.org/xref/src/distrib/common/bootimage/Makefile.installimage#41 All other users (i386, amd64) of Makefile.installimage explicitly set USE_MBR=yes. That's why it wasn't an issue before now. Cheers, Jared
Re: CVS commit: src/distrib/common/bootimage
> Modified Files: > src/distrib/common/bootimage: Makefile.installimage > > Log Message: > Default USE_MBR to no Is this necessary? src/distrib/common/bootimage/Makefile.bootimage (included from Makefile.installimage) already has "USE_MBR?= no" line. --- Izumi Tsutsui
Re: CVS commit: src/distrib/common/bootimage
In article 20150312044123.ee11...@cvs.netbsd.org, Soren Jacobsen source-changes-d@NetBSD.org wrote: -=-=-=-=-=- Module Name: src Committed By: snj Date: Thu Mar 12 04:41:23 UTC 2015 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: unbreak amd64 install images by passing ipty to MAKEDEV. revision 1.21 of etc/etc.amd64/MAKEDEV.conf removed them from 'all'. (hi christos!) Why are they broken? The INSTALL kernel has ptyfs now? This is the wrong fix in the long run... christos
