sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

grub-0.97: fix build with automake 1.12 

(From OE-Core rev: e5a7b3af75fdc2dc2335d859faf5be2eb7f31f2e)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble 2012-05-04 11:34:58 -07:00 committed by Richard Purdie
parent 437f92c593
commit c170188511
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch Normal file
View File

@ -0,0 +1,48 @@
Upstream-Status: Pending
automake 1.12 has depricated automatic de-ANSI-fication support
this patch avoids these kinds of errors:
| stage1/Makefile.am:2: error: 'pkglibdir' is not a legitimate directory for 'DATA'
| stage2/Makefile.am:35: error: 'pkglibdir' is not a legitimate directory for 'DATA'
| stage2/Makefile.am:46: error: 'pkglibdir' is not a legitimate directory for 'DATA'
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
2012/05/04
Index: grub-0.97/stage1/Makefile.am
===================================================================
--- grub-0.97.orig/stage1/Makefile.am
+++ grub-0.97/stage1/Makefile.am
@@ -1,5 +1,5 @@
pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
-nodist_pkglib_DATA = stage1
+nodist_pkgdata_DATA = stage1
CLEANFILES = $(nodist_pkglib_DATA)
Index: grub-0.97/stage2/Makefile.am
===================================================================
--- grub-0.97.orig/stage2/Makefile.am
+++ grub-0.97/stage2/Makefile.am
@@ -32,7 +32,7 @@ pkglibdir = $(libdir)/$(PACKAGE)/$(host_
EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
if DISKLESS_SUPPORT
-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
nbgrub pxegrub
@@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start.
reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
else
-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
noinst_DATA = pre_stage2 start start_eltorito

6
meta/recipes-bsp/grub/grub_0.97.bb
View File

@ -10,11 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6"
RDEPENDS_${PN} = "diffutils"
PR = "r4"
PR = "r5"
SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
file://no-reorder-functions.patch \
file://autohell.patch "
file://autohell.patch \
file://grub_fix_for_automake-1.12.patch \
"
SRC_URI[md5sum] = "cd3f3eb54446be6003156158d51f4884"
SRC_URI[sha256sum] = "4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b"