summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
authorJesse Zhang <sen.zhang@windriver.com>2012-07-18 17:25:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-19 17:22:27 +0100
commit8adc595dd998f95563188ed72196daac2911951b (patch)
treea4674f079b8a41957a9967f48436bba50f83f18a /meta/recipes-bsp/grub
parent638cd1a7a6a3a223ace5cf6690119a533b90e6d3 (diff)
downloadpoky-8adc595dd998f95563188ed72196daac2911951b.tar.gz
grub: fix grub-mkconfig_lib install dir
The current fix_for_automake patch is not complete. It fixes the install dir of grub-mkconfig_lib but neglects to update its references in grub-mkconfig and the grub.d/* scripts. grub-mkconfig would complain: # grub-mkconfig /usr/sbin/grub-mkconfig: line 98: /usr/lib/grub/grub-mkconfig_lib: No such file or directory Backport upstream patch to fix all the references. [YOCTO #2777] (From OE-Core rev: 72a582874704838ddd19700bf7c300d7a7faaf9f) Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch203
-rw-r--r--meta/recipes-bsp/grub/grub_1.99.bb2
2 files changed, 152 insertions, 53 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch b/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
index 4d729e5eee..459b4fc37b 100644
--- a/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
+++ b/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
@@ -1,37 +1,32 @@
1Upstream-Status: Pending 1Upstream-Status: Backport
2 2
3Fixes these errors observed with automake 1.11.2 3http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/3766
4The useof pkglibhas become more strict compared to the earlier release of 4 Handle newer autotools. Add some missing quotes while on it.
5automake resulting in these failures.
6Fixed the files related to automake to avoid the issue.
7 5
8| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' 6http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/3983
9| grub-core/Makefile.am:5: `conf/Makefile.common' included from here 7 gentpl.py: Remove obsolete pkglib_DATA handling.
10| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA'
11| Makefile.am:6: `conf/Makefile.common' included from here
12| autoreconf: automake failed with exit status: 1
13| ERROR: autoreconf execution failed.
14 8
9Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
15 10
16 11diff --git a/Makefile.am b/Makefile.am
17| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS' 12index 9301c91..d706968 100644
18| grub-core/Makefile.am:5: `conf/Makefile.common' included from here 13--- a/Makefile.am
19| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' 14+++ b/Makefile.am
20| grub-core/Makefile.am:5: `conf/Makefile.common' included from here 15@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
21| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS' 16 # Install config.h into platformdir
22| Makefile.am:6: `conf/Makefile.common' included from here 17 platform_HEADERS = config.h
23| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' 18
24| Makefile.am:6: `conf/Makefile.common' included from here 19-pkglib_DATA += grub-mkconfig_lib
25| autoreconf: automake failed with exit status: 1 20-pkglib_DATA += update-grub_lib
26 21+pkgdata_DATA += grub-mkconfig_lib
27Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 22+pkgdata_DATA += update-grub_lib
282012/01/12 23
29 24
30 25 if COND_i386_coreboot
31Index: grub-1.99/conf/Makefile.common 26diff --git a/conf/Makefile.common b/conf/Makefile.common
32=================================================================== 27index 5aa13cd..2040a2e 100644
33--- grub-1.99.orig/conf/Makefile.common 28--- a/conf/Makefile.common
34+++ grub-1.99/conf/Makefile.common 29+++ b/conf/Makefile.common
35@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES = 30@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
36 31
37 man_MANS = 32 man_MANS =
@@ -41,40 +36,144 @@ Index: grub-1.99/conf/Makefile.common
41 bin_SCRIPTS = 36 bin_SCRIPTS =
42 sbin_SCRIPTS = 37 sbin_SCRIPTS =
43 bin_PROGRAMS = 38 bin_PROGRAMS =
44@@ -147,7 +147,7 @@ check_SCRIPTS = 39@@ -147,7 +147,6 @@ check_SCRIPTS =
45 grubconf_DATA = 40 grubconf_DATA =
46 check_PROGRAMS = 41 check_PROGRAMS =
47 noinst_SCRIPTS = 42 noinst_SCRIPTS =
48-pkglib_SCRIPTS = 43-pkglib_SCRIPTS =
49+pkglibexec_SCRIPTS =
50 noinst_PROGRAMS = 44 noinst_PROGRAMS =
51 grubconf_SCRIPTS = 45 grubconf_SCRIPTS =
52 noinst_LIBRARIES = 46 noinst_LIBRARIES =
53Index: grub-1.99/Makefile.am 47diff --git a/gentpl.py b/gentpl.py
54=================================================================== 48index a42a606..7992376 100644
55--- grub-1.99.orig/Makefile.am 49--- a/gentpl.py
56+++ grub-1.99/Makefile.am 50+++ b/gentpl.py
57@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
58 # Install config.h into platformdir
59 platform_HEADERS = config.h
60
61-pkglib_DATA += grub-mkconfig_lib
62-pkglib_DATA += update-grub_lib
63+pkgdata_DATA += grub-mkconfig_lib
64+pkgdata_DATA += update-grub_lib
65
66
67 if COND_i386_coreboot
68Index: grub-1.99/gentpl.py
69===================================================================
70--- grub-1.99.orig/gentpl.py
71+++ grub-1.99/gentpl.py
72@@ -440,7 +440,7 @@ def script(platform): 51@@ -440,7 +440,7 @@ def script(platform):
73 r += "[+ ENDIF +]" 52 r += "[+ ENDIF +]"
74 53
75 r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ 54 r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
76-$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ 55-$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
77+$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@ 56+$(top_builddir)/config.status --file=$@:$<
78 chmod a+x [+ name +] 57 chmod a+x [+ name +]
79 """) 58 """)
80 59
60diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
61index afc66f8..0c81084 100644
62--- a/util/grub-mkconfig.in
63+++ b/util/grub-mkconfig.in
64@@ -95,7 +95,7 @@ do
65 esac
66 done
67
68-. ${libdir}/grub/grub-mkconfig_lib
69+. ${datadir}/grub/grub-mkconfig_lib
70
71 if [ "x$EUID" = "x" ] ; then
72 EUID=`id -u`
73diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
74index 9da1511..30d61f1 100644
75--- a/util/grub.d/00_header.in
76+++ b/util/grub.d/00_header.in
77@@ -25,7 +25,7 @@ libdir=@libdir@
78 locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
79 grub_lang=`echo $LANG | cut -d . -f 1`
80
81-. ${libdir}/grub/grub-mkconfig_lib
82+. @datadir@/grub/grub-mkconfig_lib
83
84 # Do this as early as possible, since other commands might depend on it.
85 # (e.g. the `loadfont' command might need lvm or raid modules)
86diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
87index 8c54eab..d823ba3 100644
88--- a/util/grub.d/10_hurd.in
89+++ b/util/grub.d/10_hurd.in
90@@ -20,7 +20,7 @@ set -e
91 prefix=@prefix@
92 exec_prefix=@exec_prefix@
93 libdir=@libdir@
94-. ${libdir}/grub/grub-mkconfig_lib
95+. @datadir@/grub/grub-mkconfig_lib
96
97 CLASS="--class gnu --class os"
98
99diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
100index 3600c74..fd8399b 100644
101--- a/util/grub.d/10_kfreebsd.in
102+++ b/util/grub.d/10_kfreebsd.in
103@@ -21,7 +21,7 @@ prefix=@prefix@
104 exec_prefix=@exec_prefix@
105 bindir=@bindir@
106 libdir=@libdir@
107-. ${libdir}/grub/grub-mkconfig_lib
108+. @datadir@/grub/grub-mkconfig_lib
109
110 export TEXTDOMAIN=@PACKAGE@
111 export TEXTDOMAINDIR=@localedir@
112diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
113index 1d1eb40..0977700 100644
114--- a/util/grub.d/10_linux.in
115+++ b/util/grub.d/10_linux.in
116@@ -21,7 +21,7 @@ prefix=@prefix@
117 exec_prefix=@exec_prefix@
118 bindir=@bindir@
119 libdir=@libdir@
120-. ${libdir}/grub/grub-mkconfig_lib
121+. @datadir@/grub/grub-mkconfig_lib
122
123 export TEXTDOMAIN=@PACKAGE@
124 export TEXTDOMAINDIR=@localedir@
125diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
126index ffd31ad..ce77096 100644
127--- a/util/grub.d/10_netbsd.in
128+++ b/util/grub.d/10_netbsd.in
129@@ -21,7 +21,7 @@ prefix=@prefix@
130 exec_prefix=@exec_prefix@
131 bindir=@bindir@
132 libdir=@libdir@
133-. ${libdir}/grub/grub-mkconfig_lib
134+. @datadir@/grub/grub-mkconfig_lib
135
136 export TEXTDOMAIN=@PACKAGE@
137 export TEXTDOMAINDIR=@localedir@
138diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
139index fd068dd..9b73dc6 100644
140--- a/util/grub.d/10_windows.in
141+++ b/util/grub.d/10_windows.in
142@@ -20,7 +20,7 @@ set -e
143 prefix=@prefix@
144 exec_prefix=@exec_prefix@
145 libdir=@libdir@
146-. ${libdir}/grub/grub-mkconfig_lib
147+. @datadir@/grub/grub-mkconfig_lib
148
149 case "`uname 2>/dev/null`" in
150 CYGWIN*) ;;
151diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
152index a900760..aef5bea 100644
153--- a/util/grub.d/20_linux_xen.in
154+++ b/util/grub.d/20_linux_xen.in
155@@ -21,7 +21,7 @@ prefix=@prefix@
156 exec_prefix=@exec_prefix@
157 bindir=@bindir@
158 libdir=@libdir@
159-. ${libdir}/grub/grub-mkconfig_lib
160+. @datadir@/grub/grub-mkconfig_lib
161
162 export TEXTDOMAIN=@PACKAGE@
163 export TEXTDOMAINDIR=@localedir@
164diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
165index d9d4b0a..485b224 100644
166--- a/util/grub.d/30_os-prober.in
167+++ b/util/grub.d/30_os-prober.in
168@@ -21,7 +21,7 @@ prefix=@prefix@
169 exec_prefix=@exec_prefix@
170 libdir=@libdir@
171
172-. ${libdir}/grub/grub-mkconfig_lib
173+. @datadir@/grub/grub-mkconfig_lib
174
175 if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
176 exit 0
177--
1781.7.7
179
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb
index 775c6aad88..1009ce899f 100644
--- a/meta/recipes-bsp/grub/grub_1.99.bb
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
13 13
14DEPENDS = "autogen-native" 14DEPENDS = "autogen-native"
15RDEPENDS_${PN} = "diffutils freetype" 15RDEPENDS_${PN} = "diffutils freetype"
16PR = "r9" 16PR = "r10"
17 17
18SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 18SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
19 file://grub-install.in.patch \ 19 file://grub-install.in.patch \