From owner-svn-src-user@FreeBSD.ORG Tue Feb 22 14:02:00 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9810C106566C; Tue, 22 Feb 2011 14:02:00 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7AE808FC15; Tue, 22 Feb 2011 14:02:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1ME20bA010856; Tue, 22 Feb 2011 14:02:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1ME20tL010853; Tue, 22 Feb 2011 14:02:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102221402.p1ME20tL010853@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 22 Feb 2011 14:02:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218948 - user/nwhitehorn/bsdinstall/release X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 14:02:00 -0000 Author: nwhitehorn Date: Tue Feb 22 14:02:00 2011 New Revision: 218948 URL: http://svn.freebsd.org/changeset/base/218948 Log: New-style release scripts designed for integration into the main tree. Added: user/nwhitehorn/bsdinstall/release/Makefile user/nwhitehorn/bsdinstall/release/README Deleted: user/nwhitehorn/bsdinstall/release/testsystem.sh Added: user/nwhitehorn/bsdinstall/release/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/release/Makefile Tue Feb 22 14:02:00 2011 (r218948) @@ -0,0 +1,49 @@ +# $FreeBSD: head/release/Makefile 210097 2010-07-15 01:48:30Z nwhitehorn $ + +WORLDDIR?= ${.CURDIR}/.. +DISTDIR?= ${DESTDIR}/usr/freebsd-dist +PORTSDIR?= /usr/ports + +TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} == ${MACHINE_ARCH} +TARGET?= ${MACHINE} +.else +TARGET?= ${TARGET_ARCH} +.endif +IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} + +packagesystem: + -mkdir -p ${DISTDIR} + cd ${WORLDDIR} && ${IMAKE} distributeworld distributekernel packageworld packagekernel DISTDIR=${DISTDIR} + -mkdir -p ${DISTDIR}/usr + ln -fs ${WORLDDIR} ${DISTDIR}/usr/src + ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports +.if !defined(NOPORTS) + cd ${DISTDIR} && tar cLvJf ${DISTDIR}/ports.txz --exclude usr/ports/distfiles --exclude usr/ports/packages --exclude 'usr/ports/INDEX*' usr/ports +.endif +.if !defined(NOSRC) + cd ${DISTDIR} && tar cLvJf ${DISTDIR}/src.txz --exclude .svn --exclude CVS usr/src +.endif + +system: +# Install system + -mkdir ${DISTDIR}/release + cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution DESTDIR=${DISTDIR}/release + -rm ${DISTDIR}/release/boot/kernel/*.symbols +# Copy distfiles + mkdir ${DISTDIR}/release/usr/freebsd-dist + cp ${DISTDIR}/*.txz ${DISTDIR}/release/usr/freebsd-dist +# Set up installation environment + ln -s /tmp/bsdinstall_etc/resolv.conf ${DISTDIR}/release/etc/resolv.conf + echo sendmail_enable=\"NONE\" > ${DISTDIR}/release/etc/rc.conf + echo hostid_enable=\"NO\" >> ${DISTDIR}/release/etc/rc.conf + touch ${DISTDIR}/release/etc/fstab + cp rc.local ${DISTDIR}/release/etc + +cdrom: + echo kernel_options=\"-C\" > ${DISTDIR}/release/boot/loader.conf + sh /usr/src/release/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${DISTDIR}/release.iso ${DISTDIR}/release + rm ${DISTDIR}/release/boot/loader.conf + +release: packagesystem system cdrom + Added: user/nwhitehorn/bsdinstall/release/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/release/README Tue Feb 22 14:02:00 2011 (r218948) @@ -0,0 +1,16 @@ +This files should be copied to /usr/src/release. + +Options +- NOPORTS: Does not include a ports tree on the install media +- NOSRC: Does not include documentation + +Targets: +- release: Sets up installation media for a prebuilt world and kernel +- packagesystem: Builds distributions and tars them +- system: Sets up a bootable system that runs the installer at boot +- cdrom: Makes an ISO image from the output of system + +Missing features: +- Release documentation build +- Memstick images +- FTP area prep From owner-svn-src-user@FreeBSD.ORG Thu Feb 24 14:56:12 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9815106566B; Thu, 24 Feb 2011 14:56:12 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B92B38FC0C; Thu, 24 Feb 2011 14:56:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OEuCje043996; Thu, 24 Feb 2011 14:56:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OEuCXa043994; Thu, 24 Feb 2011 14:56:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102241456.p1OEuCXa043994@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 24 Feb 2011 14:56:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219002 - user/nwhitehorn/bsdinstall/release X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 14:56:12 -0000 Author: nwhitehorn Date: Thu Feb 24 14:56:12 2011 New Revision: 219002 URL: http://svn.freebsd.org/changeset/base/219002 Log: Fix a copy/paste hardcode of /usr/src. Modified: user/nwhitehorn/bsdinstall/release/Makefile Modified: user/nwhitehorn/bsdinstall/release/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/release/Makefile Thu Feb 24 13:42:35 2011 (r219001) +++ user/nwhitehorn/bsdinstall/release/Makefile Thu Feb 24 14:56:12 2011 (r219002) @@ -42,7 +42,7 @@ system: cdrom: echo kernel_options=\"-C\" > ${DISTDIR}/release/boot/loader.conf - sh /usr/src/release/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${DISTDIR}/release.iso ${DISTDIR}/release + sh ${WORLDDIR}/release/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${DISTDIR}/release.iso ${DISTDIR}/release rm ${DISTDIR}/release/boot/loader.conf release: packagesystem system cdrom