File grub2-emu-4-all.patch of Package grub2

Overview Repositories Revisions Requests Users Attributes Meta

File grub2-emu-4-all.patch of Package grub2 (Revision a77553ca51338c92a059372b7c8cc7b3)

Currently displaying revision a77553ca51338c92a059372b7c8cc7b3 , Show latest

---
 Makefile.util.def                 |   10 +++++-----
 configure.ac                      |    1 +
 grub-core/Makefile.core.def       |   14 +++++---------
 grub-core/osdep/unix/emuconsole.c |    5 +++--
 4 files changed, 14 insertions(+), 16 deletions(-)

--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -377,7 +377,7 @@
   ldadd = grub-core/lib/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
   cppflags = '-DGRUB_SETUP_FUNC=grub_util_bios_setup';
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 program = {
@@ -398,7 +398,7 @@
   ldadd = grub-core/lib/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
   cppflags = '-DGRUB_SETUP_FUNC=grub_util_sparc_setup';
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 program = {
@@ -414,7 +414,7 @@
   ldadd = libgrubkern.a;
   ldadd = grub-core/lib/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 program = {
@@ -445,7 +445,7 @@
   ldadd = libgrubkern.a;
   ldadd = grub-core/lib/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 data = {
@@ -1420,7 +1420,7 @@
   ldadd = libgrubkern.a;
   ldadd = grub-core/lib/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 program = {
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1183,7 +1183,7 @@
 module = {
   name = videotest;
   common = commands/videotest.c;
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 module = {
@@ -1638,7 +1638,7 @@
   common = gfxmenu/gui_progress_bar.c;
   common = gfxmenu/gui_util.c;
   common = gfxmenu/gui_string_util.c;
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 module = {
@@ -2077,13 +2077,13 @@
   name = gfxterm;
   common = term/gfxterm.c;
   enable = videomodules;
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 module = {
   name = gfxterm_background;
   common = term/gfxterm_background.c;
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 module = {
@@ -2204,9 +2204,7 @@
   enable = i386_xen_pvh;
   enable = i386_efi;
   enable = x86_64_efi;
-  enable = emu;
   enable = xen;
-  emu_condition = COND_NOT_s390x;
 };
 
 module = {
@@ -2253,7 +2251,7 @@
 module = {
   name = gfxterm_menu;
   common = tests/gfxterm_menu.c;
-  emu_condition = COND_NOT_s390x;
+  emu_condition = COND_NOT_emu;
 };
 
 module = {
@@ -2413,9 +2411,7 @@
   enable = i386_xen_pvh;
   enable = i386_efi;
   enable = x86_64_efi;
-  enable = emu;
   enable = xen;
-  emu_condition = COND_NOT_s390x;
 };
 
 module = {
--- a/configure.ac
+++ b/configure.ac
@@ -2061,6 +2061,7 @@
 
 AM_CONDITIONAL([COND_real_platform], [test x$platform != xnone])
 AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
+AM_CONDITIONAL([COND_NOT_emu], [test x$platform != xemu])
 AM_CONDITIONAL([COND_arm], [test x$target_cpu = xarm ])
 AM_CONDITIONAL([COND_arm_uboot], [test x$target_cpu = xarm -a x$platform = xuboot])
 AM_CONDITIONAL([COND_arm_coreboot], [test x$target_cpu = xarm -a x$platform = xcoreboot])
--- a/grub-core/osdep/unix/emuconsole.c
+++ b/grub-core/osdep/unix/emuconsole.c
@@ -50,13 +50,12 @@
 static int console_mode = 0;
 
 #define MAX_LEN 1023
-#if defined(__s390x__)
+
 static int
 dummy (void)
 {
   return 0;
 }
-#endif
 #if 0
 static char msg[MAX_LEN+1];
 static  void
@@ -128,6 +127,7 @@
   return -1;
 }
 
+#if defined(__s390x__)
 #define NO_KEY	((grub_uint8_t)-1)
 static int
 readkey_dumb (struct grub_term_input *term)
@@ -158,6 +158,7 @@
     p = c;
   return c;
 }
+#endif
 
 static void
 grub_dumb_putchar (struct grub_term_output *term,

Places

File grub2-emu-4-all.patch of Package grub2 (Revision a77553ca51338c92a059372b7c8cc7b3)

Places