Page MenuHomeFreeBSD
Files F107493207

D48038.diff
No OneTemporary
Actions

D48038.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1538,24 +1538,16 @@
.endfor
.if defined(NO_ROOT)
.for dist in base ${EXTRA_DISTRIBUTIONS}
+.for path suffix in "" .meta /usr/lib/debug .debug.meta
@# For each file that exists in this dist, print the corresponding
@# line from the METALOG. This relies on the fact that
@# a line containing only the filename will sort immediately before
@# the relevant mtree line.
cd ${DESTDIR}/${DISTDIR}; \
- find ./${dist} | ${METALOG_SORT_CMD} -u ${METALOG} - | \
- awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \
- ${DESTDIR}/${DISTDIR}/${dist}.meta
+ find ./${dist}${path} | ${METALOG_SORT_CMD} -u ${METALOG} - | \
+ awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \
+ ${DESTDIR}/${DISTDIR}/${dist}${suffix}
.endfor
-.for dist in ${DEBUG_DISTRIBUTIONS}
- @# For each file that exists in this dist, print the corresponding
- @# line from the METALOG. This relies on the fact that
- @# a line containing only the filename will sort immediately before
- @# the relevant mtree line.
- cd ${DESTDIR}/${DISTDIR}; \
- find ./${dist}/usr/lib/debug | ${METALOG_SORT_CMD} -u ${METALOG} - | \
- awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \
- ${DESTDIR}/${DISTDIR}/${dist}.debug.meta
.endfor
.endif
.endif # make(distributeworld)

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 15, 11:40 PM (18 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15334418
Default Alt Text
D48038.diff (1 KB)

Event Timeline