mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-27 13:32:45 +00:00
MFC r323924:
Revert r323812 from release/tools/arm.subr, which has broken the build on arm/armv6 images. Pointyhat: gjb (myself) MFC note: releng/10.4 has broken because of this Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
6fe9f52e55
commit
e983a222b0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=323925
@ -99,16 +99,6 @@ arm_install_base() {
|
||||
TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
|
||||
DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \
|
||||
installworld installkernel distribution
|
||||
|
||||
# Bootstrap etcupdate(8) and mergemaster(8) databases.
|
||||
mkdir -p ${DESTDIR}/var/db/etcupdate
|
||||
etcupdate extract -B \
|
||||
-M "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \
|
||||
-s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate
|
||||
sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \
|
||||
-F "TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}" \
|
||||
-D ${DESTDIR}
|
||||
|
||||
chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
|
||||
|
||||
arm_create_user
|
||||
|
Loading…
Reference in New Issue
Block a user