svn commit: r335329 - user/gjb/thermite
Glen Barber
gjb at FreeBSD.org
Mon Jun 18 18:49:25 UTC 2018
Author: gjb
Date: Mon Jun 18 18:49:22 2018
New Revision: 335329
URL: https://svnweb.freebsd.org/changeset/base/335329
Log:
Update files I still managed to miss in r335326 and r335328.
Sigh.
Sponsored by: The FreeBSD Foundation
Modified:
user/gjb/thermite/10-i386-GENERIC-snap.conf
user/gjb/thermite/10-ia64-GENERIC-snap.conf
user/gjb/thermite/10-powerpc-GENERIC-snap.conf
user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf
user/gjb/thermite/10-sparc64-GENERIC-snap.conf
user/gjb/thermite/11-aarch64-GENERIC-snap.conf
user/gjb/thermite/11-i386-GENERIC-snap.conf
user/gjb/thermite/11-powerpc-GENERIC-snap.conf
user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf
user/gjb/thermite/11-sparc64-GENERIC-snap.conf
Modified: user/gjb/thermite/10-i386-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/10-i386-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/10-i386-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -14,6 +14,8 @@ CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
WITH_VMIMAGES=1
WITH_COMPRESSED_VMIMAGES=1
XZ_THREADS="10"
Modified: user/gjb/thermite/10-ia64-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/10-ia64-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/10-ia64-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -12,3 +12,5 @@ TARGET_ARCH="ia64"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
Modified: user/gjb/thermite/10-powerpc-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/10-powerpc-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/10-powerpc-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -9,7 +9,10 @@ BUILDBRANCH="10"
TARGET="powerpc"
TARGET_ARCH="powerpc"
-WORLD_FLAGS="-j10"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Modified: user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf
==============================================================================
--- user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -7,10 +7,13 @@ BUILDBRANCH="10"
. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
-KERNEL="GENERIC64"
TARGET="powerpc"
TARGET_ARCH="powerpc64"
-WORLD_FLAGS="-j10"
+KERNEL="GENERIC64"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Modified: user/gjb/thermite/10-sparc64-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/10-sparc64-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/10-sparc64-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -12,3 +12,5 @@ TARGET_ARCH="sparc64"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
Modified: user/gjb/thermite/11-aarch64-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/11-aarch64-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/11-aarch64-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -13,21 +13,7 @@ TARGET_ARCH="aarch64"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
-NOPORTS=
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
WITH_VMIMAGES=1
WITH_COMPRESSED_VMIMAGES=1
-
-buildenv_setup() {
- if [ ! -d ${CHROOTDIR}/usr/ports/devel/aarch64-binutils ]; then
- chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
- /usr/sbin/pkg bootstrap -y
- chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
- /usr/sbin/pkg install -y devel/aarch64-binutils
- else
- chroot ${CHROOTDIR} env BATCH=1 \
- make -C /usr/ports/devel/aarch64-binutils \
- all install clean
- fi
- return 0
-}
-
Modified: user/gjb/thermite/11-i386-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/11-i386-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/11-i386-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -14,6 +14,8 @@ CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
WITH_VMIMAGES=1
WITH_COMPRESSED_VMIMAGES=1
XZ_THREADS="10"
Modified: user/gjb/thermite/11-powerpc-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/11-powerpc-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/11-powerpc-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -9,7 +9,10 @@ BUILDBRANCH="11"
TARGET="powerpc"
TARGET_ARCH="powerpc"
-WORLD_FLAGS="-j10"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Modified: user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf
==============================================================================
--- user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -10,7 +10,10 @@ BUILDBRANCH="11"
TARGET="powerpc"
TARGET_ARCH="powerpc64"
KERNEL="GENERIC64"
-WORLD_FLAGS="-j10"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Modified: user/gjb/thermite/11-sparc64-GENERIC-snap.conf
==============================================================================
--- user/gjb/thermite/11-sparc64-GENERIC-snap.conf Mon Jun 18 18:46:32 2018 (r335328)
+++ user/gjb/thermite/11-sparc64-GENERIC-snap.conf Mon Jun 18 18:49:22 2018 (r335329)
@@ -12,3 +12,7 @@ TARGET_ARCH="sparc64"
__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
More information about the svn-src-user
mailing list