diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-03-25 22:35:08 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-03-25 22:35:08 +0000 |
| commit | e6e746bfb086d563bf0ad454a33ecbcab8836dbf (patch) | |
| tree | 01bc43f0862c8b5e58d45ca2120582bc866babdc /release/arm | |
| parent | 6c787c8ff0be41657c0999aeaa9ff6befa5fceb0 (diff) | |
| parent | 6fb3faab63f8e63e85abffaab6e59c81e49e2e2e (diff) | |
| download | src-e6e746bfb086d563bf0ad454a33ecbcab8836dbf.tar.gz src-e6e746bfb086d563bf0ad454a33ecbcab8836dbf.zip | |
MFH: r278968-r280640
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-arm-redux/; revision=280641
Diffstat (limited to 'release/arm')
| -rw-r--r-- | release/arm/BEAGLEBONE.conf | 2 | ||||
| -rw-r--r-- | release/arm/PANDABOARD.conf | 2 | ||||
| -rw-r--r-- | release/arm/RPI-B.conf | 2 | ||||
| -rw-r--r-- | release/arm/WANDBOARD-QUAD.conf | 2 | ||||
| -rw-r--r-- | release/arm/ZEDBOARD.conf | 2 | ||||
| -rwxr-xr-x | release/arm/release.sh | 7 |
6 files changed, 9 insertions, 8 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index 28e084d808a7..546af5ca2715 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -32,6 +32,6 @@ load_target_env() { export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="BEAGLEBONE" - export CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + export CROCHETSRC="https://github.com/freebsd/crochet" export CROCHETBRANCH="trunk@r744" } diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf index a9fbb6f4f57f..9518914ef7bb 100644 --- a/release/arm/PANDABOARD.conf +++ b/release/arm/PANDABOARD.conf @@ -32,6 +32,6 @@ load_target_env() { export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="PANDABOARD" - export CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + export CROCHETSRC="https://github.com/freebsd/crochet" export CROCHETBRANCH="trunk@r744" } diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index d9ab15638afe..19778f87536a 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -32,7 +32,7 @@ load_target_env() { export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="RPI-B" - export CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + export CROCHETSRC="https://github.com/freebsd/crochet" export CROCHETBRANCH="trunk@r744" export UBOOTSRC="https://github.com/gonzoua/u-boot-pi" export UBOOTBRANCH="trunk" diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf index 4249bf65219e..48aa63165a50 100644 --- a/release/arm/WANDBOARD-QUAD.conf +++ b/release/arm/WANDBOARD-QUAD.conf @@ -32,6 +32,6 @@ load_target_env() { export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="WANDBOARD-QUAD" - export CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + export CROCHETSRC="https://github.com/freebsd/crochet" export CROCHETBRANCH="trunk@r744" } diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf index a6d1de0b4a4e..07c35ba21bad 100644 --- a/release/arm/ZEDBOARD.conf +++ b/release/arm/ZEDBOARD.conf @@ -31,6 +31,6 @@ load_target_env() { export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no" export KERNEL="ZEDBOARD" - export CROCHETSRC="https://github.com/kientzle/crochet-freebsd" + export CROCHETSRC="https://github.com/freebsd/crochet" export CROCHETBRANCH="trunk@r744" } diff --git a/release/arm/release.sh b/release/arm/release.sh index dbbdbf53202a..104edd8cb32d 100755 --- a/release/arm/release.sh +++ b/release/arm/release.sh @@ -99,6 +99,7 @@ main() { BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) UNAME_r=${REVISION}-${BRANCH} export UNAME_r + export XZ_CMD=$(chroot ${CHROOTDIR} make -C /usr/src/release -V XZ_CMD) # Build the 'xdev' target for crochet. eval chroot ${CHROOTDIR} make -C /usr/src \ @@ -146,9 +147,9 @@ main() { -c /tmp/external/${XDEV}/crochet-${KERNEL}.conf mkdir -p ${CHROOTDIR}/R/ cp -p ${CHROOTDIR}/usr/obj/*.img ${CHROOTDIR}/R/ - bzip2 ${CHROOTDIR}/R/FreeBSD*.img - cd ${CHROOTDIR}/R/ && sha256 FreeBSD*.img.bz2 > CHECKSUM.SHA256 - cd ${CHROOTDIR}/R/ && md5 FreeBSD*.img.bz2 > CHECKSUM.MD5 + ${XZ_CMD} ${CHROOTDIR}/R/FreeBSD*.img + cd ${CHROOTDIR}/R/ && sha256 FreeBSD*.img.xz > CHECKSUM.SHA256 + cd ${CHROOTDIR}/R/ && md5 FreeBSD*.img.xz > CHECKSUM.MD5 } main "$@" |