From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by mail.openembedded.org (Postfix) with ESMTP id 4AD0F70D61 for ; Fri, 15 Aug 2014 20:38:46 +0000 (UTC) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 15 Aug 2014 13:38:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,873,1400050800"; d="scan'208";a="469229331" Received: from unknown (HELO [10.255.12.111]) ([10.255.12.111]) by azsmga001.ch.intel.com with ESMTP; 15 Aug 2014 13:38:46 -0700 Message-ID: <53EE6FD6.50809@linux.intel.com> Date: Fri, 15 Aug 2014 13:38:46 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: nitin.a.kamble@intel.com, Openembedded-core@lists.openembedded.org, richard.purdie@linuxfoundation.org References: In-Reply-To: Subject: Re: [PATCH 1/1] grub_2.00: strip the sparc64 files from building X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 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, 15 Aug 2014 20:38:49 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 08/15/2014 12:49 PM, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble > > Avoid building and packaging of sparc64 specific files in the x86 builds. > > Fixes Bug: > [YOCTO #6427] > > Signed-off-by: Nitin A Kamble > --- > ...rub2-remove-sparc64-setup-from-x86-builds.patch | 104 +++++++++++++++++++++ > meta/recipes-bsp/grub/grub_2.00.bb | 3 +- > 2 files changed, 106 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch > > diff --git a/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch > new file mode 100644 > index 0000000..6259a1a > --- /dev/null > +++ b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch > @@ -0,0 +1,104 @@ > +Upstream-Status: Inappropriate [embedded specific] > + > +remove the grub-sparc64-setup files from the x86 builds. > + > +Signed-Off-By: Nitin A Kamble > + > +--- a/Makefile.util.am 2014-08-15 11:41:02.441011278 -0700 > ++++ b/Makefile.util.am 2014-08-15 11:44:26.245021142 -0700 > +@@ -4692,9 +4692,9 @@ > + endif > + > + if COND_emu > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > +@@ -4715,9 +4715,9 @@ > + endif > + > + if COND_i386_pc > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > +@@ -4738,9 +4738,9 @@ > + endif > + > + if COND_i386_efi > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > +@@ -4761,9 +4761,9 @@ > + endif > + > + if COND_i386_qemu > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > +@@ -4784,9 +4784,9 @@ > + endif > + > + if COND_i386_coreboot > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > +@@ -4807,9 +4807,9 @@ > + endif > + > + if COND_i386_multiboot > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > +@@ -4830,9 +4830,9 @@ > + endif > + > + if COND_i386_ieee1275 > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > +@@ -4853,9 +4853,9 @@ > + endif > + > + if COND_x86_64_efi > +-sbin_PROGRAMS += grub-sparc64-setup > ++sbin_PROGRAMS += > + if COND_MAN_PAGES > +-man_MANS += grub-sparc64-setup.8 > ++man_MANS += > + > + grub-sparc64-setup.8: grub-sparc64-setup > + chmod a+x grub-sparc64-setup > diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb > index 3c1ec0b..ddc0722 100644 > --- a/meta/recipes-bsp/grub/grub_2.00.bb > +++ b/meta/recipes-bsp/grub/grub_2.00.bb > @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > DEPENDS = "autogen-native flex-native bison-native xz" > RDEPENDS_${PN} = "diffutils freetype" > -PR = "r1" > +PR = "r2" > You don't need the PR bump anymore, just leave it set to r1 Sau! > SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ > file://grub-install.in.patch \ > @@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ > file://fix-issue-with-flex-2.5.37.patch \ > file://grub-2.00-add-oe-kernel.patch \ > file://fix-endianness-problem.patch \ > + file://grub2-remove-sparc64-setup-from-x86-builds.patch \ > " > > SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" >