From owner-svn-src-stable-10@freebsd.org Mon Nov 20 15:57:59 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DC75DEFA38; Mon, 20 Nov 2017 15:57:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 BDD5339F8; Mon, 20 Nov 2017 15:57:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAKFvvRq038244; Mon, 20 Nov 2017 15:57:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAKFvu1g038231; Mon, 20 Nov 2017 15:57:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711201557.vAKFvu1g038231@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 20 Nov 2017 15:57:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r326016 - in stable/10/release: amd64 arm i386 ia64 powerpc sparc64 X-SVN-Group: stable-10 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in stable/10/release: amd64 arm i386 ia64 powerpc sparc64 X-SVN-Commit-Revision: 326016 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2017 15:57:59 -0000 Author: gjb Date: Mon Nov 20 15:57:56 2017 New Revision: 326016 URL: https://svnweb.freebsd.org/changeset/base/326016 Log: MFC r325950, r325953: r325950: Sort variables for consistency. r325953: Add general configuration files used by release/release.sh for big-iron installation images. Sponsored by: The FreeBSD Foundation Added: stable/10/release/amd64/amd64.conf - copied unchanged from r325953, head/release/amd64/amd64.conf stable/10/release/i386/i386.conf - copied unchanged from r325953, head/release/i386/i386.conf stable/10/release/ia64/ia64.conf (contents, props changed) stable/10/release/powerpc/powerpc.conf - copied unchanged from r325953, head/release/powerpc/powerpc.conf stable/10/release/powerpc/powerpc64.conf - copied unchanged from r325953, head/release/powerpc/powerpc64.conf stable/10/release/sparc64/sparc64.conf - copied unchanged from r325953, head/release/sparc64/sparc64.conf Modified: stable/10/release/arm/BEAGLEBONE.conf stable/10/release/arm/CUBOX-HUMMINGBOARD.conf stable/10/release/arm/GUMSTIX.conf stable/10/release/arm/PANDABOARD.conf stable/10/release/arm/RPI-B.conf stable/10/release/arm/RPI2.conf stable/10/release/arm/WANDBOARD.conf Directory Properties: stable/10/ (props changed) Copied: stable/10/release/amd64/amd64.conf (from r325953, head/release/amd64/amd64.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/amd64/amd64.conf Mon Nov 20 15:57:56 2017 (r326016, copy of r325953, head/release/amd64/amd64.conf) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build amd64/amd64. + +TARGET="amd64" +TARGET_ARCH="amd64" +KERNEL="GENERIC" Modified: stable/10/release/arm/BEAGLEBONE.conf ============================================================================== --- stable/10/release/arm/BEAGLEBONE.conf Mon Nov 20 15:57:11 2017 (r326015) +++ stable/10/release/arm/BEAGLEBONE.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -2,19 +2,19 @@ # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-beaglebone" -KERNEL="BEAGLEBONE" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL="BEAGLEBONE" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone" Modified: stable/10/release/arm/CUBOX-HUMMINGBOARD.conf ============================================================================== --- stable/10/release/arm/CUBOX-HUMMINGBOARD.conf Mon Nov 20 15:57:11 2017 (r326015) +++ stable/10/release/arm/CUBOX-HUMMINGBOARD.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -3,19 +3,19 @@ # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard" -KERNEL="IMX6" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" -IMAGE_SIZE="495M" -PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" FAT_TYPE="16" +IMAGE_SIZE="495M" +KERNEL="IMX6" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" export BOARDNAME="CUBOX-HUMMINGBOARD" arm_install_uboot() { Modified: stable/10/release/arm/GUMSTIX.conf ============================================================================== --- stable/10/release/arm/GUMSTIX.conf Mon Nov 20 15:57:11 2017 (r326015) +++ stable/10/release/arm/GUMSTIX.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -3,19 +3,19 @@ # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="arm" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-duovero" -KERNEL="GUMSTIX" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL="GUMSTIX" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero" Modified: stable/10/release/arm/PANDABOARD.conf ============================================================================== --- stable/10/release/arm/PANDABOARD.conf Mon Nov 20 15:57:11 2017 (r326015) +++ stable/10/release/arm/PANDABOARD.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -2,19 +2,19 @@ # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-pandaboard" -KERNEL="PANDABOARD" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="2m" FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL="PANDABOARD" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard" Modified: stable/10/release/arm/RPI-B.conf ============================================================================== --- stable/10/release/arm/RPI-B.conf Mon Nov 20 15:57:11 2017 (r326015) +++ stable/10/release/arm/RPI-B.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -2,19 +2,19 @@ # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-rpi" -KERNEL="RPI-B" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="17m" FAT_TYPE="16" +IMAGE_SIZE="480M" +KERNEL="RPI-B" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi" Modified: stable/10/release/arm/RPI2.conf ============================================================================== --- stable/10/release/arm/RPI2.conf Mon Nov 20 15:57:11 2017 (r326015) +++ stable/10/release/arm/RPI2.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -3,19 +3,19 @@ # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-rpi2" -KERNEL="RPI2" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" -IMAGE_SIZE="480M" -PART_SCHEME="MBR" FAT_SIZE="50m" FAT_TYPE="16" +IMAGE_SIZE="480M" +KERNEL="RPI2" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" arm_install_uboot() { UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2" Modified: stable/10/release/arm/WANDBOARD.conf ============================================================================== --- stable/10/release/arm/WANDBOARD.conf Mon Nov 20 15:57:11 2017 (r326015) +++ stable/10/release/arm/WANDBOARD.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -3,19 +3,19 @@ # $FreeBSD$ # -SRCBRANCH="base/stable/10@rHEAD" -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm" EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-wandboard" -KERNEL="IMX6" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" -IMAGE_SIZE="495M" -PART_SCHEME="MBR" FAT_SIZE="50m -b 16384" FAT_TYPE="16" +IMAGE_SIZE="495M" +KERNEL="IMX6" MD_ARGS="-x 63 -y 255" NODOC=1 +PART_SCHEME="MBR" +SRCBRANCH="base/stable/10@rHEAD" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" export BOARDNAME="WANDBOARD" arm_install_uboot() { Copied: stable/10/release/i386/i386.conf (from r325953, head/release/i386/i386.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/i386/i386.conf Mon Nov 20 15:57:56 2017 (r326016, copy of r325953, head/release/i386/i386.conf) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build i386/i386. +# Note: CHROOT_MAKEENV assumes the build host is amd64. + +TARGET="i386" +TARGET_ARCH="i386" +KERNEL="GENERIC" +CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" Added: stable/10/release/ia64/ia64.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/ia64/ia64.conf Mon Nov 20 15:57:56 2017 (r326016) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build ia64/ia64. + +TARGET="ia64" +TARGET_ARCH="ia64" +KERNEL="GENERIC" Copied: stable/10/release/powerpc/powerpc.conf (from r325953, head/release/powerpc/powerpc.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/powerpc/powerpc.conf Mon Nov 20 15:57:56 2017 (r326016, copy of r325953, head/release/powerpc/powerpc.conf) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build powerpc/powerpc. + +TARGET="powerpc" +TARGET_ARCH="powerpc" +KERNEL="GENERIC" Copied: stable/10/release/powerpc/powerpc64.conf (from r325953, head/release/powerpc/powerpc64.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/powerpc/powerpc64.conf Mon Nov 20 15:57:56 2017 (r326016, copy of r325953, head/release/powerpc/powerpc64.conf) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build powerpc/powerpc64. + +TARGET="powerpc" +TARGET_ARCH="powerpc64" +KERNEL="GENERIC64" Copied: stable/10/release/sparc64/sparc64.conf (from r325953, head/release/sparc64/sparc64.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/release/sparc64/sparc64.conf Mon Nov 20 15:57:56 2017 (r326016, copy of r325953, head/release/sparc64/sparc64.conf) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# Configuration file for release/release.sh to build sparc64/sparc64. + +TARGET="sparc64" +TARGET_ARCH="sparc64" +KERNEL="GENERIC"