svn commit: r323925 - in stable: 10/release/tools 11/release/tools

2017-09-22 Thread Glen Barber 
Author: gjb
Date: Fri Sep 22 14:40:04 2017
New Revision: 323925
URL: https://svnweb.freebsd.org/changeset/base/323925

Log:
  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

Modified:
  stable/11/release/tools/arm.subr
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/release/tools/arm.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/release/tools/arm.subr
==
--- stable/11/release/tools/arm.subrFri Sep 22 14:34:27 2017
(r323924)
+++ stable/11/release/tools/arm.subrFri Sep 22 14:40:04 2017
(r323925)
@@ -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
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r323925 - in stable: 10/release/tools 11/release/tools

2017-09-22 Thread Glen Barber 
Author: gjb
Date: Fri Sep 22 14:40:04 2017
New Revision: 323925
URL: https://svnweb.freebsd.org/changeset/base/323925

Log:
  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

Modified:
  stable/10/release/tools/arm.subr
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/release/tools/arm.subr
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/release/tools/arm.subr
==
--- stable/10/release/tools/arm.subrFri Sep 22 14:34:27 2017
(r323924)
+++ stable/10/release/tools/arm.subrFri Sep 22 14:40:04 2017
(r323925)
@@ -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
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"