Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src By default, do not install any bootable images.



details:   https://anonhg.NetBSD.org/src/rev/71f0a112ad35
branches:  trunk
changeset: 369593:71f0a112ad35
user:      brook <brook%NetBSD.org@localhost>
date:      Mon Aug 22 16:50:25 2022 +0000

description:
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).

diffstat:

 BUILDING                    |  11 ++++++++---
 etc/etc.evbarm/Makefile.inc |  11 +----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diffs (49 lines):

diff -r 39cbb2747ae5 -r 71f0a112ad35 BUILDING
--- a/BUILDING  Mon Aug 22 16:18:44 2022 +0000
+++ b/BUILDING  Mon Aug 22 16:50:25 2022 +0000
@@ -153,12 +153,17 @@
                        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
diff -r 39cbb2747ae5 -r 71f0a112ad35 etc/etc.evbarm/Makefile.inc
--- a/etc/etc.evbarm/Makefile.inc       Mon Aug 22 16:18:44 2022 +0000
+++ b/etc/etc.evbarm/Makefile.inc       Mon Aug 22 16:50:25 2022 +0000
@@ -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.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} \



Home | Main Index | Thread Index | Old Index