From owner-svn-src-projects@FreeBSD.ORG  Fri May  8 20:08:02 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 455DD2FD;
 Fri,  8 May 2015 20:08:02 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3506B1A87;
 Fri,  8 May 2015 20:08:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t48K81XL074193;
 Fri, 8 May 2015 20:08:01 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t48K81O8074192;
 Fri, 8 May 2015 20:08:01 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505082008.t48K81O8074192@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 20:08:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r282663 - projects/release-arm-redux/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.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 May 2015 20:08:02 -0000

Author: gjb
Date: Fri May  8 20:08:01 2015
New Revision: 282663
URL: https://svnweb.freebsd.org/changeset/base/282663

Log:
  Fix re-sourcing the configuration file, since now we cannot
  rely on the kernel configuration name to match the file name.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-arm-redux/release/release.sh

Modified: projects/release-arm-redux/release/release.sh
==============================================================================
--- projects/release-arm-redux/release/release.sh	Fri May  8 20:02:40 2015	(r282662)
+++ projects/release-arm-redux/release/release.sh	Fri May  8 20:08:01 2015	(r282663)
@@ -328,7 +328,7 @@ chroot_arm_armv6_build_release() {
 	if [ -e "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr" ]; then
 		. "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr"
 	fi
-	. "${RELENGDIR}/arm/${KERNEL}.conf"
+	. "${RELEASECONF}"
 	WORLDDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V WORLDDIR)"
 	OBJDIR="$(eval chroot ${CHROOTDIR} make -C /usr/src/release -V .OBJDIR)"
 	DESTDIR="${OBJDIR}/${KERNEL}"