Date: Wed, 23 Apr 2014 01:09:23 -0400 From: Glen Barber <gjb@FreeBSD.org> To: Warner Losh <imp@bsdimp.com> 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: <20140423050923.GW49791@glenbarber.us> In-Reply-To: <11A48119-4502-4EE6-A4AF-E726578380DF@gmail.com> References: <201404230201.s3N21NiE054881@svn.freebsd.org> <11A48119-4502-4EE6-A4AF-E726578380DF@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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. > Well, this commit only moves where the definition is, from the script itself to the configuration file. But, to be fair, I think you broke it in r264660. Glen > Warner > > On Apr 22, 2014, at 7:01 PM, Glen Barber <gjb@freebsd.org> wrote: > > > Author: gjb > > Date: Wed Apr 23 02:01:22 2014 > > New Revision: 264794 > > URL: http://svnweb.freebsd.org/changeset/base/264794 > > > > Log: > > Move xdev knobs from release/arm/release.sh and into an > > XDEV_FLAGS variable in ${KERNCONF}.conf file. > > > > MFC after: 3 days > > X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch > > Sponsored by: The FreeBSD Foundation > > > > 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 > > > > Modified: head/release/arm/BEAGLEBONE.conf > > ============================================================================== > > --- 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=1 > > EMBEDDEDPORTS="lang/python textproc/gsed" > > XDEV="arm" > > XDEV_ARCH="armv6" > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" > > KERNEL="BEAGLEBONE" > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd" > > CROCHETBRANCH="trunk" > > > > Modified: head/release/arm/PANDABOARD.conf > > ============================================================================== > > --- 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=1 > > EMBEDDEDPORTS="lang/python textproc/gsed" > > XDEV="arm" > > XDEV_ARCH="armv6" > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" > > KERNEL="PANDABOARD" > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd" > > CROCHETBRANCH="trunk" > > > > Modified: head/release/arm/RPI-B.conf > > ============================================================================== > > --- 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=1 > > EMBEDDEDPORTS="lang/python textproc/gsed" > > XDEV="arm" > > XDEV_ARCH="armv6" > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" > > KERNEL="RPI-B" > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd" > > CROCHETBRANCH="trunk" > > > > Modified: head/release/arm/WANDBOARD-QUAD.conf > > ============================================================================== > > --- 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=1 > > EMBEDDEDPORTS="lang/python textproc/gsed" > > XDEV="arm" > > XDEV_ARCH="armv6" > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" > > KERNEL="WANDBOARD-QUAD" > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd" > > CROCHETBRANCH="trunk" > > > > Modified: head/release/arm/ZEDBOARD.conf > > ============================================================================== > > --- 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="/scratch" > > EMBEDDEDBUILD=1 > > XDEV="arm" > > XDEV_ARCH="armv6" > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1" > > KERNEL="ZEDBOARD" > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd" > > CROCHETBRANCH="trunk" > > > > Modified: head/release/arm/release.sh > > ============================================================================== > > --- 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=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \ > > - XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ > > + ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ > > ${WORLD_FLAGS} xdev > > > > # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints > > > [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJTV0sDAAoJELls3eqvi17QO94QAI+u8Ht2oxIOlVqR5dZwhbTR /6dJrj37tDU6nhVOlHQrM6DBr+Q7VgohWbcEggSCT2MhoiafkYTCfoM+tbEZHn2p pX+0wazYDx0rpioC2O80gBwVF4euTQXUosSw2GfenZ7heQPn7xQWE/s0myC9FBnG h6YqI++uyyCZhw53uhQApElBIhXCGe72NuzSisKr+AqfGy6b4jzVetL+lql9mYB0 rioK4tdDzAHUGxWFQA0VlQ+xvg8YgOmXQ8JehMS/ZI2yV8+ngFZpl3IrH0rIPRop HYfvUw4lF+PIBgeOEkEjFPqcxT4+1aMpVTivXZMfRqhro6r148SlW0gPZ80AFKdy +2xVGcISsN1SklSTio4DRRxIa++ginbgK/Nqw9XlnaOc7WvqMwsSWJ/YqLMbylM/ n2cxWkftHisP15NccBEt+scTnvUokjnbiZIoT/984aIMd1YIqaEyefRiDEYv9xhN X9QQH/mMRmmZ5RII9a/6hStDGy35g3QfJD6Ll7Ze887dL6gaUsPnsMZI8TtnoMZ6 hIOLED2ey6LNnHnJ9BPqiiJv4gPrw5wVmHVrSUaO1ka56nFk537Rs97ZuOFGMpG/ oCSVWU1Q2+Z9KISIZczpGmd+UDu9OjsnAY87SB86sz7hpZI5tWdXv7nxImQqP0jD kZEew3fx516gb2fcwHMO =qFJg -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140423050923.GW49791>