From ace13a15f6285647f75084f5799a159ae9c8caa3ff6d43c50b86dee0c08ba627 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 13 Sep 2014 11:15:00 +0000 Subject: [PATCH 1/4] Accepting request 248825 from home:michael-chang:bnc895884 - fix xen pvops kernel not appear on menu (bnc#895286) * refresh grub2-fix-menu-in-xen-host-server.patch - fix extraneous comma in printf shell command (bnc#895884) * refresh grub2-btrfs-04-grub2-install.patch OBS-URL: https://build.opensuse.org/request/show/248825 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=112 --- grub2-btrfs-04-grub2-install.patch | 10 +++++----- grub2-fix-menu-in-xen-host-server.patch | 2 +- grub2.changes | 12 ++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/grub2-btrfs-04-grub2-install.patch b/grub2-btrfs-04-grub2-install.patch index e0f7889..ae75097 100644 --- a/grub2-btrfs-04-grub2-install.patch +++ b/grub2-btrfs-04-grub2-install.patch @@ -28,8 +28,8 @@ Index: grub-2.02~beta2/grub-core/osdep/unix/config.c - strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\", " - "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\""); -+ strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\", " -+ "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\", \"$SUSE_BTRFS_SNAPSHOT_BOOTING\""); ++ strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\" " ++ "\"$GRUB_ENABLE_CRYPTODISK\" \"$GRUB_DISTRIBUTOR\" \"$SUSE_BTRFS_SNAPSHOT_BOOTING\""); argv[2] = script; argv[3] = '\0'; @@ -70,7 +70,7 @@ Index: grub-2.02~beta2/util/grub-install.c =================================================================== --- grub-2.02~beta2.orig/util/grub-install.c +++ grub-2.02~beta2/util/grub-install.c -@@ -816,6 +816,8 @@ fill_core_services (const char *core_ser +@@ -803,6 +803,8 @@ fill_core_services (const char *core_ser free (sysv_plist); } @@ -79,7 +79,7 @@ Index: grub-2.02~beta2/util/grub-install.c int main (int argc, char *argv[]) { -@@ -849,6 +851,9 @@ main (int argc, char *argv[]) +@@ -836,6 +838,9 @@ main (int argc, char *argv[]) grub_util_load_config (&config); @@ -89,7 +89,7 @@ Index: grub-2.02~beta2/util/grub-install.c if (!bootloader_id && config.grub_distributor) { char *ptr; -@@ -1334,6 +1339,16 @@ main (int argc, char *argv[]) +@@ -1305,6 +1310,16 @@ main (int argc, char *argv[]) fprintf (load_cfg_f, "set debug='%s'\n", debug_image); } diff --git a/grub2-fix-menu-in-xen-host-server.patch b/grub2-fix-menu-in-xen-host-server.patch index ccc3619..db4a6cf 100644 --- a/grub2-fix-menu-in-xen-host-server.patch +++ b/grub2-fix-menu-in-xen-host-server.patch @@ -99,7 +99,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in + + if test "$xen_pv_domU" = "false" ; then + # prevent xen kernel without pv_opt support from booting -+ if (grep -qx "CONFIG_XEN=y" "${config}" 2> /dev/null && grep -qvx "CONFIG_PARAVIRT=y" "${config}" 2> /dev/null); then ++ if (grep -qx "CONFIG_XEN=y" "${config}" 2> /dev/null && ! grep -qx "CONFIG_PARAVIRT=y" "${config}" 2> /dev/null); then + echo "Skip xenlinux kernel $linux" >&2 + list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` + continue diff --git a/grub2.changes b/grub2.changes index e2be52a..0be78a7 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Sep 12 04:14:38 UTC 2014 - mchang@suse.com + +- fix xen pvops kernel not appear on menu (bnc#895286) + * refresh grub2-fix-menu-in-xen-host-server.patch + +------------------------------------------------------------------- +Wed Sep 10 10:34:47 UTC 2014 - mchang@suse.com + +- fix extraneous comma in printf shell command (bnc#895884) + * refresh grub2-btrfs-04-grub2-install.patch + ------------------------------------------------------------------- Wed Aug 27 07:53:35 UTC 2014 - schwab@suse.de From af4e19f8eeccfd5cefafdeabb6848f51d417c463c9503f0aa1ac4097472feba6 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 16 Sep 2014 05:55:16 +0000 Subject: [PATCH 2/4] Accepting request 249357 from home:arvidjaar:grub2-next add grub2-glibc-2.20.patch - fix build with glibc 2.20+ (use _DEFAULT_SOURCE to avoid warning) OBS-URL: https://build.opensuse.org/request/show/249357 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=113 --- grub2-glibc-2.20.patch | 34 ++++++++++++++++++++++++++++++++++ grub2.changes | 6 ++++++ grub2.spec | 3 +++ 3 files changed, 43 insertions(+) create mode 100644 grub2-glibc-2.20.patch diff --git a/grub2-glibc-2.20.patch b/grub2-glibc-2.20.patch new file mode 100644 index 0000000..cd81e3a --- /dev/null +++ b/grub2-glibc-2.20.patch @@ -0,0 +1,34 @@ +* grub-core/kern/emu/hostfs.c: squahes below warning + warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + +Signed-off-by: Khem Raj + +Upstream-Status: Submitted +--- + grub-core/kern/emu/hostfs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c +index 7e725f6..823116d 100644 +--- a/grub-core/kern/emu/hostfs.c ++++ b/grub-core/kern/emu/hostfs.c +@@ -19,7 +19,11 @@ + + #include + ++/* Legacy feature macro.*/ + #define _BSD_SOURCE ++/* New feature macro that provides everything _BSD_SOURCE and ++ * _SVID_SOURCE provided and possibly more. */ ++#define _DEFAULT_SOURCE + #include + #include + #include +-- +2.1.0 + + +_______________________________________________ +Grub-devel mailing list +Grub-devel@gnu.org +https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/grub2.changes b/grub2.changes index 0be78a7..32ef9af 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 15 15:30:03 UTC 2014 - arvidjaar@gmail.com + +- add grub2-glibc-2.20.patch - fix build with glibc 2.20+ + (use _DEFAULT_SOURCE to avoid warning) + ------------------------------------------------------------------- Fri Sep 12 04:14:38 UTC 2014 - mchang@suse.com diff --git a/grub2.spec b/grub2.spec index 313f204..8fdfea2 100644 --- a/grub2.spec +++ b/grub2.spec @@ -156,6 +156,8 @@ Patch102: grub2-btrfs-02-export-subvolume-envvars.patch Patch103: grub2-btrfs-03-follow_default.patch Patch104: grub2-btrfs-04-grub2-install.patch Patch105: grub2-btrfs-05-grub2-mkconfig.patch +# Fix build with glibc 2.20+ +Patch106: grub2-glibc-2.20.patch # PowerPC LE support Patch201: grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch Patch202: grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch @@ -356,6 +358,7 @@ mv po/grub.pot po/%{name}.pot %patch103 -p1 %patch104 -p1 %patch105 -p1 +%patch106 -p1 %patch201 -p1 %patch202 -p1 %patch203 -p1 From 292a009a627c98cc8731c6c84ce18617067c7118c16cfced2df5293c4b5121c5 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 16 Sep 2014 09:34:50 +0000 Subject: [PATCH 3/4] Accepting request 249503 from home:Andreas_Schwab:Factory - grub2-mkconfig-aarch64.patch: Look for Image-* instead of vmlinuz-* on aarch64 OBS-URL: https://build.opensuse.org/request/show/249503 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=114 --- grub2-mkconfig-aarch64.patch | 17 +++++++++++++++++ grub2.changes | 6 ++++++ grub2.spec | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 grub2-mkconfig-aarch64.patch diff --git a/grub2-mkconfig-aarch64.patch b/grub2-mkconfig-aarch64.patch new file mode 100644 index 0000000..537c065 --- /dev/null +++ b/grub2-mkconfig-aarch64.patch @@ -0,0 +1,17 @@ +grub-mkonfig: Look for Image-* on aarch64 + +Index: grub-2.02~beta2/util/grub.d/10_linux.in +=================================================================== +--- grub-2.02~beta2.orig/util/grub.d/10_linux.in ++++ grub-2.02~beta2/util/grub.d/10_linux.in +@@ -168,6 +168,10 @@ case "x$machine" in + list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; ++ xaarch64) ++ list=`for i in /boot/Image-* /Image-* /boot/kernel-* ; do ++ if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi ++ done` ;; + *) + list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi diff --git a/grub2.changes b/grub2.changes index 32ef9af..ade3cad 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 16 07:08:18 UTC 2014 - schwab@suse.de + +- grub2-mkconfig-aarch64.patch: Look for Image-* instead of vmlinuz-* on + aarch64 + ------------------------------------------------------------------- Mon Sep 15 15:30:03 UTC 2014 - arvidjaar@gmail.com diff --git a/grub2.spec b/grub2.spec index 8fdfea2..188e53e 100644 --- a/grub2.spec +++ b/grub2.spec @@ -150,6 +150,7 @@ Patch39: grub2-use-rpmsort-for-version-sorting.patch Patch40: aarch64-reloc.patch Patch41: grub2-vbe-blacklist-preferred-1440x900x32.patch Patch42: grub2-btrfs-fix-incorrect-address-reference.patch +Patch43: grub2-mkconfig-aarch64.patch # Btrfs snapshot booting related patches Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch Patch102: grub2-btrfs-02-export-subvolume-envvars.patch @@ -353,6 +354,7 @@ mv po/grub.pot po/%{name}.pot %patch40 -p1 %patch41 -p1 %patch42 -p1 +%patch43 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 From 1f44d7d11770695cd272b2f4beeb079feeddd4e7efeba7b0aa6ee0ae817a39c3 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 17 Sep 2014 03:45:57 +0000 Subject: [PATCH 4/4] Accepting request 249623 from home:arvidjaar:grub2-next No real changes, it just moves glibc 2.20 patch to proper place so it is not mixed with btrfs patches. Sorry for messing it up. OBS-URL: https://build.opensuse.org/request/show/249623 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=115 --- grub2.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grub2.spec b/grub2.spec index 188e53e..66edc29 100644 --- a/grub2.spec +++ b/grub2.spec @@ -151,14 +151,14 @@ Patch40: aarch64-reloc.patch Patch41: grub2-vbe-blacklist-preferred-1440x900x32.patch Patch42: grub2-btrfs-fix-incorrect-address-reference.patch Patch43: grub2-mkconfig-aarch64.patch +# Fix build with glibc 2.20+ +Patch44: grub2-glibc-2.20.patch # Btrfs snapshot booting related patches Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch Patch102: grub2-btrfs-02-export-subvolume-envvars.patch Patch103: grub2-btrfs-03-follow_default.patch Patch104: grub2-btrfs-04-grub2-install.patch Patch105: grub2-btrfs-05-grub2-mkconfig.patch -# Fix build with glibc 2.20+ -Patch106: grub2-glibc-2.20.patch # PowerPC LE support Patch201: grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch Patch202: grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch @@ -355,12 +355,12 @@ mv po/grub.pot po/%{name}.pot %patch41 -p1 %patch42 -p1 %patch43 -p1 +%patch44 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -p1 %patch201 -p1 %patch202 -p1 %patch203 -p1