svn commit: r326015 - in stable/11/release: amd64 arm arm64 i386 powerpc sparc64

Glen Barber gjb at FreeBSD.org
Mon Nov 20 15:57:14 UTC 2017 

Author: gjb
Date: Mon Nov 20 15:57:11 2017
New Revision: 326015
URL: https://svnweb.freebsd.org/changeset/base/326015

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/11/release/amd64/amd64.conf
     - copied unchanged from r325953, head/release/amd64/amd64.conf
  stable/11/release/arm64/aarch64.conf
     - copied unchanged from r325953, head/release/arm64/aarch64.conf
  stable/11/release/i386/i386.conf
     - copied unchanged from r325953, head/release/i386/i386.conf
  stable/11/release/powerpc/powerpc.conf
     - copied unchanged from r325953, head/release/powerpc/powerpc.conf
  stable/11/release/powerpc/powerpc64.conf
     - copied unchanged from r325953, head/release/powerpc/powerpc64.conf
  stable/11/release/powerpc/powerpcspe.conf
     - copied unchanged from r325953, head/release/powerpc/powerpcspe.conf
  stable/11/release/sparc64/sparc64.conf
     - copied unchanged from r325953, head/release/sparc64/sparc64.conf
Modified:
  stable/11/release/arm/BANANAPI.conf
  stable/11/release/arm/BEAGLEBONE.conf
  stable/11/release/arm/CUBIEBOARD.conf
  stable/11/release/arm/CUBIEBOARD2.conf
  stable/11/release/arm/CUBOX-HUMMINGBOARD.conf
  stable/11/release/arm/GUMSTIX.conf
  stable/11/release/arm/PANDABOARD.conf
  stable/11/release/arm/RPI-B.conf
  stable/11/release/arm/RPI2.conf
  stable/11/release/arm/WANDBOARD.conf
Directory Properties:
  stable/11/   (props changed)

Copied: stable/11/release/amd64/amd64.conf (from r325953, head/release/amd64/amd64.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/release/amd64/amd64.conf	Mon Nov 20 15:57:11 2017	(r326015, 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/11/release/arm/BANANAPI.conf
==============================================================================
--- stable/11/release/arm/BANANAPI.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/BANANAPI.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDED_TARGET="arm"
+EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-bananapi"
-KERNEL="ALLWINNER"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-IMAGE_SIZE="1G"
-PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
+IMAGE_SIZE="1G"
+KERNEL="ALLWINNER"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 export BOARDNAME="BANANAPI"
 
 arm_install_uboot() {

Modified: stable/11/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/11/release/arm/BEAGLEBONE.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/BEAGLEBONE.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-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="1G"
-PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
+IMAGE_SIZE="1G"
+KERNEL="BEAGLEBONE"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"

Modified: stable/11/release/arm/CUBIEBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/CUBIEBOARD.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDED_TARGET="arm"
+EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard"
-KERNEL="ALLWINNER_UP"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-IMAGE_SIZE="1G"
-PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
+IMAGE_SIZE="1G"
+KERNEL="ALLWINNER_UP"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard"

Modified: stable/11/release/arm/CUBIEBOARD2.conf
==============================================================================
--- stable/11/release/arm/CUBIEBOARD2.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/CUBIEBOARD2.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDED_TARGET="arm"
+EMBEDDEDBUILD=1
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard2"
-KERNEL="ALLWINNER"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-IMAGE_SIZE="1G"
-PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
+IMAGE_SIZE="1G"
+KERNEL="ALLWINNER"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 export BOARDNAME="CUBIEBOARD2"
 
 arm_install_uboot() {

Modified: stable/11/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- stable/11/release/arm/CUBOX-HUMMINGBOARD.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/CUBOX-HUMMINGBOARD.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-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="1536M"
-PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
+IMAGE_SIZE="1536M"
+KERNEL="IMX6"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 export BOARDNAME="CUBOX-HUMMINGBOARD"
 
 arm_install_uboot() {

Modified: stable/11/release/arm/GUMSTIX.conf
==============================================================================
--- stable/11/release/arm/GUMSTIX.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/GUMSTIX.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-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="1G"
-PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
+IMAGE_SIZE="1G"
+KERNEL="GUMSTIX"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero"

Modified: stable/11/release/arm/PANDABOARD.conf
==============================================================================
--- stable/11/release/arm/PANDABOARD.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/PANDABOARD.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-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="1G"
-PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
+IMAGE_SIZE="1G"
+KERNEL="PANDABOARD"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard"

Modified: stable/11/release/arm/RPI-B.conf
==============================================================================
--- stable/11/release/arm/RPI-B.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/RPI-B.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-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="1G"
-PART_SCHEME="MBR"
 FAT_SIZE="17m"
 FAT_TYPE="16"
+IMAGE_SIZE="1G"
+KERNEL="RPI-B"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"

Modified: stable/11/release/arm/RPI2.conf
==============================================================================
--- stable/11/release/arm/RPI2.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/RPI2.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-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="1536M"
-PART_SCHEME="MBR"
 FAT_SIZE="50m"
 FAT_TYPE="16"
+IMAGE_SIZE="1536M"
+KERNEL="RPI2"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"

Modified: stable/11/release/arm/WANDBOARD.conf
==============================================================================
--- stable/11/release/arm/WANDBOARD.conf	Mon Nov 20 15:46:23 2017	(r326014)
+++ stable/11/release/arm/WANDBOARD.conf	Mon Nov 20 15:57:11 2017	(r326015)
@@ -3,18 +3,18 @@
 # $FreeBSD$
 #
 
-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="1536M"
-PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
+IMAGE_SIZE="1536M"
+KERNEL="IMX6"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+PART_SCHEME="MBR"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 export BOARDNAME="WANDBOARD"
 
 arm_install_uboot() {

Copied: stable/11/release/arm64/aarch64.conf (from r325953, head/release/arm64/aarch64.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/release/arm64/aarch64.conf	Mon Nov 20 15:57:11 2017	(r326015, copy of r325953, head/release/arm64/aarch64.conf)
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# Configuration file for release/release.sh to build arm64/aarch64
+# big-iron installation images (not system-on-chip (SoC) images).
+
+TARGET="arm64"
+TARGET_ARCH="aarch64"
+KERNEL="GENERIC"

Copied: stable/11/release/i386/i386.conf (from r325953, head/release/i386/i386.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/release/i386/i386.conf	Mon Nov 20 15:57:11 2017	(r326015, 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}"

Copied: stable/11/release/powerpc/powerpc.conf (from r325953, head/release/powerpc/powerpc.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/release/powerpc/powerpc.conf	Mon Nov 20 15:57:11 2017	(r326015, 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/11/release/powerpc/powerpc64.conf (from r325953, head/release/powerpc/powerpc64.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/release/powerpc/powerpc64.conf	Mon Nov 20 15:57:11 2017	(r326015, 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/11/release/powerpc/powerpcspe.conf (from r325953, head/release/powerpc/powerpcspe.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/release/powerpc/powerpcspe.conf	Mon Nov 20 15:57:11 2017	(r326015, copy of r325953, head/release/powerpc/powerpcspe.conf)
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# Configuration file for release/release.sh to build powerpc/powerpcspe.
+
+TARGET="powerpc"
+TARGET_ARCH="powerpcspe"
+KERNEL="MPC85XXSPE"

Copied: stable/11/release/sparc64/sparc64.conf (from r325953, head/release/sparc64/sparc64.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/release/sparc64/sparc64.conf	Mon Nov 20 15:57:11 2017	(r326015, 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"

More information about the svn-src-all mailing list