From owner-svn-src-head@FreeBSD.ORG Wed Apr 23 05:13:45 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 467C6A5A for ; Wed, 23 Apr 2014 05:13:45 +0000 (UTC) Received: from mail-pb0-f46.google.com (mail-pb0-f46.google.com [209.85.160.46]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 189161E56 for ; Wed, 23 Apr 2014 05:13:44 +0000 (UTC) Received: by mail-pb0-f46.google.com with SMTP id rq2so393197pbb.5 for ; Tue, 22 Apr 2014 22:13:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=0hMsPAP3u842vUl4ICsLgN2cJBtDljkqD2+EvKi3HSU=; b=nE+EmwLALHBM+2wXKlmJy/m4jKz9hR57YdKuuesAVYoG4ZygUuclu7PdM/M3rN0YQu pT3YVPsjLcMjSOfzsk3D8y05JG2FOo+jzO4tD7Bt5BxV2RT5kkGc8m/EhfmTStrOvzCv JN4jyKUIYtE0xGbNOC6HMzW8ROb0dfx1ILIUWiTcaB+q3axQh/6oohjtQKTt0ikjIVwt HT/hVWYw41fAySRXVcX1Gb0iH1KQc5bLSfwHvu4DubV/+tiPqmtt+GIGZw5RIiGsZ8OF F5ess3svpvCQCgcNOlZZX8W0MTiMtVlnHueHDXECxMLuGUj5l3ynxxb4x98PrD9ySr5u 5RlA== X-Gm-Message-State: ALoCoQko60v5o5zz+qDSxE68BQvwCG47Ei7LGnDEvUCBaVb/9GLIkoK26dDRHvgJoxMvv3jKTCOl X-Received: by 10.68.220.137 with SMTP id pw9mr50582966pbc.24.1398230024268; Tue, 22 Apr 2014 22:13:44 -0700 (PDT) Received: from [10.0.103.142] ([50.242.69.61]) by mx.google.com with ESMTPSA id pv4sm88716829pbb.55.2014.04.22.22.13.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Apr 2014 22:13:43 -0700 (PDT) Sender: Warner Losh Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: svn commit: r264794 - head/release/arm From: Warner Losh In-Reply-To: <20140423050923.GW49791@glenbarber.us> Date: Tue, 22 Apr 2014 22:13:42 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <561CD4F3-6F88-4897-8B49-DF001C76053B@bsdimp.com> References: <201404230201.s3N21NiE054881@svn.freebsd.org> <11A48119-4502-4EE6-A4AF-E726578380DF@gmail.com> <20140423050923.GW49791@glenbarber.us> To: Glen Barber X-Mailer: Apple Mail (2.1874) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 05:13:45 -0000 On Apr 22, 2014, at 10:09 PM, Glen Barber 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 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