mirror of
https://github.com/opnsense/src.git
synced 2026-02-24 10:20:24 -05:00
b58ea3e1f7
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 |
||
|---|---|---|
| .. | ||
| aarch64 | ||
| amd64 | ||
| arm | ||
| capability | ||
| compat-43 | ||
| db | ||
| gdtoa | ||
| gen | ||
| gmon | ||
| i386 | ||
| iconv | ||
| include | ||
| inet | ||
| isc | ||
| locale | ||
| md | ||
| nameser | ||
| net | ||
| nls | ||
| posix1e | ||
| powerpc | ||
| powerpc64 | ||
| powerpcspe | ||
| quad | ||
| regex | ||
| resolv | ||
| riscv | ||
| rpc | ||
| secure | ||
| softfloat | ||
| stdio | ||
| stdlib | ||
| stdtime | ||
| string | ||
| sys | ||
| tests | ||
| uuid | ||
| x86 | ||
| xdr | ||
| yp | ||
| libc.ldscript | ||
| libc_nossp.ldscript | ||
| Makefile | ||
| Makefile.depend | ||
| Makefile.depend.options | ||
| Versions.def | ||