From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 93-97-173-237.zone5.bethere.co.uk ([93.97.173.237] helo=tim.rpsys.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QQx1r-0000ta-38 for openembedded-core@lists.openembedded.org; Mon, 30 May 2011 09:36:47 +0200 Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id p4U7XaAx031116; Mon, 30 May 2011 08:33:36 +0100 Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 30738-08; Mon, 30 May 2011 08:33:32 +0100 (BST) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id p4U7XS09031110 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 30 May 2011 08:33:28 +0100 From: Richard Purdie To: Patches and discussions about the oe-core layer In-Reply-To: <1306245860-12820-1-git-send-email-koen@dominion.thruhere.net> References: <1306245860-12820-1-git-send-email-koen@dominion.thruhere.net> Date: Mon, 30 May 2011 08:33:16 +0100 Message-ID: <1306740796.27470.330.camel@rex> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-Virus-Scanned: amavisd-new at rpsys.net Cc: Koen Kooi Subject: Re: [RFC][PATCH] bitbake.conf: make OVERRIDES match what people expect X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2011 07:36:47 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Tue, 2011-05-24 at 16:04 +0200, Koen Kooi wrote: > In the current situation TARGET_ARCH will override MACHINE, which is counter intuitive since the machine is more specific than the arch. > > The order is now pn-$PN} -> arch -> machine -> distro as the machine is a set of defaults and the distro is the ultimate policy. > > 'failfast' has been removed since it's not used anymore, just like 'local' > --- > meta/conf/bitbake.conf | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index a0af672..59238b8 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -602,15 +602,15 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" > # > # This means that an envionment variable named '_arm' overrides an > # environment variable '' (when ${TARGET_ARCH} is arm). > -# An environment variable '_ramses' overrides '' but doesn't override > -# '_arm' when ${MACHINE} is 'ramses'. > -# If you use combination ie '_arm_ramses', then '_arm_ramses' will override > -# '_arm' and then '' will be overriden with that value from '_arm'. > -# And finally '_local' overrides any standard variable, but with lowest priority. > +# An environment variable '_qemuarm' overrides '' and overrides > +# '_arm' when ${MACHINE} is 'qemuarm'. > +# If you use combination ie '_qemuarm_arm', then '_qemuarm_arm' will override > +# '_qemuarm' and then '' will be overriden with that value from '_qemuarm'. > +# And finally '_forcevariable' overrides any standard variable, with the highest priority. > # > # This works for functions as well, they are really just environment variables. > # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. > -OVERRIDES = "local:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable" > +OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable" > DISTROOVERRIDES ?= "${DISTRO}" > MACHINEOVERRIDES ?= "${MACHINE}" Merged to master. I left forcevariable in since otherwise I think distros would all end up adding something anyway. If there are strong feelings it shouldn't be there we can remove it. Cheers, Richard