From nobody Sat Jun 11 23:34:09 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0C2B68428E4; Sat, 11 Jun 2022 23:34:19 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LLDgZ10b4z3vdV; Sat, 11 Jun 2022 23:34:18 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-lj1-x235.google.com with SMTP id j20so2685760ljg.8; Sat, 11 Jun 2022 16:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=exl9WpLi3YgZuvBnJZfLxwqR/QIrP8bQs4IdBNMdaFs=; b=LSpMJ4gxgs7p6gxdhPnpAWhEiRxfGCgzuFmg58emcTwtoK7PSNz2nykNqEiAwrxub4 c9xuXSO131TFUOXYJqOp3dr5iZsWwfXPSG/owPPodl8zqCEP3sSnO6qMZiD7PIHvr6Gx QL6qp9CzAtFIp7HF8AKooQra7+6XUaKTRA7d/yUASwl55SiHp6+nFdaepwWFOGUzn3Za pDgxywPef3tvE4KNCO2kA3pf3RAZXyiQY3JQCMVHEHBxm/NHsBidb9+IB/DHo5Iv1oR4 SZ2ajP+7gpO4UriH3poaGrG5IvN0JI5aw0WFAKJOSLN1Z14QlQlubqSruPYKNDsYlqv3 0QMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=exl9WpLi3YgZuvBnJZfLxwqR/QIrP8bQs4IdBNMdaFs=; b=CzWwDZ7XKUM+lTWutp7CQJOUbsp+r7vVPE0T7gFm4oHKMpppA7FcIOGM5sOtl/iXaG A/eZRUwIVC/T3Lj6cGUK1p/iA4JVW8clsqFcSHVdTljiBVD3E+DES5ueaz9slS5KUTbT EeATv+ZEYQoWHurwm+OUZYv/O8npF+MqlRQszLTVBpLaqvl8OdoS5ovKkD9eeWpHjlNW X1lXWDT+klWzqE0DujAfzA7M58SQcl9hRsRJiR/ux10tX5KWBO8wuXfTS/fiZ+Zs1lUv VuSBAHiyMJXJp8H1MIHz27kJYEowxy0M1ljdybSg6k77Z1zavrYcR65wznhGHHGB6U8X +aGQ== X-Gm-Message-State: AOAM532J74r47k4a+Gz/Tq+iq4TPA9t8RCj0PPZZMT2/ErFMUFWoGXrF JH2X/aOkJgG9fEesg/x9EdSiIfimqwkn6CfTUUTVkEcR X-Google-Smtp-Source: ABdhPJxxxpBiVHkuwJoBStwR14PhqRwuTPAYo4jJx18H1xlXAGeOBUSIlf6kFb3Heu1y+5SNMu4ggIZ02sg/ZJVzrL8= X-Received: by 2002:a2e:9682:0:b0:255:7b9f:6e8a with SMTP id q2-20020a2e9682000000b002557b9f6e8amr23977773lji.19.1654990450117; Sat, 11 Jun 2022 16:34:10 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:aa6:c2d2:0:b0:1e6:e5ee:dbad with HTTP; Sat, 11 Jun 2022 16:34:09 -0700 (PDT) In-Reply-To: <202111261152.1AQBqO2l001185@gitrepo.freebsd.org> References: <202111261152.1AQBqO2l001185@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sun, 12 Jun 2022 01:34:09 +0200 Message-ID: Subject: Re: git: df90aeac24c9 - main - Fix build with -DNO_ROOT To: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4LLDgZ10b4z3vdV X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=LSpMJ4gx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2a00:1450:4864:20::235 as permitted sender) smtp.mailfrom=mjguzik@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::235:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-ThisMailContainsUnwantedMimeParts: N I bisected an error to this commit: # make -sssss 'DESTDIR=3D/mnt/tmp' distribution ls: amd64/.8: No such file or directory make[3]: "/bin/sh -c "/bin/ls amd64/.8"" returned non-zero status On 11/26/21, Fernando Apestegu=C3=ADa wrote: > The branch main has been updated by fernape (doc, ports committer): > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Ddf90aeac24c9d3621f294e6638a3149= 9b56f4f6b > > commit df90aeac24c9d3621f294e6638a31499b56f4f6b > Author: Fernando Apestegu=C3=ADa > AuthorDate: 2021-11-26 10:55:50 +0000 > Commit: Fernando Apestegu=C3=ADa > CommitDate: 2021-11-26 11:51:08 +0000 > > Fix build with -DNO_ROOT > > The inclusion of 0a0f7486413c broke the build with the -DNO_ROOT > option. > Specifically, that commit adds some relative paths (with `..`) to > METALOG > that make other tools using that log, fail afterwards (tar, makefs...= ). > > It's been argued[1] if this is really something mtree(8) should handl= e > more > graciously. In the meantime, fix the breakage but changing the order = in > which > the links are created: first in the parent directory, then in the > architecture-specific one. > > We keep the architecture-specific directories an the links to the > parent > directories. This is something that we might want to change in the > future. > > This commit is based on a concept patch by avg@. > > [1] > https://lists.freebsd.org/archives/dev-commits-src-all/2021-November/inde= x.html > > Reported by: bapt@, emaste@ > Approved by: avg@ > Fixes: 0a0f7486413c > Differential Revision: https://reviews.freebsd.org/D33126 > --- > share/man/man4/man4.aarch64/Makefile | 26 ++++++++++++++++---------- > share/man/man4/man4.arm/Makefile | 10 ++++++---- > share/man/man4/man4.i386/Makefile | 10 ++++++---- > share/man/man4/man4.powerpc/Makefile | 10 ++++++---- > usr.sbin/Makefile.amd64 | 5 +++++ > usr.sbin/apm/Makefile | 4 ---- > 6 files changed, 39 insertions(+), 26 deletions(-) > > diff --git a/share/man/man4/man4.aarch64/Makefile > b/share/man/man4/man4.aarch64/Makefile > index 6d0e427e6b28..d1fbced3b0a8 100644 > --- a/share/man/man4/man4.aarch64/Makefile > +++ b/share/man/man4/man4.aarch64/Makefile > @@ -4,6 +4,17 @@ > > MAN=3D \ > armv8crypto.4 \ > + enetc.4 \ > + felix.4 \ > + rk_gpio.4 \ > + rk_grf.4 \ > + rk_i2c.4 \ > + rk_pinctrl.4 \ > + > +# Install manpages shared with arm only if not installing manpages > +# for all architectures, otherwise arm takes care of installing them. > +.if !empty(MAN_ARCH) && ${MAN_ARCH} !=3D "all" > +MAN+=3D \ > aw_gpio.4 \ > aw_mmc.4 \ > aw_rtc.4 \ > @@ -11,18 +22,13 @@ MAN=3D \ > aw_spi.4 \ > aw_syscon.4 \ > bcm283x_pwm.4 \ > - enetc.4 \ > - felix.4 \ > - rk_gpio.4 \ > - rk_grf.4 \ > - rk_i2c.4 \ > - rk_pinctrl.4 \ > > -# Link files to the parent directory > +.endif > + > +# Link files to the architecture directory. > +_ARCH_SUBDIR=3Daarch64 > .for _manpage in ${MAN} > -MLINKS+=3D${_manpage} ../${_manpage} > +MLINKS+=3D${_manpage} ${_ARCH_SUBDIR}/${_manpage} > .endfor > > -MANSUBDIR=3D/aarch64 > - > .include > diff --git a/share/man/man4/man4.arm/Makefile > b/share/man/man4/man4.arm/Makefile > index 2ac8dbb5fd81..76146f4ebdb7 100644 > --- a/share/man/man4/man4.arm/Makefile > +++ b/share/man/man4/man4.arm/Makefile > @@ -18,11 +18,13 @@ MAN=3D \ > MLINKS=3D imx_wdog.4 imxwdt.4 > MLINKS+=3D mge.4 if_mge.4 > > -# Link files to the parent directory > +# Link files to the architecture directory > +_ARCH_SUBDIR=3Darm > +.for _manpage _link in ${MLINKS} > +MLINKS+=3D${_link} ${_ARCH_SUBDIR}/${_link} > +.endfor > .for _manpage in ${MAN} > -MLINKS+=3D${_manpage} ../${_manpage} > +MLINKS+=3D${_manpage} ${_ARCH_SUBDIR}/${_manpage} > .endfor > > -MANSUBDIR=3D/arm > - > .include > diff --git a/share/man/man4/man4.i386/Makefile > b/share/man/man4/man4.i386/Makefile > index e3d2e66ca78d..3dfc5f151f9f 100644 > --- a/share/man/man4/man4.i386/Makefile > +++ b/share/man/man4/man4.i386/Makefile > @@ -21,11 +21,13 @@ MLINKS=3D CPU_ELAN.4 CPU_SOEKRIS.4 > MLINKS+=3Dpae.4 PAE.4 > MLINKS+=3Dsbni.4 if_sbni.4 > > -# Link files to the parent directory > +# Link files to the architecture directory > +_ARCH_SUBDIR=3Di386 > +.for _manpage _link in ${MLINKS} > +MLINKS+=3D${_link} ${_ARCH_SUBDIR}/${_link} > +.endfor > .for _manpage in ${MAN} > -MLINKS+=3D${_manpage} ../${_manpage} > +MLINKS+=3D${_manpage} ${_ARCH_SUBDIR}/${_manpage} > .endfor > > -MANSUBDIR=3D/i386 > - > .include > diff --git a/share/man/man4/man4.powerpc/Makefile > b/share/man/man4/man4.powerpc/Makefile > index aa0e137fcedd..e6ade9778db3 100644 > --- a/share/man/man4/man4.powerpc/Makefile > +++ b/share/man/man4/man4.powerpc/Makefile > @@ -15,11 +15,13 @@ MAN=3D adb.4 \ > snd_davbus.4 \ > tsec.4 > > -# Link files to the parent directory > +# Link files to the architecture directory > +_ARCH_SUBDIR=3Dpowerpc > +.for _manpage _link in ${MLINKS} > +MLINKS+=3D${_link} ${_ARCH_SUBDIR}/${_link} > +.endfor > .for _manpage in ${MAN} > -MLINKS+=3D${_manpage} ../${_manpage} > +MLINKS+=3D${_manpage} ${_ARCH_SUBDIR}/${_manpage} > .endfor > > -MANSUBDIR=3D/powerpc > - > .include > diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 > index d4d185414f41..1f15259eb1ac 100644 > --- a/usr.sbin/Makefile.amd64 > +++ b/usr.sbin/Makefile.amd64 > @@ -2,11 +2,16 @@ > > # mptable: broken (not 64 bit clean) > # pnpinfo: crashes (not really useful anyway) > +_ARCH_SUBDIR=3Damd64 > .if ${MK_ACPI} !=3D "no" > SUBDIR+=3D acpi > .endif > .if ${MK_APM} !=3D "no" > SUBDIR+=3D apm > +# Link files to the architecture directory > +.for _manpage in ${:!/bin/sh -c "/bin/ls ${_ARCH_SUBDIR}/.8"!:E} > +MLINKS+=3D${_manpage} ${_ARCH_SUBDIR}/${_manpage} > +.endfor > .endif > .if ${MK_BHYVE} !=3D "no" > SUBDIR+=3D bhyve > diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile > index 27fa0c37d5cf..f52453c62522 100644 > --- a/usr.sbin/apm/Makefile > +++ b/usr.sbin/apm/Makefile > @@ -5,10 +5,6 @@ MAN=3D apm.8 > MLINKS=3D apm.8 apmconf.8 > MANSUBDIR=3D /${MACHINE_CPUARCH} > > -# Link files to the parent directory > -MLINKS+=3D apm.8 ../apm.8 > -MLINKS+=3D apmconf.8 ../apmconf.8 > - > PACKAGE=3Dapm > > .include > --=20 Mateusz Guzik