Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Mar 2011 18:02:28 +0000 (UTC)
From:      Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r219616 - head/release
Message-ID:  <201103131802.p2DI2SMu061925@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nwhitehorn
Date: Sun Mar 13 18:02:28 2011
New Revision: 219616
URL: http://svn.freebsd.org/changeset/base/219616

Log:
  Fix some typos due to unremoved commented-out lines. A great big pointy
  hat goes to me for this one.

Modified:
  head/release/Makefile.bsdinstall
  head/release/generate-release.sh

Modified: head/release/Makefile.bsdinstall
==============================================================================
--- head/release/Makefile.bsdinstall	Sun Mar 13 17:15:31 2011	(r219615)
+++ head/release/Makefile.bsdinstall	Sun Mar 13 18:02:28 2011	(r219616)
@@ -135,7 +135,7 @@ memstick: system
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh ${.OBJDIR}/release ${.OBJDIR}/memstick
 
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
-	sh ${.CURDIR}/${TARGET}/make-manifest.sh ${DISTDIR}/*.txz > ${.OBJDIR}/MANIFEST
+	sh ${.CURDIR}/scripts/make-manifest.sh ${.OBJDIR}/*.txz > ${.OBJDIR}/MANIFEST
 	touch ${.OBJDIR}/${.TARGET}
 
 cdrom: release.iso

Modified: head/release/generate-release.sh
==============================================================================
--- head/release/generate-release.sh	Sun Mar 13 17:15:31 2011	(r219615)
+++ head/release/generate-release.sh	Sun Mar 13 18:02:28 2011	(r219616)
@@ -42,7 +42,7 @@ if [ ! -z $CVSUP_HOST ]; then 
 	cp /etc/resolv.conf $2/etc/resolv.conf
 
 	# Checkout ports and doc trees
-	#chroot $2 /usr/bin/csup /docports-supfile || exit 1
+	chroot $2 /usr/bin/csup /docports-supfile || exit 1
 
 	# Build ports to build the docs, then build the docs
 	chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)' || exit 1
@@ -50,6 +50,7 @@ if [ ! -z $CVSUP_HOST ]; then 
 fi
 
 chroot $2 /bin/sh -c "cd /usr/src && make $MAKE_FLAGS buildworld buildkernel" || exit 1
+chroot $2 /bin/sh -c "cd /usr/src/release && make -f Makefile.bsdinstall obj release $RELEASE_FLAGS" || exit 1
 mkdir $2/R
-chroot $2 /bin/sh -c "cd /usr/src/release && MAKEOBJDIR=/R make -f Makefile.bsdinstall release $RELEASE_FLAGS" || exit 1
+cp -pRP $2/usr/obj/usr/src/release/release.iso $2/usr/obj/usr/src/release/memstick $2/usr/obj/usr/src/release/ftp $2/R
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103131802.p2DI2SMu061925>