Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F153571491
D50383.id155579.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D50383.id155579.diff
View Options
Index: release/Makefile
===================================================================
--- release/Makefile
+++ release/Makefile
@@ -183,12 +183,12 @@
-DDB_FROM_SRC -DNO_ROOT)
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
- for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \
- do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
- done
echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG
- for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \
- do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
+ cp MANIFEST ${.TARGET}/usr/freebsd-dist
+ echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG
+ for dist in $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); do \
+ cp $${dist} ${.TARGET}/usr/freebsd-dist; \
+ echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
done
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
# Install packages onto release media.
@@ -226,8 +226,8 @@
-DDB_FROM_SRC -DNO_ROOT)
# Copy manifest only (no distfiles) to get checksums
mkdir -p ${.TARGET}/usr/freebsd-dist
- cp MANIFEST ${.TARGET}/usr/freebsd-dist
echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG
+ cp MANIFEST ${.TARGET}/usr/freebsd-dist
echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
# Install packages onto release media.
@@ -258,12 +258,12 @@
-DDB_FROM_SRC -DNO_ROOT)
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
- for dist in MANIFEST $$(ls *.txz | grep -v container); \
- do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
- done
echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG
- for dist in MANIFEST $$(ls *.txz | grep -v container); \
- do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
+ cp MANIFEST ${.TARGET}/usr/freebsd-dist
+ echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG
+ for dist in $$(ls *.txz | grep -v container); do \
+ cp $${dist} ${.TARGET}/usr/freebsd-dist; \
+ echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
done
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
# Install packages onto release media.
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Apr 23, 12:35 AM (8 h, 5 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32004729
Default Alt Text
D50383.id155579.diff (2 KB)
Attached To
Mode
D50383: release/Makefile: Refactor dist set logic
Attached
Detach File
Event Timeline
Log In to Comment