git: ee10666327b6 - main - Links for bmake and bmake.1

[O. Hartmann]

On Mon, 15 Feb 2021 01:22:58 GMT
"Simon J. Gerraty" <sjg at FreeBSD.org> wrote:

> The branch main has been updated by sjg:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=ee10666327b622c2f20a4ac17e7a5673b04e7c9a
>
> commit ee10666327b622c2f20a4ac17e7a5673b04e7c9a
> Author:     Simon J. Gerraty <sjg at FreeBSD.org>
> AuthorDate: 2021-02-15 01:20:10 +0000
> Commit:     Simon J. Gerraty <sjg at FreeBSD.org>
> CommitDate: 2021-02-15 01:22:21 +0000
>
>     Links for bmake and bmake.1
>
>     Some folk forget that make is bmake, and want the links...
>
>     MFC after: 1 week
> ---
>  usr.bin/bmake/Makefile.inc | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
> index 96431c19d2af..8c4cb659e1d8 100644
> --- a/usr.bin/bmake/Makefile.inc
> +++ b/usr.bin/bmake/Makefile.inc
> @@ -9,6 +9,8 @@
>
>  .if exists(${.CURDIR}/tests)
>  PROG= make
> +LINKS= make bmake
> +MLINKS= ${MAN} b${MAN}
>  .endif
>
>  .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
> _______________________________________________
> dev-commits-src-main at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
> To unsubscribe, send any mail to
> "dev-commits-src-main-unsubscribe at freebsd.org"

This commit seems to break updating and installation of jail's base system
based on 14-CURRENT.

# poudriere jail -l
headamd64 14.0-CURRENT 1400004     amd64 src=/pool/sources/CURRENT/src/ \
2021-02-12 15:07:33 /pool/poudriere/jails/headamd64

#poudriere jail -j _somejailname_ -u -b

[...]
--- realinstall_subdir_usr.bin ---
rm -f /pool/poudriere/jails/headamd64/usr/share/man/man1/bmake.1
/pool/poudriere/jails/headamd64/usr/share/man/man1/bmake.1.gz;  install -N
/pool/poudriere/jails/headamd64/usr/src/etc -l h -o root -g wheel -m 444
/pool/poudriere/jails/headamd64/usr/share/man/man1/make.1.gz
/pool/poudriere/jails/headamd64/usr/share/man/man1/bmake.1.gz --- _installlinks
--- install -N /pool/poudriere/jails/headamd64/usr/src/etc -l h -o root -g
wheel -m 555  /pool/poudriere/jails/headamd64make
/pool/poudriere/jails/headamd64bmake install: link
/pool/poudriere/jails/headamd64make -> /pool/poudriere/jails/headamd64bmake: No
such file or directory *** [_installlinks] Error code 71

make[5]: stopped in /pool/poudriere/jails/headamd64/usr/src/usr.bin/bmake
1 error

make[5]: stopped in /pool/poudriere/jails/headamd64/usr/src/usr.bin/bmake
--- realinstall_subdir_share ---