pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c8d45660b1
grub2/grub2-emu-4-all.patch
Michael Chang 62e3547e57 Accepting request 741033 from home:michael-chang:devel 
- Version bump to 2.04
  * removed
    - translations-20170427.tar.xz
  * grub2.spec
    - Make signed grub-tpm.efi specific to x86_64-efi build, the platform
      currently shipped with tpm module from upstream codebase
    - Add shim_lock to signed grub.efi in x86_64-efi build
    - x86_64: linuxefi now depends on linux, both will verify kernel via
      shim_lock
    - Remove translation tarball and po file hacks as it's been included in
      upstream tarball
  * rediff
    - grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
    - grub2-commands-introduce-read_file-subcommand.patch
    - grub2-secureboot-add-linuxefi.patch
    - 0001-add-support-for-UEFI-network-protocols.patch
    - grub2-efi-HP-workaround.patch
    - grub2-secureboot-install-signed-grub.patch
    - grub2-linux.patch
    - use-grub2-as-a-package-name.patch
    - grub2-pass-corret-root-for-nfsroot.patch
    - grub2-secureboot-use-linuxefi-on-uefi.patch
    - grub2-secureboot-no-insmod-on-sb.patch
    - grub2-secureboot-provide-linuxefi-config.patch
    - grub2-secureboot-chainloader.patch
    - grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
    - grub2-s390x-02-kexec-module-added-to-emu.patch
    - grub2-s390x-04-grub2-install.patch
    - grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
    - grub2-efi-chainloader-root.patch

OBS-URL: https://build.opensuse.org/request/show/741033
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=340
2019-10-18 10:18:53 +00:00

171 lines
4.8 KiB
Diff
Raw Blame History

---
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(-)
Index: grub-2.04~rc1/Makefile.util.def
===================================================================
--- grub-2.04~rc1.orig/Makefile.util.def
+++ grub-2.04~rc1/Makefile.util.def
@@ -362,7 +362,7 @@ program = {
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 = {
@@ -383,7 +383,7 @@ program = {
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 = {
@@ -399,7 +399,7 @@ program = {
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 = {
@@ -430,7 +430,7 @@ program = {
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 = {
@@ -1361,7 +1361,7 @@ program = {
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 = {
Index: grub-2.04~rc1/grub-core/Makefile.core.def
===================================================================
--- grub-2.04~rc1.orig/grub-core/Makefile.core.def
+++ grub-2.04~rc1/grub-core/Makefile.core.def
@@ -1139,7 +1139,7 @@ module = {
module = {
name = videotest;
common = commands/videotest.c;
- emu_condition = COND_NOT_s390x;
+ emu_condition = COND_NOT_emu;
};
module = {
@@ -1572,7 +1572,7 @@ module = {
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 = {
@@ -2008,13 +2008,13 @@ module = {
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 = {
@@ -2133,9 +2133,7 @@ module = {
enable = i386_xen_pvh;
enable = i386_efi;
enable = x86_64_efi;
- enable = emu;
enable = xen;
- emu_condition = COND_NOT_s390x;
};
module = {
@@ -2182,7 +2180,7 @@ module = {
module = {
name = gfxterm_menu;
common = tests/gfxterm_menu.c;
- emu_condition = COND_NOT_s390x;
+ emu_condition = COND_NOT_emu;
};
module = {
@@ -2334,9 +2332,7 @@ module = {
enable = i386_xen_pvh;
enable = i386_efi;
enable = x86_64_efi;
- enable = emu;
enable = xen;
- emu_condition = COND_NOT_s390x;
};
module = {
Index: grub-2.04~rc1/configure.ac
===================================================================
--- grub-2.04~rc1.orig/configure.ac
+++ grub-2.04~rc1/configure.ac
@@ -1911,6 +1911,7 @@ AC_SUBST(BUILD_LIBM)
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_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
AM_CONDITIONAL([COND_ia64_efi], [test x$target_cpu = xia64 -a x$platform = xefi])
Index: grub-2.04~rc1/grub-core/osdep/unix/emuconsole.c
===================================================================
--- grub-2.04~rc1.orig/grub-core/osdep/unix/emuconsole.c
+++ grub-2.04~rc1/grub-core/osdep/unix/emuconsole.c
@@ -50,13 +50,12 @@ static struct termios new_tty;
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 @@ readkey (struct grub_term_input *term)
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 @@ readkey_dumb (struct grub_term_input *te
p = c;
return c;
}
+#endif
static void
grub_dumb_putchar (struct grub_term_output *term,
Reference in New Issue View Git Blame Copy Permalink