diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-04 11:34:58 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:18:01 +0100 |
commit | c170188511c99c248e552740d48c3f10eb745b74 (patch) | |
tree | 20cd26fea6b9f4797c93a3850c198a21ad1b1aac /meta/recipes-bsp/grub/grub-0.97 | |
parent | 437f92c593d5d2b452d10f0a5597a8cf390c5da8 (diff) | |
download | poky-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/grub-0.97')
-rw-r--r-- | meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch | 48 |
1 files changed, 48 insertions, 0 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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has depricated automatic de-ANSI-fication support | ||
4 | |||
5 | this 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 | |||
13 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
14 | 2012/05/04 | ||
15 | |||
16 | Index: 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 | |||
27 | Index: 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 | ||