From 77542b069db8ee7fd24cd4b01e9f16c82cef7cbb Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Sun, 13 Mar 2011 18:02:28 +0000 Subject: Fix some typos due to unremoved commented-out lines. A great big pointy hat goes to me for this one. --- release/generate-release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'release/generate-release.sh') diff --git a/release/generate-release.sh b/release/generate-release.sh index 08232ee..b3f4bbb 100755 --- a/release/generate-release.sh +++ b/release/generate-release.sh @@ -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 -- cgit v1.1