BSD Commit Log Search

Merge bmake-20250308

Import bmake-20250308

Intersting/relevant changes since bmake-20250125

ChangeLog since bmake-20250125

2025-03-08  Simon J Gerraty  <sjg at beast.crufty.net>

        * bsd.after-import.mk: by default generate makefiles
        closer to BSD style.

        * VERSION (_MAKE_VERSION): 20250308
        Merge with NetBSD make, pick up
        o clean up comments and code for parallel mode
        o job.c: avoid SIGPIPE for children, call Job_Wait befor abort.

2025-02-27  Simon J Gerraty  <sjg at beast.crufty.net>

        * VERSION (_MAKE_VERSION): 20250225

    [18 lines not shown]

Add newlog.sh and setops.sh to share/mk

jobs.mk makes use of newlog.sh if found.

Set NEWLOG_SH in local.sys.env.mk to save jobs.mk searching for it.

PR:     284390
Reviewed by:    stevek
Differential Revision:  https://reviews.freebsd.org/D48737

rc.subr:rc_trace take advantage of sdot

Since we now have sdot, use it to get RC_LEVEL from rc.conf.d/rc_trace
also avoid logging execution of ':' when RC_LEVEL > 0

Reviewed by:    stevek
Differential Revision:  https://reviews.freebsd.org/D48856

Update dirdeps.mk et al

Update dirdeps.mk and friends to match latest contrib/bmake/mk

Reviewed by:    stevek
Differential Revision:  https://reviews.freebsd.org/D48855

Fix mangled bmake makefile

Merge bmake-20250125

Merge commit '5ad769f660f3d00853bc739f82d9bc62f6a682cb'

Import bmake-20250125

Intersting/relevant changes since bmake-20240711

ChangeLog since bmake-20240711

2025-01-25  Simon J Gerraty  <sjg at beast.crufty.net>

        * VERSION (_MAKE_VERSION): 20250125
        Merge with NetBSD make, sync up below change.

        * unit-tests/Makefile: remove $TMPDIR via .END
        to avoid failure in test on NFS - since the temp file for the
        target script is open and thus gets renamed by the server rather
        than removed.

2025-01-20  Simon J Gerraty  <sjg at beast.crufty.net>

        * VERSION (_MAKE_VERSION): 20250120

    [244 lines not shown]

libsecureboot/README.rst clarify use of gpg

Clarify some language and provide an example of gpg use to generate
a detached signature.

libsecureboot add sha384 and sha512 for OpenPGP

gpg supports SHA384, SHA512 as well as SHA256 so allow for them.

Tweak Makefile.inc so we can build libsecureboot with only OpenPGP
trust anchors.

Reviewed by: imp
Differential Revision:  https://reviews.freebsd.org/D48546

Update libexec/rc/debug.sh and hooks.sh

Use local_works() to test if 'local' actually works for
current shell.

proc_rwmem check PRIV_PROC_MEM_WRITE when writing

This will fail when mac_veriexec is enforced.

Move the check from procfs_doprocmem to proc_rwmem to ensure all
cases are covered.

Reviewed by:    olce, markj
Sponsored by:   Juniper Networks, Inc.
Differential Revision:  https://reviews.freebsd.org/D47484

debug.sh check for :debug_add:

When we match a tag and turn tracing, see if we have any
$DEBUG_ON:debug_add:tag in DEBUG_SH and if so add the new tag.

This allows for more focused debugging during boot.

Reviewed by:    stevek

debug.sh add DebugAdd

Sometimes it is desirable while debugging one script for it to enable
debugging of a child.
We can do that with

$DEBUG_DO DebugAdd tag

to add tag to DEBUG_SH but only when we are already debugging.

bootstrap-packages.sh escape ++

We need to escape + when egreping parent makefile too.

Reviewed by:    stevek

Updated and new Makefile.depend files

Reviewd by:     stevek

Add local.meta.stage.mk

We need to undo NO_OBJ if we are staging
as it causes us to drop the stage* target cookies in src tree
which is bad, and may break doing the same targets for multiple
architectures.

Reviewed by:    stevek

bootstrap-packages handle optional DIRDEPS

Add logic to bootstrap-packages.sh to handle constructs like:

SUBDIR.${MK_OPT}+= sub

and:

.if ${MK_OPT} == "yes"
SUBDIR+= sub
.endif

there are other methods used in various makefiles
so this will be better than nothing, but not complete coverage.

In either case a reldir will be added to
targets/packages/$package/Makefile.depend.options
rather than
targets/packages/$package/Makefile.depend

    [11 lines not shown]

local.dirdeps-targets.mk include src.opts.mk

Include src.opts.mk to ensure we have options defined for when
assessing dirdeps-options.

Reviewed by:    stevek

targets/Makefile.inc skip updates

When PKG_METHOD is "no" or "none" we should *not*
attempt to update Makefile.depend.

Reviewed by:    stevek

local.gendirdeps.mk skip awk and xinstall for host

Do not record DIRDEPS for awk.host or xinstall.host
if we ever need them they can be dealt with specially.

Reviewed by: stevek

Update dirdeps.mk for better debug output

Latest dirdeps.mk provides better clue as to which makefile
is being read for a given DIRDEP.

Reviewed by: stevek

Update Makefile.depend files

After building packages we have a number of new
and updated Makefile.depend files

Reviewed by:    stevek

Add targets/pseudo/bootstrap-packages

Try to compensate for the lack any origin for a DIRDEPS build.

bootstrap-packages will extract the PACKAGE lines from
the tree's Makefiles and use them to populate
targets/packages/Makefile.depend and targets/packages/*/Makefile.depend
so we can at least try to keep the Makefile.depend files throughout
the tree up to date.

This is far from ideal, as we cannot (easily) take into account
options that affect the contents of various packages.

Reviewed by:    stevek
Sponsored by:   Juniper Networks, Inc.
Differential Revision:  https://reviews.freebsd.org/D47065

procfs require PRIV_PROC_MEM_WRITE to write mem

Add a priv_check for PRIV_PROC_MEM_WRITE which will be blocked
by mac_veriexec if being enforced, unless the process has a maclabel
to grant priv.

Reviewed by:    stevek
Sponsored by:   Juniper Networks, Inc.
Differential Revision:  https://reviews.freebsd.org/D46692

debug.sh take advantage of hooks.sh

Allow Debug{On,Off} to run associated hooks.
This makes it feasible to collect extra debug info at runtime
without needing to modify any potentially verified and hence immutable
scripts.

Like debug.sh, hooks.sh is extremely handy and used extensively
in many parts of Junos and its build environment.
It is provided here in the hope that others may benefit.

We do not dot hooks.sh by default to reduce overhead, but it can
but done from rc.conf et al using

$_HOOKS_SH . /libexec/hooks.sh

to avoid including more than once.

Reviewed by:    stevek

    [2 lines not shown]

bmake/unit-tests/Makefile use _shell

Set _shell like later versions of bmake so that .SHELL
does not appear in conditionals.

This avoids errors when an older version of bmake parses this makefile
such as when doing src upgrade from stable/12 or older.

Direct commit to stable/13 since this is the only branch where
this issue arrises.

PR:             281151

kern.pre.mk include local.kern.pre.mk

Allow for local customization.

Reviewed by:    stevek
Differential Revision:  https://reviews.freebsd.org/D46423

safe_dot check file is a file

Since we are being paranoid, check that each arg to safe_dot is
actually a file as well as non-empty.

Check for white-space in filenames - these require special handling.

Update safe_eval.sh to support --export

This update allows

safe_dot --export file ...

to export any variables that get set.

Reviewed by: obrien