forked from pool/grub2
Accepting request 342218 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/342218 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=126
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
ca195913ab
@ -4,24 +4,18 @@ Subject: disable rsync to make it possible to use in RPM build
|
||||
We need to create po/LINGUAS to generate message catalogs. Use
|
||||
linguas.sh to ensure we always use the same rules as upstream, but
|
||||
disable rsync.
|
||||
Index: grub-2.00/linguas.sh
|
||||
Index: grub-2.02~beta2/linguas.sh
|
||||
===================================================================
|
||||
--- grub-2.00.orig/linguas.sh
|
||||
+++ grub-2.00/linguas.sh
|
||||
@@ -1,6 +1,6 @@
|
||||
--- grub-2.02~beta2.orig/linguas.sh 2015-11-02 20:47:03.471686784 +0300
|
||||
+++ grub-2.02~beta2/linguas.sh 2015-11-02 20:48:15.707687638 +0300
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/bin/sh
|
||||
|
||||
-rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po
|
||||
+#rsync -Lrtvz --exclude=ko.po translationproject.org::tp/latest/grub/ po
|
||||
|
||||
autogenerated="en@quot en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH"
|
||||
-autogenerated="en@quot en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH"
|
||||
+autogenerated="en@quot" # en@hebrew de@hebrew en@cyrillic en@greek en@arabic en@piglatin de_CH"
|
||||
|
||||
@@ -14,7 +14,7 @@ done
|
||||
(
|
||||
cd po && ls *.po| cut -d. -f1
|
||||
for x in $autogenerated; do
|
||||
- echo "$x";
|
||||
+ : echo "$x";
|
||||
done
|
||||
) | sort | uniq | xargs
|
||||
) >po/LINGUAS
|
||||
|
||||
for x in $autogenerated; do
|
||||
|
||||
23
grub2-menu-unrestricted.patch
Normal file
23
grub2-menu-unrestricted.patch
Normal file
@ -0,0 +1,23 @@
|
||||
Index: grub-2.02~beta2/grub-core/normal/menu.c
|
||||
===================================================================
|
||||
--- grub-2.02~beta2.orig/grub-core/normal/menu.c
|
||||
+++ grub-2.02~beta2/grub-core/normal/menu.c
|
||||
@@ -213,7 +213,17 @@ grub_menu_execute_entry(grub_menu_entry_
|
||||
grub_size_t sz = 0;
|
||||
|
||||
if (entry->restricted)
|
||||
- err = grub_auth_check_authentication (entry->users);
|
||||
+ {
|
||||
+ int auth_check = 1;
|
||||
+ if (entry->users && entry->users[0] == 0)
|
||||
+ {
|
||||
+ const char *unr = grub_env_get ("unrestricted_menu");
|
||||
+ if (unr && (unr[0] == '1' || unr[0] == 'y'))
|
||||
+ auth_check = 0;
|
||||
+ }
|
||||
+ if (auth_check)
|
||||
+ err = grub_auth_check_authentication (entry->users);
|
||||
+ }
|
||||
|
||||
if (err)
|
||||
{
|
||||
@ -50,7 +50,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
|
||||
- if [ -d /sys/firmware/efi ]; then
|
||||
+ if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
echo '$message'
|
||||
echo '$(echo "$message" | grub_quote)'
|
||||
linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
|
||||
@@ -147,7 +147,7 @@ EOF
|
||||
if test -n "${initrd}" ; then
|
||||
@ -59,5 +59,5 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
|
||||
- if [ -d /sys/firmware/efi ]; then
|
||||
+ if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
|
||||
sed "s/^/$submenu_indentation/" << EOF
|
||||
echo '$message'
|
||||
echo '$(echo "$message" | grub_quote)'
|
||||
initrdefi ${rel_dirname}/${initrd}
|
||||
|
||||
@ -22,7 +22,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
|
||||
- sed "s/^/$submenu_indentation/" << EOF
|
||||
+ if [ -d /sys/firmware/efi ]; then
|
||||
+ sed "s/^/$submenu_indentation/" << EOF
|
||||
+ echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
+ linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
|
||||
+EOF
|
||||
+ else
|
||||
@ -37,7 +37,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
|
||||
- sed "s/^/$submenu_indentation/" << EOF
|
||||
+ if [ -d /sys/firmware/efi ]; then
|
||||
+ sed "s/^/$submenu_indentation/" << EOF
|
||||
+ echo '$message'
|
||||
+ echo '$(echo "$message" | grub_quote)'
|
||||
+ initrdefi ${rel_dirname}/${initrd}
|
||||
+EOF
|
||||
+ else
|
||||
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 1 21:30:02 UTC 2015 - arvidjaar@gmail.com
|
||||
|
||||
- Modify grub2-linguas.sh-no-rsync.patch to re-enable en@quot catalog
|
||||
(boo#953022). Other autogenerated catalogs still fail to build due
|
||||
to missing C.UTF-8 locale.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 30 10:09:02 UTC 2015 - mchang@suse.com
|
||||
|
||||
- Allow to execute menuentry unrestricted as default (fate#318574)
|
||||
* added grub2-menu-unrestricted.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 29 04:17:08 UTC 2015 - mchang@suse.com
|
||||
|
||||
- Add missing quoting for linuxefi (bsc#951962)
|
||||
* modified grub2-secureboot-use-linuxefi-on-uefi.patch
|
||||
* refreshed grub2-secureboot-provide-linuxefi-config.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 18 11:45:10 UTC 2015 - eich@suse.com
|
||||
|
||||
|
||||
@ -205,6 +205,7 @@ Patch67: grub2-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch
|
||||
Patch68: grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
|
||||
Patch69: grub2-getroot-fix-get-btrfs-fs-prefix-big-endian.patch
|
||||
Patch70: grub2-default-distributor.patch
|
||||
Patch71: grub2-menu-unrestricted.patch
|
||||
# Btrfs snapshot booting related patches
|
||||
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
|
||||
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
|
||||
@ -477,6 +478,7 @@ mv po/grub.pot po/%{name}.pot
|
||||
%patch68 -p1
|
||||
%patch69 -p1
|
||||
%patch70 -p1
|
||||
%patch71 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user