]> git.pld-linux.org Git - packages/grub2.git/blame - grub-shelllib.patch
projects / packages / grub2.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
x86_64 build fixes
[packages/grub2.git] / grub-shelllib.patch
CommitLineData
7615a862
JK		 1diff -dur grub-2.00.orig/Makefile.am grub-2.00/Makefile.am
2--- grub-2.00.orig/Makefile.am 2012-06-26 04:07:30.000000000 +0200
3+++ grub-2.00/Makefile.am 2012-10-27 16:05:36.203732745 +0200
4@@ -122,7 +122,8 @@
bc6e6053
AM		 5 # Install config.h into platformdir
6 platform_HEADERS = config.h
7
7615a862 8-pkgdata_DATA += grub-mkconfig_lib
bc6e6053
AM		 9+ulibdir = /lib
10+ulib_DATA = grub-mkconfig_lib
bc6e6053
AM		 11
12
7615a862
JK		 13 if COND_i386_coreboot
14diff -dur grub-2.00.orig/util/grub-install.in grub-2.00/util/grub-install.in
15--- grub-2.00.orig/util/grub-install.in 2012-06-26 23:31:03.000000000 +0200
16+++ grub-2.00/util/grub-install.in 2012-10-27 16:04:14.446027790 +0200
17@@ -76,7 +76,7 @@
78785d3a 18
7615a862
JK		 19 disk_module=unspecified
20
21-. "${pkgdatadir}/grub-mkconfig_lib"
22+. "/lib/grub-mkconfig_lib"
23
24 # Usage: usage
25 # Print the usage.
26diff -dur grub-2.00.orig/util/grub-kbdcomp.in grub-2.00/util/grub-kbdcomp.in
27--- grub-2.00.orig/util/grub-kbdcomp.in 2012-04-05 19:56:36.000000000 +0200
28+++ grub-2.00/util/grub-kbdcomp.in 2012-10-27 16:04:14.446027790 +0200
29@@ -18,7 +18,7 @@
30 export TEXTDOMAIN=@PACKAGE@
31 export TEXTDOMAINDIR="@localedir@"
32
33-. "${pkgdatadir}/grub-mkconfig_lib"
34+. "/lib/grub-mkconfig_lib"
35
36 self=`basename $0`
37
38diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
39--- grub-2.00.orig/util/grub-mkconfig.in 2012-10-27 16:01:08.000000000 +0200
40+++ grub-2.00/util/grub-mkconfig.in 2012-10-27 16:04:14.449361166 +0200
41@@ -46,7 +46,7 @@
42 export TEXTDOMAIN=@PACKAGE@
43 export TEXTDOMAINDIR="@localedir@"
44
45-. "${pkgdatadir}/grub-mkconfig_lib"
46+. "/lib/grub-mkconfig_lib"
47
48 # Usage: usage
49 # Print the usage.
50diff -dur grub-2.00.orig/util/grub-mknetdir.in grub-2.00/util/grub-mknetdir.in
51--- grub-2.00.orig/util/grub-mknetdir.in 2012-04-11 22:36:24.000000000 +0200
52+++ grub-2.00/util/grub-mknetdir.in 2012-10-27 16:04:14.449361166 +0200
53@@ -56,7 +56,7 @@
54 export TEXTDOMAIN=@PACKAGE@
55 export TEXTDOMAINDIR="@localedir@"
56
57-. "${pkgdatadir}/grub-mkconfig_lib"
58+. "/lib/grub-mkconfig_lib"
59
60 # Usage: usage
61 # Print the usage.
62diff -dur grub-2.00.orig/util/grub-mkrescue.in grub-2.00/util/grub-mkrescue.in
63--- grub-2.00.orig/util/grub-mkrescue.in 2012-06-14 19:25:07.000000000 +0200
64+++ grub-2.00/util/grub-mkrescue.in 2012-10-27 16:04:14.452694542 +0200
65@@ -58,7 +58,7 @@
66
67 localedir="@datadir@/locale"
68
69-. "${pkgdatadir}/grub-mkconfig_lib"
70+. "/lib/grub-mkconfig_lib"
71
72 # Usage: usage
73 # Print the usage.
74diff -dur grub-2.00.orig/util/grub-mkstandalone.in grub-2.00/util/grub-mkstandalone.in
75--- grub-2.00.orig/util/grub-mkstandalone.in 2012-04-05 19:54:27.000000000 +0200
76+++ grub-2.00/util/grub-mkstandalone.in 2012-10-27 16:04:14.452694542 +0200
77@@ -46,7 +46,7 @@
78 export TEXTDOMAIN=@PACKAGE@
79 export TEXTDOMAINDIR="@localedir@"
80
81-. "${pkgdatadir}/grub-mkconfig_lib"
82+. "/lib/grub-mkconfig_lib"
83
84 # Usage: usage
85 # Print the usage.
86diff -dur grub-2.00.orig/util/grub-reboot.in grub-2.00/util/grub-reboot.in
87--- grub-2.00.orig/util/grub-reboot.in 2012-04-05 19:55:31.000000000 +0200
88+++ grub-2.00/util/grub-reboot.in 2012-10-27 16:04:14.456027917 +0200
89@@ -40,7 +40,7 @@
90 export TEXTDOMAIN=@PACKAGE@
91 export TEXTDOMAINDIR="@localedir@"
92
93-. "${pkgdatadir}/grub-mkconfig_lib"
94+. "/lib/grub-mkconfig_lib"
95
96 # Usage: usage
97 # Print the usage.
98diff -dur grub-2.00.orig/util/grub-set-default.in grub-2.00/util/grub-set-default.in
99--- grub-2.00.orig/util/grub-set-default.in 2012-04-05 19:42:05.000000000 +0200
100+++ grub-2.00/util/grub-set-default.in 2012-10-27 16:04:14.456027917 +0200
101@@ -40,7 +40,7 @@
102 export TEXTDOMAIN=@PACKAGE@
103 export TEXTDOMAINDIR="@localedir@"
104
105-. "${pkgdatadir}/grub-mkconfig_lib"
106+. "/lib/grub-mkconfig_lib"
107
108 # Usage: usage
109 # Print the usage.
110diff -dur grub-2.00.orig/util/grub.d/00_header.in grub-2.00/util/grub.d/00_header.in
111--- grub-2.00.orig/util/grub.d/00_header.in 2012-05-04 01:04:39.000000000 +0200
112+++ grub-2.00/util/grub.d/00_header.in 2012-10-27 16:03:01.041766812 +0200
113@@ -27,7 +27,7 @@
114 export TEXTDOMAIN=@PACKAGE@
115 export TEXTDOMAINDIR="@localedir@"
116
117-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
118+. "/lib/grub-mkconfig_lib"
78785d3a
ER		 119
120 # Do this as early as possible, since other commands might depend on it.
121 # (e.g. the `loadfont' command might need lvm or raid modules)
7615a862
JK		 122diff -dur grub-2.00.orig/util/grub.d/10_hurd.in grub-2.00/util/grub.d/10_hurd.in
123--- grub-2.00.orig/util/grub.d/10_hurd.in 2012-03-04 21:10:04.000000000 +0100
124+++ grub-2.00/util/grub.d/10_hurd.in 2012-10-27 16:03:01.045100187 +0200
125@@ -24,7 +24,7 @@
126 export TEXTDOMAIN=@PACKAGE@
127 export TEXTDOMAINDIR="@localedir@"
128
129-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
130+. "/lib/grub-mkconfig_lib"
131
132 CLASS="--class gnu --class os"
133
134diff -dur grub-2.00.orig/util/grub.d/10_illumos.in grub-2.00/util/grub.d/10_illumos.in
135--- grub-2.00.orig/util/grub.d/10_illumos.in 2012-03-04 20:03:38.000000000 +0100
136+++ grub-2.00/util/grub.d/10_illumos.in 2012-10-27 16:03:01.045100187 +0200
137@@ -20,7 +20,7 @@
138 prefix="@prefix@"
139 exec_prefix="@exec_prefix@"
140 datarootdir="@datarootdir@"
141-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
142+. "/lib/grub-mkconfig_lib"
143
144 export TEXTDOMAIN=@PACKAGE@
145 export TEXTDOMAINDIR="@localedir@"
146diff -dur grub-2.00.orig/util/grub.d/10_kfreebsd.in grub-2.00/util/grub.d/10_kfreebsd.in
147--- grub-2.00.orig/util/grub.d/10_kfreebsd.in 2012-03-04 22:02:30.000000000 +0100
148+++ grub-2.00/util/grub.d/10_kfreebsd.in 2012-10-27 16:03:01.045100187 +0200
149@@ -20,7 +20,7 @@
150 prefix="@prefix@"
151 exec_prefix="@exec_prefix@"
152 datarootdir="@datarootdir@"
153-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
154+. "/lib/grub-mkconfig_lib"
155
156 export TEXTDOMAIN=@PACKAGE@
157 export TEXTDOMAINDIR="@localedir@"
158diff -dur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in
159--- grub-2.00.orig/util/grub.d/10_linux.in 2012-10-27 16:01:08.000000000 +0200
160+++ grub-2.00/util/grub.d/10_linux.in 2012-10-27 16:03:01.048433562 +0200
161@@ -21,7 +21,7 @@
162 exec_prefix="@exec_prefix@"
163 datarootdir="@datarootdir@"
164
165-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
166+. "/lib/grub-mkconfig_lib"
167
168 export TEXTDOMAIN=@PACKAGE@
169 export TEXTDOMAINDIR="@localedir@"
170diff -dur grub-2.00.orig/util/grub.d/10_netbsd.in grub-2.00/util/grub.d/10_netbsd.in
171--- grub-2.00.orig/util/grub.d/10_netbsd.in 2012-03-04 20:47:35.000000000 +0100
172+++ grub-2.00/util/grub.d/10_netbsd.in 2012-10-27 16:03:01.048433562 +0200
173@@ -20,7 +20,7 @@
174 prefix="@prefix@"
175 exec_prefix="@exec_prefix@"
176 datarootdir="@datarootdir@"
177-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
178+. "/lib/grub-mkconfig_lib"
179
180 export TEXTDOMAIN=@PACKAGE@
181 export TEXTDOMAINDIR="@localedir@"
182diff -dur grub-2.00.orig/util/grub.d/10_windows.in grub-2.00/util/grub.d/10_windows.in
183--- grub-2.00.orig/util/grub.d/10_windows.in 2012-03-04 22:11:43.000000000 +0100
184+++ grub-2.00/util/grub.d/10_windows.in 2012-10-27 16:03:01.048433562 +0200
185@@ -24,7 +24,7 @@
186 export TEXTDOMAIN=@PACKAGE@
187 export TEXTDOMAINDIR="@localedir@"
188
189-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
190+. "/lib/grub-mkconfig_lib"
78785d3a
ER		 191
192 case "`uname 2>/dev/null`" in
193 CYGWIN*) ;;
7615a862
JK		 194diff -dur grub-2.00.orig/util/grub.d/10_xnu.in grub-2.00/util/grub.d/10_xnu.in
195--- grub-2.00.orig/util/grub.d/10_xnu.in 2012-05-29 12:31:03.000000000 +0200
196+++ grub-2.00/util/grub.d/10_xnu.in 2012-10-27 16:03:01.048433562 +0200
197@@ -24,7 +24,7 @@
198 export TEXTDOMAIN=@PACKAGE@
199 export TEXTDOMAINDIR="@localedir@"
78785d3a 200
7615a862
JK		 201-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
202+. "/lib/grub-mkconfig_lib"
78785d3a 203
7615a862
JK		 204 osx_entry() {
205 if [ x$2 = x32 ]; then
206diff -dur grub-2.00.orig/util/grub.d/20_linux_xen.in grub-2.00/util/grub.d/20_linux_xen.in
207--- grub-2.00.orig/util/grub.d/20_linux_xen.in 2012-06-03 21:57:42.000000000 +0200
208+++ grub-2.00/util/grub.d/20_linux_xen.in 2012-10-27 16:03:01.051766938 +0200
bc6e6053 209@@ -21,7 +21,7 @@
7615a862
JK		 210 exec_prefix="@exec_prefix@"
211 datarootdir="@datarootdir@"
bc6e6053 212
7615a862
JK		 213-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
214+. "/lib/grub-mkconfig_lib"
215
216 export TEXTDOMAIN=@PACKAGE@
217 export TEXTDOMAINDIR="@localedir@"
218diff -dur grub-2.00.orig/util/grub.d/30_os-prober.in grub-2.00/util/grub.d/30_os-prober.in
219--- grub-2.00.orig/util/grub.d/30_os-prober.in 2012-03-04 21:52:03.000000000 +0100
220+++ grub-2.00/util/grub.d/30_os-prober.in 2012-10-27 16:03:01.051766938 +0200
221@@ -24,7 +24,7 @@
e1eb7e7d 222 export TEXTDOMAIN=@PACKAGE@
7615a862
JK		 223 export TEXTDOMAINDIR="@localedir@"
224
225-. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
226+. "/lib/grub-mkconfig_lib"
227
228 if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
229 exit 0
GRand Unified Bootloader
This page took 0.05956 seconds and 4 git commands to generate.