From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com ([143.182.124.22] helo=azsmga101.ch.intel.com) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1T4z6r-0003J1-4M for openembedded-core@lists.openembedded.org; Fri, 24 Aug 2012 20:59:57 +0200 Received: from mail-pz0-f52.google.com ([209.85.210.52]) by mga03.intel.com with ESMTP/TLS/RC4-SHA; 24 Aug 2012 11:47:47 -0700 Received: by dakf10 with SMTP id f10so1061396dak.25 for ; Fri, 24 Aug 2012 11:47:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:organization:user-agent:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding:x-gm-message-state; bh=3LVzp7EKsNxk4K+FEv5Mp/NE/sQGsoX+S6vZ3vylF7c=; b=gjqsp0pNTj6Z3Ik4lZOqb3lg9PLK0FB4nY6ndyqDA7We/DmJxC93mDGfspjv+d/5QI MDyIDHlotv2Ara/TTlwLMWiLpw6askloVuCqsaP1dFZ8EsYAv/0VkRKnW7n1HQ9/ti0F MQAAEzaFkOQ1HGe98OR+vhKn//Tq2B2SoQxpcDVaK8ENBC0Y7ZQxOCVWTReUIDcTNxG1 aTCHqelTJtnTwLfIDxiMhVAgdeztR2foUIt/Y1AypU2/wDhVL601bU0VowskcKZFWv7d gNhgMDIhRzHq+WONg/S1oQ41uxQI4I5YnVXd6x7diuY8ie1fr56kN9KcCuMwdFIrUJt6 74qg== Received: by 10.68.196.193 with SMTP id io1mr15312257pbc.17.1345834067372; Fri, 24 Aug 2012 11:47:47 -0700 (PDT) Received: from [10.6.18.71] (c-71-193-189-117.hsd1.wa.comcast.net. [71.193.189.117]) by mx.google.com with ESMTPS id hc10sm1897524pbc.21.2012.08.24.11.47.44 (version=SSLv3 cipher=OTHER); Fri, 24 Aug 2012 11:47:45 -0700 (PDT) Message-ID: <5037CC50.2050805@intel.com> Date: Fri, 24 Aug 2012 11:47:44 -0700 From: Saul Wold Organization: Intel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 MIME-Version: 1.0 To: Bruce Ashfield References: <6bfd8089c0dade4775adfac96644215ffdfc0f4e.1345785364.git.bruce.ashfield@windriver.com> In-Reply-To: <6bfd8089c0dade4775adfac96644215ffdfc0f4e.1345785364.git.bruce.ashfield@windriver.com> X-Gm-Message-State: ALoCoQmAQay225X9mIgQ3YQhrKjjIyN1G0mOQj1zq3daklkD1aNvFut5c53kwCxqolfbsQR3rdt5 Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 1/1] kernel.bbclass: fix INC directory for SLANG X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2012 18:59:57 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 08/23/2012 10:18 PM, Bruce Ashfield wrote: > From: Liang Li > > In the kernel's tools/perf/Makefile CFLAGS was previously hard coded to > contain "-I/usr/include/slang" to work with hosts that have > "/usr/include/slang/slang.h" as well as hosts that have > "/usr/include/slang.h". This path can cause compile warnings like: > > cc1: warning: '/usr/include/slang' doesn't exists. > > or > > cc1: warning: include location "/usr/include/slang" is unsafe for > cross-compilation [-Wpoison-system-directories] > > Then in some cases warnings become errors if WERROR is enabled hence > build errors. > > In coordination with a kernel fix, we can fix this error for all > kernels by modifying the perf Makefile within the staged kernel > source. > > Signed-off-by: Liang Li > Signed-off-by: Bruce Ashfield > --- > meta/classes/kernel.bbclass | 3 +++ > .../recipes-kernel/linux/linux-yocto/noslang.patch | 20 -------------------- > meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 -- > meta/recipes-kernel/linux/linux-yocto_3.2.bb | 2 -- > meta/recipes-kernel/linux/linux-yocto_3.4.bb | 2 -- > 5 files changed, 3 insertions(+), 26 deletions(-) > delete mode 100644 meta/recipes-kernel/linux/linux-yocto/noslang.patch > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index f34e632..fdef1be 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -204,6 +204,9 @@ kernel_do_install() { > for entry in $bin_files; do > rm -f $kerneldir/$entry > done > + > + # Fix SLANG_INC for slang.h > + sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile > } > > sysroot_stage_all_append() { > diff --git a/meta/recipes-kernel/linux/linux-yocto/noslang.patch b/meta/recipes-kernel/linux/linux-yocto/noslang.patch > deleted file mode 100644 > index 9cada34..0000000 > --- a/meta/recipes-kernel/linux/linux-yocto/noslang.patch > +++ /dev/null > @@ -1,20 +0,0 @@ > -We (OE) install slang into /usr/include so we never need to look into > -/usr/include/slang/. We never want to look into a hardcoded path like this > -since it triggers host infection issues. For now, simply remove this > -since it causes us problems. > - > -Upstream-Status: Pending (would need rework) > - > -Index: tools/perf/Makefile > -=================================================================== > ---- linux.orig/tools/perf/Makefile 2012-08-07 10:29:43.020149620 +0000 > -+++ linux/tools/perf/Makefile 2012-08-07 10:30:08.128148098 +0000 > -@@ -504,7 +504,7 @@ > - BASIC_CFLAGS += -DNO_NEWT_SUPPORT > - else > - # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h > -- BASIC_CFLAGS += -I/usr/include/slang > -+ # BASIC_CFLAGS += -I/usr/include/slang > - EXTLIBS += -lnewt -lslang > - LIB_OBJS += $(OUTPUT)util/ui/setup.o > - LIB_OBJS += $(OUTPUT)util/ui/browser.o > diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb > index 4d19664..b9e5036 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb > @@ -24,8 +24,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}" > > SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" > > -SRC_URI += "file://noslang.patch" > - > COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" > > # Functionality flags > diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb > index c3fb252..6a162dd 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb > @@ -24,8 +24,6 @@ KMETA = "meta" > > SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" > > -SRC_URI += "file://noslang.patch" > - > COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" > > # Functionality flags > diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb > index 691d789..6fa4920 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb > @@ -13,8 +13,6 @@ SRCREV_meta ?= "28bcd46af1d592dab39bd8a0891c872454fde8bc" > > SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" > > -SRC_URI += "file://noslang.patch" > - > LINUX_VERSION ?= "3.4.7" > > PR = "${INC_PR}.0" > Is a PR bump needed here? Sau!