Date: Tue, 22 Apr 2014 22:13:42 -0700 From: Warner Losh <imp@bsdimp.com> To: Glen Barber <gjb@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r264794 - head/release/arm Message-ID: <561CD4F3-6F88-4897-8B49-DF001C76053B@bsdimp.com> In-Reply-To: <20140423050923.GW49791@glenbarber.us> References: <201404230201.s3N21NiE054881@svn.freebsd.org> <11A48119-4502-4EE6-A4AF-E726578380DF@gmail.com> <20140423050923.GW49791@glenbarber.us>
next in thread | previous in thread | raw e-mail | index | archive | help
On Apr 22, 2014, at 10:09 PM, Glen Barber <gjb@FreeBSD.org> wrote: > On Tue, Apr 22, 2014 at 10:02:03PM -0700, Warner Losh wrote: >> Ditto. This should be backed out and you should make whoever broke = this fix it in head. >>=20 >=20 > Well, this commit only moves where the definition is, from the script > itself to the configuration file. >=20 > But, to be fair, I think you broke it in r264660. i=92m pretty sure I broke it and was poking fun at myself until I can = get it fixed :) Warner > Glen >=20 >> Warner >>=20 >> On Apr 22, 2014, at 7:01 PM, Glen Barber <gjb@freebsd.org> wrote: >>=20 >>> Author: gjb >>> Date: Wed Apr 23 02:01:22 2014 >>> New Revision: 264794 >>> URL: http://svnweb.freebsd.org/changeset/base/264794 >>>=20 >>> Log: >>> Move xdev knobs from release/arm/release.sh and into an >>> XDEV_FLAGS variable in ${KERNCONF}.conf file. >>>=20 >>> MFC after: 3 days >>> X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch >>> Sponsored by: The FreeBSD Foundation >>>=20 >>> Modified: >>> head/release/arm/BEAGLEBONE.conf >>> head/release/arm/PANDABOARD.conf >>> head/release/arm/RPI-B.conf >>> head/release/arm/WANDBOARD-QUAD.conf >>> head/release/arm/ZEDBOARD.conf >>> head/release/arm/release.sh >>>=20 >>> Modified: head/release/arm/BEAGLEBONE.conf >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- head/release/arm/BEAGLEBONE.conf Wed Apr 23 01:47:07 2014 = (r264793) >>> +++ head/release/arm/BEAGLEBONE.conf Wed Apr 23 02:01:22 2014 = (r264794) >>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=3D1 >>> EMBEDDEDPORTS=3D"lang/python textproc/gsed" >>> XDEV=3D"arm" >>> XDEV_ARCH=3D"armv6" >>> +XDEV_FLAGS=3D"WITH_GCC=3D1 WITH_GCC_BOOTSTRAP=3D1 = WITHOUT_CLANG_IS_CC=3D1" >>> KERNEL=3D"BEAGLEBONE" >>> CROCHETSRC=3D"https://github.com/kientzle/crochet-freebsd" >>> CROCHETBRANCH=3D"trunk" >>>=20 >>> Modified: head/release/arm/PANDABOARD.conf >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- head/release/arm/PANDABOARD.conf Wed Apr 23 01:47:07 2014 = (r264793) >>> +++ head/release/arm/PANDABOARD.conf Wed Apr 23 02:01:22 2014 = (r264794) >>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=3D1 >>> EMBEDDEDPORTS=3D"lang/python textproc/gsed" >>> XDEV=3D"arm" >>> XDEV_ARCH=3D"armv6" >>> +XDEV_FLAGS=3D"WITH_GCC=3D1 WITH_GCC_BOOTSTRAP=3D1 = WITHOUT_CLANG_IS_CC=3D1" >>> KERNEL=3D"PANDABOARD" >>> CROCHETSRC=3D"https://github.com/kientzle/crochet-freebsd" >>> CROCHETBRANCH=3D"trunk" >>>=20 >>> Modified: head/release/arm/RPI-B.conf >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- head/release/arm/RPI-B.conf Wed Apr 23 01:47:07 2014 = (r264793) >>> +++ head/release/arm/RPI-B.conf Wed Apr 23 02:01:22 2014 = (r264794) >>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=3D1 >>> EMBEDDEDPORTS=3D"lang/python textproc/gsed" >>> XDEV=3D"arm" >>> XDEV_ARCH=3D"armv6" >>> +XDEV_FLAGS=3D"WITH_GCC=3D1 WITH_GCC_BOOTSTRAP=3D1 = WITHOUT_CLANG_IS_CC=3D1" >>> KERNEL=3D"RPI-B" >>> CROCHETSRC=3D"https://github.com/kientzle/crochet-freebsd" >>> CROCHETBRANCH=3D"trunk" >>>=20 >>> Modified: head/release/arm/WANDBOARD-QUAD.conf >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 01:47:07 2014 = (r264793) >>> +++ head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 02:01:22 2014 = (r264794) >>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=3D1 >>> EMBEDDEDPORTS=3D"lang/python textproc/gsed" >>> XDEV=3D"arm" >>> XDEV_ARCH=3D"armv6" >>> +XDEV_FLAGS=3D"WITH_GCC=3D1 WITH_GCC_BOOTSTRAP=3D1 = WITHOUT_CLANG_IS_CC=3D1" >>> KERNEL=3D"WANDBOARD-QUAD" >>> CROCHETSRC=3D"https://github.com/kientzle/crochet-freebsd" >>> CROCHETBRANCH=3D"trunk" >>>=20 >>> Modified: head/release/arm/ZEDBOARD.conf >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- head/release/arm/ZEDBOARD.conf Wed Apr 23 01:47:07 2014 = (r264793) >>> +++ head/release/arm/ZEDBOARD.conf Wed Apr 23 02:01:22 2014 = (r264794) >>> @@ -21,6 +21,7 @@ CHROOTDIR=3D"/scratch" >>> EMBEDDEDBUILD=3D1 >>> XDEV=3D"arm" >>> XDEV_ARCH=3D"armv6" >>> +XDEV_FLAGS=3D"WITH_GCC=3D1 WITH_GCC_BOOTSTRAP=3D1 = WITHOUT_CLANG_IS_CC=3D1" >>> KERNEL=3D"ZEDBOARD" >>> CROCHETSRC=3D"https://github.com/kientzle/crochet-freebsd" >>> CROCHETBRANCH=3D"trunk" >>>=20 >>> Modified: head/release/arm/release.sh >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- head/release/arm/release.sh Wed Apr 23 01:47:07 2014 = (r264793) >>> +++ head/release/arm/release.sh Wed Apr 23 02:01:22 2014 = (r264794) >>> @@ -94,8 +94,7 @@ install_uboot() { >>> main() { >>> # Build the 'xdev' target for crochet. >>> eval chroot ${CHROOTDIR} make -C /usr/src \ >>> - WITH_GCC=3D1 WITH_GCC_BOOTSTRAP=3D1 = WITHOUT_CLANG_IS_CC=3D1 \ >>> - XDEV=3D${XDEV} XDEV_ARCH=3D${XDEV_ARCH} \ >>> + ${XDEV_FLAGS} XDEV=3D${XDEV} XDEV_ARCH=3D${XDEV_ARCH} \ >>> ${WORLD_FLAGS} xdev >>>=20 >>> # Run the ldconfig(8) startup script so = /var/run/ld-elf*.so.hints >>>=20 >>=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?561CD4F3-6F88-4897-8B49-DF001C76053B>