aboutsummaryrefslogtreecommitdiff
path: root/release/arm64
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-11-01 21:22:05 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-11-01 21:22:05 +0000
commitdfa099890c456aed9b7924373d4dc2f013856c04 (patch)
treecd861b9d8d01f2b83ede657ac533cd19ee9409a8 /release/arm64
parent648176e095097c5c2642a5627542423e277a5f8e (diff)
downloadsrc-dfa099890c456aed9b7924373d4dc2f013856c04.tar.gz
src-dfa099890c456aed9b7924373d4dc2f013856c04.zip
Add option UNIFIED_OBJDIR, on by default, which moves the default build OBJDIR.
This changes the build OBJDIR from the older style of /usr/obj/<srcdir> for native builds, and /usr/obj/<target>.<target_arch>/<srcdir> for cross builds to a new simpler format of /usr/obj/<srcdir>/<target>.<target_arch>. This new format is used regardless of cross or native build. It allows easier management of multiple source tree object directories. The UNIFIED_OBJDIR option will be removed and its feature made permanent for the 12.0 release. Relnotes: yes (don't note UNIFIED_OBJDIR option since it will be removed) Prior work: D3711 D874 Reviewed by: gjb, sjg Discussed at: https://lists.freebsd.org/pipermail/freebsd-arch/2016-May/017805.html Discussed with: emaste Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12840
Notes
Notes: svn path=/head/; revision=325288
Diffstat (limited to 'release/arm64')
-rw-r--r--release/arm64/RPI3.conf12
1 files changed, 5 insertions, 7 deletions
diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
index a8eaff9bf04d..8636ddbfa8ba 100644
--- a/release/arm64/RPI3.conf
+++ b/release/arm64/RPI3.conf
@@ -42,13 +42,11 @@ arm_install_uboot() {
"${DTB_REPO}/overlays/${_OL}?raw=true"
done
- _OBJDIR="$(chroot ${CHROOTDIR} make -C ${WORLDDIR} -V .OBJDIR)"
- _OBJDIR="$(realpath ${_OBJDIR})"
- if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}" ]; then
- BOOTFILES="/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}/usr/src/sys/boot"
- else
- BOOTFILES="/${_OBJDIR}/sys/boot"
- fi
+ BOOTFILES="$(chroot ${CHROOTDIR} \
+ env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
+ WITH_UNIFIED_OBJDIR=yes \
+ make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+ BOOTFILES="$(realpath ${BOOTFILES})"
chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT
chroot ${CHROOTDIR} cp -p ${BOOTFILES}/efi/boot1/boot1.efi \