Attachment 10277 Details for Bug 23268 – spec diff for Mga6 update

spec diff for Mga6 update

file_23268.txt (text/plain), 2.13 KB, created by Barry Jackson on 2018-07-13 01:27:48 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2018-07-13 01:27:48 CEST

Size: 2.13 KB

patch

obsolete

>Index: SPECS/grub2.spec
>===================================================================
>--- SPECS/grub2.spec	(revision 1243325)
>+++ SPECS/grub2.spec	(working copy)
>@@ -1,3 +1,4 @@
>+%define subrel	1
> %define Werror_cflags %nil
> # Modules always contain just 32-bit code
> %define _libdir %{_exec_prefix}/lib
>@@ -66,7 +67,6 @@
> Patch10001:	10001-Put-the-correct-.file-directives-in-our-.S-files.patch
> Patch10002:	10002-Make-it-possible-to-enabled-build-id-sha1.patch
> Patch10004:	10004-Add-grub_qdprintf-grub_dprintf-without-the-file-lin.patch
>-###Patch10005:	10005-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
> 
> #
> # Mga patches:
>@@ -76,6 +76,9 @@
> Patch20003:	grub2-2.00-mga-dont_write_diskfilter_error_to_screen.patch
> Patch20004:	grub2-2.00-mga-dont_check_uuid_in_installer.patch
> Patch20005:	grub2-2.00-mga-remove-unrestricted_when_password_set.patch
>+Patch20006:	grub2-2.02-mga-translate-theme-label.patch
>+Patch20007:	grub2-2.00-mga-Change_default_tsc_calibration_method_to_pmtimer_on_EFI.patch
>+
> #
> # SuSE Patch:
> #
>@@ -83,6 +86,11 @@
> # have a dualboot with windows starting at sector 63
> Patch30001:	grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
> 
>+#
>+# Unity Patches
>+#
>+# Fixes Mga#22918 - grub2-mkrescue still searches /boot/grub for config
>+Patch22001:     grub2-2.02-unity-mkrescue-use-grub2-dir.patch
> 
> BuildRequires:	autoconf
> BuildRequires:	autogen
>@@ -163,6 +171,8 @@
> Recommends:	os-prober >= 1.53
> Recommends:	xorriso
> Requires:	grub2bootloader = %{version}-%{release}
>+# Not available in Mga6
>+#Requires:	console-setup
> 
> %description common
> Common files used by both grub2 and grub2-efi.
>@@ -304,8 +314,9 @@
> 
> # Workaround for RHL Bug 817187
> install -d %{buildroot}%{_datadir}/locale/en/LC_MESSAGES
>-ln -s %{_datadir}/locale/en@quot/LC_MESSAGES/grub.mo %{buildroot}%{_datadir}/locale/en/LC_MESSAGES/grub.mo
>-
>+cp -f %{buildroot}%{_datadir}/locale/en@quot/LC_MESSAGES/grub.mo \
>+      %{buildroot}%{_datadir}/locale/en/LC_MESSAGES/grub.mo
>+      
> cat > %{buildroot}/boot/%{name}/custom.cfg <<EOF
> # Set non-graphical text/background colours
> set menu_color_normal=cyan/blue

Index: SPECS/grub2.spec
===================================================================
--- SPECS/grub2.spec	(revision 1243325)
+++ SPECS/grub2.spec	(working copy)
@@ -1,3 +1,4 @@
+%define subrel	1
 %define Werror_cflags %nil
 # Modules always contain just 32-bit code
 %define _libdir %{_exec_prefix}/lib
@@ -66,7 +67,6 @@
 Patch10001:	10001-Put-the-correct-.file-directives-in-our-.S-files.patch
 Patch10002:	10002-Make-it-possible-to-enabled-build-id-sha1.patch
 Patch10004:	10004-Add-grub_qdprintf-grub_dprintf-without-the-file-lin.patch
-###Patch10005:	10005-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
 
 #
 # Mga patches:
@@ -76,6 +76,9 @@
 Patch20003:	grub2-2.00-mga-dont_write_diskfilter_error_to_screen.patch
 Patch20004:	grub2-2.00-mga-dont_check_uuid_in_installer.patch
 Patch20005:	grub2-2.00-mga-remove-unrestricted_when_password_set.patch
+Patch20006:	grub2-2.02-mga-translate-theme-label.patch
+Patch20007:	grub2-2.00-mga-Change_default_tsc_calibration_method_to_pmtimer_on_EFI.patch
+
 #
 # SuSE Patch:
 #
@@ -83,6 +86,11 @@
 # have a dualboot with windows starting at sector 63
 Patch30001:	grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
 
+#
+# Unity Patches
+#
+# Fixes Mga#22918 - grub2-mkrescue still searches /boot/grub for config
+Patch22001:     grub2-2.02-unity-mkrescue-use-grub2-dir.patch
 
 BuildRequires:	autoconf
 BuildRequires:	autogen
@@ -163,6 +171,8 @@
 Recommends:	os-prober >= 1.53
 Recommends:	xorriso
 Requires:	grub2bootloader = %{version}-%{release}
+# Not available in Mga6
+#Requires:	console-setup
 
 %description common
 Common files used by both grub2 and grub2-efi.
@@ -304,8 +314,9 @@
 
 # Workaround for RHL Bug 817187
 install -d %{buildroot}%{_datadir}/locale/en/LC_MESSAGES
-ln -s %{_datadir}/locale/en@quot/LC_MESSAGES/grub.mo %{buildroot}%{_datadir}/locale/en/LC_MESSAGES/grub.mo
-
+cp -f %{buildroot}%{_datadir}/locale/en@quot/LC_MESSAGES/grub.mo \
+      %{buildroot}%{_datadir}/locale/en/LC_MESSAGES/grub.mo
+      
 cat > %{buildroot}/boot/%{name}/custom.cfg <<EOF
 # Set non-graphical text/background colours
 set menu_color_normal=cyan/blue

Actions: View

Attachments on bug 23268: 10272 | 10275 | 10276 | 10277