Skip to content

Commit 439f74e

Browse files
committed
build.sh: add show-params operation
Add show-params operation to the makefile target, and reword params operation to describe what it's done since 2012. (In 2012-11-04 the Makefile's previous params target was renamed to show-params and a new params target was added to save a 'params' file, and build.sh wasn't adapted.)
1 parent a25022c commit 439f74e

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.335 2022/08/21 07:10:03 lukem Exp $
1+
# $NetBSD: Makefile,v 1.336 2023/06/02 20:48:09 lukem Exp $
22

33
#
44
# This is the top-level makefile for building NetBSD. For an outline of
@@ -88,8 +88,8 @@
8888
# do-top-obj: creates the top level object directory.
8989
# do-tools-obj: creates object directories for the host toolchain.
9090
# do-tools: builds host toolchain.
91-
# params: record the values of variables that might affect the
92-
# build.
91+
# params: create params file with various make(1) parameters.
92+
# show-params: show various make(1) parameters.
9393
# obj: creates object directories.
9494
# do-distrib-dirs: creates the distribution directories.
9595
# includes: installs include files.

build.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /usr/bin/env sh
2-
# $NetBSD: build.sh,v 1.370 2023/06/02 14:29:11 lukem Exp $
2+
# $NetBSD: build.sh,v 1.371 2023/06/02 20:48:09 lukem Exp $
33
#
44
# Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
55
# All rights reserved.
@@ -563,6 +563,7 @@ level of source directory"
563563
do_install_image=false
564564
do_disk_image=false
565565
do_params=false
566+
do_show_params=false
566567
do_rump=false
567568
do_dtb=false
568569

@@ -1084,7 +1085,8 @@ help()
10841085
RELEASEDIR/RELEASEMACHINEDIR/installation/installimage.
10851086
disk-image=TARGET Create bootable disk image in
10861087
RELEASEDIR/RELEASEMACHINEDIR/binary/gzimg/TARGET.img.gz.
1087-
params Show various make(1) parameters.
1088+
params Create params file with various make(1) parameters.
1089+
show-params Show various make(1) parameters.
10881090
list-arch Show a list of valid MACHINE/MACHINE_ARCH values,
10891091
and exit. The list may be narrowed by passing glob
10901092
patterns or exact values in MACHINE or MACHINE_ARCH.
@@ -1461,6 +1463,7 @@ parseoptions()
14611463
rump|\
14621464
rumptest|\
14631465
sets|\
1466+
show-params|\
14641467
sourcesets|\
14651468
syspkgs|\
14661469
tools)
@@ -2013,7 +2016,7 @@ createmakewrapper()
20132016
eval cat <<EOF ${makewrapout}
20142017
#! ${HOST_SH}
20152018
# Set proper variables to allow easy "make" building of a NetBSD subtree.
2016-
# Generated from: \$NetBSD: build.sh,v 1.370 2023/06/02 14:29:11 lukem Exp $
2019+
# Generated from: \$NetBSD: build.sh,v 1.371 2023/06/02 20:48:09 lukem Exp $
20172020
# with these arguments: ${_args}
20182021
#
20192022
@@ -2485,7 +2488,7 @@ main()
24852488
statusmsg "Successful make ${op}"
24862489
;;
24872490

2488-
cleandir|obj|sourcesets|syspkgs|params)
2491+
cleandir|obj|sourcesets|syspkgs|params|show-params)
24892492
${runcmd} "${makewrapper}" ${parallel} ${op} ||
24902493
bomb "Failed to make ${op}"
24912494
statusmsg "Successful make ${op}"

0 commit comments

Comments
 (0)