diff options
| author | gjb <gjb@FreeBSD.org> | 2017-09-22 14:40:04 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-09-22 14:40:04 +0000 |
| commit | ed34c9c7cb43c8a5085ab968bad30ce511895f80 (patch) | |
| tree | 002c15611c833e6da8a660069a7858eb3b81c08d /release/tools | |
| parent | a3c81b6ad82652cfa97c5a0a84cd99c1ed1a0cae (diff) | |
| download | FreeBSD-src-ed34c9c7cb43c8a5085ab968bad30ce511895f80.zip FreeBSD-src-ed34c9c7cb43c8a5085ab968bad30ce511895f80.tar.gz | |
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
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/arm.subr | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 3459985..edce8ba 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -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 |
