Merge ~ubuntu-core-dev/grub/+git/ubuntu:fix-seabios-ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
- Git
- lp:~ubuntu-core-dev/grub/+git/ubuntu
- fix-seabios-ubuntu
- Merge into ubuntu
Proposed by
Łukasz Zemczak
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 4791e5629bdbba87c63c52959f293bbec3e8aa23 | ||||
Proposed branch: | ~ubuntu-core-dev/grub/+git/ubuntu:fix-seabios-ubuntu | ||||
Merge into: | ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu | ||||
Diff against target: |
529 lines (+114/-71) 31 files modified
debian/.git-dpm (+2/-2) debian/changelog (+9/-0) debian/patches/bootp_new_net_bootp6_command.patch (+2/-2) debian/patches/bootp_process_dhcpack_http_boot.patch (+1/-1) debian/patches/default_grub_d.patch (+1/-1) debian/patches/efinet_set_dns_from_uefi_proto.patch (+2/-2) debian/patches/efinet_set_network_from_uefi_devpath.patch (+1/-1) debian/patches/efinet_uefi_ipv6_pxe_support.patch (+2/-2) debian/patches/gfxpayload_dynamic.patch (+4/-4) debian/patches/grub-install-extra-removable.patch (+1/-1) debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch (+33/-0) debian/patches/install_locale_langpack.patch (+1/-1) debian/patches/install_powerpc_machtypes.patch (+4/-4) debian/patches/install_signed.patch (+1/-1) debian/patches/linuxefi.patch (+2/-2) debian/patches/linuxefi_add_sb_to_efi_chainload.patch (+1/-1) debian/patches/linuxefi_fix_efi_validation_race.patch (+1/-1) debian/patches/linuxefi_handle_multiarch_boot.patch (+3/-3) debian/patches/linuxefi_honor_sb_mode.patch (+12/-12) debian/patches/linuxefi_load_arm_with_sb.patch (+5/-5) debian/patches/linuxefi_non_sb_fallback.patch (+1/-1) debian/patches/linuxefi_rework_linux16_cmd.patch (+1/-1) debian/patches/linuxefi_rework_non-sb_efi_chainload.patch (+4/-4) debian/patches/linuxefi_rework_pe_loading.patch (+2/-2) debian/patches/net_read_bracketed_ipv6_addr.patch (+3/-3) debian/patches/quick_boot.patch (+6/-6) debian/patches/restore_mkdevicemap.patch (+2/-2) debian/patches/series (+1/-0) debian/patches/syslinux-test-out-of-tree.patch (+2/-2) debian/patches/uefi_firmware_setup.patch (+2/-2) tests/util/grub-shell.in (+2/-2) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Core Development Team | Pending | ||
Review via email: mp+347486@code.launchpad.net |
Commit message
In the grub-shell test helper, disable seabios's serial console through fw_cfg runtime configuration as its boot output interferes with testing.
Description of the change
In the grub-shell test helper, disable seabios's serial console through fw_cfg runtime configuration as its boot output interferes with testing.
Without this, grub2 FTBFS on i386 and amd64 (as only those use qemu+seabios).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/.git-dpm b/debian/.git-dpm | |||
2 | index 32844ae..330ef7d 100644 | |||
3 | --- a/debian/.git-dpm | |||
4 | +++ b/debian/.git-dpm | |||
5 | @@ -1,6 +1,6 @@ | |||
6 | 1 | # see git-dpm(1) from git-dpm package | 1 | # see git-dpm(1) from git-dpm package |
9 | 2 | 1696f83780575139eb0ad801a311c947028278f2 | 2 | aebe41c9004522170f1c93568f4267566e370b61 |
10 | 3 | 1696f83780575139eb0ad801a311c947028278f2 | 3 | aebe41c9004522170f1c93568f4267566e370b61 |
11 | 4 | 0992ffbac6a1b4c97c350d12e5301e0067daa0d6 | 4 | 0992ffbac6a1b4c97c350d12e5301e0067daa0d6 |
12 | 5 | 0992ffbac6a1b4c97c350d12e5301e0067daa0d6 | 5 | 0992ffbac6a1b4c97c350d12e5301e0067daa0d6 |
13 | 6 | grub2_2.02.orig.tar.xz | 6 | grub2_2.02.orig.tar.xz |
14 | diff --git a/debian/changelog b/debian/changelog | |||
15 | index 05270e1..e02ed3f 100644 | |||
16 | --- a/debian/changelog | |||
17 | +++ b/debian/changelog | |||
18 | @@ -1,3 +1,12 @@ | |||
19 | 1 | grub2 (2.02-2ubuntu10) cosmic; urgency=medium | ||
20 | 2 | |||
21 | 3 | * debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch: In the | ||
22 | 4 | grub-shell test helper, disable seabios's serial console through fw_cfg | ||
23 | 5 | runtime configuration as its boot output interferes with testing. | ||
24 | 6 | (LP: #1775249) | ||
25 | 7 | |||
26 | 8 | -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 06 Jun 2018 01:03:26 +0200 | ||
27 | 9 | |||
28 | 1 | grub2 (2.02-2ubuntu9) cosmic; urgency=medium | 10 | grub2 (2.02-2ubuntu9) cosmic; urgency=medium |
29 | 2 | 11 | ||
30 | 3 | * debian/patches/add-an-auto-nvram-option-to-grub-install.patch: Add the | 12 | * debian/patches/add-an-auto-nvram-option-to-grub-install.patch: Add the |
31 | diff --git a/debian/patches/bootp_new_net_bootp6_command.patch b/debian/patches/bootp_new_net_bootp6_command.patch | |||
32 | index 82975bc..64665bd 100644 | |||
33 | --- a/debian/patches/bootp_new_net_bootp6_command.patch | |||
34 | +++ b/debian/patches/bootp_new_net_bootp6_command.patch | |||
35 | @@ -11,8 +11,8 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com> | |||
36 | 11 | 11 | ||
37 | 12 | Patch-Name: bootp_new_net_bootp6_command.patch | 12 | Patch-Name: bootp_new_net_bootp6_command.patch |
38 | 13 | --- | 13 | --- |
41 | 14 | grub-core/net/bootp.c | 908 +++++++++++++++++++++++++++++++++++++++++++++++++- | 14 | grub-core/net/bootp.c | 908 +++++++++++++++++++++++++++++++++++++++++- |
42 | 15 | grub-core/net/ip.c | 39 +++ | 15 | grub-core/net/ip.c | 39 ++ |
43 | 16 | include/grub/net.h | 72 ++++ | 16 | include/grub/net.h | 72 ++++ |
44 | 17 | 3 files changed, 1018 insertions(+), 1 deletion(-) | 17 | 3 files changed, 1018 insertions(+), 1 deletion(-) |
45 | 18 | 18 | ||
46 | diff --git a/debian/patches/bootp_process_dhcpack_http_boot.patch b/debian/patches/bootp_process_dhcpack_http_boot.patch | |||
47 | index 473329a..73ab005 100644 | |||
48 | --- a/debian/patches/bootp_process_dhcpack_http_boot.patch | |||
49 | +++ b/debian/patches/bootp_process_dhcpack_http_boot.patch | |||
50 | @@ -19,7 +19,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com> | |||
51 | 19 | 19 | ||
52 | 20 | Patch-Name: bootp_process_dhcpack_http_boot.patch | 20 | Patch-Name: bootp_process_dhcpack_http_boot.patch |
53 | 21 | --- | 21 | --- |
55 | 22 | grub-core/net/bootp.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-- | 22 | grub-core/net/bootp.c | 67 +++++++++++++++++++++++++++++++++++++++++-- |
56 | 23 | include/grub/net.h | 1 + | 23 | include/grub/net.h | 1 + |
57 | 24 | 2 files changed, 66 insertions(+), 2 deletions(-) | 24 | 2 files changed, 66 insertions(+), 2 deletions(-) |
58 | 25 | 25 | ||
59 | diff --git a/debian/patches/default_grub_d.patch b/debian/patches/default_grub_d.patch | |||
60 | index f5e8102..e3b4ce6 100644 | |||
61 | --- a/debian/patches/default_grub_d.patch | |||
62 | +++ b/debian/patches/default_grub_d.patch | |||
63 | @@ -9,7 +9,7 @@ Last-Update: 2014-01-28 | |||
64 | 9 | 9 | ||
65 | 10 | Patch-Name: default_grub_d.patch | 10 | Patch-Name: default_grub_d.patch |
66 | 11 | --- | 11 | --- |
68 | 12 | grub-core/osdep/unix/config.c | 114 ++++++++++++++++++++++++++++++++++-------- | 12 | grub-core/osdep/unix/config.c | 114 +++++++++++++++++++++++++++------- |
69 | 13 | util/grub-mkconfig.in | 5 ++ | 13 | util/grub-mkconfig.in | 5 ++ |
70 | 14 | 2 files changed, 98 insertions(+), 21 deletions(-) | 14 | 2 files changed, 98 insertions(+), 21 deletions(-) |
71 | 15 | 15 | ||
72 | diff --git a/debian/patches/efinet_set_dns_from_uefi_proto.patch b/debian/patches/efinet_set_dns_from_uefi_proto.patch | |||
73 | index 4b2fdfe..cb75f3f 100644 | |||
74 | --- a/debian/patches/efinet_set_dns_from_uefi_proto.patch | |||
75 | +++ b/debian/patches/efinet_set_dns_from_uefi_proto.patch | |||
76 | @@ -30,8 +30,8 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com> | |||
77 | 30 | 30 | ||
78 | 31 | Patch-Name: efinet_set_dns_from_uefi_proto.patch | 31 | Patch-Name: efinet_set_dns_from_uefi_proto.patch |
79 | 32 | --- | 32 | --- |
82 | 33 | grub-core/net/drivers/efi/efinet.c | 163 +++++++++++++++++++++++++++++++++++++ | 33 | grub-core/net/drivers/efi/efinet.c | 163 +++++++++++++++++++++++++++++ |
83 | 34 | include/grub/efi/api.h | 76 +++++++++++++++++ | 34 | include/grub/efi/api.h | 76 ++++++++++++++ |
84 | 35 | 2 files changed, 239 insertions(+) | 35 | 2 files changed, 239 insertions(+) |
85 | 36 | 36 | ||
86 | 37 | diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c | 37 | diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c |
87 | diff --git a/debian/patches/efinet_set_network_from_uefi_devpath.patch b/debian/patches/efinet_set_network_from_uefi_devpath.patch | |||
88 | index ca47cca..c9e17e4 100644 | |||
89 | --- a/debian/patches/efinet_set_network_from_uefi_devpath.patch | |||
90 | +++ b/debian/patches/efinet_set_network_from_uefi_devpath.patch | |||
91 | @@ -29,7 +29,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com> | |||
92 | 29 | 29 | ||
93 | 30 | Patch-Name: efinet_set_network_from_uefi_devpath.patch | 30 | Patch-Name: efinet_set_network_from_uefi_devpath.patch |
94 | 31 | --- | 31 | --- |
96 | 32 | grub-core/net/drivers/efi/efinet.c | 268 +++++++++++++++++++++++++++++++++++-- | 32 | grub-core/net/drivers/efi/efinet.c | 268 ++++++++++++++++++++++++++++- |
97 | 33 | include/grub/efi/api.h | 11 ++ | 33 | include/grub/efi/api.h | 11 ++ |
98 | 34 | 2 files changed, 270 insertions(+), 9 deletions(-) | 34 | 2 files changed, 270 insertions(+), 9 deletions(-) |
99 | 35 | 35 | ||
100 | diff --git a/debian/patches/efinet_uefi_ipv6_pxe_support.patch b/debian/patches/efinet_uefi_ipv6_pxe_support.patch | |||
101 | index 3ff75c2..e7dca37 100644 | |||
102 | --- a/debian/patches/efinet_uefi_ipv6_pxe_support.patch | |||
103 | +++ b/debian/patches/efinet_uefi_ipv6_pxe_support.patch | |||
104 | @@ -12,8 +12,8 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com> | |||
105 | 12 | 12 | ||
106 | 13 | Patch-Name: efinet_uefi_ipv6_pxe_support.patch | 13 | Patch-Name: efinet_uefi_ipv6_pxe_support.patch |
107 | 14 | --- | 14 | --- |
110 | 15 | grub-core/net/drivers/efi/efinet.c | 24 +++++++++++++---- | 15 | grub-core/net/drivers/efi/efinet.c | 24 ++++++++++--- |
111 | 16 | include/grub/efi/api.h | 55 +++++++++++++++++++++++++++++++++++++- | 16 | include/grub/efi/api.h | 55 +++++++++++++++++++++++++++++- |
112 | 17 | 2 files changed, 73 insertions(+), 6 deletions(-) | 17 | 2 files changed, 73 insertions(+), 6 deletions(-) |
113 | 18 | 18 | ||
114 | 19 | diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c | 19 | diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c |
115 | diff --git a/debian/patches/gfxpayload_dynamic.patch b/debian/patches/gfxpayload_dynamic.patch | |||
116 | index e47dfde..f5f70e1 100644 | |||
117 | --- a/debian/patches/gfxpayload_dynamic.patch | |||
118 | +++ b/debian/patches/gfxpayload_dynamic.patch | |||
119 | @@ -13,10 +13,10 @@ Last-Update: 2013-12-25 | |||
120 | 13 | 13 | ||
121 | 14 | Patch-Name: gfxpayload_dynamic.patch | 14 | Patch-Name: gfxpayload_dynamic.patch |
122 | 15 | --- | 15 | --- |
127 | 16 | configure.ac | 11 +++ | 16 | configure.ac | 11 ++ |
128 | 17 | grub-core/Makefile.core.def | 9 +++ | 17 | grub-core/Makefile.core.def | 9 ++ |
129 | 18 | grub-core/commands/i386/pc/hwmatch.c | 146 +++++++++++++++++++++++++++++++++++ | 18 | grub-core/commands/i386/pc/hwmatch.c | 146 +++++++++++++++++++++++++++ |
130 | 19 | util/grub.d/10_linux.in | 37 ++++++++- | 19 | util/grub.d/10_linux.in | 37 ++++++- |
131 | 20 | 4 files changed, 200 insertions(+), 3 deletions(-) | 20 | 4 files changed, 200 insertions(+), 3 deletions(-) |
132 | 21 | create mode 100644 grub-core/commands/i386/pc/hwmatch.c | 21 | create mode 100644 grub-core/commands/i386/pc/hwmatch.c |
133 | 22 | 22 | ||
134 | diff --git a/debian/patches/grub-install-extra-removable.patch b/debian/patches/grub-install-extra-removable.patch | |||
135 | index 38c5bba..341f93e 100644 | |||
136 | --- a/debian/patches/grub-install-extra-removable.patch | |||
137 | +++ b/debian/patches/grub-install-extra-removable.patch | |||
138 | @@ -18,7 +18,7 @@ Last-Update: 2014-12-20 | |||
139 | 18 | 18 | ||
140 | 19 | Patch-Name: grub-install-extra-removable.patch | 19 | Patch-Name: grub-install-extra-removable.patch |
141 | 20 | --- | 20 | --- |
143 | 21 | util/grub-install.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++- | 21 | util/grub-install.c | 125 +++++++++++++++++++++++++++++++++++++++++++- |
144 | 22 | 1 file changed, 123 insertions(+), 2 deletions(-) | 22 | 1 file changed, 123 insertions(+), 2 deletions(-) |
145 | 23 | 23 | ||
146 | 24 | diff --git a/util/grub-install.c b/util/grub-install.c | 24 | diff --git a/util/grub-install.c b/util/grub-install.c |
147 | diff --git a/debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch b/debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch | |||
148 | 25 | new file mode 100644 | 25 | new file mode 100644 |
149 | index 0000000..cfa5946 | |||
150 | --- /dev/null | |||
151 | +++ b/debian/patches/grub-shell-test-helper-disable-seabios-sercon.patch | |||
152 | @@ -0,0 +1,33 @@ | |||
153 | 1 | From aebe41c9004522170f1c93568f4267566e370b61 Mon Sep 17 00:00:00 2001 | ||
154 | 2 | From: Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> | ||
155 | 3 | Date: Wed, 6 Jun 2018 00:55:46 +0200 | ||
156 | 4 | Subject: In the grub-shell test helper, disable seabios's serial console | ||
157 | 5 | through fw_cfg runtime configuration as it's boot output interferes with | ||
158 | 6 | testing. | ||
159 | 7 | |||
160 | 8 | --- | ||
161 | 9 | tests/util/grub-shell.in | 4 ++-- | ||
162 | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
163 | 11 | |||
164 | 12 | diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in | ||
165 | 13 | index 814f36c6b..8e1e86bb0 100644 | ||
166 | 14 | --- a/tests/util/grub-shell.in | ||
167 | 15 | +++ b/tests/util/grub-shell.in | ||
168 | 16 | @@ -474,7 +474,7 @@ if [ x$boot = xnet ]; then | ||
169 | 17 | cp "${cfgfile}" "$netdir/boot/grub/grub.cfg" | ||
170 | 18 | cp "${source}" "$netdir/boot/grub/testcase.cfg" | ||
171 | 19 | [ -z "$files" ] || copy_extra_files "$netdir" $files | ||
172 | 20 | - timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext" -net nic | cat | tr -d "\r" | do_trim | ||
173 | 21 | + timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext" -net nic | cat | tr -d "\r" | do_trim | ||
174 | 22 | elif [ x$boot = xemu ]; then | ||
175 | 23 | rootdir="$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")" | ||
176 | 24 | grubdir="$rootdir/boot/grub" | ||
177 | 25 | @@ -497,7 +497,7 @@ elif [ x$boot = xemu ]; then | ||
178 | 26 | test -n "$debug" || rm -rf "$rootdir" | ||
179 | 27 | test -n "$debug" || rm -f "$roottar" | ||
180 | 28 | else | ||
181 | 29 | - timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim | ||
182 | 30 | + timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim | ||
183 | 31 | fi | ||
184 | 32 | if [ x$boot = xcoreboot ]; then | ||
185 | 33 | test -n "$debug" || rm -f "${imgfile}" | ||
186 | diff --git a/debian/patches/install_locale_langpack.patch b/debian/patches/install_locale_langpack.patch | |||
187 | index 2b2a868..93abe0c 100644 | |||
188 | --- a/debian/patches/install_locale_langpack.patch | |||
189 | +++ b/debian/patches/install_locale_langpack.patch | |||
190 | @@ -9,7 +9,7 @@ Last-Update: 2013-12-25 | |||
191 | 9 | 9 | ||
192 | 10 | Patch-Name: install_locale_langpack.patch | 10 | Patch-Name: install_locale_langpack.patch |
193 | 11 | --- | 11 | --- |
195 | 12 | util/grub-install-common.c | 40 +++++++++++++++++++++++++++++++++------- | 12 | util/grub-install-common.c | 40 +++++++++++++++++++++++++++++++------- |
196 | 13 | 1 file changed, 33 insertions(+), 7 deletions(-) | 13 | 1 file changed, 33 insertions(+), 7 deletions(-) |
197 | 14 | 14 | ||
198 | 15 | diff --git a/util/grub-install-common.c b/util/grub-install-common.c | 15 | diff --git a/util/grub-install-common.c b/util/grub-install-common.c |
199 | diff --git a/debian/patches/install_powerpc_machtypes.patch b/debian/patches/install_powerpc_machtypes.patch | |||
200 | index 9618f9b..fef2d56 100644 | |||
201 | --- a/debian/patches/install_powerpc_machtypes.patch | |||
202 | +++ b/debian/patches/install_powerpc_machtypes.patch | |||
203 | @@ -17,11 +17,11 @@ Last-Update: 2014-10-15 | |||
204 | 17 | Patch-Name: install_powerpc_machtypes.patch | 17 | Patch-Name: install_powerpc_machtypes.patch |
205 | 18 | --- | 18 | --- |
206 | 19 | grub-core/osdep/basic/platform.c | 5 +++ | 19 | grub-core/osdep/basic/platform.c | 5 +++ |
210 | 20 | grub-core/osdep/linux/platform.c | 72 ++++++++++++++++++++++++++++++++++++++ | 20 | grub-core/osdep/linux/platform.c | 72 ++++++++++++++++++++++++++++++ |
211 | 21 | grub-core/osdep/unix/platform.c | 28 +++++++++++---- | 21 | grub-core/osdep/unix/platform.c | 28 +++++++++--- |
212 | 22 | grub-core/osdep/windows/platform.c | 6 ++++ | 22 | grub-core/osdep/windows/platform.c | 6 +++ |
213 | 23 | include/grub/util/install.h | 3 ++ | 23 | include/grub/util/install.h | 3 ++ |
215 | 24 | util/grub-install.c | 11 ++++++ | 24 | util/grub-install.c | 11 +++++ |
216 | 25 | 6 files changed, 119 insertions(+), 6 deletions(-) | 25 | 6 files changed, 119 insertions(+), 6 deletions(-) |
217 | 26 | 26 | ||
218 | 27 | diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c | 27 | diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c |
219 | diff --git a/debian/patches/install_signed.patch b/debian/patches/install_signed.patch | |||
220 | index a7b5397..e79ff52 100644 | |||
221 | --- a/debian/patches/install_signed.patch | |||
222 | +++ b/debian/patches/install_signed.patch | |||
223 | @@ -15,7 +15,7 @@ Last-Update: 2016-11-01 | |||
224 | 15 | 15 | ||
225 | 16 | Patch-Name: install_signed.patch | 16 | Patch-Name: install_signed.patch |
226 | 17 | --- | 17 | --- |
228 | 18 | util/grub-install.c | 195 +++++++++++++++++++++++++++++++++++++++------------- | 18 | util/grub-install.c | 195 +++++++++++++++++++++++++++++++++----------- |
229 | 19 | 1 file changed, 148 insertions(+), 47 deletions(-) | 19 | 1 file changed, 148 insertions(+), 47 deletions(-) |
230 | 20 | 20 | ||
231 | 21 | diff --git a/util/grub-install.c b/util/grub-install.c | 21 | diff --git a/util/grub-install.c b/util/grub-install.c |
232 | diff --git a/debian/patches/linuxefi.patch b/debian/patches/linuxefi.patch | |||
233 | index f5b4460..bc46b54 100644 | |||
234 | --- a/debian/patches/linuxefi.patch | |||
235 | +++ b/debian/patches/linuxefi.patch | |||
236 | @@ -10,8 +10,8 @@ Last-Update: 2017-11-01 | |||
237 | 10 | Patch-Name: linuxefi.patch | 10 | Patch-Name: linuxefi.patch |
238 | 11 | --- | 11 | --- |
239 | 12 | grub-core/Makefile.core.def | 8 + | 12 | grub-core/Makefile.core.def | 8 + |
242 | 13 | grub-core/kern/efi/mm.c | 32 ++++ | 13 | grub-core/kern/efi/mm.c | 32 +++ |
243 | 14 | grub-core/loader/i386/efi/linux.c | 371 ++++++++++++++++++++++++++++++++++++++ | 14 | grub-core/loader/i386/efi/linux.c | 371 ++++++++++++++++++++++++++++++ |
244 | 15 | include/grub/efi/efi.h | 3 + | 15 | include/grub/efi/efi.h | 3 + |
245 | 16 | include/grub/i386/linux.h | 1 + | 16 | include/grub/i386/linux.h | 1 + |
246 | 17 | 5 files changed, 415 insertions(+) | 17 | 5 files changed, 415 insertions(+) |
247 | diff --git a/debian/patches/linuxefi_add_sb_to_efi_chainload.patch b/debian/patches/linuxefi_add_sb_to_efi_chainload.patch | |||
248 | index 7557cd8..6261249 100644 | |||
249 | --- a/debian/patches/linuxefi_add_sb_to_efi_chainload.patch | |||
250 | +++ b/debian/patches/linuxefi_add_sb_to_efi_chainload.patch | |||
251 | @@ -24,7 +24,7 @@ Last-Update: 2017-11-01 | |||
252 | 24 | Patch-Name: linuxefi_add_sb_to_efi_chainload.patch | 24 | Patch-Name: linuxefi_add_sb_to_efi_chainload.patch |
253 | 25 | --- | 25 | --- |
254 | 26 | grub-core/Makefile.core.def | 1 + | 26 | grub-core/Makefile.core.def | 1 + |
256 | 27 | grub-core/loader/efi/chainloader.c | 612 ++++++++++++++++++++++++++++++++++--- | 27 | grub-core/loader/efi/chainloader.c | 612 +++++++++++++++++++++++++++-- |
257 | 28 | include/grub/efi/pe32.h | 20 +- | 28 | include/grub/efi/pe32.h | 20 +- |
258 | 29 | 3 files changed, 596 insertions(+), 37 deletions(-) | 29 | 3 files changed, 596 insertions(+), 37 deletions(-) |
259 | 30 | 30 | ||
260 | diff --git a/debian/patches/linuxefi_fix_efi_validation_race.patch b/debian/patches/linuxefi_fix_efi_validation_race.patch | |||
261 | index 028f18e..447fc12 100644 | |||
262 | --- a/debian/patches/linuxefi_fix_efi_validation_race.patch | |||
263 | +++ b/debian/patches/linuxefi_fix_efi_validation_race.patch | |||
264 | @@ -9,7 +9,7 @@ Last-Update: 2017-11-01 | |||
265 | 9 | 9 | ||
266 | 10 | Patch-Name: linuxefi_fix_efi_validation_race.patch | 10 | Patch-Name: linuxefi_fix_efi_validation_race.patch |
267 | 11 | --- | 11 | --- |
269 | 12 | grub-core/loader/i386/efi/linux.c | 44 ++++++++++----------------------------- | 12 | grub-core/loader/i386/efi/linux.c | 44 ++++++++----------------------- |
270 | 13 | 1 file changed, 11 insertions(+), 33 deletions(-) | 13 | 1 file changed, 11 insertions(+), 33 deletions(-) |
271 | 14 | 14 | ||
272 | 15 | diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c | 15 | diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c |
273 | diff --git a/debian/patches/linuxefi_handle_multiarch_boot.patch b/debian/patches/linuxefi_handle_multiarch_boot.patch | |||
274 | index 3f07c16..0930864 100644 | |||
275 | --- a/debian/patches/linuxefi_handle_multiarch_boot.patch | |||
276 | +++ b/debian/patches/linuxefi_handle_multiarch_boot.patch | |||
277 | @@ -13,9 +13,9 @@ Last-Update: 2017-11-01 | |||
278 | 13 | 13 | ||
279 | 14 | Patch-Name: linuxefi_handle_multiarch_boot.patch | 14 | Patch-Name: linuxefi_handle_multiarch_boot.patch |
280 | 15 | --- | 15 | --- |
284 | 16 | grub-core/loader/efi/linux.c | 9 +++- | 16 | grub-core/loader/efi/linux.c | 9 ++- |
285 | 17 | grub-core/loader/i386/efi/linux.c | 108 ++++++++++++++++++++++++++------------ | 17 | grub-core/loader/i386/efi/linux.c | 108 +++++++++++++++++++++--------- |
286 | 18 | include/grub/i386/linux.h | 7 ++- | 18 | include/grub/i386/linux.h | 7 +- |
287 | 19 | 3 files changed, 88 insertions(+), 36 deletions(-) | 19 | 3 files changed, 88 insertions(+), 36 deletions(-) |
288 | 20 | 20 | ||
289 | 21 | diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c | 21 | diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c |
290 | diff --git a/debian/patches/linuxefi_honor_sb_mode.patch b/debian/patches/linuxefi_honor_sb_mode.patch | |||
291 | index 128e4df..fab527c 100644 | |||
292 | --- a/debian/patches/linuxefi_honor_sb_mode.patch | |||
293 | +++ b/debian/patches/linuxefi_honor_sb_mode.patch | |||
294 | @@ -16,23 +16,23 @@ Patch-Name: linuxefi_honor_sb_mode.patch | |||
295 | 16 | --- | 16 | --- |
296 | 17 | grub-core/Makefile.am | 1 + | 17 | grub-core/Makefile.am | 1 + |
297 | 18 | grub-core/Makefile.core.def | 1 + | 18 | grub-core/Makefile.core.def | 1 + |
300 | 19 | grub-core/commands/iorw.c | 7 +++++ | 19 | grub-core/commands/iorw.c | 7 ++++ |
301 | 20 | grub-core/commands/memrw.c | 7 +++++ | 20 | grub-core/commands/memrw.c | 7 ++++ |
302 | 21 | grub-core/kern/dl.c | 1 + | 21 | grub-core/kern/dl.c | 1 + |
306 | 22 | grub-core/kern/efi/efi.c | 28 ------------------ | 22 | grub-core/kern/efi/efi.c | 28 --------------- |
307 | 23 | grub-core/kern/efi/sb.c | 58 ++++++++++++++++++++++++++++++++++++++ | 23 | grub-core/kern/efi/sb.c | 58 ++++++++++++++++++++++++++++++ |
308 | 24 | grub-core/loader/efi/appleloader.c | 7 +++++ | 24 | grub-core/loader/efi/appleloader.c | 7 ++++ |
309 | 25 | grub-core/loader/efi/chainloader.c | 1 + | 25 | grub-core/loader/efi/chainloader.c | 1 + |
315 | 26 | grub-core/loader/i386/bsd.c | 7 +++++ | 26 | grub-core/loader/i386/bsd.c | 7 ++++ |
316 | 27 | grub-core/loader/i386/linux.c | 7 +++++ | 27 | grub-core/loader/i386/linux.c | 7 ++++ |
317 | 28 | grub-core/loader/i386/pc/linux.c | 7 +++++ | 28 | grub-core/loader/i386/pc/linux.c | 7 ++++ |
318 | 29 | grub-core/loader/multiboot.c | 7 +++++ | 29 | grub-core/loader/multiboot.c | 7 ++++ |
319 | 30 | grub-core/loader/xnu.c | 7 +++++ | 30 | grub-core/loader/xnu.c | 7 ++++ |
320 | 31 | include/grub/efi/efi.h | 1 - | 31 | include/grub/efi/efi.h | 1 - |
322 | 32 | include/grub/efi/sb.h | 29 +++++++++++++++++++ | 32 | include/grub/efi/sb.h | 29 +++++++++++++++ |
323 | 33 | include/grub/ia64/linux.h | 0 | 33 | include/grub/ia64/linux.h | 0 |
324 | 34 | include/grub/mips/linux.h | 0 | 34 | include/grub/mips/linux.h | 0 |
326 | 35 | include/grub/powerpc/linux.h | 22 +++++++++++++++ | 35 | include/grub/powerpc/linux.h | 22 ++++++++++++ |
327 | 36 | include/grub/sparc64/linux.h | 0 | 36 | include/grub/sparc64/linux.h | 0 |
328 | 37 | 20 files changed, 169 insertions(+), 29 deletions(-) | 37 | 20 files changed, 169 insertions(+), 29 deletions(-) |
329 | 38 | create mode 100644 grub-core/kern/efi/sb.c | 38 | create mode 100644 grub-core/kern/efi/sb.c |
330 | diff --git a/debian/patches/linuxefi_load_arm_with_sb.patch b/debian/patches/linuxefi_load_arm_with_sb.patch | |||
331 | index 96a79b7..54fbe54 100644 | |||
332 | --- a/debian/patches/linuxefi_load_arm_with_sb.patch | |||
333 | +++ b/debian/patches/linuxefi_load_arm_with_sb.patch | |||
334 | @@ -17,11 +17,11 @@ Patch-Name: linuxefi_load_arm_with_sb.patch | |||
335 | 17 | --- | 17 | --- |
336 | 18 | grub-core/Makefile.core.def | 3 + | 18 | grub-core/Makefile.core.def | 3 + |
337 | 19 | grub-core/loader/arm/linux.c | 1 + | 19 | grub-core/loader/arm/linux.c | 1 + |
343 | 20 | grub-core/loader/arm64/linux.c | 119 ++++++++++++++++++++------------------ | 20 | grub-core/loader/arm64/linux.c | 119 ++++++++++++++++-------------- |
344 | 21 | grub-core/loader/efi/linux.c | 65 +++++++++++++++++++++ | 21 | grub-core/loader/efi/linux.c | 65 ++++++++++++++++ |
345 | 22 | grub-core/loader/i386/efi/linux.c | 39 +------------ | 22 | grub-core/loader/i386/efi/linux.c | 39 +--------- |
346 | 23 | include/grub/arm64/linux.h | 7 +++ | 23 | include/grub/arm64/linux.h | 7 ++ |
347 | 24 | include/grub/efi/linux.h | 31 ++++++++++ | 24 | include/grub/efi/linux.h | 31 ++++++++ |
348 | 25 | 7 files changed, 174 insertions(+), 91 deletions(-) | 25 | 7 files changed, 174 insertions(+), 91 deletions(-) |
349 | 26 | create mode 100644 grub-core/loader/efi/linux.c | 26 | create mode 100644 grub-core/loader/efi/linux.c |
350 | 27 | create mode 100644 include/grub/efi/linux.h | 27 | create mode 100644 include/grub/efi/linux.h |
351 | diff --git a/debian/patches/linuxefi_non_sb_fallback.patch b/debian/patches/linuxefi_non_sb_fallback.patch | |||
352 | index 3e7c686..73df218 100644 | |||
353 | --- a/debian/patches/linuxefi_non_sb_fallback.patch | |||
354 | +++ b/debian/patches/linuxefi_non_sb_fallback.patch | |||
355 | @@ -10,7 +10,7 @@ Last-Update: 2017-11-01 | |||
356 | 10 | Patch-Name: linuxefi_non_sb_fallback.patch | 10 | Patch-Name: linuxefi_non_sb_fallback.patch |
357 | 11 | --- | 11 | --- |
358 | 12 | grub-core/loader/i386/efi/linux.c | 2 +- | 12 | grub-core/loader/i386/efi/linux.c | 2 +- |
360 | 13 | grub-core/loader/i386/linux.c | 43 +++++++++++++++++++++++++++++++++++++++ | 13 | grub-core/loader/i386/linux.c | 43 +++++++++++++++++++++++++++++++ |
361 | 14 | 2 files changed, 44 insertions(+), 1 deletion(-) | 14 | 2 files changed, 44 insertions(+), 1 deletion(-) |
362 | 15 | 15 | ||
363 | 16 | diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c | 16 | diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c |
364 | diff --git a/debian/patches/linuxefi_rework_linux16_cmd.patch b/debian/patches/linuxefi_rework_linux16_cmd.patch | |||
365 | index 4c22a18..2205e94 100644 | |||
366 | --- a/debian/patches/linuxefi_rework_linux16_cmd.patch | |||
367 | +++ b/debian/patches/linuxefi_rework_linux16_cmd.patch | |||
368 | @@ -13,7 +13,7 @@ Last-Update: 2017-11-01 | |||
369 | 13 | 13 | ||
370 | 14 | Patch-Name: linuxefi_rework_linux16_cmd.patch | 14 | Patch-Name: linuxefi_rework_linux16_cmd.patch |
371 | 15 | --- | 15 | --- |
373 | 16 | grub-core/loader/i386/pc/linux.c | 34 +++++++++++++++++++++------------- | 16 | grub-core/loader/i386/pc/linux.c | 34 ++++++++++++++++++++------------ |
374 | 17 | 1 file changed, 21 insertions(+), 13 deletions(-) | 17 | 1 file changed, 21 insertions(+), 13 deletions(-) |
375 | 18 | 18 | ||
376 | 19 | diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c | 19 | diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c |
377 | diff --git a/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch b/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch | |||
378 | index 894832e..00cf6dd 100644 | |||
379 | --- a/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch | |||
380 | +++ b/debian/patches/linuxefi_rework_non-sb_efi_chainload.patch | |||
381 | @@ -47,11 +47,11 @@ Last-Update: 2017-11-01 | |||
382 | 47 | 47 | ||
383 | 48 | Patch-Name: linuxefi_rework_non-sb_efi_chainload.patch | 48 | Patch-Name: linuxefi_rework_non-sb_efi_chainload.patch |
384 | 49 | --- | 49 | --- |
386 | 50 | grub-core/kern/efi/sb.c | 14 +++-- | 50 | grub-core/kern/efi/sb.c | 14 +++- |
387 | 51 | grub-core/loader/arm64/linux.c | 4 +- | 51 | grub-core/loader/arm64/linux.c | 4 +- |
391 | 52 | grub-core/loader/efi/chainloader.c | 115 ++++++++++++++++++++++--------------- | 52 | grub-core/loader/efi/chainloader.c | 115 ++++++++++++++++++----------- |
392 | 53 | grub-core/loader/efi/linux.c | 13 +++-- | 53 | grub-core/loader/efi/linux.c | 13 ++-- |
393 | 54 | grub-core/loader/i386/efi/linux.c | 7 ++- | 54 | grub-core/loader/i386/efi/linux.c | 7 +- |
394 | 55 | include/grub/efi/linux.h | 2 +- | 55 | include/grub/efi/linux.h | 2 +- |
395 | 56 | 6 files changed, 97 insertions(+), 58 deletions(-) | 56 | 6 files changed, 97 insertions(+), 58 deletions(-) |
396 | 57 | 57 | ||
397 | diff --git a/debian/patches/linuxefi_rework_pe_loading.patch b/debian/patches/linuxefi_rework_pe_loading.patch | |||
398 | index 8bc36e4..37acdee 100644 | |||
399 | --- a/debian/patches/linuxefi_rework_pe_loading.patch | |||
400 | +++ b/debian/patches/linuxefi_rework_pe_loading.patch | |||
401 | @@ -13,8 +13,8 @@ Last-Update: 2017-11-01 | |||
402 | 13 | 13 | ||
403 | 14 | Patch-Name: linuxefi_rework_pe_loading.patch | 14 | Patch-Name: linuxefi_rework_pe_loading.patch |
404 | 15 | --- | 15 | --- |
407 | 16 | grub-core/loader/efi/chainloader.c | 156 +++++++++++++++++++++++++++++-------- | 16 | grub-core/loader/efi/chainloader.c | 156 +++++++++++++++++++++++------ |
408 | 17 | include/grub/efi/pe32.h | 32 +++++++- | 17 | include/grub/efi/pe32.h | 32 +++++- |
409 | 18 | 2 files changed, 152 insertions(+), 36 deletions(-) | 18 | 2 files changed, 152 insertions(+), 36 deletions(-) |
410 | 19 | 19 | ||
411 | 20 | diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c | 20 | diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c |
412 | diff --git a/debian/patches/net_read_bracketed_ipv6_addr.patch b/debian/patches/net_read_bracketed_ipv6_addr.patch | |||
413 | index aa061d3..cdfadc2 100644 | |||
414 | --- a/debian/patches/net_read_bracketed_ipv6_addr.patch | |||
415 | +++ b/debian/patches/net_read_bracketed_ipv6_addr.patch | |||
416 | @@ -9,9 +9,9 @@ number | |||
417 | 9 | 9 | ||
418 | 10 | Patch-Name: net_read_bracketed_ipv6_addr.patch | 10 | Patch-Name: net_read_bracketed_ipv6_addr.patch |
419 | 11 | --- | 11 | --- |
423 | 12 | grub-core/net/http.c | 21 +++++++++--- | 12 | grub-core/net/http.c | 21 ++++++++-- |
424 | 13 | grub-core/net/net.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++---- | 13 | grub-core/net/net.c | 93 +++++++++++++++++++++++++++++++++++++++++--- |
425 | 14 | grub-core/net/tftp.c | 6 +++- | 14 | grub-core/net/tftp.c | 6 ++- |
426 | 15 | include/grub/net.h | 1 + | 15 | include/grub/net.h | 1 + |
427 | 16 | 4 files changed, 110 insertions(+), 11 deletions(-) | 16 | 4 files changed, 110 insertions(+), 11 deletions(-) |
428 | 17 | 17 | ||
429 | diff --git a/debian/patches/quick_boot.patch b/debian/patches/quick_boot.patch | |||
430 | index 48f6076..f04887d 100644 | |||
431 | --- a/debian/patches/quick_boot.patch | |||
432 | +++ b/debian/patches/quick_boot.patch | |||
433 | @@ -23,13 +23,13 @@ Last-Update: 2015-09-04 | |||
434 | 23 | 23 | ||
435 | 24 | Patch-Name: quick_boot.patch | 24 | Patch-Name: quick_boot.patch |
436 | 25 | --- | 25 | --- |
440 | 26 | configure.ac | 11 +++++++ | 26 | configure.ac | 11 ++++++ |
441 | 27 | docs/grub.texi | 14 +++++++++ | 27 | docs/grub.texi | 14 +++++++ |
442 | 28 | grub-core/normal/menu.c | 24 ++++++++++++++ | 28 | grub-core/normal/menu.c | 24 ++++++++++++ |
443 | 29 | util/grub-mkconfig.in | 3 +- | 29 | util/grub-mkconfig.in | 3 +- |
447 | 30 | util/grub.d/00_header.in | 77 ++++++++++++++++++++++++++++++++++++++------- | 30 | util/grub.d/00_header.in | 77 +++++++++++++++++++++++++++++++------ |
448 | 31 | util/grub.d/10_linux.in | 4 +++ | 31 | util/grub.d/10_linux.in | 4 ++ |
449 | 32 | util/grub.d/30_os-prober.in | 21 +++++++++++++ | 32 | util/grub.d/30_os-prober.in | 21 ++++++++++ |
450 | 33 | 7 files changed, 141 insertions(+), 13 deletions(-) | 33 | 7 files changed, 141 insertions(+), 13 deletions(-) |
451 | 34 | 34 | ||
452 | 35 | diff --git a/configure.ac b/configure.ac | 35 | diff --git a/configure.ac b/configure.ac |
453 | diff --git a/debian/patches/restore_mkdevicemap.patch b/debian/patches/restore_mkdevicemap.patch | |||
454 | index 3337939..cfca403 100644 | |||
455 | --- a/debian/patches/restore_mkdevicemap.patch | |||
456 | +++ b/debian/patches/restore_mkdevicemap.patch | |||
457 | @@ -17,9 +17,9 @@ Patch-Name: restore_mkdevicemap.patch | |||
458 | 17 | Makefile.util.def | 17 + | 17 | Makefile.util.def | 17 + |
459 | 18 | docs/man/grub-mkdevicemap.h2m | 4 + | 18 | docs/man/grub-mkdevicemap.h2m | 4 + |
460 | 19 | include/grub/util/deviceiter.h | 14 + | 19 | include/grub/util/deviceiter.h | 14 + |
462 | 20 | util/deviceiter.c | 1021 ++++++++++++++++++++++++++++++++++++++++ | 20 | util/deviceiter.c | 1021 ++++++++++++++++++++++++++++++++ |
463 | 21 | util/devicemap.c | 13 + | 21 | util/devicemap.c | 13 + |
465 | 22 | util/grub-mkdevicemap.c | 181 +++++++ | 22 | util/grub-mkdevicemap.c | 181 ++++++ |
466 | 23 | 6 files changed, 1250 insertions(+) | 23 | 6 files changed, 1250 insertions(+) |
467 | 24 | create mode 100644 docs/man/grub-mkdevicemap.h2m | 24 | create mode 100644 docs/man/grub-mkdevicemap.h2m |
468 | 25 | create mode 100644 include/grub/util/deviceiter.h | 25 | create mode 100644 include/grub/util/deviceiter.h |
469 | diff --git a/debian/patches/series b/debian/patches/series | |||
470 | index 298e3f0..b90a19b 100644 | |||
471 | --- a/debian/patches/series | |||
472 | +++ b/debian/patches/series | |||
473 | @@ -76,3 +76,4 @@ shorter_version_info.patch | |||
474 | 76 | skip_text_gfxpayload_where_not_supported.patch | 76 | skip_text_gfxpayload_where_not_supported.patch |
475 | 77 | yylex-explicitly_cast_fprintf_to_void.patch | 77 | yylex-explicitly_cast_fprintf_to_void.patch |
476 | 78 | add-an-auto-nvram-option-to-grub-install.patch | 78 | add-an-auto-nvram-option-to-grub-install.patch |
477 | 79 | grub-shell-test-helper-disable-seabios-sercon.patch | ||
478 | diff --git a/debian/patches/syslinux-test-out-of-tree.patch b/debian/patches/syslinux-test-out-of-tree.patch | |||
479 | index 7f0e389..9c34f49 100644 | |||
480 | --- a/debian/patches/syslinux-test-out-of-tree.patch | |||
481 | +++ b/debian/patches/syslinux-test-out-of-tree.patch | |||
482 | @@ -19,8 +19,8 @@ Last-Update: 2016-09-19 | |||
483 | 19 | Patch-Name: syslinux-test-out-of-tree.patch | 19 | Patch-Name: syslinux-test-out-of-tree.patch |
484 | 20 | --- | 20 | --- |
485 | 21 | Makefile.am | 6 ------ | 21 | Makefile.am | 6 ------ |
488 | 22 | tests/syslinux/ubuntu10.04_grub.cfg.in | 30 +++++++++++++++--------------- | 22 | tests/syslinux/ubuntu10.04_grub.cfg.in | 30 +++++++++++++------------- |
489 | 23 | tests/syslinux_test.in | 14 ++++++++++---- | 23 | tests/syslinux_test.in | 14 ++++++++---- |
490 | 24 | 3 files changed, 25 insertions(+), 25 deletions(-) | 24 | 3 files changed, 25 insertions(+), 25 deletions(-) |
491 | 25 | 25 | ||
492 | 26 | diff --git a/Makefile.am b/Makefile.am | 26 | diff --git a/Makefile.am b/Makefile.am |
493 | diff --git a/debian/patches/uefi_firmware_setup.patch b/debian/patches/uefi_firmware_setup.patch | |||
494 | index 8ffc301..50f0581 100644 | |||
495 | --- a/debian/patches/uefi_firmware_setup.patch | |||
496 | +++ b/debian/patches/uefi_firmware_setup.patch | |||
497 | @@ -8,8 +8,8 @@ Last-Update: 2015-09-04 | |||
498 | 8 | 8 | ||
499 | 9 | Patch-Name: uefi_firmware_setup.patch | 9 | Patch-Name: uefi_firmware_setup.patch |
500 | 10 | --- | 10 | --- |
503 | 11 | Makefile.util.def | 6 ++++++ | 11 | Makefile.util.def | 6 +++++ |
504 | 12 | util/grub.d/30_uefi-firmware.in | 46 +++++++++++++++++++++++++++++++++++++++++ | 12 | util/grub.d/30_uefi-firmware.in | 46 +++++++++++++++++++++++++++++++++ |
505 | 13 | 2 files changed, 52 insertions(+) | 13 | 2 files changed, 52 insertions(+) |
506 | 14 | create mode 100644 util/grub.d/30_uefi-firmware.in | 14 | create mode 100644 util/grub.d/30_uefi-firmware.in |
507 | 15 | 15 | ||
508 | diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in | |||
509 | index 814f36c..8e1e86b 100644 | |||
510 | --- a/tests/util/grub-shell.in | |||
511 | +++ b/tests/util/grub-shell.in | |||
512 | @@ -474,7 +474,7 @@ if [ x$boot = xnet ]; then | |||
513 | 474 | cp "${cfgfile}" "$netdir/boot/grub/grub.cfg" | 474 | cp "${cfgfile}" "$netdir/boot/grub/grub.cfg" |
514 | 475 | cp "${source}" "$netdir/boot/grub/testcase.cfg" | 475 | cp "${source}" "$netdir/boot/grub/testcase.cfg" |
515 | 476 | [ -z "$files" ] || copy_extra_files "$netdir" $files | 476 | [ -z "$files" ] || copy_extra_files "$netdir" $files |
517 | 477 | timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext" -net nic | cat | tr -d "\r" | do_trim | 477 | timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.$netbootext" -net nic | cat | tr -d "\r" | do_trim |
518 | 478 | elif [ x$boot = xemu ]; then | 478 | elif [ x$boot = xemu ]; then |
519 | 479 | rootdir="$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")" | 479 | rootdir="$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")" |
520 | 480 | grubdir="$rootdir/boot/grub" | 480 | grubdir="$rootdir/boot/grub" |
521 | @@ -497,7 +497,7 @@ elif [ x$boot = xemu ]; then | |||
522 | 497 | test -n "$debug" || rm -rf "$rootdir" | 497 | test -n "$debug" || rm -rf "$rootdir" |
523 | 498 | test -n "$debug" || rm -f "$roottar" | 498 | test -n "$debug" || rm -f "$roottar" |
524 | 499 | else | 499 | else |
526 | 500 | timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim | 500 | timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -fw_cfg name=etc/sercon-port,string=0 -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim |
527 | 501 | fi | 501 | fi |
528 | 502 | if [ x$boot = xcoreboot ]; then | 502 | if [ x$boot = xcoreboot ]; then |
529 | 503 | test -n "$debug" || rm -f "${imgfile}" | 503 | test -n "$debug" || rm -f "${imgfile}" |