d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c9023cf7fe
freebsd-dev/share/mk
History
Jessica Clarke b58ea3e1f7 Fix hand-rolled METALOG entries for installconfig during distributeworld 
During distributeworld we call distribute on subdirectories, which in
turn calls installconfig. However, this recursive installconfig call
appends the distribution name (in these cases, "base") to DESTDIR. For
install(1) this works fine as its -D argument comes from the top-level
Makefile.inc1, which passes the original DESTDIR, thereby resulting in
the METALOG entry having the distribution name as a prefix representing
its true installed path relative to the root, but for the hand-rolled
entries they do not use install(1) and thus do not have access to what
the original DESTDIR was, resulting in the METALOG missing this prefix.

Thus, pass down the name of the distribution via a new variable DISTBASE
(chosen as Makefile.inc1 already uses that to convey this exact same
information to etc's distrib-dirs during distributeworld) and prepend
this to the handful of manually-generated METALOG entries. For the
installworld case this variable will be empty and so this behaves as
before.

Note that we need to be careful to avoid double slashes in the METALOG;
distributeworld uses find | awk to split the single METALOG up into
multiple dist.meta files, and this relies on the paths in the METALOG
having the exact prefix ./dist (or ./dist/usr/lib/debug).

Reviewed by:	brooks, emaste
Differential Revision:	https://reviews.freebsd.org/D33997
2022-02-28 22:36:39 +00:00
..
atf.test.mk Another round of attempting to squelch -Wdeprecated-declarations, which 2019-09-17 06:07:08 +00:00
auto.obj.mk
bsd.arch.inc.mk
bsd.clang-analyze.mk Move all sources from the llvm project into contrib/llvm-project. 2019-12-20 19:53:05 +00:00
bsd.compat.mk bsd.compat.mk: A few cosmetic fixes. 2022-02-04 15:57:28 -08:00
bsd.compiler.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
bsd.confs.mk
bsd.cpu.mk bsd.cpu.mk: Remove mips support 2022-01-03 08:00:08 -07:00
bsd.crunchgen.mk
bsd.dep.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
bsd.dirs.mk
bsd.doc.mk
bsd.dtb.mk Introduce bsd.sysdir.mk to consolidate looking for the kernel. 2019-11-21 15:59:33 +00:00
bsd.endian.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
bsd.files.mk mk: Set the DIR tags based on the files one 2021-01-04 16:20:04 +01:00
bsd.incs.mk bsd.incs.mk: Add support to override tags for a specific include group 2021-01-04 16:21:32 +01:00
bsd.info.mk
bsd.init.mk Update dirdeps.mk et al to latest 2020-11-24 21:45:38 +00:00
bsd.kmod.mk Revert "Introduce MODULES_EXCLUDE" 2022-01-13 15:59:47 +01:00
bsd.lib.mk bsd.lib/prog.mk: Remove special case for mips 2022-01-03 08:00:08 -07:00
bsd.libnames.mk Add an internal libiscsiutil library. 2021-12-22 10:43:11 -08:00
bsd.linker.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
bsd.links.mk
bsd.man.mk pkgbase: Add an src.conf option for splitting man pages 2021-03-16 07:13:09 +01:00
bsd.mkopt.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
bsd.nls.mk
bsd.obj.mk NO_OBJ: Always fix .OBJDIR regardless of AUTO_OBJ. 2020-04-07 17:07:04 +00:00
bsd.opts.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
bsd.own.mk Standardize EFI's ESP mount point. 2019-11-20 21:06:29 +00:00
bsd.port.mk
bsd.port.options.mk
bsd.port.post.mk
bsd.port.pre.mk
bsd.port.subdir.mk
bsd.prog.mk bsd.lib/prog.mk: Remove special case for mips 2022-01-03 08:00:08 -07:00
bsd.progs.mk Add build system support for ASAN+UBSAN instrumentation 2021-08-02 14:33:24 +01:00
bsd.README share/mk: Fix obvious typo in README (TAREGT -> TARGET) 2022-02-20 17:26:04 +01:00
bsd.sanitizer.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
bsd.snmpmod.mk pkgbase: Put the mibs and defs in the bnsmp package 2021-06-19 17:50:03 +02:00
bsd.subdir.mk Fix hand-rolled METALOG entries for installconfig during distributeworld 2022-02-28 22:36:39 +00:00
bsd.suffixes-posix.mk
bsd.suffixes.mk
bsd.symver.mk Remove the SYMVER build option. 2020-04-30 22:08:40 +00:00
bsd.sys.mk Revert "Enable -Wdate-time warning" 2022-02-20 19:16:40 -05:00
bsd.sysdir.mk Introduce bsd.sysdir.mk to consolidate looking for the kernel. 2019-11-21 15:59:33 +00:00
bsd.test.mk Make capsicum test cases fine-grained 2020-10-06 06:45:52 +00:00
dirdeps-options.mk Update dirdeps.mk et al to 20211212 versions 2021-12-18 13:37:07 -08:00
dirdeps-targets.mk Update dirdeps.mk et al to 20211212 versions 2021-12-18 13:37:07 -08:00
dirdeps.mk Update dirdeps.mk et al to 20211212 versions 2021-12-18 13:37:07 -08:00
gendirdeps.mk Update dirdeps.mk et al to latest 2020-11-24 21:45:38 +00:00
googletest.test.inc.mk Work around two -Werror warning issues in googletest, which have been 2020-01-31 18:26:23 +00:00
googletest.test.mk Make capsicum test cases fine-grained 2020-10-06 06:45:52 +00:00
host-target.mk
install-new.mk
kmod.opts.mk Add a kmod.opts.mk. 2019-11-21 18:14:26 +00:00
local.autodep.mk Add missing dep patterns for .pieo 2021-09-13 13:22:31 +01:00
local.dirdeps-options.mk retire BSD_CRTBEGIN option 2020-01-31 18:04:04 +00:00
local.dirdeps.mk Update dirdeps.mk et al to latest 2020-11-24 21:45:38 +00:00
local.gendirdeps.mk Update dirdeps.mk et al to latest 2020-11-24 21:45:38 +00:00
local.init.mk Include ${.CURDIR}/local.init.mk if it exists 2020-03-31 15:59:29 +00:00
local.meta.sys.mk meta: Remove mips support 2022-01-03 08:00:08 -07:00
local.sys.env.mk
local.sys.mk
Makefile Install bsd.sysdir.mk. 2019-11-21 19:54:10 +00:00
meta2deps.py Update dirdeps.mk et al to 20211212 versions 2021-12-18 13:37:07 -08:00
meta2deps.sh Update dirdeps.mk et al to latest 2020-11-24 21:45:38 +00:00
meta.autodep.mk Update dirdeps.mk et al to 20211212 versions 2021-12-18 13:37:07 -08:00
meta.stage.mk Update dirdeps.mk et al to latest 2020-11-24 21:45:38 +00:00
meta.subdir.mk Update dirdeps.mk et al to latest 2020-11-24 21:45:38 +00:00
meta.sys.mk Update dirdeps.mk et al to 20211212 versions 2021-12-18 13:37:07 -08:00
netbsd-tests.test.mk Remove more quotes around Makefile .error/.warn/.info strings. 2022-02-04 15:59:53 -08:00
plain.test.mk
src.init.mk
src.libnames.mk src.libnames.mk: add a comment explaining libssp_nonshared 2022-02-22 16:22:03 -05:00
src.lua.mk Add flua to the base system, install to /usr/libexec 2019-11-18 23:21:13 +00:00
src.opts.mk Invert CPU arch test for LLDB default 2022-02-09 19:11:00 -05:00
src.sys.env.mk META_MODE: Allow 'make all install' to work with filemon. 2020-01-17 14:29:27 +00:00
src.sys.mk build: provide a default WARNS for all in-tree builds 2020-09-18 17:17:46 +00:00
src.sys.obj.mk
src.tools.mk ncurses: Add support for terminfo database 2021-02-25 14:25:11 +01:00
stage-install.sh
suite.test.mk make check: suppress echo of kyua binary location 2021-01-16 00:07:50 -06:00
sys.dependfile.mk
sys.mk Stop trying to strip 'eb' suffixes from ARM MACHINE_ARCH. 2022-01-25 11:37:29 -08:00
tap.test.mk
version_gen.awk