From owner-svn-src-all@FreeBSD.ORG Tue Apr 21 00:48:37 2015 Return-Path: Delivered-To: svn-src-all@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 0437D6BC; Tue, 21 Apr 2015 00:48:37 +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 D96B2DAE; Tue, 21 Apr 2015 00:48:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3L0mae5020067; Tue, 21 Apr 2015 00:48:36 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3L0mao3020058; Tue, 21 Apr 2015 00:48:36 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504210048.t3L0mao3020058@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 21 Apr 2015 00:48:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281802 - in head/release: . arm64 tools X-SVN-Group: head 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.20 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: Tue, 21 Apr 2015 00:48:37 -0000 Author: gjb Date: Tue Apr 21 00:48:35 2015 New Revision: 281802 URL: https://svnweb.freebsd.org/changeset/base/281802 Log: Merge the following from ^/projects/release-arm64 to allow building FreeBSD/arm64 VM images and memstick.img installation medium: r281786, r281788, r281792: r281786: Add support for building arm64/aarch64 virtual machine images. r281788: Copy amd64/make-memstick.sh to arm64/make-memstick.sh for aarch64 memory stick images. Although arm64 does not yet have USB support, the memstick image should be bootable with certain virtualization tools, such as qemu. r281792: 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 Added: head/release/arm64/ - copied from r281788, projects/release-arm64/release/arm64/ Modified: head/release/release.conf.sample head/release/release.sh head/release/tools/vmimage.subr Directory Properties: head/ (props changed) Modified: head/release/release.conf.sample ============================================================================== --- head/release/release.conf.sample Tue Apr 21 00:08:37 2015 (r281801) +++ head/release/release.conf.sample Tue Apr 21 00:48:35 2015 (r281802) @@ -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: head/release/release.sh ============================================================================== --- head/release/release.sh Tue Apr 21 00:08:37 2015 (r281801) +++ head/release/release.sh Tue Apr 21 00:48:35 2015 (r281802) @@ -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 Modified: head/release/tools/vmimage.subr ============================================================================== --- head/release/tools/vmimage.subr Tue Apr 21 00:08:37 2015 (r281801) +++ head/release/tools/vmimage.subr Tue Apr 21 00:48:35 2015 (r281802) @@ -29,6 +29,13 @@ write_partition_layout() { -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} ;; + arm64:aarch64) + mkimg -s gpt \ + -p efi/efiboot:=${BOOTFILES}/efi/boot1/boot1.efifat \ + ${SWAPOPT} \ + -p freebsd-ufs/rootfs:=${VMBASE} \ + -o ${VMIMAGE} + ;; powerpc:powerpc*) mkimg -s apm \ -p apple-boot/bootfs:=${BOOTFILES}/powerpc/boot1.chrp/boot1.hfs \