Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (7ed6760fcfbc3d35b6d7404c1bcd86b4afe48172)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (7ed6760fcfbc3d35b6d7404c1bcd86b4afe48172)
  • Date: Wed, 23 Nov 2016 19:23:53 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

disk/grub2/BUILD | 2 +-
disk/grub2/CONFIGURE | 18 +++++++++++++++++-
disk/grub2/HISTORY | 5 +++++
3 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 7ed6760fcfbc3d35b6d7404c1bcd86b4afe48172
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

grub2: Disable efiemu on EFI platforms.

Match {target-cpu}-{target-platform} ./configure syntax.
Specify target platform and target CPU.

diff --git a/disk/grub2/BUILD b/disk/grub2/BUILD
index e1391d4..d764bdd 100755
--- a/disk/grub2/BUILD
+++ b/disk/grub2/BUILD
@@ -1,5 +1,5 @@
OPTS="${OPTS} ${GRUB2_OPTS} -disable-werror" &&
-OPTS="$OPTS --with-platform=${GRUB2_PLATFORM%/*}" &&
+OPTS="$OPTS --with-platform=${GRUB2_PLATFORM/*-}
--target=${GRUB2_PLATFORM%-*}" &&
CFLAGS=${CFLAGS//-m64/} &&
CFLAGS=$(echo ${CFLAGS} | sed -r "s;-O([0-9]|fast);-Os;g") &&
LDFLAGS=${LDFLAGS//-s /} &&
diff --git a/disk/grub2/CONFIGURE b/disk/grub2/CONFIGURE
index 62fff9e..c4d1ac0 100755
--- a/disk/grub2/CONFIGURE
+++ b/disk/grub2/CONFIGURE
@@ -19,5 +19,21 @@ config_query_option GRUB2_OPTS 'build and install the
efiemu runtimes?' y \
'--enable-efiemu' \
'--disable-efiemu' &&

+# Conversion to match {target-cpu}-{target-platform} ./configure syntax
+case ${GRUB2_PLATFORM} in
+ pc/i386) GRUB2_PLATFORM='i386-pc' ;;
+ efi/i386) GRUB2_PLATFORM='i386-efi' ;;
+ efi/x86_64) GRUB2_PLATFORM='x86_64-efi' ;;
+ *) ;; # Do nothing
+esac &&
+
config_query_list GRUB2_PLATFORM "Select platform:" \
- pc/i386 efi/i386 efi/x86_64
+ i386-pc i386-efi x86_64-efi &&
+
+case ${GRUB2_PLATFORM} in
+ *-efi) message "${MESSAGE_COLOR}EFI emulation runtime not supported on
platform ${GRUB2_PLATFORM}. Disabled.${DEFAULT_COLOR}" &&
+ list_remove GRUB2_OPTS '--enable-efiemu' &&
+ list_add GRUB2_OPTS '--disable-efiemu'
+ ;;
+ *) ;; # Do nothing
+esac
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 5600876..077a044 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,8 @@
+2016-11-23 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Match {target-cpu}-{target-platform} ./configure syntax.
+ Disable efiemu on EFI platforms.
+ * BUILD: Specify target platform and target CPU.
+
2016-03-02 Remko van der Vossen <wich AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, PRE_BUILD:
add beta version 2.02-beta3



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (7ed6760fcfbc3d35b6d7404c1bcd86b4afe48172), Eric Sandall, 11/23/2016

Archive powered by MHonArc 2.6.24.

Top of Page