From owner-svn-src-projects@FreeBSD.ORG Wed May 6 15:41:44 2015 Return-Path: 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 5AC8BC58; Wed, 6 May 2015 15:41:44 +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 4996B1732; Wed, 6 May 2015 15:41:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t46Ffior068029; Wed, 6 May 2015 15:41:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t46FfiLl068028; Wed, 6 May 2015 15:41:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505061541.t46FfiLl068028@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 6 May 2015 15:41:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282553 - in projects/release-arm-redux/release: . arm 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 May 2015 15:41:44 -0000 Author: gjb Date: Wed May 6 15:41:43 2015 New Revision: 282553 URL: https://svnweb.freebsd.org/changeset/base/282553 Log: In extra_chroot_setup(), use 'uname -U' to determine OSVERSION. Move the port build for EMBEDDEDPORTS (if set) from arm/release.sh to release.sh. Remove arm/release.sh. Sponsored by: The FreeBSD Foundation Deleted: projects/release-arm-redux/release/arm/release.sh Modified: projects/release-arm-redux/release/release.sh Modified: projects/release-arm-redux/release/release.sh ============================================================================== --- projects/release-arm-redux/release/release.sh Wed May 6 15:30:05 2015 (r282552) +++ projects/release-arm-redux/release/release.sh Wed May 6 15:41:43 2015 (r282553) @@ -257,7 +257,7 @@ extra_chroot_setup() { if [ -d ${CHROOTDIR}/usr/ports ]; then # Trick the ports 'run-autotools-fixup' target to do the right # thing. - _OSVERSION=$(sysctl -n kern.osreldate) + _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) UNAME_r=${REVISION}-${BRANCH} @@ -271,6 +271,13 @@ extra_chroot_setup() { fi fi + if [ ! -z "${EMBEDDEDPORTS}" ]; then + for _PORT in ${EMBEDDEDPORTS}; do + eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \ + BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean + done + fi + return 0 } # extra_chroot_setup()