Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177731585
D60944.1795149942.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
D60944.1795149942.diff
View Options
diff --git a/release/Makefile.vm b/release/Makefile.vm
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -127,13 +127,6 @@
cw-${_CW:tl}-${_FS}-${_FMT}: cw-ec2-base-${_FS}-${_FMT}
.endif
-# Special handling: GCE images ingest src.txz and ports.txz and expect them
-# to be in the /ftp/ directory. Note: This will need to be reworked before
-# distribution sets go away!
-.if ${_CW} == GCE
-cw-${_CW:tl}-${_FS}-${_FMT}: ftp
-.endif
-
cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR}
mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -105,31 +105,29 @@
debug.debugger_on_panic=0
EOF
- # To meet GCE marketplace requirements, extract the src.txz and
- # ports.txz distributions to the target virtual machine disk image
- # and fetch the sources for the third-party software installed on
- # the image.
- if [ -e "${DESTDIR}/../ftp/src.txz" ]; then
- tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR}
- ( cd ${DESTDIR} && find ./usr/src ) |
- while read P; do
- metalog_add_data ${P}
- done
- fi
- if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then
- tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR}
- _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/)
- for PACKAGE in ${_INSTALLED_PACKAGES}; do
- make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \
- DISTDIR=${DESTDIR}/usr/ports/distfiles \
- DISABLE_VULNERABILITIES=YES \
- I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES
- done
- ( cd ${DESTDIR} && find ./usr/ports ) |
- while read P; do
- metalog_add_data ${P}
- done
- fi
+ # To meet GCE marketplace requirements, copy the src and ports trees
+ # to the target virtual machine disk image and fetch the sources for
+ # the third-party software installed on the image.
+ mkdir -p ${DESTDIR}/usr/src
+ tar -cf- -C ${WORLDDIR} --exclude .svn --exclude .git --exclude .got \
+ --exclude .zfs --exclude ^release/obj --exclude ^release/dist . |
+ tar -xf- -C ${DESTDIR}/usr/src
+ mkdir -p ${DESTDIR}/usr/ports
+ tar -cf- -C ${PORTSDIR} --exclude .svn --exclude .git --exclude .got \
+ --exclude ^distfiles --exclude ^packages --exclude '^INDEX*' \
+ --exclude work . |
+ tar -xf- -C ${DESTDIR}/usr/ports
+ _INSTALLED_PACKAGES=$(pkg -r ${DESTDIR} info -o -q -a | grep -v ^base/)
+ for PACKAGE in ${_INSTALLED_PACKAGES}; do
+ make -C ${DESTDIR}/usr/ports/${PACKAGE} fetch \
+ DISTDIR=${DESTDIR}/usr/ports/distfiles \
+ DISABLE_VULNERABILITIES=YES \
+ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES
+ done
+ ( cd ${DESTDIR} && find ./usr/src ./usr/ports ) |
+ while read P; do
+ metalog_add_data ${P}
+ done
## XXX: Verify this is needed. I do not see this requirement
## in the docs, and it impairs the ability to boot-test a copy
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 4:45 AM (2 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41860262
Default Alt Text
D60944.1795149942.diff (2 KB)
Attached To
Mode
D60944: GCE: Copy /usr/{src,ports} directly
Attached
Detach File
Event Timeline