Module Name: src
Committed By: brook
Date: Mon Aug 22 16:50:25 UTC 2022
Modified Files:
src: BUILDING
src/etc/etc.evbarm: Makefile.inc
Log Message:
By default, do not install any bootable images.
The previous commit introduced the ability to install a set of
bootable images as a normal part of a release build. While this made
it easy to install bootable images, the contents of a release build
depend on whether or not U-Boot packages are installed in /usr/pkgsrc,
which is the default location searched by installboot(8).
This commit requires users to explicitly list the bootable images to
be installed, which by default is none (i.e., prior behavior).
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/BUILDING
cvs rdiff -u -r1.127 -r1.128 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/BUILDING
diff -u src/BUILDING:1.144 src/BUILDING:1.145
--- src/BUILDING:1.144 Sun Aug 21 15:01:08 2022
+++ src/BUILDING Mon Aug 22 16:50:25 2022
@@ -153,12 +153,17 @@ CONFIGURATION
cannot usefully be set inside a Makefile, including
mk.conf or ${MAKECONF}.
+ INSTALLBOOT_BOARDS
+ A list of boards to create bootable images for.
+ If corresponding U-Boot packages are installed,
+ bootable images are created as part of a
+ release. See the -o "board=" option of
+ installboot(8).
+
INSTALLBOOT_UBOOT_PATHS
A colon-separated list of search paths used by
installboot to find U-Boot packages; see
- installboot(8). If appropriate U-Boot packages
- are installed, bootable images are created as
- part of a release.
+ installboot(8).
"make" variables
Several variables control the behavior of NetBSD builds. Unless
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.127 src/etc/etc.evbarm/Makefile.inc:1.128
--- src/etc/etc.evbarm/Makefile.inc:1.127 Sun Aug 21 15:01:08 2022
+++ src/etc/etc.evbarm/Makefile.inc Mon Aug 22 16:50:25 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.127 2022/08/21 15:01:08 brook Exp $
+# $NetBSD: Makefile.inc,v 1.128 2022/08/22 16:50:25 brook Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -92,15 +92,6 @@ IMAGE.dir= ${IMAGE.rel}/binary/gzimg
IMAGE.kern= ${IMAGE.rel}/binary/kernel
IMAGE.instk= ${IMAGE.rel}/installation/instkernel
-# list of boards supported by installboot(8); a bootable image will be
-# created for each (if the corresponding U-Boot package is installed
-# in one of the directories listed in the environment variable
-# INSTALLBOOT_UBOOT_PATHS)
-#
-INSTALLBOOT_BOARDS!= \
- ${TOOL_INSTALLBOOT} -m ${MACHINE} 2>&1 \
- | ${TOOL_AWK} 'BEGIN { FS=" " } { if (BOARDS) print $$1 } /^Known boards/{ BOARDS=1 }'
-
__mkimage: .USE
TOOL_MAKE=${MAKE} \
TOOL_MAKEFS=${TOOL_MAKEFS} \
