summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-04 11:34:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:18:01 +0100
commitc170188511c99c248e552740d48c3f10eb745b74 (patch)
tree20cd26fea6b9f4797c93a3850c198a21ad1b1aac /meta/recipes-bsp/grub
parent437f92c593d5d2b452d10f0a5597a8cf390c5da8 (diff)
downloadpoky-c170188511c99c248e552740d48c3f10eb745b74.tar.gz
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>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch48
-rw-r--r--meta/recipes-bsp/grub/grub_0.97.bb6
2 files changed, 52 insertions, 2 deletions
diff --git a/meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch b/meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch
new file mode 100644
index 0000000000..97ee0ad225
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch
@@ -0,0 +1,48 @@
1Upstream-Status: Pending
2
3automake 1.12 has depricated automatic de-ANSI-fication support
4
5this patch avoids these kinds of errors:
6
7| stage1/Makefile.am:2: error: 'pkglibdir' is not a legitimate directory for 'DATA'
8| stage2/Makefile.am:35: error: 'pkglibdir' is not a legitimate directory for 'DATA'
9| stage2/Makefile.am:46: error: 'pkglibdir' is not a legitimate directory for 'DATA'
10| autoreconf: automake failed with exit status: 1
11| ERROR: autoreconf execution failed.
12
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
142012/05/04
15
16Index: grub-0.97/stage1/Makefile.am
17===================================================================
18--- grub-0.97.orig/stage1/Makefile.am
19+++ grub-0.97/stage1/Makefile.am
20@@ -1,5 +1,5 @@
21 pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
22-nodist_pkglib_DATA = stage1
23+nodist_pkgdata_DATA = stage1
24
25 CLEANFILES = $(nodist_pkglib_DATA)
26
27Index: grub-0.97/stage2/Makefile.am
28===================================================================
29--- grub-0.97.orig/stage2/Makefile.am
30+++ grub-0.97/stage2/Makefile.am
31@@ -32,7 +32,7 @@ pkglibdir = $(libdir)/$(PACKAGE)/$(host_
32 EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
33
34 if DISKLESS_SUPPORT
35-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
36+pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
37 ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
38 reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
39 nbgrub pxegrub
40@@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start.
41 reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
42 xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
43 else
44-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
45+pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
46 ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
47 reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
48 noinst_DATA = pre_stage2 start start_eltorito
diff --git a/meta/recipes-bsp/grub/grub_0.97.bb b/meta/recipes-bsp/grub/grub_0.97.bb
index af489fecea..1cde30d5ee 100644
--- a/meta/recipes-bsp/grub/grub_0.97.bb
+++ b/meta/recipes-bsp/grub/grub_0.97.bb
@@ -10,11 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
10 file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6" 10 file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6"
11 11
12RDEPENDS_${PN} = "diffutils" 12RDEPENDS_${PN} = "diffutils"
13PR = "r4" 13PR = "r5"
14 14
15SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ 15SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
16 file://no-reorder-functions.patch \ 16 file://no-reorder-functions.patch \
17 file://autohell.patch " 17 file://autohell.patch \
18 file://grub_fix_for_automake-1.12.patch \
19 "
18 20
19SRC_URI[md5sum] = "cd3f3eb54446be6003156158d51f4884" 21SRC_URI[md5sum] = "cd3f3eb54446be6003156158d51f4884"
20SRC_URI[sha256sum] = "4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b" 22SRC_URI[sha256sum] = "4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b"