build.sh: fix spelling and grammar in a help string

Make sure that local var=$expansion is properly quoted as local var="$exp"
correcting some quotes incorrectly removed in the previous version, and
adding some that should have been present but never

Make sure that local var=$expansion is properly quoted as local var="$exp"
correcting some quotes incorrectly removed in the previous version, and
adding some that should have been present but never were.

This pointed out by riastradh@ -- thanks.

Also, one addition which should have been the previous update's commit
message - a couple of uses of subshells, where the only reason was to
control shell operator precedence (which works, but is costly) were changed
(in the previous rev) to use groups instead (ie: brace bracketing instead of
parentheses).

show more ...

General code cleanup. No operational change intended.

Mostly fix quoting, some missing quotes added, lots of meaningless
quotes removed (no guarantee of completeness in either of those).

Also get

General code cleanup. No operational change intended.

Mostly fix quoting, some missing quotes added, lots of meaningless
quotes removed (no guarantee of completeness in either of those).

Also get rid of one use of the obsolete test -o operator, and several
less than ideal uses of the test ! operator ... replace all that by
shell || and ! uses.

Don't use $@ in any context where field splitting cannot occur (also
avoid it in a couple of places where it would be defined, but isn't
actually wanted:
echo "whatever: $@"
is technically OK, but is generally just a waste of everyone's time,
the shell passing a whole set of args to echo for it to combine
back into one line is pointless. But X="$@" and using $@ in a
here doc are simply wrong.

The 80-column police visited during the update (just a couple of
hard cases managed to avoid detection).

Many extraneous use of sh \ line continuations removed when better
use of sh syntax means they're not required.

General cleanup of sh coding style (prefer clarity over white space
minimization).

If these changes cause any issues (aside from a small possibility of
slight layout changes in some error messages) that anyone is able
to observe, please let me know.

show more ...

build.sh: Make `build.sh pkg=...' bomb with -x/MKX11=yes for now.

Fix typo in previous

Add a new operation "show-revisionid" that extracts a marker usable
to recreate the source (depending on the revision controll system
in use).

build.sh: Use X11_TYPE=modular for build.sh pkg=... by default.

You can override it in your MAKECONF if you want to debug issues in
pkgsrc with cross-building X11_TYPE=native, but let's try to make

build.sh: Use X11_TYPE=modular for build.sh pkg=... by default.

You can override it in your MAKECONF if you want to debug issues in
pkgsrc with cross-building X11_TYPE=native, but let's try to make
things work out of the box here if you don't go out of your way.

show more ...

build.sh: Fix whitespace error introduced in previous commit.

PR toolchain/58536: build.sh should support cross-building packages
into images

build.sh: Experimental new target pkg=CATEGORY/PACKAGE.

Cross-builds a binary package of CATEGORY/PACKAGE from pkgsrc,
bootstrapping pkgsrc as necessary for the cross-build.

Requires pkgsrc, which

build.sh: Experimental new target pkg=CATEGORY/PACKAGE.

Cross-builds a binary package of CATEGORY/PACKAGE from pkgsrc,
bootstrapping pkgsrc as necessary for the cross-build.

Requires pkgsrc, which can be specified by either:

- setting PKGSRCDIR with -V or in the environment
- having it at ./pkgsrc
- having it at ../pkgsrc
- having it at /usr/pkgsrc

This isn't perfect -- it'd be better if we had some kind of manifest
for the packages you want built and/or included in install images --
but I've been sitting on this for months; let's just give it a try
and see where this goes. We can take it out again if the experiment
turns out not to be fruitful.

PR toolchain/58536: build.sh should support cross-building packages
into images

show more ...

build.sh: Adjust xsrc existence test as requested.

PR toolchain/58399

build.sh: Check for xsrc/Makefile, not just xsrc/.

Should make the failure mode a little more obvious when you forget to
mount xsrc.

PR toolchain/58399

For consistency, check MKREPRO_TIMESTAMP always numerically (not as string)

build.sh: fix typos in usage message

Add virt68k to valid_MACHINE_ARCH.

build.sh: add support for git worktree

Git supports multiple working trees attached to the same repository,
with the git-worktree(1) subcommand.

When building from a Git working tree, the repositor

build.sh: add support for git worktree

Git supports multiple working trees attached to the same repository,
with the git-worktree(1) subcommand.

When building from a Git working tree, the repository metadata in .git
from the top source directory is a file (containing the actual location
of the metadata) instead of the usual directory structure. With this
change, build.sh allows .git to be a directory or a regular file
instead, therefore letting the sources build as expected from a Git
working tree.

To test: (without this patch)

src$ git worktree add ../src-clean-tree
[...]
src$ (cd ../src-clean-tree && ./build.sh tools)
[...]
ERROR: Cannot determine VCS for '.../src-clean-tree/'

XXX: pullup-10 pullup-9

show more ...

build.sh: use mk.conf (if present) as MAKECONF

Set MAKECONF to mk.conf in the same directory as build.sh
(i.e., the top of the source tree) if mk.conf is present.
This means unprivileged users can b

build.sh: use mk.conf (if present) as MAKECONF

Set MAKECONF to mk.conf in the same directory as build.sh
(i.e., the top of the source tree) if mk.conf is present.
This means unprivileged users can benefit from mk.conf(5)
semantics without write privileges to /etc/mk.conf, and
also simplifies per-source-directory configuration.

Fail early if $MAKECONF is empty, since build.sh will fail
anyway after rebuilding nbmake.

Ensure that the computed MAKECONF isn't empty, and then
always set MAKECONF in the makewrapper (nbmake-$MACHINE).

Improve some formatting consistency in BUILDING.mdoc,
(even if BUILDING is generated without markup).

show more ...

fix build.sh wrong variable use that caused nbmake to be always rebult
(Jan-Benedict Glaw)

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 param

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

show more ...

build.sh: fix MKUNPRIVED comment

I renamed UNPRIVED to MKUNPRIVED 20 years ago, and missed a comment.

build.sh, BUILDING: consistency improvements

Consistently use "show", instead of sometimes using "display" or "print".
Fix mdoc markup (even though BUILDING is raw text).
Document help, -P, -?

build.sh: drop -lrumpdev hack introduced in previous

The existing trick in sys/rump/librump/rumpdev/rump_dev.c was not
updated after the renames in the kernel. kudos to riastradh.

PR kern/56599

build.sh: tweak rumptest and RUMP_LIBSETS

Use --no-whole-archive to keep us as honest as currently possible.
PR kern/56599

Avoid the dependency on a populated tooldir (or building the tools)
when simply doing mkrepro-timestamp and the current repository setups
does not actually require it.

build.sh: usage improvements

Use UPPERCASE as the convention to describe an option argument,
as it's more noticable than lowercase in the help description.

Expand tabs in the help.

Editorial impro

build.sh: usage improvements

Use UPPERCASE as the convention to describe an option argument,
as it's more noticable than lowercase in the help description.

Expand tabs in the help.

Editorial improvements.

show more ...

Deprecate extsrc/, EXTSRCSRCDIR, MKEXTSRC

Remove support for building extsrc/:
1. Makefile: remove do-extsrc target.
2. build.sh: remove options -y and -Y extsrcdir.
3. distrib/sets: remove support

Deprecate extsrc/, EXTSRCSRCDIR, MKEXTSRC

Remove support for building extsrc/:
1. Makefile: remove do-extsrc target.
2. build.sh: remove options -y and -Y extsrcdir.
3. distrib/sets: remove support for extsrc in various tools
including the options -L ext and -y, and the extsrc sets.
4. doc/BUILDING.mdoc: remove docs for extsrc/, EXTSRCSRCDIR, MKEXTSRC (etc)
5. bsd.own.mk and various Makefiles: remove support for extsrc/,
EXTSRCSRCDIR, MKEXTSRC.

As proposed on tech-kern and tech-userlevel on 2022-01-07
and followed up on 2022-08-21.

show more ...