Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177619690
D50383.1794856280.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None
D50383.1794856280.diff
View Options
Index: release/Makefile
===================================================================
--- release/Makefile
+++ release/Makefile
@@ -204,20 +204,17 @@
mtree -c -p ${.TARGET}/usr/freebsd-packages | \
mtree -C -k type,mode,link,size | \
sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG
-# Copy manifest only (no distfiles) to get checksums
+.endif
+ # Copy MANIFEST to get checksums for both pkgbase and legacy
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
-.else
+.if !defined(PKGBASE)
# 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; \
+ 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
.endif
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
@@ -298,20 +295,18 @@
mtree -c -p ${.TARGET}/usr/freebsd-packages | \
mtree -C -k type,mode,link,size | \
sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG
-# Copy manifest only (no distfiles) to get checksums
+.endif
+ # Copy MANIFEST to get checksums for both pkgbase and legacy
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
-.else
+.if !defined(PKGBASE)
# 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; \
+ 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
.endif
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 16, 7:11 PM (18 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41785996
Default Alt Text
D50383.1794856280.diff (2 KB)
Attached To
Mode
D50383: release/Makefile: Refactor dist set logic
Attached
Detach File
Event Timeline