diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2013-06-04 06:59:40 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-04 15:53:47 +0100 |
| commit | 18bb555268ecc11d0fb7d4f404a38f1b453f2928 (patch) | |
| tree | 0af608a49f439639da17c83ae65bab9f828ed0d3 /meta | |
| parent | 662b485e155257695ac7cc47f4cd26ddf94720ba (diff) | |
| download | openembedded-core-18bb555268ecc11d0fb7d4f404a38f1b453f2928.tar.gz openembedded-core-18bb555268ecc11d0fb7d4f404a38f1b453f2928.tar.bz2 openembedded-core-18bb555268ecc11d0fb7d4f404a38f1b453f2928.zip | |
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
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub_0.97.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch b/meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch new file mode 100644 index 0000000000..bd8e0a89fc --- /dev/null +++ b/meta/recipes-bsp/grub/grub-0.97/objcopy-absolute.patch @@ -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 $< $@ diff --git a/meta/recipes-bsp/grub/grub_0.97.bb b/meta/recipes-bsp/grub/grub_0.97.bb index 5ba1a08499..6971193378 100644 --- a/meta/recipes-bsp/grub/grub_0.97.bb +++ b/meta/recipes-bsp/grub/grub_0.97.bb @@ -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" |