Patchwork [1/1] grub_2.00: strip the sparc64 files from building

login
register
mail settings
Submitter Nitin A Kamble
Date Aug. 15, 2014, 7:49 p.m.
Message ID <f7005d8cdc8350910287333d533876982d613836.1408131949.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/78361/
State Accepted
Commit cae5cf2d97fe4537f6c5ebed78fcce2839557403
Headers show

Comments

Nitin A Kamble - Aug. 15, 2014, 7:49 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

Avoid building and packaging of sparc64 specific files in the x86 builds.

Fixes Bug:
[YOCTO #6427]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 ...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
Saul Wold - Aug. 15, 2014, 8:38 p.m.
On 08/15/2014 12:49 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> Avoid building and packaging of sparc64 specific files in the x86 builds.
>
> Fixes Bug:
> [YOCTO #6427]
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>   ...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 <nitin.a.kamble@intel.com>
> +
> +--- 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"
>
Nitin A Kamble - Aug. 15, 2014, 10:29 p.m.
On 8/15/2014 1:38 PM, Saul Wold wrote:
>> -PR = "r1"
>> +PR = "r2"
>>
> You don't need the PR bump anymore, just leave it set to r1
>
> Sau!
>
OK, I have update the commit in the contrib branch with PR = r1.


Nitin

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 <nitin.a.kamble@intel.com>
+
+--- 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"
 
 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"