From owner-svn-src-projects@FreeBSD.ORG Mon Apr 20 20:52:21 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBC7EAAA; Mon, 20 Apr 2015 20:52:21 +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 CA6E7C8; Mon, 20 Apr 2015 20:52:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3KKqLGZ033858; Mon, 20 Apr 2015 20:52:21 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3KKqLs5033854; Mon, 20 Apr 2015 20:52:21 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504202052.t3KKqLs5033854@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 20 Apr 2015 20:52:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281792 - projects/release-arm64/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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2015 20:52:22 -0000 Author: gjb Date: Mon Apr 20 20:52:20 2015 New Revision: 281792 URL: https://svnweb.freebsd.org/changeset/base/281792 Log: Add a buildenv_setup() prototype, intended to be overridden as needed. For example, the arm64/aarch64 build needs devel/aarch64-binutils, so buildenv_setup() in the release.conf for this architecture handles the installation of the port before buildworld/buildkernel. Sponsored by: The FreeBSD Foundation Modified: projects/release-arm64/release/release.conf.sample projects/release-arm64/release/release.sh Modified: projects/release-arm64/release/release.conf.sample ============================================================================== --- projects/release-arm64/release/release.conf.sample Mon Apr 20 20:51:19 2015 (r281791) +++ projects/release-arm64/release/release.conf.sample Mon Apr 20 20:52:20 2015 (r281792) @@ -7,6 +7,7 @@ ## defined in release.sh. #load_chroot_env() { } #load_target_env() { } +#buildenv_setup() { } ## Set the directory within which the release will be built. CHROOTDIR="/scratch" Modified: projects/release-arm64/release/release.sh ============================================================================== --- projects/release-arm64/release/release.sh Mon Apr 20 20:51:19 2015 (r281791) +++ projects/release-arm64/release/release.sh Mon Apr 20 20:52:20 2015 (r281792) @@ -42,6 +42,7 @@ export PATH # Prototypes that can be redefined per-chroot or per-target. load_chroot_env() { } load_target_env() { } +buildenv_setup() { } # The directory within which the release will be built. CHROOTDIR="/scratch" @@ -279,6 +280,7 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then fi fi +buildenv_setup load_target_env eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel