Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2020-02-14 16:26:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Fri Feb 14 16:26:49 2020 rev:214 rq:770419 version:2.04 Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2019-12-23 22:36:01.741783484 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new.26092/grub2.changes 2020-02-14 16:26:53.127239858 +0100 @@ -1,0 +2,7 @@ +Tue Feb 4 07:59:40 UTC 2020 - Michael Chang <mch...@suse.com> + +- From Stefan Seyfried <se...@novell.slipkontur.de> : Fix grub2-install fails + with "not a directory" error (boo#1161641, bsc#1162403) + * grub2-install-fix-not-a-directory-error.patch + +------------------------------------------------------------------- New: ---- grub2-install-fix-not-a-directory-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.tjWIXC/_old 2020-02-14 16:26:55.011240880 +0100 +++ /var/tmp/diff_new_pack.tjWIXC/_new 2020-02-14 16:26:55.015240883 +0100 @@ -1,7 +1,7 @@ # # spec file for package grub2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -222,6 +222,7 @@ Patch85: grub2-getroot-scan-disk-pv.patch Patch92: grub2-util-30_os-prober-multiple-initrd.patch Patch93: grub2-getroot-support-nvdimm.patch +Patch94: grub2-install-fix-not-a-directory-error.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 @@ -506,6 +507,7 @@ %patch85 -p1 %patch92 -p1 %patch93 -p1 +%patch94 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 ++++++ grub2-install-fix-not-a-directory-error.patch ++++++ From: Stefan Seyfried <se...@novell.slipkontur.de> Subject: Makefile.am: makes sure that ext2/3/4 is tried before minix References: boo#1161641 I recently came across a strange grub2-install error when building kiwi images in OBS. The reason is a bug in the minix file system detection. I filed upstream bug [1]. Note I experienced this on SLES15-SP1. The bug is still present in current Tumbleweed [2]. This bug thus needs fixing in all supported openSUSE releases. The reproducer-script is called as root like bash ./grub-bug-57652-reproduce-suse.sh /tmp/grub-test.img /mnt /tmp needs 1GB of free storage to store the image. Maybe this would be good enough as a minimal-intrusive fix. It does not fix the minix detection code, but instead makes sure that ext[234] is tried before minix. [1] https://savannah.gnu.org/bugs/index.php?57652 [2] https://bugzilla.opensuse.org/attachment.cgi?id=828118 Index: grub-2.04/Makefile.am =================================================================== --- grub-2.04.orig/Makefile.am +++ grub-2.04/Makefile.am @@ -42,8 +42,11 @@ libgrub.pp: grub_script.tab.h grub_scrip -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) CLEANFILES += libgrub.pp +# the grep/sed ensures that ext2 gets initialized before minix* +# see https://savannah.gnu.org/bugs/?57652 libgrub_a_init.lst: libgrub.pp cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1) + if grep ^ext2 $@ >/dev/null; then sed '/ext2/d;/newc/iext2' < $@ > $@.tmp && mv $@.tmp $@; fi CLEANFILES += libgrub_a_init.lst libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
