Date: Mon, 18 Jun 2018 18:38:58 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r335326 - user/gjb/thermite Message-ID: <201806181838.w5IIcwUY001409@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Jun 18 18:38:58 2018 New Revision: 335326 URL: https://svnweb.freebsd.org/changeset/base/335326 Log: Update the thermite configuration files to match those used for snapshot and release builds. Sponsored by: The FreeBSD Foundation Added: user/gjb/thermite/10-arm-GUMSTIX-snap.conf - copied unchanged from r335325, user/gjb/thermite/10-armv6-GUMSTIX-snap.conf user/gjb/thermite/11-arm-GUMSTIX-snap.conf - copied unchanged from r335325, user/gjb/thermite/11-armv6-GUMSTIX-snap.conf user/gjb/thermite/12-aarch64-PINE64-snap.conf (contents, props changed) user/gjb/thermite/12-aarch64-RPI3-snap.conf (contents, props changed) user/gjb/thermite/12-arm-GUMSTIX-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-GUMSTIX-snap.conf user/gjb/thermite/12-armv7-BANANAPI-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-BANANAPI-snap.conf user/gjb/thermite/12-armv7-BEAGLEBONE-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-BEAGLEBONE-snap.conf user/gjb/thermite/12-armv7-CUBIEBOARD-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-CUBIEBOARD-snap.conf user/gjb/thermite/12-armv7-CUBIEBOARD2-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-CUBIEBOARD2-snap.conf user/gjb/thermite/12-armv7-CUBOX-HUMMINGBOARD-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf user/gjb/thermite/12-armv7-PANDABOARD-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-PANDABOARD-snap.conf user/gjb/thermite/12-armv7-RPI2-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-RPI2-snap.conf user/gjb/thermite/12-armv7-WANDBOARD-snap.conf - copied, changed from r335325, user/gjb/thermite/12-armv6-WANDBOARD-snap.conf Deleted: user/gjb/thermite/10-armv6-GUMSTIX-snap.conf user/gjb/thermite/11-armv6-GUMSTIX-snap.conf user/gjb/thermite/12-armv6-BANANAPI-snap.conf user/gjb/thermite/12-armv6-BEAGLEBONE-snap.conf user/gjb/thermite/12-armv6-CUBIEBOARD-snap.conf user/gjb/thermite/12-armv6-CUBIEBOARD2-snap.conf user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf user/gjb/thermite/12-armv6-GUMSTIX-snap.conf user/gjb/thermite/12-armv6-PANDABOARD-snap.conf user/gjb/thermite/12-armv6-RPI2-snap.conf user/gjb/thermite/12-armv6-WANDBOARD-snap.conf Modified: user/gjb/thermite/10-amd64-GENERIC-snap.conf user/gjb/thermite/11-amd64-GENERIC-snap.conf user/gjb/thermite/12-aarch64-GENERIC-snap.conf user/gjb/thermite/12-amd64-GENERIC-snap.conf user/gjb/thermite/12-armv6-RPI-B-snap.conf user/gjb/thermite/12-i386-GENERIC-snap.conf user/gjb/thermite/12-powerpc-GENERIC-snap.conf user/gjb/thermite/12-powerpc64-GENERIC64-snap.conf user/gjb/thermite/12-powerpcspe-MPC85XXSPE-snap.conf user/gjb/thermite/12-sparc64-GENERIC-snap.conf user/gjb/thermite/builds-10.conf user/gjb/thermite/builds-11.conf user/gjb/thermite/builds-12.conf user/gjb/thermite/defaults-10.conf user/gjb/thermite/defaults-11.conf user/gjb/thermite/defaults-12.conf Modified: user/gjb/thermite/10-amd64-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/10-amd64-GENERIC-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/10-amd64-GENERIC-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -13,6 +13,8 @@ TARGET_ARCH="amd64" __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf + WITH_VMIMAGES=1 WITH_COMPRESSED_VMIMAGES=1 WITH_CLOUDWARE=1 Copied: user/gjb/thermite/10-arm-GUMSTIX-snap.conf (from r335325, user/gjb/thermite/10-armv6-GUMSTIX-snap.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-arm-GUMSTIX-snap.conf Mon Jun 18 18:38:58 2018 (r335326, copy of r335325, user/gjb/thermite/10-armv6-GUMSTIX-snap.conf) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-duovero" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL_FLAGS="-j6" +KERNEL="GUMSTIX" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Modified: user/gjb/thermite/11-amd64-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/11-amd64-GENERIC-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/11-amd64-GENERIC-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -13,6 +13,8 @@ TARGET_ARCH="amd64" __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf + WITH_VMIMAGES=1 WITH_COMPRESSED_VMIMAGES=1 WITH_CLOUDWARE=1 Copied: user/gjb/thermite/11-arm-GUMSTIX-snap.conf (from r335325, user/gjb/thermite/11-armv6-GUMSTIX-snap.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-arm-GUMSTIX-snap.conf Mon Jun 18 18:38:58 2018 (r335326, copy of r335325, user/gjb/thermite/11-armv6-GUMSTIX-snap.conf) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-duovero" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="GUMSTIX" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Modified: user/gjb/thermite/12-aarch64-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/12-aarch64-GENERIC-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-aarch64-GENERIC-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -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 -} - Added: user/gjb/thermite/12-aarch64-PINE64-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/12-aarch64-PINE64-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="12" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export EMBEDDED_TARGET_ARCH="aarch64" +export BOARDNAME="PINE64" +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +. ${srcdir}/arm64/${BOARDNAME}.conf + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + Added: user/gjb/thermite/12-aarch64-RPI3-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/12-aarch64-RPI3-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="12" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export EMBEDDED_TARGET_ARCH="aarch64" +export BOARDNAME="RPI3" +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +. ${srcdir}/arm64/${BOARDNAME}.conf + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + Modified: user/gjb/thermite/12-amd64-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/12-amd64-GENERIC-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-amd64-GENERIC-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -13,6 +13,8 @@ TARGET_ARCH="amd64" __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf + WITH_VMIMAGES=1 WITH_COMPRESSED_VMIMAGES=1 WITH_CLOUDWARE=1 Copied and modified: user/gjb/thermite/12-arm-GUMSTIX-snap.conf (from r335325, user/gjb/thermite/12-armv6-GUMSTIX-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-GUMSTIX-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-arm-GUMSTIX-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,27 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" +export EMBEDDED_TARGET_ARCH="arm" +export KERNEL="GUMSTIX" +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-duovero" -FAT_SIZE="2m" -FAT_TYPE="12" -IMAGE_SIZE="1G" +. ${srcdir}/arm/${KERNEL}.conf + KERNEL_FLAGS="-j6" -KERNEL="GUMSTIX" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" -export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" - load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -37,24 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Modified: user/gjb/thermite/12-armv6-RPI-B-snap.conf ============================================================================== --- user/gjb/thermite/12-armv6-RPI-B-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-armv6-RPI-B-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,27 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" +export EMBEDDED_TARGET_ARCH="armv6" +export KERNEL="RPI-B" +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-rpi" -FAT_SIZE="17m" -FAT_TYPE="16" -IMAGE_SIZE="1G" +. ${srcdir}/arm/${KERNEL}.conf + KERNEL_FLAGS="-j6" -KERNEL="RPI-B" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" -export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" -export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" - load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -37,30 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi" - UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ - start.elf start_cd.elf u-boot.img" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - for _UF in ${UBOOT_FILES}; do - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ - ${FATMOUNT}/${_UF} - done - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \ - ${FATMOUNT}/rpi.dtb - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-BANANAPI-snap.conf (from r335325, user/gjb/thermite/12-armv6-BANANAPI-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-BANANAPI-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-BANANAPI-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,28 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" - -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-bananapi" -FAT_SIZE="32m -b 1m" -FAT_TYPE="16" -IMAGE_SIZE="1G" -KERNEL_FLAGS="-j6" -KERNEL="GENERIC" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" -WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" +export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="BANANAPI" - +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/arm/${BOARDNAME}.conf + +KERNEL_FLAGS="-j6" +WORLD_FLAGS="-j10" + load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -38,25 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi" - UBOOT_FILES="u-boot-sunxi-with-spl.bin" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=1k seek=8 conv=sync - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-BEAGLEBONE-snap.conf (from r335325, user/gjb/thermite/12-armv6-BEAGLEBONE-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-BEAGLEBONE-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-BEAGLEBONE-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,27 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" +export EMBEDDED_TARGET_ARCH="armv7" +export BOARDNAME="BEAGLEBONE" +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-beaglebone" -FAT_SIZE="2m" -FAT_TYPE="12" -IMAGE_SIZE="1G" +. ${srcdir}/arm/${BOARDNAME}.conf + KERNEL_FLAGS="-j6" -KERNEL="BEAGLEBONE" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" -export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" - load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -37,24 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-CUBIEBOARD-snap.conf (from r335325, user/gjb/thermite/12-armv6-CUBIEBOARD-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-CUBIEBOARD-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-CUBIEBOARD-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,28 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" - -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-cubieboard" -FAT_SIZE="32m -b 1m" -FAT_TYPE="16" -IMAGE_SIZE="1G" -KERNEL_FLAGS="-j6" -KERNEL="ALLWINNER_UP" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" -WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" +export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="CUBIEBOARD" - +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/arm/${BOARDNAME}.conf + +KERNEL_FLAGS="-j6" +WORLD_FLAGS="-j10" + load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -38,25 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard" - UBOOT_FILES="u-boot-sunxi-with-spl.bin" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=1k seek=8 conv=sync - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-CUBIEBOARD2-snap.conf (from r335325, user/gjb/thermite/12-armv6-CUBIEBOARD2-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-CUBIEBOARD2-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-CUBIEBOARD2-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,28 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" - -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-cubieboard2" -FAT_SIZE="32m -b 1m" -FAT_TYPE="16" -IMAGE_SIZE="1G" -KERNEL_FLAGS="-j6" -KERNEL="GENERIC" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" -WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" +export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="CUBIEBOARD2" - +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/arm/${BOARDNAME}.conf + +KERNEL_FLAGS="-j6" +WORLD_FLAGS="-j10" + load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -38,25 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard2" - UBOOT_FILES="u-boot-sunxi-with-spl.bin" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=1k seek=8 conv=sync - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-CUBOX-HUMMINGBOARD-snap.conf (from r335325, user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-CUBOX-HUMMINGBOARD-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,28 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" - -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard" -FAT_SIZE="50m -b 16384" -FAT_TYPE="16" -IMAGE_SIZE="1536M" -KERNEL_FLAGS="-j6" -KERNEL="IMX6" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" -WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" +export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="CUBOX-HUMMINGBOARD" - +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/arm/${BOARDNAME}.conf + +KERNEL_FLAGS="-j6" +WORLD_FLAGS="-j10" + load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -38,25 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard" - UBOOT_FILES="u-boot.imx" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=512 seek=2 conv=sync - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-PANDABOARD-snap.conf (from r335325, user/gjb/thermite/12-armv6-PANDABOARD-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-PANDABOARD-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-PANDABOARD-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,27 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" +export EMBEDDED_TARGET_ARCH="armv7" +export BOARDNAME="PANDABOARD" +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-pandaboard" -FAT_SIZE="2m" -FAT_TYPE="12" -IMAGE_SIZE="1G" +. ${srcdir}/arm/${BOARDNAME}.conf + KERNEL_FLAGS="-j6" -KERNEL="PANDABOARD" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" -export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" -export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" - load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -37,24 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-RPI2-snap.conf (from r335325, user/gjb/thermite/12-armv6-RPI2-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-RPI2-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-RPI2-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,28 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" - -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-rpi2" -FAT_SIZE="50m" -FAT_TYPE="16" -IMAGE_SIZE="1536M" -KERNEL_FLAGS="-j6" -KERNEL="GENERIC" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" -WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" +export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="RPI2" - +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/arm/${BOARDNAME}.conf + +KERNEL_FLAGS="-j6" +WORLD_FLAGS="-j10" + load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -38,30 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2" - UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ - fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - for _UF in ${UBOOT_FILES}; do - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ - ${FATMOUNT}/${_UF} - done - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi2.dtb \ - ${FATMOUNT}/rpi2.dtb - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Copied and modified: user/gjb/thermite/12-armv7-WANDBOARD-snap.conf (from r335325, user/gjb/thermite/12-armv6-WANDBOARD-snap.conf) ============================================================================== --- user/gjb/thermite/12-armv6-WANDBOARD-snap.conf Mon Jun 18 18:35:29 2018 (r335325, copy source) +++ user/gjb/thermite/12-armv7-WANDBOARD-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -7,28 +7,17 @@ BUILDBRANCH="12" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" - -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-wandboard" -FAT_SIZE="50m -b 16384" -FAT_TYPE="16" -IMAGE_SIZE="1536M" -KERNEL_FLAGS="-j6" -KERNEL="IMX6" -MD_ARGS="-x 63 -y 255" -NODOC=1 -NOPORTS= -PART_SCHEME="MBR" -WORLD_FLAGS="-j10" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" +export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="WANDBOARD" - +export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/arm/${BOARDNAME}.conf + +KERNEL_FLAGS="-j6" +WORLD_FLAGS="-j10" + load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} @@ -38,25 +27,3 @@ if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi -arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard" - UBOOT_FILES="u-boot.imx" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" - chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ - of=/dev/${mddev} bs=512 seek=2 conv=sync - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr - chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ - ${FATMOUNT}/ubldr.bin - chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - umount_loop ${CHROOTDIR}/${UFSMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${UFSMOUNT} - - return 0 -} Modified: user/gjb/thermite/12-i386-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/12-i386-GENERIC-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-i386-GENERIC-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -9,11 +9,13 @@ BUILDBRANCH="12" TARGET="i386" TARGET_ARCH="i386" -CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf + +CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" WITH_VMIMAGES=1 WITH_COMPRESSED_VMIMAGES=1 XZ_THREADS="10" Modified: user/gjb/thermite/12-powerpc-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/12-powerpc-GENERIC-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-powerpc-GENERIC-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -9,7 +9,10 @@ BUILDBRANCH="12" 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/12-powerpc64-GENERIC64-snap.conf ============================================================================== --- user/gjb/thermite/12-powerpc64-GENERIC64-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-powerpc64-GENERIC64-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -10,7 +10,10 @@ BUILDBRANCH="12" 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/12-powerpcspe-MPC85XXSPE-snap.conf ============================================================================== --- user/gjb/thermite/12-powerpcspe-MPC85XXSPE-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-powerpcspe-MPC85XXSPE-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -10,7 +10,10 @@ BUILDBRANCH="12" TARGET="powerpc" TARGET_ARCH="powerpcspe" KERNEL="MPC85XXSPE" -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/12-sparc64-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/12-sparc64-GENERIC-snap.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/12-sparc64-GENERIC-snap.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -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" Modified: user/gjb/thermite/builds-10.conf ============================================================================== --- user/gjb/thermite/builds-10.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/builds-10.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -10,7 +10,7 @@ heads= stables="10" revs="${heads} ${stables}" -archs="amd64 i386 ia64 powerpc powerpc64 sparc64 armv6" +archs="amd64 i386 ia64 powerpc powerpc64 sparc64 arm armv6" types="snap" x86_kernels="GENERIC" Modified: user/gjb/thermite/builds-11.conf ============================================================================== --- user/gjb/thermite/builds-11.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/builds-11.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -10,7 +10,7 @@ heads= stables="11" revs="${heads} ${stables}" -archs="amd64 i386 powerpc powerpc64 sparc64 armv6 aarch64" +archs="amd64 i386 powerpc powerpc64 sparc64 arm armv6 aarch64" types="snap" x86_kernels="GENERIC" Modified: user/gjb/thermite/builds-12.conf ============================================================================== --- user/gjb/thermite/builds-12.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/builds-12.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -10,13 +10,13 @@ heads="12" stables= revs="${heads} ${stables}" -archs="amd64 i386 powerpc powerpc64 powerpcspe sparc64 armv6 aarch64" +archs="amd64 i386 powerpc powerpc64 powerpcspe sparc64 arm armv6 armv7 aarch64" types="snap" x86_kernels="GENERIC" -armv6_kernels="ALLWINNER_UP BANANAPI BEAGLEBONE CUBIEBOARD CUBIEBOARD2 CUBOX-HUMMINGBOARD GUMSTIX" -armv6_kernels="${armv6_kernels} RPI-B RPI2 PANDABOARD WANDBOARD" -kernels="${x86_kernels} GENERIC64 ${armv6_kernels} MPC85XXSPE" +arm_kernels="ALLWINNER_UP BANANAPI BEAGLEBONE CUBIEBOARD CUBIEBOARD2 CUBOX-HUMMINGBOARD GUMSTIX" +arm_kernels="${arm_kernels} RPI-B RPI2 RPI3 PANDABOARD WANDBOARD PINE64" +kernels="${x86_kernels} GENERIC64 ${arm_kernels} MPC85XXSPE" case ${types} in snap) Modified: user/gjb/thermite/defaults-10.conf ============================================================================== --- user/gjb/thermite/defaults-10.conf Mon Jun 18 18:35:29 2018 (r335325) +++ user/gjb/thermite/defaults-10.conf Mon Jun 18 18:38:58 2018 (r335326) @@ -15,14 +15,13 @@ DOCBRANCH="doc/head@HEAD" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806181838.w5IIcwUY001409>