From owner-svn-src-user@freebsd.org Mon Jun 18 18:49:25 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9409B1019A4E for ; Mon, 18 Jun 2018 18:49:25 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 412756C53C; Mon, 18 Jun 2018 18:49:25 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1665327FB4; Mon, 18 Jun 2018 18:49:25 +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 w5IInOjb006463; Mon, 18 Jun 2018 18:49:24 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5IInMkd006453; Mon, 18 Jun 2018 18:49:22 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806181849.w5IInMkd006453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 18 Jun 2018 18:49:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r335329 - user/gjb/thermite X-SVN-Group: user X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: user/gjb/thermite X-SVN-Commit-Revision: 335329 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jun 2018 18:49:25 -0000 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"