diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2014-08-15 12:34:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 09:26:13 +0100 |
commit | cae5cf2d97fe4537f6c5ebed78fcce2839557403 (patch) | |
tree | 1e70e9aea26e1ab4d85eea08892cb9edb9707705 /meta/recipes-bsp/grub | |
parent | a140514f9797b4696978f3b5531d4d47f90de019 (diff) | |
download | poky-cae5cf2d97fe4537f6c5ebed78fcce2839557403.tar.gz |
grub_2.00: strip the sparc64 files from building
Avoid building and packaging of sparc64 specific files in the x86 builds.
Fixes Bug:
[YOCTO #6427]
(From OE-Core rev: e9d1264a63f47965c2f10e18e532b117bbda26be)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r-- | meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch | 104 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_2.00.bb | 1 |
2 files changed, 105 insertions, 0 deletions
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 0000000000..6259a1abe3 --- /dev/null +++ b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch | |||
@@ -0,0 +1,104 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | remove the grub-sparc64-setup files from the x86 builds. | ||
4 | |||
5 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
6 | |||
7 | --- a/Makefile.util.am 2014-08-15 11:41:02.441011278 -0700 | ||
8 | +++ b/Makefile.util.am 2014-08-15 11:44:26.245021142 -0700 | ||
9 | @@ -4692,9 +4692,9 @@ | ||
10 | endif | ||
11 | |||
12 | if COND_emu | ||
13 | -sbin_PROGRAMS += grub-sparc64-setup | ||
14 | +sbin_PROGRAMS += | ||
15 | if COND_MAN_PAGES | ||
16 | -man_MANS += grub-sparc64-setup.8 | ||
17 | +man_MANS += | ||
18 | |||
19 | grub-sparc64-setup.8: grub-sparc64-setup | ||
20 | chmod a+x grub-sparc64-setup | ||
21 | @@ -4715,9 +4715,9 @@ | ||
22 | endif | ||
23 | |||
24 | if COND_i386_pc | ||
25 | -sbin_PROGRAMS += grub-sparc64-setup | ||
26 | +sbin_PROGRAMS += | ||
27 | if COND_MAN_PAGES | ||
28 | -man_MANS += grub-sparc64-setup.8 | ||
29 | +man_MANS += | ||
30 | |||
31 | grub-sparc64-setup.8: grub-sparc64-setup | ||
32 | chmod a+x grub-sparc64-setup | ||
33 | @@ -4738,9 +4738,9 @@ | ||
34 | endif | ||
35 | |||
36 | if COND_i386_efi | ||
37 | -sbin_PROGRAMS += grub-sparc64-setup | ||
38 | +sbin_PROGRAMS += | ||
39 | if COND_MAN_PAGES | ||
40 | -man_MANS += grub-sparc64-setup.8 | ||
41 | +man_MANS += | ||
42 | |||
43 | grub-sparc64-setup.8: grub-sparc64-setup | ||
44 | chmod a+x grub-sparc64-setup | ||
45 | @@ -4761,9 +4761,9 @@ | ||
46 | endif | ||
47 | |||
48 | if COND_i386_qemu | ||
49 | -sbin_PROGRAMS += grub-sparc64-setup | ||
50 | +sbin_PROGRAMS += | ||
51 | if COND_MAN_PAGES | ||
52 | -man_MANS += grub-sparc64-setup.8 | ||
53 | +man_MANS += | ||
54 | |||
55 | grub-sparc64-setup.8: grub-sparc64-setup | ||
56 | chmod a+x grub-sparc64-setup | ||
57 | @@ -4784,9 +4784,9 @@ | ||
58 | endif | ||
59 | |||
60 | if COND_i386_coreboot | ||
61 | -sbin_PROGRAMS += grub-sparc64-setup | ||
62 | +sbin_PROGRAMS += | ||
63 | if COND_MAN_PAGES | ||
64 | -man_MANS += grub-sparc64-setup.8 | ||
65 | +man_MANS += | ||
66 | |||
67 | grub-sparc64-setup.8: grub-sparc64-setup | ||
68 | chmod a+x grub-sparc64-setup | ||
69 | @@ -4807,9 +4807,9 @@ | ||
70 | endif | ||
71 | |||
72 | if COND_i386_multiboot | ||
73 | -sbin_PROGRAMS += grub-sparc64-setup | ||
74 | +sbin_PROGRAMS += | ||
75 | if COND_MAN_PAGES | ||
76 | -man_MANS += grub-sparc64-setup.8 | ||
77 | +man_MANS += | ||
78 | |||
79 | grub-sparc64-setup.8: grub-sparc64-setup | ||
80 | chmod a+x grub-sparc64-setup | ||
81 | @@ -4830,9 +4830,9 @@ | ||
82 | endif | ||
83 | |||
84 | if COND_i386_ieee1275 | ||
85 | -sbin_PROGRAMS += grub-sparc64-setup | ||
86 | +sbin_PROGRAMS += | ||
87 | if COND_MAN_PAGES | ||
88 | -man_MANS += grub-sparc64-setup.8 | ||
89 | +man_MANS += | ||
90 | |||
91 | grub-sparc64-setup.8: grub-sparc64-setup | ||
92 | chmod a+x grub-sparc64-setup | ||
93 | @@ -4853,9 +4853,9 @@ | ||
94 | endif | ||
95 | |||
96 | if COND_x86_64_efi | ||
97 | -sbin_PROGRAMS += grub-sparc64-setup | ||
98 | +sbin_PROGRAMS += | ||
99 | if COND_MAN_PAGES | ||
100 | -man_MANS += grub-sparc64-setup.8 | ||
101 | +man_MANS += | ||
102 | |||
103 | grub-sparc64-setup.8: grub-sparc64-setup | ||
104 | 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 3c1ec0b651..e2fcbb98f5 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb | |||
@@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ | |||
23 | file://fix-issue-with-flex-2.5.37.patch \ | 23 | file://fix-issue-with-flex-2.5.37.patch \ |
24 | file://grub-2.00-add-oe-kernel.patch \ | 24 | file://grub-2.00-add-oe-kernel.patch \ |
25 | file://fix-endianness-problem.patch \ | 25 | file://fix-endianness-problem.patch \ |
26 | file://grub2-remove-sparc64-setup-from-x86-builds.patch \ | ||
26 | " | 27 | " |
27 | 28 | ||
28 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" | 29 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" |