summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-08-09 15:12:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-13 23:06:00 +0100
commit693e6a3613c8732c59ef747600549286e7bbdaa9 (patch)
tree389d61916849ddd3e73ddab8eeb5de151dc5ec80 /meta
parentdbee00c9e9f8381bbab02cab42ef6f94318d347e (diff)
downloadpoky-693e6a3613c8732c59ef747600549286e7bbdaa9.tar.gz
grub_0.97: Fix to correctly ship files under /usr/lib
The grub_fix_for_automake-1.12.patch replaced pkglib with pkgdata to make grub_0.97 build with automake-1.12. However, it forgot to set up the pkgdatadir, thus causing grub_0.97 not shipping files under /usr/lib. This in turn resulted in an unworkable grub. This patch fixes this problem by setting up the pkgdatadir correctly. [YOCTO #4997] (From OE-Core rev: 883b1b396328e6cd67dcb4ca6fd8975b6e716c0a) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/grub/grub-0.97/grub_fix_for_automake-1.12.patch50
1 files changed, 38 insertions, 12 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
index 97ee0ad225..0cf7dc96d7 100644
--- 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
@@ -1,4 +1,6 @@
1Upstream-Status: Pending 1Upstream-Status: Inappropriate
2
3Subject: [PATCH] grub: fix for automake-1.12
2 4
3automake 1.12 has depricated automatic de-ANSI-fication support 5automake 1.12 has depricated automatic de-ANSI-fication support
4 6
@@ -10,25 +12,37 @@ this patch avoids these kinds of errors:
10| autoreconf: automake failed with exit status: 1 12| autoreconf: automake failed with exit status: 1
11| ERROR: autoreconf execution failed. 13| ERROR: autoreconf execution failed.
12 14
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 15The upstream status is marked as 'Inappropriate' because this problem is not uncommon,
142012/05/04 16it has been there for a long time and no change in upstream.
17
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
15 19
16Index: grub-0.97/stage1/Makefile.am 20Index: grub-0.97/stage1/Makefile.am
17=================================================================== 21===================================================================
18--- grub-0.97.orig/stage1/Makefile.am 22--- a/stage1/Makefile.am
19+++ grub-0.97/stage1/Makefile.am 23+++ b/stage1/Makefile.am
20@@ -1,5 +1,5 @@ 24@@ -1,7 +1,7 @@
21 pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) 25-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
22-nodist_pkglib_DATA = stage1 26-nodist_pkglib_DATA = stage1
27+pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
23+nodist_pkgdata_DATA = stage1 28+nodist_pkgdata_DATA = stage1
24 29
25 CLEANFILES = $(nodist_pkglib_DATA) 30-CLEANFILES = $(nodist_pkglib_DATA)
31+CLEANFILES = $(nodist_pkgdata_DATA)
26 32
33 # We can't use builtins or standard includes.
34 AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
27Index: grub-0.97/stage2/Makefile.am 35Index: grub-0.97/stage2/Makefile.am
28=================================================================== 36===================================================================
29--- grub-0.97.orig/stage2/Makefile.am 37--- a/stage2/Makefile.am
30+++ grub-0.97/stage2/Makefile.am 38+++ b/stage2/Makefile.am
31@@ -32,7 +32,7 @@ pkglibdir = $(libdir)/$(PACKAGE)/$(host_ 39@@ -27,12 +27,12 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
40 -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
41
42 # Stage 2 and Stage 1.5's.
43-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
44+pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
45
32 EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec 46 EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
33 47
34 if DISKLESS_SUPPORT 48 if DISKLESS_SUPPORT
@@ -37,7 +51,7 @@ Index: grub-0.97/stage2/Makefile.am
37 ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ 51 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 \ 52 reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
39 nbgrub pxegrub 53 nbgrub pxegrub
40@@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start. 54@@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
41 reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \ 55 reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
42 xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec 56 xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
43 else 57 else
@@ -46,3 +60,15 @@ Index: grub-0.97/stage2/Makefile.am
46 ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ 60 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 61 reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
48 noinst_DATA = pre_stage2 start start_eltorito 62 noinst_DATA = pre_stage2 start start_eltorito
63@@ -105,7 +105,7 @@ else
64 BUILT_SOURCES = stage2_size.h
65 endif
66
67-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
68+CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
69
70 stage2_size.h: pre_stage2
71 -rm -f stage2_size.h
72--
731.7.9.5
74