From nobody Fri Nov 26 11:52:24 2021 X-Original-To: dev-commits-src-all@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 BAA8F18A93D0; Fri, 26 Nov 2021 11:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J0tQc3GsGz4prJ; Fri, 26 Nov 2021 11:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4682939E; Fri, 26 Nov 2021 11:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AQBqOVc001186; Fri, 26 Nov 2021 11:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQBqO2l001185; Fri, 26 Nov 2021 11:52:24 GMT (envelope-from git) Date: Fri, 26 Nov 2021 11:52:24 GMT Message-Id: <202111261152.1AQBqO2l001185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: df90aeac24c9 - main - Fix build with -DNO_ROOT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df90aeac24c9d3621f294e6638a31499b56f4f6b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637927544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xeDbXzF99c5rC0PvMK0PMQzVv6+nszfoTqUYk3JfjGw=; b=jPYX0h/jX+d/aaz6GueC7nvMxRvnekT62Y+7fhb7AE3e9lsMhD9bCg641upETIlrYGP0++ fOslnx45eufeJJ61V9Ijpc2BoLfmSQb/BO2vyLDpouMBcPBjoDhF7NLO8AU/UjINqmesDU 9lH69QDSPhN6WT0D5c2lSGkLQSi+7iZYh9Wab/eyjBR6yG51PrcmaLEmyvGEX7Ddz756/L 0nt2RwGPg5fHe8ENkC9twRA5aczbHwVXC2RTrYrRNliVN7T7yajg85THhjx9JUPLyXri7y kUGgP044N8/rXVc8eDGo9Px07AlTcGdOOk9OgwRYIvw6OkKJBTxgIeurWnFYDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637927544; a=rsa-sha256; cv=none; b=S2CAh78CGenXispz5IfjBDc8h0x5ws8SjldOoPCdOJi/8z0+o0s4VxMEHcMH5PH/9eECQA UiBe9XZN7zC4Xmm7+V9Fq5xkLsHJx2FrA19NFnDtgQKycUOHtNMGkVucviLK2xaxwd8/42 Qb3GeU5tjzISKY66RB/+s8u1rq+3h7WXoSu9iRQGBPD8exG2tglqHXjIvSsp+YO5aI8SFW ThzpXhrlcAUQ6BI734Do+mRS7bIYGSReU+/I2wvg9V6unVtIg9pa3F5YUdNkB+NLqZRR4V +l1IBTVgVsY+W9WD2Vcz0s4lHmXNJBPK3QQmzPhaVFKovuiSFIpiQM3qNDNxcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=df90aeac24c9d3621f294e6638a31499b56f4f6b commit df90aeac24c9d3621f294e6638a31499b56f4f6b Author: Fernando Apesteguía AuthorDate: 2021-11-26 10:55:50 +0000 Commit: Fernando Apesteguía 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 handle 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/index.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= \ 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} != "all" +MAN+= \ aw_gpio.4 \ aw_mmc.4 \ aw_rtc.4 \ @@ -11,18 +22,13 @@ MAN= \ 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=aarch64 .for _manpage in ${MAN} -MLINKS+=${_manpage} ../${_manpage} +MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage} .endfor -MANSUBDIR=/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= \ MLINKS= imx_wdog.4 imxwdt.4 MLINKS+= mge.4 if_mge.4 -# Link files to the parent directory +# Link files to the architecture directory +_ARCH_SUBDIR=arm +.for _manpage _link in ${MLINKS} +MLINKS+=${_link} ${_ARCH_SUBDIR}/${_link} +.endfor .for _manpage in ${MAN} -MLINKS+=${_manpage} ../${_manpage} +MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage} .endfor -MANSUBDIR=/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= CPU_ELAN.4 CPU_SOEKRIS.4 MLINKS+=pae.4 PAE.4 MLINKS+=sbni.4 if_sbni.4 -# Link files to the parent directory +# Link files to the architecture directory +_ARCH_SUBDIR=i386 +.for _manpage _link in ${MLINKS} +MLINKS+=${_link} ${_ARCH_SUBDIR}/${_link} +.endfor .for _manpage in ${MAN} -MLINKS+=${_manpage} ../${_manpage} +MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage} .endfor -MANSUBDIR=/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= adb.4 \ snd_davbus.4 \ tsec.4 -# Link files to the parent directory +# Link files to the architecture directory +_ARCH_SUBDIR=powerpc +.for _manpage _link in ${MLINKS} +MLINKS+=${_link} ${_ARCH_SUBDIR}/${_link} +.endfor .for _manpage in ${MAN} -MLINKS+=${_manpage} ../${_manpage} +MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage} .endfor -MANSUBDIR=/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=amd64 .if ${MK_ACPI} != "no" SUBDIR+= acpi .endif .if ${MK_APM} != "no" SUBDIR+= apm +# Link files to the architecture directory +.for _manpage in ${:!/bin/sh -c "/bin/ls ${_ARCH_SUBDIR}/.8"!:E} +MLINKS+=${_manpage} ${_ARCH_SUBDIR}/${_manpage} +.endfor .endif .if ${MK_BHYVE} != "no" SUBDIR+= 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= apm.8 MLINKS= apm.8 apmconf.8 MANSUBDIR= /${MACHINE_CPUARCH} -# Link files to the parent directory -MLINKS+= apm.8 ../apm.8 -MLINKS+= apmconf.8 ../apmconf.8 - PACKAGE=apm .include