mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-19 05:36:38 +02:00
0f3c992e98
Upgrade to Grub 2.12. Remove patches no longer required and rename/tweak existing patches still required. Add a minor fix to get Grub 2.12 to build (upstream forgot to include a necessary, but empty, file that build requires.
22 lines
740 B
Diff
22 lines
740 B
Diff
65d6f17b0b6651007ded36dff9ba206fac8d7caa ensure grub-mkconfig ignores *.apk-new files
|
|
util/grub-mkconfig.in | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
index f8cbb8d7a..8b6501209 100644
|
|
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -282,6 +282,10 @@ for i in "${grub_mkconfig_dir}"/* ; do
|
|
*~) ;;
|
|
# emacsen autosave files. FIXME: support other editors
|
|
*/\#*\#) ;;
|
|
+ # Copy of a template file from Alpine Grub package where the stock file
|
|
+ # was locally modified. Any such *.apk-new files should be ignored by
|
|
+ # grub-mkconfig.
|
|
+ *.apk-new) ;;
|
|
*)
|
|
if grub_file_is_not_garbage "$i" && test -x "$i" ; then
|
|
echo
|
|
--
|
|
2.39.2
|
|
|