From 368276a335bd8b1e34955a4b022ce9cd9bb35d47 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 18 Sep 2014 17:15:38 +0000 Subject: [PATCH] MFC r271676, r271677, r271678: r271676: Catch up with Crochet changes to fix the BEAGLEBONE build. r271677: Catch up with Crochet changes to fix the WANDBOARD-QUAD build. r271678: Set a static revision of the Crochet checkout to avoid surprise build failures. Approved by: re (marius) Sponsored by: The FreeBSD Foundation git-svn-id: svn://svn.freebsd.org/base/stable/10@271791 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- release/arm/BEAGLEBONE.conf | 2 +- release/arm/PANDABOARD.conf | 2 +- release/arm/RPI-B.conf | 2 +- release/arm/WANDBOARD-QUAD.conf | 2 +- release/arm/ZEDBOARD.conf | 2 +- release/arm/release.sh | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index f15ac1f2e..8c4b4116d 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -25,6 +25,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="BEAGLEBONE" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" +CROCHETBRANCH="trunk@r744" set +a diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf index 57e03df31..d0cc0347a 100644 --- a/release/arm/PANDABOARD.conf +++ b/release/arm/PANDABOARD.conf @@ -25,6 +25,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="PANDABOARD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" +CROCHETBRANCH="trunk@r744" set +a diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index b2886e439..8069f6e9c 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -25,7 +25,7 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="RPI-B" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" +CROCHETBRANCH="trunk@r744" UBOOTSRC="https://github.com/gonzoua/u-boot-pi" UBOOTBRANCH="trunk" UBOOTDIR="/tmp/crochet/u-boot-rpi" diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf index 8efb211ff..e75ea2e1b 100644 --- a/release/arm/WANDBOARD-QUAD.conf +++ b/release/arm/WANDBOARD-QUAD.conf @@ -25,6 +25,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="WANDBOARD-QUAD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" +CROCHETBRANCH="trunk@r744" set +a diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf index 9a1cb6509..8c4aa1b70 100644 --- a/release/arm/ZEDBOARD.conf +++ b/release/arm/ZEDBOARD.conf @@ -24,6 +24,6 @@ XDEV_ARCH="armv6" XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="ZEDBOARD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" -CROCHETBRANCH="trunk" +CROCHETBRANCH="trunk@r744" set +a diff --git a/release/arm/release.sh b/release/arm/release.sh index 452a73d7a..c3df3d24f 100755 --- a/release/arm/release.sh +++ b/release/arm/release.sh @@ -44,8 +44,8 @@ before_build() { case ${KERNEL} in BEAGLEBONE) WANT_UBOOT=1 - KNOWNHASH="4150e5a4480707c55a8d5b4570262e43af68d8ed3bdc0a433d8e7df47989a69e" - UBOOT_VERSION="u-boot-2013.04" + KNOWNHASH="7b6444bd23eb61068c43bd1d44ec7e7bfdbce5cadeca20c833eee186b4d3fd31" + UBOOT_VERSION="u-boot-2014.04" ;; PANDABOARD) WANT_UBOOT=1 @@ -54,8 +54,8 @@ before_build() { ;; WANDBOARD-QUAD) WANT_UBOOT=1 - KNOWNHASH="0d71e62beb952b41ebafb20a7ee4df2f960db64c31b054721ceb79ff14014c55" - UBOOT_VERSION="u-boot-2013.10" + KNOWNHASH="b4f83b8db325c21671a997198ec3a373e2e00dde2fcf17be9b9afd7cfd727f56" + UBOOT_VERSION="u-boot-2014.07" ;; *) # Fallthrough. -- 2.45.0