grub-0.97: fix the objcopy error in configure

Get patch from ubuntu to fix this:
error: GRUB requires a working absolute objcopy; upgrade your binutils

(From OE-Core rev: 18bb555268ecc11d0fb7d4f404a38f1b453f2928)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jackie Huang 2013-06-04 06:59:40 -04:00 committed by Richard Purdie
parent cf2c4b046f
commit d83253951a
2 changed files with 41 additions and 0 deletions

View File

@ -0,0 +1,40 @@
This patch is from ubuntu:
* objcopy-absolute.diff (update): Remove .note, .comment, and
.note.gnu.build-id sections from images (LP: #444703).
Upstream-Status: Inappropriate [no longer maintained]
Index: b/acinclude.m4
===================================================================
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -61,7 +61,7 @@
else
AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
fi
- if AC_TRY_COMMAND([${OBJCOPY-objcopy} -O binary conftest.exec conftest]); then :
+ if AC_TRY_COMMAND([${OBJCOPY-objcopy} --only-section=.text -O binary conftest.exec conftest]); then :
else
AC_MSG_ERROR([${OBJCOPY-objcopy} cannot create binary files])
fi
Index: b/stage1/Makefile.am
===================================================================
--- a/stage1/Makefile.am
+++ b/stage1/Makefile.am
@@ -12,4 +12,4 @@
SUFFIXES = .exec
.exec:
- $(OBJCOPY) -O binary $< $@
+ $(OBJCOPY) -O binary -R .note -R .comment -R .note.gnu.build-id $< $@
Index: b/stage2/Makefile.am
===================================================================
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -293,4 +293,4 @@
# General rule for making a raw binary.
SUFFIXES = .exec
.exec:
- $(OBJCOPY) -O binary $< $@
+ $(OBJCOPY) -O binary -R .note -R .comment -R .note.gnu.build-id $< $@

View File

@ -16,6 +16,7 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
file://no-reorder-functions.patch \
file://autohell.patch \
file://grub_fix_for_automake-1.12.patch \
file://objcopy-absolute.patch \
"
SRC_URI[md5sum] = "cd3f3eb54446be6003156158d51f4884"