From owner-svn-src-projects@FreeBSD.ORG Wed Mar 5 16:16:05 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08CAC5BC; Wed, 5 Mar 2014 16:16:05 +0000 (UTC) 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 E9A10CC7; Wed, 5 Mar 2014 16:16:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25GG47d082187; Wed, 5 Mar 2014 16:16:04 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25GG47H082185; Wed, 5 Mar 2014 16:16:04 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201403051616.s25GG47H082185@svn.freebsd.org> From: Glen Barber Date: Wed, 5 Mar 2014 16:16:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r262787 - projects/release-embedded/release X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 16:16:05 -0000 Author: gjb Date: Wed Mar 5 16:16:04 2014 New Revision: 262787 URL: http://svnweb.freebsd.org/changeset/base/262787 Log: Remove RELSTRING, which has not been used in a long time. Sponsored by: The FreeBSD Foundation Modified: projects/release-embedded/release/release.conf.sample projects/release-embedded/release/release.sh Modified: projects/release-embedded/release/release.conf.sample ============================================================================== --- projects/release-embedded/release/release.conf.sample Wed Mar 5 16:04:24 2014 (r262786) +++ projects/release-embedded/release/release.conf.sample Wed Mar 5 16:16:04 2014 (r262787) @@ -45,7 +45,6 @@ PORTBRANCH="ports/head@rHEAD" ## Set miscellaneous 'make release' settings. #NODOC= #NOPORTS= -#RELSTRING= #WITH_DVD= ## Set when building embedded images. Modified: projects/release-embedded/release/release.sh ============================================================================== --- projects/release-embedded/release/release.sh Wed Mar 5 16:04:24 2014 (r262786) +++ projects/release-embedded/release/release.sh Wed Mar 5 16:16:04 2014 (r262787) @@ -244,13 +244,9 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then fi fi -if [ "x${RELSTRING}" = "x" ]; then - RELSTRING="$(chroot ${CHROOTDIR} uname -s)-${OSRELEASE}-${TARGET_ARCH}" -fi - eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ - release RELSTRING=${RELSTRING} + release eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ - install DESTDIR=/R RELSTRING=${RELSTRING} + install DESTDIR=/R