From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QTygv-000352-SI for openembedded-core@lists.openembedded.org; Tue, 07 Jun 2011 17:59:42 +0200 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 07 Jun 2011 08:56:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,333,1304319600"; d="scan'208";a="10242034" Received: from unknown (HELO [10.255.13.55]) ([10.255.13.55]) by orsmga002.jf.intel.com with ESMTP; 07 Jun 2011 08:56:22 -0700 Message-ID: <4DEE4A26.6020608@linux.intel.com> Date: Tue, 07 Jun 2011 08:56:22 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc13 Thunderbird/3.1.10 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: In-Reply-To: Cc: Kang, poky@yoctoproject.org Subject: Re: [PATCH 1/2] bitbake: add another local configuration file 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: Tue, 07 Jun 2011 15:59:42 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 06/07/2011 02:42 AM, Kang Kai wrote: > From: Kang Kai > > Add a new local configuration file local.conf.sample.extended, and more advanced > settings what user can configure could put in this file. > > Signed-off-by: Kang Kai > --- > meta-yocto/conf/local.conf.sample.extended | 5 +++++ > meta/conf/bitbake.conf | 1 + > scripts/oe-setup-builddir | 19 +++++++++++++++++++ > 3 files changed, 25 insertions(+), 0 deletions(-) > create mode 100644 meta-yocto/conf/local.conf.sample.extended > You seem to have inconsistent naming of your local.extended.conf sample file, this should probably named local.extended.conf.sample to be more consistent. Sau! > diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended > new file mode 100644 > index 0000000..048d641 > --- /dev/null > +++ b/meta-yocto/conf/local.conf.sample.extended > @@ -0,0 +1,5 @@ > +# eglibc configurability is used to reduce minimal images's size. > +# the all supported eglibc options are default enabled by adding > +# to DISTRO_FEATURES in default-distrovars.inc > +# put the options what you want to enable below and uncomment it > +#DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index de94316..1b1cf6b 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -641,6 +641,7 @@ CPU_FEATURES_arm ?= "vfp" > include conf/site.conf > include conf/auto.conf > include conf/local.conf > +include conf/local.extended.conf > include conf/build/${BUILD_SYS}.conf > include conf/target/${TARGET_SYS}.conf > include conf/machine/${MACHINE}.conf > diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir > index 5fc8b19..7af2373 100755 > --- a/scripts/oe-setup-builddir > +++ b/scripts/oe-setup-builddir > @@ -55,6 +55,7 @@ if [ "x" != "x$TEMPLATECONF" ]; then > fi > OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" > OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" > + OECORELOCALCONFEXTENDED="$TEMPLATECONF/local.conf.sample.extended" > fi > > if [ "x" = "x$OECORELOCALCONF" ]; then > @@ -79,6 +80,24 @@ EOM > cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf > fi > > +if ! (test -r "$BUILDDIR/conf/local.extended.conf"); then > +cat< +You had no conf/local.conf file. This configuration file has therefore been > +created for you with some default values. You may wish to edit it to use > +different eglibc configuration options for example. See the file for more > +information as common configuration options are commented. > + > +The Yocto Project has extensive documentation about OE including a reference manual > +which can be found at: > + http://yoctoproject.org/community/documentation > + > +For more information about OpenEmbedded see their website: > + http://www.openembedded.org/ > + > +EOM > + cp -f $OECORELOCALCONFEXTENDED $BUILDDIR/conf/local.extended.conf > +fi > + > if [ "x" = "x$OECORELAYERCONF" ]; then > OECORELAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" > fi