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 /usr.sbin/apm | |
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 'usr.sbin/apm')
-rw-r--r-- | usr.sbin/apm/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
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 <bsd.prog.mk> |