From owner-svn-src-all@FreeBSD.ORG Thu Jul 25 02:43:06 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 24650FC5; Thu, 25 Jul 2013 02:43:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EC26B26EC; Thu, 25 Jul 2013 02:43:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6P2h56c029681; Thu, 25 Jul 2013 02:43:05 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6P2h5ua029680; Thu, 25 Jul 2013 02:43:05 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201307250243.r6P2h5ua029680@svn.freebsd.org> From: Glen Barber Date: Thu, 25 Jul 2013 02:43:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r253632 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jul 2013 02:43:06 -0000 Author: gjb Date: Thu Jul 25 02:43:05 2013 New Revision: 253632 URL: http://svnweb.freebsd.org/changeset/base/253632 Log: MFC r253513, r253542: r253513: Create memstick images with the '.img' filename extension. r253542: For consistency with previous releases, name the cdrom install cd 'disc1.iso'. Approved by: kib (mentor) Approved by: re (marius) Modified: stable/9/release/Makefile Directory Properties: stable/9/release/ (props changed) Modified: stable/9/release/Makefile ============================================================================== --- stable/9/release/Makefile Wed Jul 24 22:48:29 2013 (r253631) +++ stable/9/release/Makefile Thu Jul 25 02:43:05 2013 (r253632) @@ -3,8 +3,8 @@ # Makefile for building releases and release media. # # User-driven targets: -# cdrom: Builds release CD-ROM media (release.iso) -# memstick: Builds memory stick image (memstick) +# cdrom: Builds release CD-ROM media (disc1.iso) +# memstick: Builds memory stick image (memstick.img) # ftp: Sets up FTP distribution area (ftp) # release: Build all media and FTP distribution area # install: Copies all release media into ${DESTDIR} @@ -70,11 +70,11 @@ RELEASE_TARGETS= ftp IMAGES= .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh) RELEASE_TARGETS+= cdrom -IMAGES+= release.iso bootonly.iso +IMAGES+= disc1.iso bootonly.iso .endif .if exists(${.CURDIR}/${TARGET}/make-memstick.sh) -RELEASE_TARGETS+= memstick -IMAGES+= memstick +RELEASE_TARGETS+= memstick.img +IMAGES+= memstick.img .endif .include @@ -165,7 +165,8 @@ release/cdrom.inf: system echo "CD_VERSION = ${REVISION}-${BRANCH}" > ${.TARGET} echo "CD_VOLUME = 1" >> ${.TARGET} -release.iso: system release/cdrom.inf +release.iso: disc1.iso +disc1.iso: system release/cdrom.inf sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release bootonly/cdrom.inf: bootonly @@ -175,14 +176,15 @@ bootonly/cdrom.inf: bootonly bootonly.iso: bootonly bootonly/cdrom.inf sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly -memstick: system +memstick: memstick.img +memstick.img: system sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET} packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET} -cdrom: release.iso bootonly.iso +cdrom: disc1.iso bootonly.iso ftp: packagesystem rm -rf ftp mkdir -p ftp @@ -199,7 +201,7 @@ clean: rm -f *.txz MANIFEST rm -f system rm -rf release bootonly - rm -f release.iso bootonly.iso memstick + rm -f disc1.iso bootonly.iso memstick.img install: .if defined(DESTDIR) && !empty(DESTDIR)