[grub2] Fix release to -18 as that's the build we're doing...
Peter Jones
pjones at fedoraproject.org
Thu May 16 20:46:50 UTC 2013
commit 379acc058736a59a24f19b77fddf554b6d11be5b
Author: Peter Jones <pjones at redhat.com>
Date: Thu May 16 16:43:20 2013 -0400
Fix release to -18 as that's the build we're doing...
This build:
- Moves starfield to a subpackage
- Doesn't allow SSE or MMX on UEFI builds (#949761)
Signed-off-by: Peter Jones <pjones at redhat.com>
...ac-Don-t-use-extended-registers-on-x86_64.patch | 28 +++
...c-Don-t-disable-extended-registers-on-emu.patch | 27 +++
...le.common-Poison-float-and-double-on-non-.patch | 48 +++++
...instead-of-direct-assignment-for-complex-.patch | 200 --------------------
grub2.spec | 11 +-
5 files changed, 108 insertions(+), 206 deletions(-)
---
diff --git a/0002-configure.ac-Don-t-use-extended-registers-on-x86_64.patch b/0002-configure.ac-Don-t-use-extended-registers-on-x86_64.patch
new file mode 100644
index 0000000..34330dc
--- /dev/null
+++ b/0002-configure.ac-Don-t-use-extended-registers-on-x86_64.patch
@@ -0,0 +1,28 @@
+From ebef39797bef17e7a28678f4b8370e6b63e10cc4 Mon Sep 17 00:00:00 2001
+From: Vladimir 'phcoder' Serbinenko <phcoder at gmail.com>
+Date: Tue, 7 May 2013 20:42:05 +0200
+Subject: [PATCH 2/5] * configure.ac: Don't use extended registers on
+ x86_64. Reported by: Peter Jones.
+
+---
+ ChangeLog | 5 +++++
+ configure.ac | 2 ++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6c310f7..80549b0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -464,7 +464,9 @@ if test "x$target_cpu" = xi386; then
+ else
+ TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
+ fi
++fi
+
++if test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64; then
+ # Some toolchains enable these features by default, but they need
+ # registers that aren't set up properly in GRUB.
+ TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
+--
+1.8.2.1
+
diff --git a/0003-configure.ac-Don-t-disable-extended-registers-on-emu.patch b/0003-configure.ac-Don-t-disable-extended-registers-on-emu.patch
new file mode 100644
index 0000000..b98c9a5
--- /dev/null
+++ b/0003-configure.ac-Don-t-disable-extended-registers-on-emu.patch
@@ -0,0 +1,27 @@
+From 780556c3e1047acbcdfa588980f52c73d9aae89a Mon Sep 17 00:00:00 2001
+From: Vladimir 'phcoder' Serbinenko <phcoder at gmail.com>
+Date: Wed, 8 May 2013 11:01:11 +0200
+Subject: [PATCH 3/5] * configure.ac: Don't disable extended registers on
+ emu.
+
+---
+ ChangeLog | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 80549b0..fa0e00a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -466,7 +466,7 @@ if test "x$target_cpu" = xi386; then
+ fi
+ fi
+
+-if test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64; then
++if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$platform" != xemu; then
+ # Some toolchains enable these features by default, but they need
+ # registers that aren't set up properly in GRUB.
+ TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
+--
+1.8.2.1
+
diff --git a/0004-conf-Makefile.common-Poison-float-and-double-on-non-.patch b/0004-conf-Makefile.common-Poison-float-and-double-on-non-.patch
new file mode 100644
index 0000000..df0a7f2
--- /dev/null
+++ b/0004-conf-Makefile.common-Poison-float-and-double-on-non-.patch
@@ -0,0 +1,48 @@
+From 5c6c289a6a6c939e7fb3f4a7ba8a737794875a44 Mon Sep 17 00:00:00 2001
+From: Vladimir 'phcoder' Serbinenko <phcoder at gmail.com>
+Date: Wed, 8 May 2013 11:05:37 +0200
+Subject: [PATCH 4/5] * conf/Makefile.common: Poison float and double on
+ non-emu.
+
+---
+ ChangeLog | 4 ++++
+ conf/Makefile.common | 5 +++++
+ util/import_gcry.py | 6 ++++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index c185a55..ca1cb17 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -40,6 +40,11 @@ endif
+
+ # Other options
+
++if ! COND_emu
++CFLAGS_PLATFORM += -Dfloat=__grub_poision
++CFLAGS_PLATFORM += -Ddouble=__grub_poision
++endif
++
+ CPPFLAGS_DEFAULT = -DGRUB_FILE=\"$(subst $(srcdir)/,,$<)\"
+ CPPFLAGS_DEFAULT += -I$(builddir)
+ CPPFLAGS_DEFAULT += -I$(srcdir)
+diff --git a/util/import_gcry.py b/util/import_gcry.py
+index 18f5253..afa8e69 100644
+--- a/util/import_gcry.py
++++ b/util/import_gcry.py
+@@ -488,6 +488,12 @@ for src in sorted (os.listdir (os.path.join (indir, "src"))):
+ fw.close ()
+ continue
+ f = codecs.open (infile, "r", "utf-8")
++ if src == "types.h":
++ fw.write (f.read ().replace ("float f;", "").replace ("double g;", ""))
++ f.close ()
++ fw.close ()
++ continue
++
+ fw.write (f.read ())
+ f.close ()
+ fw.close ()
+--
+1.8.2.1
+
diff --git a/grub2.spec b/grub2.spec
index 417d1ba..f774788 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -41,7 +41,7 @@
Name: grub2
Epoch: 1
Version: 2.00
-Release: 19%{?dist}
+Release: 18%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
@@ -415,7 +415,9 @@ Patch0360: 0360-Add-bootpath-device-to-the-list.patch
Patch0361: 0361-add-GRUB_DISABLE_SUBMENU-option.patch
Patch0362: 0362-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
Patch0363: 0363-Move-bash-completion-script-922997.patch
-Patch0364: 0364-Use-memcpy-instead-of-direct-assignment-for-complex-.patch
+Patch0364: 0002-configure.ac-Don-t-use-extended-registers-on-x86_64.patch
+Patch0365: 0003-configure.ac-Don-t-disable-extended-registers-on-emu.patch
+Patch0366: 0004-conf-Makefile.common-Poison-float-and-double-on-non-.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -758,7 +760,6 @@ fi
%{_bindir}/%{name}-mkimage
%{_bindir}/%{name}-mkpasswd-pbkdf2
%{_bindir}/%{name}-mkrelpath
-%{_bindir}/%{name}-mount
%{_bindir}/%{name}-glue-efi
%{_bindir}/%{name}-render-label
%ifnarch %{sparc}
@@ -788,11 +789,9 @@ fi
%{_datarootdir}/grub/themes/starfield
%changelog
-* Wed May 15 2013 Matthias Clasen <mclasen at redhat.com> - 2.00-19
-- Fix a typo
-
* Fri May 10 2013 Matthias Clasen <mclasen at redhat.com> - 2.00-18
- Move the starfield theme to a subpackage (#962004)
+- Don't allow SSE or MMX on UEFI builds (#949761)
* Wed Apr 24 2013 Peter Jones <pjones at redhat.com> - 2.00-17.pj0
- Rebase to upstream snapshot.
More information about the scm-commits
mailing list