mirror of
https://git.yoctoproject.org/poky
synced 2026-02-28 04:19:40 +01:00
ac867c3d4d
* Make grub, grub-efi grub_git use a grub2.inc to reduce the duplicated code.
* Make grub and grub-efi use the same patches since they use the same
source. (grub_git is different).
* grub-efi:
- Use autotools to replace autotools-brokensep
- Remove the DEPENDS of freetype, it should be a RDEPENDS.
- Remove grub-2.00-ignore-gnulib-gets-stupidity.patch since it is a
duplication of remove-gets.patch.
- Make grub-efi.rpm contain files rather than make an empty package.
* grub_git:
- Fix a SSE build failure.
[YOCTO #6310]
(From OE-Core rev: cf4aaed28a34cc652352f0817316187b72babc76)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
105 lines
2.2 KiB
Diff
105 lines
2.2 KiB
Diff
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
|