diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-03-13 18:02:28 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-03-13 18:02:28 +0000 |
| commit | 77542b069db8ee7fd24cd4b01e9f16c82cef7cbb (patch) | |
| tree | 8657522a12f60afd94ef2437757f8eaed4148893 /release | |
| parent | da52594639ac9c096c58d385310db81b2d28dd13 (diff) | |
| download | FreeBSD-src-77542b069db8ee7fd24cd4b01e9f16c82cef7cbb.zip FreeBSD-src-77542b069db8ee7fd24cd4b01e9f16c82cef7cbb.tar.gz | |
Fix some typos due to unremoved commented-out lines. A great big pointy
hat goes to me for this one.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.bsdinstall | 2 | ||||
| -rwxr-xr-x | release/generate-release.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/release/Makefile.bsdinstall b/release/Makefile.bsdinstall index bda97a4..828328d 100644 --- a/release/Makefile.bsdinstall +++ b/release/Makefile.bsdinstall @@ -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 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 |
