diff options
author | Fernando ApesteguĂa <fernape@FreeBSD.org> | 2021-11-26 10:55:50 +0000 |
---|---|---|
committer | Fernando ApesteguĂa <fernape@FreeBSD.org> | 2021-11-26 11:51:08 +0000 |
commit | df90aeac24c9d3621f294e6638a31499b56f4f6b (patch) | |
tree | e14876351b2493e2bd74a5a3013139a787e2dabe /share/man/man4 | |
parent | 0906362646546843f371bebccb51d5578a99cc7c (diff) | |
download | src-df90aeac24c9d3621f294e6638a31499b56f4f6b.tar.gz src-df90aeac24c9d3621f294e6638a31499b56f4f6b.zip |
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
Diffstat (limited to 'share/man/man4')
-rw-r--r-- | share/man/man4/man4.aarch64/Makefile | 26 | ||||
-rw-r--r-- | share/man/man4/man4.arm/Makefile | 10 | ||||
-rw-r--r-- | share/man/man4/man4.i386/Makefile | 10 | ||||
-rw-r--r-- | share/man/man4/man4.powerpc/Makefile | 10 |
4 files changed, 34 insertions, 22 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 <bsd.prog.mk> 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 <bsd.prog.mk> 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 <bsd.prog.mk> 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 <bsd.prog.mk> |