grub 2.0: several fixes
cover grub 2.0: several fixes
The following changes since commit 24f19fedb40d0af84beb8e9a6595ea06f09d4615:
gstreamer1.0-omx: use mulitple SCMs to fetch submodules (2014-12-31 08:22:53 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/grub2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/grub2
Robert Yang (1):
grub 2.0: several fixes
.../fix-endianness-problem.patch | 0
.../grub-2.00-ignore-gnulib-gets-stupidity.patch | 28 ------------
.../{grub-2.00 => files}/grub-install.in.patch | 0
...rub2-remove-sparc64-setup-from-x86-builds.patch | 0
.../grub/{grub-2.00 => files}/remove-gets.patch | 0
meta/recipes-bsp/grub/grub-efi_2.00.bb | 48 +++++---------------
meta/recipes-bsp/grub/grub2.inc | 44 ++++++++++++++++++
meta/recipes-bsp/grub/grub_2.00.bb | 32 +------------
meta/recipes-bsp/grub/grub_git.bb | 16 +------
9 files changed, 58 insertions(+), 110 deletions(-)
rename meta/recipes-bsp/grub/{grub-2.00 => files}/fix-endianness-problem.patch (100%)
delete mode 100644 meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch
rename meta/recipes-bsp/grub/{grub-2.00 => files}/grub-install.in.patch (100%)
rename meta/recipes-bsp/grub/{grub-2.00 => files}/grub2-remove-sparc64-setup-from-x86-builds.patch (100%)
rename meta/recipes-bsp/grub/{grub-2.00 => files}/remove-gets.patch (100%)
create mode 100644 meta/recipes-bsp/grub/grub2.incSignature · 1 line
1.7.9.5
PATCH 1/1 grub 2.0: several fixes
* 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]
Signed-off-by Robert Yang <[email protected]>
---
.../fix-endianness-problem.patch | 0
.../grub-2.00-ignore-gnulib-gets-stupidity.patch | 28 ------------
.../{grub-2.00 => files}/grub-install.in.patch | 0
...rub2-remove-sparc64-setup-from-x86-builds.patch | 0
.../grub/{grub-2.00 => files}/remove-gets.patch | 0
meta/recipes-bsp/grub/grub-efi_2.00.bb | 48 +++++---------------
meta/recipes-bsp/grub/grub2.inc | 44 ++++++++++++++++++
meta/recipes-bsp/grub/grub_2.00.bb | 32 +------------
meta/recipes-bsp/grub/grub_git.bb | 16 +------
9 files changed, 58 insertions(+), 110 deletions(-)
rename meta/recipes-bsp/grub/{grub-2.00 => files}/fix-endianness-problem.patch (100%)
delete mode 100644 meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch
rename meta/recipes-bsp/grub/{grub-2.00 => files}/grub-install.in.patch (100%)
rename meta/recipes-bsp/grub/{grub-2.00 => files}/grub2-remove-sparc64-setup-from-x86-builds.patch (100%)
rename meta/recipes-bsp/grub/{grub-2.00 => files}/remove-gets.patch (100%)
create mode 100644 meta/recipes-bsp/grub/grub2.incmeta/recipes-bsp/grub/files/fix-endianness-problem.patch renamed from meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch +0 -0
meta/recipes-bsp/grub/files/grub-2.00-ignore-gnulib-gets-stupidity.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From f66d54b934710f54999debb72e8b7c620edece1d Mon Sep 17 00:00:00 2001 -From: Peter Jones <[email protected]> -Date: Fri, 25 May 2012 15:28:19 -0400 -Subject: [PATCH] gnulib accused in build breaking shocker. - -Upstream-Status: pending [Fedora will push this] - ---- - grub-core/gnulib/stdio.in.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h -index 80b9dbf..69932d9 100644 ---- a/grub-core/gnulib/stdio.in.h -+++ b/grub-core/gnulib/stdio.in.h -@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets -+#if 0 - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ --- -1.7.10.1 -
meta/recipes-bsp/grub/files/grub-install.in.patch renamed from meta/recipes-bsp/grub/grub-2.00/grub-install.in.patch +0 -0
meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch renamed from meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch +0 -0
meta/recipes-bsp/grub/files/remove-gets.patch renamed from meta/recipes-bsp/grub/grub-2.00/remove-gets.patch +0 -0
meta/recipes-bsp/grub/grub-efi_2.00.bb +11 -37
74 lines not on this page · raw message
meta/recipes-bsp/grub/grub2.inc new file +44 -0
44 lines not on this page · raw message
meta/recipes-bsp/grub/grub_2.00.bb +1 -31
@@ -1,41 +1,11 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" +require grub2.inc -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images." - -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "autogen-native flex-native bison-native xz" RDEPENDS_${PN} = "diffutils freetype" PR = "r1" -SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ - file://grub-install.in.patch \ - file://grub-2.00-fpmath-sse-387-fix.patch \ - file://remove-gets.patch \ - file://check-if-liblzma-is-disabled.patch \ - 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" -SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' - FILES_${PN}-dbg += "${libdir}/${BPN}/i386-pc/.debug" -inherit autotools gettext texinfo - PACKAGECONFIG ??= "" PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2"
meta/recipes-bsp/grub/grub_git.bb +2 -14
@@ -1,17 +1,4 @@ -SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" - -DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ -intended to unify bootloading across x86 operating systems. In \ -addition to loading the Linux kernel, it implements the Multiboot \ -standard, which allows for flexible loading of multiple boot images." - -HOMEPAGE = "http://www.gnu.org/software/grub/" -SECTION = "bootloaders" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "autogen-native flex-native bison-native xz freetype" +require grub2.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm = "1"
@@ -19,6 +6,7 @@ DEFAULT_PREFERENCE_arm = "1" PV = "2.00+${SRCPV}" SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" SRC_URI = "git://git.savannah.gnu.org/grub.git \ + file://grub-2.00-fpmath-sse-387-fix.patch \ file://autogen.sh-exclude-pc.patch \ file://grub-2.00-add-oe-kernel.patch \ file://0001-Fix-build-with-glibc-2.20.patch \
Signature · 1 line
1.7.9.5