diff options
Diffstat (limited to 'meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch | 179 |
1 files changed, 0 insertions, 179 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 deleted file mode 100644 index 459b4fc37b..0000000000 --- a/meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch +++ /dev/null | |||
@@ -1,179 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/3766 | ||
4 | Handle newer autotools. Add some missing quotes while on it. | ||
5 | |||
6 | http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/3983 | ||
7 | gentpl.py: Remove obsolete pkglib_DATA handling. | ||
8 | |||
9 | Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> | ||
10 | |||
11 | diff --git a/Makefile.am b/Makefile.am | ||
12 | index 9301c91..d706968 100644 | ||
13 | --- a/Makefile.am | ||
14 | +++ b/Makefile.am | ||
15 | @@ -101,8 +101,8 @@ CLEANFILES += widthspec.h | ||
16 | # Install config.h into platformdir | ||
17 | platform_HEADERS = config.h | ||
18 | |||
19 | -pkglib_DATA += grub-mkconfig_lib | ||
20 | -pkglib_DATA += update-grub_lib | ||
21 | +pkgdata_DATA += grub-mkconfig_lib | ||
22 | +pkgdata_DATA += update-grub_lib | ||
23 | |||
24 | |||
25 | if COND_i386_coreboot | ||
26 | diff --git a/conf/Makefile.common b/conf/Makefile.common | ||
27 | index 5aa13cd..2040a2e 100644 | ||
28 | --- a/conf/Makefile.common | ||
29 | +++ b/conf/Makefile.common | ||
30 | @@ -137,7 +137,7 @@ KERNEL_HEADER_FILES = | ||
31 | |||
32 | man_MANS = | ||
33 | noinst_DATA = | ||
34 | -pkglib_DATA = | ||
35 | +pkgdata_DATA = | ||
36 | bin_SCRIPTS = | ||
37 | sbin_SCRIPTS = | ||
38 | bin_PROGRAMS = | ||
39 | @@ -147,7 +147,6 @@ check_SCRIPTS = | ||
40 | grubconf_DATA = | ||
41 | check_PROGRAMS = | ||
42 | noinst_SCRIPTS = | ||
43 | -pkglib_SCRIPTS = | ||
44 | noinst_PROGRAMS = | ||
45 | grubconf_SCRIPTS = | ||
46 | noinst_LIBRARIES = | ||
47 | diff --git a/gentpl.py b/gentpl.py | ||
48 | index a42a606..7992376 100644 | ||
49 | --- a/gentpl.py | ||
50 | +++ b/gentpl.py | ||
51 | @@ -440,7 +440,7 @@ def script(platform): | ||
52 | r += "[+ ENDIF +]" | ||
53 | |||
54 | r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ | ||
55 | -$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ | ||
56 | +$(top_builddir)/config.status --file=$@:$< | ||
57 | chmod a+x [+ name +] | ||
58 | """) | ||
59 | |||
60 | diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in | ||
61 | index 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` | ||
73 | diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in | ||
74 | index 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) | ||
86 | diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in | ||
87 | index 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 | |||
99 | diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in | ||
100 | index 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@ | ||
112 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in | ||
113 | index 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@ | ||
125 | diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in | ||
126 | index 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@ | ||
138 | diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in | ||
139 | index 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*) ;; | ||
151 | diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in | ||
152 | index 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@ | ||
164 | diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in | ||
165 | index 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 | -- | ||
178 | 1.7.7 | ||
179 | |||