commit grub2.1127 for openSUSE:12.2:Update

Hello community, here is the log from the commit of package grub2.1127 for openSUSE:12.2:Update checked in at 2012-12-04 13:36:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/grub2.1127 (Old) and /work/SRC/openSUSE:12.2:Update/.grub2.1127.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2.1127", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-11-30 12:21:47.308011256 +0100 +++ /work/SRC/openSUSE:12.2:Update/.grub2.1127.new/grub2.changes 2012-12-04 13:36:13.000000000 +0100 @@ -0,0 +1,324 @@ +------------------------------------------------------------------- +Thu Nov 22 02:47:07 UTC 2012 - mchang@suse.com + +- disable grub2-enable-theme-for-terminal-window.patch to use + default black background due to current background has poor + contrast to the font color (bnc#776244). + +------------------------------------------------------------------- +Wed Oct 17 14:54:33 UTC 2012 - arvidjaar@gmail.com + +- modify patch grub2-iterate-and-hook-for-extended-partition.patch to + ignore extended partitions other then primary (bnc#785341) + +------------------------------------------------------------------- +Tue Sep 18 08:11:49 UTC 2012 - mchang@suse.com + +- add grub2-fix-Grub2-with-SUSE-Xen-package-install.patch (bnc#774666) + +------------------------------------------------------------------- +Thu Sep 13 08:03:44 UTC 2012 - mchang@suse.com + +- add grub2-once (bnc#771587) +- add not-display-menu-when-boot-once.patch + +------------------------------------------------------------------- +Sat Jul 28 14:17:56 UTC 2012 - aj@suse.de + +- Fix build with missing gets declaration (glibc 2.16) + +------------------------------------------------------------------- +Fri Jul 27 13:22:24 UTC 2012 - tittiatcoke@gmail.com + +- Add grub2-enable-theme-for-terminal-window.patch (bnc#770107) + +------------------------------------------------------------------- +Thu Jul 19 11:03:37 UTC 2012 - mchang@suse.com + +- add grub2-fix-menu-in-xen-host-server.patch (bnc#757895) + +------------------------------------------------------------------- +Wed Jul 18 08:29:53 UTC 2012 - mchang@suse.com + +- add grub2-fix-error-terminal-gfxterm-isn-t-found.patch +- add grub2-fix-mo-not-copied-to-grubdir-locale.patch + +------------------------------------------------------------------- +Wed Jul 18 08:12:19 UTC 2012 - aj@suse.de + +- We only need makeinfo, not texinfo for building. + +------------------------------------------------------------------- +Tue Jul 17 21:12:26 CEST 2012 - jslaby@suse.de + +- fix build by adding texinfo to buildrequires. + +------------------------------------------------------------------- +Fri Jul 6 08:09:16 UTC 2012 - mchang@suse.com + +- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch. We + don't run in sigle user mode for recovery, instead use different + set kernel command line options which could be specified by this + GRUB_CMDLINE_LINUX_RECOVERY setting. + +------------------------------------------------------------------- +Wed Jul 4 06:20:23 UTC 2012 - mchang@suse.com + +- add use-grub2-efi-as-a-package-name.patch (bnc#769916) + +------------------------------------------------------------------- +Fri Jun 29 10:02:08 UTC 2012 - dvaleev@suse.com + +- Add configuration support for serial terminal consoles. This will + set the maximum screen size so that text is not overwritten. + +------------------------------------------------------------------- +Fri Jun 29 09:51:59 UTC 2012 - dvaleev@suse.com + +- don't enable grub-emu-usb on ppc ppc641 + +------------------------------------------------------------------- +Thu Jun 28 09:33:26 CEST 2012 - jslaby@suse.de + +- update to 2.0 final + * see ChangeLog for changes + +------------------------------------------------------------------- +Mon Jun 25 11:10:27 UTC 2012 - adrian@suse.de + +- enable xz/lzma support for image file generation + +------------------------------------------------------------------- +Sun Jun 24 18:10:27 UTC 2012 - jslaby@suse.de + +- update to 2.0 beta6, a snapshot from today + * see ChangeLog for changes + +------------------------------------------------------------------- +Fri Jun 22 08:50:12 UTC 2012 - mchang@suse.com + +- do not package grub.cfg, as it's generated at runtime and the + presence of it would confuse pygrub (bnc#768063) + +------------------------------------------------------------------- +Wed May 16 06:38:05 UTC 2012 - mchang@suse.com + +- fix build error on 12.1 caused by autogen aborts because of + absence of guile package + +------------------------------------------------------------------- +Wed May 2 03:17:21 UTC 2012 - mchang@suse.com + +- grub2-automake-1-11-2.patch : fix grub2 build error on newer + autotools (automake >= 1.11.2) +- call ./autogen.sh + +------------------------------------------------------------------- +Thu Apr 19 11:28:44 UTC 2012 - mchang@suse.com + +- grub2-probe-disk-mountby.patch : fix grub2-probe fails on + probing mount-by devices under /dev/disk/by-(id|uuid|path). + (bnc#757746) + +------------------------------------------------------------------- +Thu Mar 29 07:08:38 UTC 2012 - mchang@suse.com + +- Add Requires to os-prober as script depends on it for probing + foreign os (bnc#753229) + +------------------------------------------------------------------- +Wed Mar 21 06:58:43 UTC 2012 - mchang@suse.com + +- Mark %config(noreplace) to /etc/default/grub (bnc#753246) + +------------------------------------------------------------------- +Fri Mar 16 09:21:40 UTC 2012 - aj@suse.de + +- Fix build with gcc 4.7 (needs -fno-strict-aliasing for zfs code). + +------------------------------------------------------------------- +Tue Mar 13 04:06:06 UTC 2012 - mchang@suse.com + +- Fix error in installation to extended partition (bnc#750897) + add grub2-iterate-and-hook-for-extended-partition.patch + add grub2-install-opt-skip-fs-probe.patch + +------------------------------------------------------------------- +Mon Mar 12 09:34:40 UTC 2012 - tittiatcoke@gmail.com + +- Added BuildRequires for gnu-unifont in order to create the + necessary fonts for a graphical boot menu. + +------------------------------------------------------------------- +Mon Feb 20 13:04:51 UTC 2012 - andrea.turrini@gmail.com + +- fixed typos in grub2.spec + +------------------------------------------------------------------- +Mon Jan 2 03:16:13 UTC 2012 - mchang@suse.com + +- platforms without efi should not specify exclusion of it + +------------------------------------------------------------------- +Thu Dec 29 02:31:23 UTC 2011 - mchang@suse.com + +- set --target=%{_target_plaform) explicitly to %configure in case + it wouldn't do that for us implicitly +- when making x86_64-efi image not use i386 target build and keep + use of x86_64. otherwise it would have error "invalid ELF header" + +------------------------------------------------------------------- +Fri Dec 2 16:31:14 UTC 2011 - coolo@suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon Nov 28 09:40:44 CET 2011 - jslaby@suse.de + +- remove doubly packaged files +- remove INSTALL from docs +- handle duplicate bindir files + +------------------------------------------------------------------- +Mon Oct 31 13:08:21 CET 2011 - meissner@suse.de + +- make efi exclusion more complete + +------------------------------------------------------------------- +Thu Oct 27 08:16:58 UTC 2011 - aj@suse.de + +- efibootmgr only exists on x86-64 and ia64. + +------------------------------------------------------------------- +Tue Oct 25 08:38:19 UTC 2011 - aj@suse.de + +- Add requires from efi subpackage to main package (bnc#72596) + +------------------------------------------------------------------- ++++ 127 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.grub2.1127.new/grub2.changes New: ---- 90_persistent README.openSUSE grub-2.00.tar.xz grub.default grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch grub2-correct-font-path.patch grub2-enable-theme-for-terminal-window.patch grub2-fix-Grub2-with-SUSE-Xen-package-install.patch grub2-fix-error-terminal-gfxterm-isn-t-found.patch grub2-fix-menu-in-xen-host-server.patch grub2-fix-mo-not-copied-to-grubdir-locale.patch grub2-install-opt-skip-fs-probe.patch grub2-iterate-and-hook-for-extended-partition.patch grub2-linux.patch grub2-once grub2-ppc-terminfo.patch grub2-stdio.in.patch grub2.changes grub2.rpmlintrc grub2.spec not-display-menu-when-boot-once.patch rename-grub-info-file-to-grub2.patch translations-20120622.tar.xz use-grub2-as-a-package-name.patch use-grub2-efi-as-a-package-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ # # spec file for package grub2 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: grub2 %ifarch x86_64 ppc64 BuildRequires: freetype2-devel-32bit BuildRequires: gcc-32bit BuildRequires: glibc-32bit BuildRequires: glibc-devel-32bit BuildRequires: libncurses5-32bit BuildRequires: libusb-1_0-devel-32bit BuildRequires: ncurses-devel-32bit %else BuildRequires: freetype2-devel BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: libncurses5 BuildRequires: libusb-1_0-devel BuildRequires: ncurses-devel %endif BuildRequires: autogen BuildRequires: automake BuildRequires: bison BuildRequires: device-mapper-devel BuildRequires: fdupes BuildRequires: flex BuildRequires: fuse-devel BuildRequires: gnu-unifont BuildRequires: lzma BuildRequires: makeinfo BuildRequires: python BuildRequires: ruby BuildRequires: xz-devel %if 0%{?suse_version} == 1210 BuildRequires: guile %endif # Modules always contain just 32-bit code %define _libdir %{_exec_prefix}/lib %ifarch ppc ppc64 %define platform ieee1275 %else %define platform pc %endif # build efi bootloader on some platforms only: %if ! 0%{?efi} %global efi %{ix86} x86_64 ia64 %endif Version: 2.00 Release: 0 Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0+ Group: System/Boot Url: http://www.gnu.org/software/grub/ %define rev 20120622 Source0: grub-%{version}.tar.xz Source1: 90_persistent Source2: grub.default Source3: README.openSUSE Source4: grub2.rpmlintrc # rsync -Lrtvz translationproject.org::tp/latest/grub/ po Source5: translations-20120622.tar.xz Source6: grub2-once Patch0: grub2-correct-font-path.patch Patch1: rename-grub-info-file-to-grub2.patch Patch2: grub2-linux.patch Patch3: use-grub2-as-a-package-name.patch Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch7: grub2-install-opt-skip-fs-probe.patch Patch8: grub2-ppc-terminfo.patch Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch Patch10: grub2-fix-error-terminal-gfxterm-isn-t-found.patch Patch11: grub2-fix-mo-not-copied-to-grubdir-locale.patch Patch12: grub2-fix-menu-in-xen-host-server.patch Patch13: grub2-enable-theme-for-terminal-window.patch Patch14: grub2-stdio.in.patch Patch15: not-display-menu-when-boot-once.patch Patch16: grub2-fix-Grub2-with-SUSE-Xen-package-install.patch Patch99: use-grub2-efi-as-a-package-name.patch PreReq: perl-Bootloader Requires: gettext-runtime Requires: os-prober Requires(post): /sbin/install-info Requires(preun):/sbin/install-info BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc ppc64 %description This is the second version of the GRUB (Grand Unified Bootloader), a highly configurable and customizable bootloader with modular architecture. It supports rich scale of kernel formats, file systems, computer architectures and hardware devices. PLEASE NOTE: This is a development snapshot, and as such will not replace grub if you install it, but will be merely added as another kernel to your existing GRUB menu. Do not replace GRUB (grub package) with it unless you know what are you doing. Refer to README.openSUSE file that is part of this package's documentation for more information. %ifarch %{efi} %package efi Summary: GRUB2 for EFI systems Group: System/Boot %ifarch ia64 x86_64 #Package is available on ia64 and x86_64 only and not necessarily needed Requires: efibootmgr %endif Requires: grub2 %description efi The GRand Unified Bootloader (GRUB) is a highly configurable and customizable bootloader with modular architecture. It supports rich variety of kernel formats, file systems, computer architectures and hardware devices. This subpackage provides support for EFI systems. %endif %prep # We create (if we build for efi) two copies of the sources in the Builddir %setup -q -T -c -n grub-%{version} -a 0 -a 5 cp -r po grub-%{version}/ cd grub-%{version} (cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 # disable and back to use black colored terminal window (bnc#776244) #%patch13 -p1 %patch14 -p2 %patch15 -p1 %patch16 -p1 cd .. # README.openSUSE cp %{SOURCE3} grub-%{version}/ %ifarch %{efi} (cp -a grub-%{version} grub-efi-%{version}) cd grub-efi-%{version} %patch99 -p1 cd .. %endif %build %ifarch %{efi} cd grub-efi-%{version} ./autogen.sh # we don't want to let rpm to override *FLAGS by bogus ones CFLAGS="-fno-strict-aliasing " CXXFLAGS=" " FFLAGS=" " export CFLAGS CXXFLAGS FFLAGS %configure \ TARGET_LDFLAGS=-static \ --target=%{_target_platform} \ --with-platform=efi \ --program-transform-name=s,grub,%{name}-efi, make %{?_smp_mflags} %ifarch %{ix86} %define grubefiarch i386-efi %else %define grubefiarch %{_arch}-efi %endif ./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \ ext2 btrfs normal chain boot configfile linux appleldr minicmd \ loadbios reboot halt search font gfxterm cd .. %endif cd grub-%{version} ./autogen.sh # we don't want to let rpm to override *FLAGS by bogus ones CFLAGS="-fno-strict-aliasing " CXXFLAGS=" " FFLAGS=" " export CFLAGS CXXFLAGS FFLAGS # 64-bit x86-64 machines use 32-bit boot loader # (We cannot just redefine _target_cpu, as we'd get i386.rpm packages then) %ifarch x86_64 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} %endif %ifnarch ppc ppc64 %define extraconfigure --enable-grub-emu-usb %endif # -static is needed so that autoconf script is able to link # test that looks for _start symbol on 64 bit platforms %configure TARGET_LDFLAGS=-static \ --target=%{_target_platform} \ --with-platform=%{platform} \ %{extraconfigure} \ --program-transform-name=s,grub,%{name}, make %{?_smp_mflags} %install %ifarch %{efi} cd grub-efi-%{version} make DESTDIR=$RPM_BUILD_ROOT install # Ghost config file install -d $RPM_BUILD_ROOT/boot/%{name}-efi touch $RPM_BUILD_ROOT/boot/%{name}-efi/grub.cfg install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/ install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/grub.efi # Remove devel files rm $RPM_BUILD_ROOT/%{_libdir}/%{name}-efi/*/*.h rm $RPM_BUILD_ROOT%{_datadir}/%{name}-efi/*.h %find_lang %{name}-efi cd .. %endif cd grub-%{version} make DESTDIR=$RPM_BUILD_ROOT install # Script that makes part of grub.cfg persist across updates install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/ # Ghost config file install -d $RPM_BUILD_ROOT/boot/%{name} touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg # Remove devel files rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h # Defaults install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once %find_lang %{name} %fdupes %buildroot%{_bindir} %post /sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || : /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : mkdir -p /boot/%{name}/ 2>/dev/null || true # Determine the partition with /boot BOOT_PARTITION=$(df -h /boot |(read; awk '{print $1; exit}')) # Generate core.img, but don't let it be installed in boot sector %{name}-install --grub-setup=/bin/true $BOOT_PARTITION || true exec >/dev/null 2>&1 # Remove stale menu.lst entries /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || true # Add core.img as multiboot kernel to GRUB Legacy menu /sbin/update-bootloader --add --image /boot/%{name}/core.img --name="GNU GRUB 2" || true /sbin/update-bootloader --refresh || true %ifarch %{efi} %post efi /sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || : /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %endif %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : exec >/dev/null if [ -e /boot/%{name}/core.img ] ; then /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || : /sbin/update-bootloader --refresh || : fi # Cleanup installed files rm -f /boot/%{name}/*.mod rm -f /boot/%{name}/*.img rm -f /boot/%{name}/*.lst rm -f /boot/%{name}/device.map fi %ifarch %{efi} %preun efi if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %endif %files -f grub-%{version}/%{name}.lang %defattr(-,root,root,-) %doc grub-%{version}/COPYING grub-%{version}/NEWS grub-%{version}/README %doc grub-%{version}/THANKS grub-%{version}/TODO grub-%{version}/ChangeLog %doc grub-%{version}/README.openSUSE %dir /boot/%{name} %ghost /boot/%{name}/grub.cfg %{_sysconfdir}/bash_completion.d/grub %config(noreplace) %{_sysconfdir}/default/grub %dir %{_sysconfdir}/grub.d %{_sysconfdir}/grub.d/README %config %{_sysconfdir}/grub.d/??_* %{_sbindir}/%{name}-bios-setup %{_sbindir}/%{name}-install %{_sbindir}/%{name}-mkconfig %{_sbindir}/%{name}-mknetdir %{_sbindir}/%{name}-once %{_sbindir}/%{name}-ofpathname %{_sbindir}/%{name}-probe %{_sbindir}/%{name}-reboot %{_sbindir}/%{name}-set-default %{_sbindir}/%{name}-sparc64-setup %{_bindir}/%{name}-editenv %{_bindir}/%{name}-fstest %{_bindir}/%{name}-kbdcomp %{_bindir}/%{name}-menulst2cfg %{_bindir}/%{name}-mkfont %{_bindir}/%{name}-mkimage %{_bindir}/%{name}-mklayout %{_bindir}/%{name}-mkpasswd-pbkdf2 %{_bindir}/%{name}-mkrelpath %{_bindir}/%{name}-mkrescue %{_bindir}/%{name}-mkstandalone %{_bindir}/%{name}-mount %{_bindir}/%{name}-script-check %dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/*/ %ifnarch ppc ppc64 %{_libdir}/%{name}/*/*.image %endif %{_libdir}/%{name}/*/*.img %{_libdir}/%{name}/*/*.lst %{_libdir}/%{name}/*/*.mod %{_libdir}/%{name}/*/*.module %ifarch x86_64 %{_libdir}/%{name}/*/efiemu*.o %endif %{_libdir}/%{name}/*/gdb_grub2 %{_libdir}/%{name}/*/gmodule.pl %{_libdir}/%{name}/*/kernel.exec %{_libdir}/%{name}/*/modinfo.sh %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.pf2 %{_datadir}/%{name}/grub-mkconfig_lib %{_infodir}/grub-dev.info* %{_infodir}/%{name}.info* %ifarch %{efi} %files efi -f grub-efi-%{version}/%{name}-efi.lang %defattr(-,root,root,-) %dir /boot/efi %dir /boot/efi/EFI %dir /boot/efi/EFI/opensuse %attr(0755,root,root)/boot/efi/EFI/opensuse/grub.efi %dir /boot/grub2-efi %ghost /boot/grub2-efi/grub.cfg %{_sbindir}/grub2-efi-bios-setup %{_sbindir}/grub2-efi-install %{_sbindir}/grub2-efi-mkconfig %{_sbindir}/grub2-efi-mknetdir %{_sbindir}/grub2-efi-ofpathname %{_sbindir}/grub2-efi-probe %{_sbindir}/grub2-efi-reboot %{_sbindir}/grub2-efi-set-default %{_sbindir}/grub2-efi-sparc64-setup %{_bindir}/grub2-efi-editenv %{_bindir}/grub2-efi-fstest %{_bindir}/grub2-efi-kbdcomp %{_bindir}/grub2-efi-menulst2cfg %{_bindir}/grub2-efi-mkstandalone %{_bindir}/grub2-efi-mkfont %{_bindir}/grub2-efi-mklayout %{_bindir}/grub2-efi-mkimage %{_bindir}/grub2-efi-mkpasswd-pbkdf2 %{_bindir}/grub2-efi-mkrelpath %ifnarch %{sparc} ppc ppc64 %{_bindir}/grub2-efi-mkrescue %endif %{_bindir}/grub2-efi-mount %{_bindir}/grub2-efi-script-check %dir %{_libdir}/%{name}-efi/ %dir %{_libdir}/%{name}-efi/*/ %{_libdir}/%{name}-efi/*/*.img %{_libdir}/%{name}-efi/*/*.lst %{_libdir}/%{name}-efi/*/*.mod %{_libdir}/%{name}-efi/*/*.module %{_libdir}/%{name}-efi/*/gdb_grub2-efi %{_libdir}/%{name}-efi/*/gmodule.pl %{_libdir}/%{name}-efi/*/kernel.exec %{_libdir}/%{name}-efi/*/modinfo.sh %dir %{_datadir}/%{name}-efi %{_datadir}/%{name}-efi/grub-mkconfig_lib %{_datadir}/%{name}-efi/*.pf2 %endif %changelog ++++++ 90_persistent ++++++ #! /bin/sh -e # update-grub helper script. # Copyright (C) 2008 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # GRUB is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with GRUB. If not, see http://www.gnu.org/licenses/. # The output of this script is copied from part of grub.cfg # that correspond to itself. The achievement is that user can # modify that part of grub.cfg directly, and it will be persistent # across update-grub runs. transform="s&^&&;s,grub,grub2," ME=$(echo $0 |sed 's,/,\\/,g') GRUBCFG=/boot/`echo grub | sed ${transform}`/grub.cfg # Exit gracefully if there's no configuration file yet [ -f ${GRUBCFG} ] || exit 0 awk " BEGIN {echo = 0} /### BEGIN $ME ###/ {echo = 1; next} /### END $ME ###/ {echo = 0; next} {if (echo) print} " ${GRUBCFG} ++++++ README.openSUSE ++++++ Using GNU GRUB 2 in openSUSE ============================ Though GRUB 2 provides various feature enhancements over previous GRUB version (referred to as "GRUB", or "GRUB Legacy"), it did not reach its stability and feature completness yet, and thus is not ready to replace it for the whole user base. This package is primarily intended to encourage testing and accelerate distribution integration. It is generally safe to install the package. It is able to co-exist with existing GRUB installation and adds itself to the GRUB menu upon installation, so you'll able to select GRUB 2 from GRUB menu during the boot. Utilities --------- The GRUB 2 utilities are prefixed (or postfixed) with 'grub2': grub2-editenv grub2-mkimage grub2-mkelfimage grub2-mkrescue grub2-emu grub2-install grub2-mkdevicemap grub2-probe grub2-setup update-grub2 Documentation ------------- The GRUB 2 lacks documentation. While you are encouraged to contribute the documentation, you can use the GRUB 2 Wiki [1] as primary source of information pertaining to this development snapshot. [1] http://grub.enbug.org/ If you intend to install grub2 as your primary boot loader refer to the GRUB 2 Wiki for information on how to set it up. Support channels ---------------- If you find a bug in this package, report them to the openSUSE Bugzilla [2]. [2] http://bugzilla.novell.com/ Installation ------------ There is not yet any support in openSUSE to configure and install grub2. To install it for the first time, run (replace /dev/sdaX with your boot partition or use /dev/sda for the MBR): # grub2-install --no-floppy /dev/sdaX # grub2-mkconfig -o /boot/grub2/grub.cfg To just update the configuration after the kernel changes, run # grub2-mkconfig -o /boot/grub2/grub.cfg For testing, you might want to pass --grub-setup=/bin/true to grub2-install - this way, grub2 is not setup in the MBR and you can use grub to chainload a grub2 configuration. In the grub menu.lst, just add (after changing the hd0,1 parameter): title GNU GRUB 2 -- openSUSE 12.1 - GNU GRUB 2 kernel (hd0,1)/boot/grub2/core.img Warning ------- Currently, perl-Bootloader does not support grub2 as bootloader. Therefore you need to run the following after each kernel change: # grub2-mkconfig -o /boot/grub2/grub.cfg ++++++ grub.default ++++++ # If you change this file, run 'grub2-mkconfig -o /boot/grub2/grub.cfg' afterwards to update # /boot/grub2/grub.cfg. GRUB_DISTRIBUTOR="openSUSE" GRUB_DEFAULT=0 GRUB_HIDDEN_TIMEOUT=0 GRUB_HIDDEN_TIMEOUT_QUIET=true GRUB_TIMEOUT=10 GRUB_CMDLINE_LINUX_DEFAULT="quiet splash=silent" GRUB_CMDLINE_LINUX="" # Uncomment to enable BadRAM filtering, modify to suit your needs # This works with Linux (no patch required) and with any kernel that obtains # the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) #GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef" # Uncomment to disable graphical terminal (grub-pc only) #GRUB_TERMINAL=console # The resolution used on graphical terminal # note that you can use only modes which your graphic card supports via VBE # you can see them in real GRUB with the command `vbeinfo' #GRUB_GFXMODE=640x480 # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux #GRUB_DISABLE_LINUX_UUID=true # Uncomment to disable generation of recovery mode menu entries #GRUB_DISABLE_LINUX_RECOVERY="true" # Uncomment to get a beep at grub start #GRUB_INIT_TUNE="480 440 1" ++++++ grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch ++++++

From 6225854682a736e4312ce15b34c90fff03b002db Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 6 Jul 2012 15:55:18 +0800 Subject: [PATCH] add GRUB_CMDLINE_LINUX_RECOVERY for recovery mode

References: [openSUSE-factory] Has FailSafe or Safe Mode been removed permanently from 12.2? Patch-Mainline: no We adapt the script a bit in order to support openSUSE's failsafe booting mode. We don't use single user mode but with specific kernel command line options decided in YaST. These command line could be applied to grub2's recovery mode via the new setting GRUB_CMDLINE_LINUX_RECOVERY. --- util/grub-mkconfig.in | 3 ++- util/grub.d/10_linux.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 516be86..f61796f 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -216,7 +216,8 @@ export GRUB_DEFAULT \ GRUB_INIT_TUNE \ GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ - GRUB_BADRAM + GRUB_BADRAM \ + GRUB_CMDLINE_LINUX_RECOVERY if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index d856481..e7a180e 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -243,7 +243,7 @@ while [ "x$list" != "x" ] ; do "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_RECOVERY}" fi list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` -- 1.7.3.4 ++++++ grub2-correct-font-path.patch ++++++ Suse has its fonts in /usr/share/fonts/uni, so use it. --- --- a/configure.ac 2012-06-06 10:36:33 +0000 +++ b/configure.ac 2012-06-24 13:24:26 +0000 @@ -242,7 +242,7 @@ FONT_SOURCE= for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do if test -f "$dir/unifont.$ext"; then FONT_SOURCE="$dir/unifont.$ext" break 2 --- a/configure +++ b/configure @@ -4126,7 +4126,7 @@ fi FONT_SOURCE= for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do - for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni; do if test -f "$dir/unifont.$ext"; then FONT_SOURCE="$dir/unifont.$ext" break 2 ++++++ grub2-enable-theme-for-terminal-window.patch ++++++ --- a/util/grub.d/00_header.in 2012-03-27 21:45:08.992732967 -0400 +++ b/util/grub.d/00_header.in 2012-03-27 21:45:08.992732967 -0400 @@ -253,8 +253,9 @@ set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME` export theme EOF - elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \ - && is_path_readable_by_grub "$GRUB_BACKGROUND"; then + fi + if [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \ + && is_path_readable_by_grub "$GRUB_BACKGROUND"; then gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2 case "$GRUB_BACKGROUND" in *.png) reader=png ;; ++++++ grub2-fix-Grub2-with-SUSE-Xen-package-install.patch ++++++

From 86fdefd6b0d447cd7d3d80f794fcd4df2aa96792 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 30 Aug 2012 15:27:50 +0800 Subject: [PATCH] fix Grub2 with SUSE Xen package install

References: bnc#774666 Patch-Mainline: no This fixes Grub2 does not offer a Xen entry after installing hypervisor and tools, which is caused by install sequence of xen-kernel and xen is unpredictable. By judging the system is dom0 with xen kernel installed, the xen_list will be set to /boot/xen.gz if it's empty. Because the xen kernel would trigger the config updated prior to the xen package installation. --- util/grub.d/20_linux_xen.in | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index fd103f1..6a7c1e6 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -171,6 +171,19 @@ file_is_not_sym () { xen_list=`for i in /boot/xen*.gz; do if grub_file_is_not_garbage "$i" && test ! -L "$i" ; then echo -n "$i " ; fi done` + +# bnc#774666 - Grub2 does not offer a Xen entry after installing hypervisor and tools +# This is a workaround to the install sequence of xen-kernel and xen is unpredictable +if [ "x${xen_list}" = "x" ] && +# If the code reaches here, it means that xen-kernel has been installed, but xen hypervisor +# is missing. This is not likely a sane condition for dom0. We assume this is xen-kernel +# triggers config update prior to the xen package. +# Test the system is dom0, if it is, we set the xen_list to /boot/xen.gz which should become +# available after xen package installed. + [ -e /proc/xen/xsd_port -o ! -e /proc/xen ]; then + xen_list="/boot/xen.gz" +fi + prepare_boot_cache= boot_device_id= -- 1.7.3.4 ++++++ grub2-fix-error-terminal-gfxterm-isn-t-found.patch ++++++

From e2e0fe44cf2a03744e96f886f95ab2c2a8aed331 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 18 Jul 2012 14:54:32 +0800 Subject: [PATCH] fix error: terminal 'gfxterm' isn't found

References: bnc#771393 Patch-Mainline: no If set GRUB_TERMINAL="gfxterm", the error message "terminal 'gfxterm' isn't found" will be logged to screen. This is caused by GRUB_TERMINAL_INPUT erroneously set to gfxterm. This patch fixes the issue by not setting it. --- util/grub-mkconfig.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index f61796f..ca62e9f 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -146,7 +146,11 @@ fi # XXX: should this be deprecated at some point? if [ "x${GRUB_TERMINAL}" != "x" ] ; then - GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}" +# bnc#771393 - fix error: terminal 'gfxterm' isn't found. +# by not specifying 'gfxterm' to GRUB_TERMINAL_INPUT + if [ "x${GRUB_TERMINAL}" != "xgfxterm" ]; then + GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}" + fi GRUB_TERMINAL_OUTPUT="${GRUB_TERMINAL}" fi -- 1.7.3.4 ++++++ grub2-fix-menu-in-xen-host-server.patch ++++++

From b411dc88b46890400a2e1ba0aa8650e00f738c23 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 19 Jul 2012 18:43:55 +0800 Subject: [PATCH] fix menu in xen host server

References: bnc#771689, bnc#757895 Patch-Mainline: no When system is configred as "Xen Virtual Machines Host Server", the grub2 menu is not well organized. We could see some issues on it. - Many duplicated xen entries generated by links to xen hypervisor - Non bootable kernel entries trying to boot xen kernel natively - The -dbg xen hypervisor takes precedence over release version This patch fixes above three issues. --- util/grub-mkconfig_lib.in | 5 +++++ util/grub.d/10_linux.in | 12 ++++++++++-- util/grub.d/20_linux_xen.in | 6 ++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in index 76133b4..defc364 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -239,6 +239,11 @@ version_test_gt () *.old:*.old) ;; *.old:*) version_test_gt_a="`echo -n "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;; *:*.old) version_test_gt_b="`echo -n "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;; +# bnc#757895 - Grub2 menu items incorrect when "Xen Virtual Machines Host Server" selected +# The dbg version should be placed after release version + dbg-*:dbg-*) ;; + dbg-*:*) version_test_gt_a="" ;; + *:dbg-*) version_test_gt_b="" ;; esac version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b" return "$?" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index e7a180e..a02bf17 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -150,15 +150,23 @@ EOF EOF } +# bnc#757895 - Grub2 menu items incorrect when "Xen Virtual Machines Host Server" selected +# check kernel's flavor to prevent xen kernel from booting natively without hypervisor +is_not_xen () +{ + flavor=`echo $1 | sed -e "s,.*-,,g"` + test "x$flavor" != xxen +} + machine=`uname -m` case "x$machine" in xi?86 | xx86_64) list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + if grub_file_is_not_garbage "$i" && is_not_xen "$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 + if grub_file_is_not_garbage "$i" && is_not_xen "$i" ; then echo -n "$i " ; fi done` ;; esac diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index 1d94502..fd103f1 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -166,8 +166,10 @@ file_is_not_sym () { esac } -xen_list=`for i in /boot/xen*; do - if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi +# bnc#757895 - Grub2 menu items incorrect when "Xen Virtual Machines Host Server" selected +# wildcard expasion with correct suffix (.gz) and exclude symlinks for not generating many duplicated menu entries +xen_list=`for i in /boot/xen*.gz; do + if grub_file_is_not_garbage "$i" && test ! -L "$i" ; then echo -n "$i " ; fi done` prepare_boot_cache= boot_device_id= -- 1.7.3.4 ++++++ grub2-fix-mo-not-copied-to-grubdir-locale.patch ++++++

From 4b5567de4546b48e5911a45eba184c92ec45eed0 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 18 Jul 2012 15:11:59 +0800 Subject: [PATCH] fix mo not copied to ${grubdir}/locale/

References: bnc#771393 Patch-Mainline: no The hard-coded grub.mo should be replaced by @PACKAGE@.mo. For people who configure to use other package name, the hard-coded grub.mo is not matched thus not copied to ${grubdir}/locale. This patch fixes the issue by using @PACKAGE@.mo to correct match the file name. --- util/grub-install.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/util/grub-install.in b/util/grub-install.in index 3a7d332..af4e2e2 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -545,8 +545,8 @@ fi # Copy gettext files mkdir -p "${grubdir}"/locale/ for dir in "${localedir}"/*; do - if test -f "$dir/LC_MESSAGES/grub.mo"; then - cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo" + if test -f "$dir/LC_MESSAGES/@PACKAGE@.mo"; then + cp -f "$dir/LC_MESSAGES/@PACKAGE@.mo" "${grubdir}/locale/${dir##*/}.mo" fi done -- 1.7.3.4 ++++++ grub2-install-opt-skip-fs-probe.patch ++++++ From: Michael Chang To be able to install grub on an extended partition, user, if they are convinced it is a good idea, has to use --skip-fs-probe for grub-setup. For convenience, let us support --skip-fs-probe directly in grub-install and pass it to grub-setup internally. Otherwise with such a setup: Device Boot Start End Blocks Id System /dev/sda1 2048 4208639 2103296 82 Linux swap / Solaris /dev/sda2 * 4208640 213921791 104856576 f W95 Ext'd (LBA) /dev/sda5 4210688 46153727 20971520 83 Linux This fails: $ grub2-install --force /dev/sda2 /usr/sbin/grub2-probe: error: cannot find a GRUB drive for /dev/sda2. Check your device.map. Signed-off-by: Jiri Slaby References: https://bugzilla.novell.com/show_bug.cgi?id=750897 --- Index: grub-1.99/util/grub-install.in =================================================================== --- grub-1.99.orig/util/grub-install.in +++ grub-1.99/util/grub-install.in @@ -248,6 +248,9 @@ do -f | --force) setup_force="--force" ;; + -s | --skip-fs-probe) + setup_skip_fs_probe="--skip-fs-probe" ;; + -*) gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2 usage @@ -581,7 +584,7 @@ fi # Perform the grub_modinfo_platform-dependent install if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ] ; then # Now perform the installation. - "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \ + "$grub_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform" \ --device-map="${device_map}" "${install_device}" || exit 1 elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1275" ]; then ++++++ grub2-iterate-and-hook-for-extended-partition.patch ++++++ From: Michael Chang The same as in the previous patch, add a support for installing grub into an extended partition. Here, we do not ignore extended partitions anymore. Instead we call a hook that makes sure we have the partition when installing. Signed-off-by: Jiri Slaby References: https://bugzilla.novell.com/show_bug.cgi?id=750897 From: Andrey Borzenkov Apply this logic only to primary extended partition. Ignore extended partitions that are used to link together logical partitions. References: https://bugzilla.novell.com/show_bug.cgi?id=785341 --- Index: grub-2.00/grub-core/partmap/msdos.c =================================================================== --- grub-2.00.orig/grub-core/partmap/msdos.c +++ grub-2.00/grub-core/partmap/msdos.c @@ -181,13 +181,20 @@ grub_partition_msdos_iterate (grub_disk_ (unsigned long long) p.len); /* If this partition is a normal one, call the hook. */ - if (! grub_msdos_partition_is_empty (e->type) - && ! grub_msdos_partition_is_extended (e->type)) + if (! grub_msdos_partition_is_empty (e->type)) { - p.number++; + if (!grub_msdos_partition_is_extended (e->type) || p.number < 3) + { + p.number++; - if (hook (disk, &p)) - return grub_errno; + /* prevent someone doing mkfs or mkswap on an + extended partition, but leave room for LILO */ + if (grub_msdos_partition_is_extended (e->type)) + p.len = 2; + + if (hook (disk, &p)) + return grub_errno; + } } else if (p.number < 4) /* If this partition is a logical one, shouldn't increase the ++++++ grub2-linux.patch ++++++ Index: grub-1.99/util/grub.d/10_linux.in =================================================================== --- grub-1.99.orig/util/grub.d/10_linux.in +++ grub-1.99/util/grub.d/10_linux.in @@ -31,7 +31,7 @@ CLASS="--class gnu-linux --class gnu --c if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" + OS="${GRUB_DISTRIBUTOR}" CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" fi @@ -116,7 +116,7 @@ EOF message="$(gettext_printf "Loading Linux %s ..." ${version})" sed "s/^/$submenu_indentation/" << EOF echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ${args} EOF if test -n "${initrd}" ; then # TRANSLATORS: ramdisk isn't identifier. Should be translated. ++++++ grub2-once ++++++ #!/usr/bin/perl use strict; my $grub2_dir; my $grub2_reboot; my $show_mapped; my $id_name; my @menuentry; sub parse_menuentry { my ($parent, $menu) = @_; my @m = $menu =~ /(submenu|menuentry) \s+ '([^']*)' .*? ( \{ (?: [^{}]* | (?3))* \} )/sxg; for (my $i = 0; $i <= $#m; $i += 3) { my $type = $m[$i]; my $title = $m[$i+1]; my $data = $m[$i+2]; my $name = ($parent) ? "$parent>$title" : "$title"; if ($type eq "menuentry") { push @menuentry, $name; } elsif ($type eq "submenu") { &parse_menuentry ($name, $data); } } } $id_name = ""; if (@ARGV == 2 && ($ARGV[0] eq "--show-mapped")) { $show_mapped = 1; $id_name = $ARGV[1]; } elsif (@ARGV == 1) { $show_mapped = 0; $id_name = $ARGV[0]; } die "wrong command line options" if ($id_name eq ""); open(SYSCONF, "= 0) { $id = $i; $name = $menuentry[$id]; $ret = "$id"; } } if ($show_mapped > 0) { print $ret; } else { system "$grub2_reboot \"$name\""; } ++++++ grub2-ppc-terminfo.patch ++++++

From e263907f50e496e602edd9bd846ccb6e0565a085 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 Subject: [PATCH] Migrate PPC from Yaboot to Grub2

Add configuration support for serial terminal consoles. This will set the maximum screen size so that text is not overwritten. --- Makefile.util.def | 7 +++ util/grub.d/20_ppc_terminfo.in | 114 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 0 deletions(-) create mode 100644 util/grub.d/20_ppc_terminfo.in diff --git a/Makefile.util.def b/Makefile.util.def index c41b76e..b349758 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -423,6 +423,13 @@ script = { }; script = { + name = '20_ppc_terminfo'; + common = util/grub.d/20_ppc_terminfo.in; + installdir = grubconf; + condition = COND_HOST_LINUX; +}; + +script = { name = '30_os-prober'; common = util/grub.d/30_os-prober.in; installdir = grubconf; diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in new file mode 100644 index 0000000..10d6658 --- /dev/null +++ b/util/grub.d/20_ppc_terminfo.in @@ -0,0 +1,114 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see http://www.gnu.org/licenses/. + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libdir=@libdir@ +. "@datadir@/@PACKAGE@/grub-mkconfig_lib" + +export TEXTDOMAIN=@PACKAGE@ +export TEXTDOMAINDIR=@localedir@ + +X=80 +Y=24 +TERMINAL=ofconsole + +argument () { + opt=$1 + shift + + if test $# -eq 0; then + echo "$0: option requires an argument -- '$opt'" 1>&2 + exit 1 + fi + echo $1 +} + +check_terminfo () { + + while test $# -gt 0 + do + option=$1 + shift + + case "$option" in + terminfo | TERMINFO) + ;; + + -g) + NEWXY=`argument $option "$@"` + NEWX=`echo $NEWXY | cut -d x -f 1` + NEWY=`echo $NEWXY | cut -d x -f 2` + + if [ ${NEWX} -ge 80 ] ; then + X=${NEWX} + else + echo "Warning: ${NEWX} is less than the minimum size of 80" + fi + + if [ ${NEWY} -ge 24 ] ; then + Y=${NEWY} + else + echo "Warning: ${NEWY} is less than the minimum size of 24" + fi + + shift + ;; + + *) +# # accept console or ofconsole +# if [ "$option" != "console" -a "$option" != "ofconsole" ] ; then +# echo "Error: GRUB_TERMINFO unknown console: $option" +# exit 1 +# fi +# # perfer console +# TERMINAL=console + # accept ofconsole + if [ "$option" != "ofconsole" ] ; then + echo "Error: GRUB_TERMINFO unknown console: $option" + exit 1 + fi + # perfer console + TERMINAL=ofconsole + ;; + esac + + done + +} + +if ! uname -m | grep -q ppc ; then + exit 0 +fi + +if [ "x${GRUB_TERMINFO}" != "x" ] ; then + F1=`echo ${GRUB_TERMINFO} | cut -d " " -f 1` + + if [ "${F1}" != "terminfo" ] ; then + echo "Error: GRUB_TERMINFO is set to \"${GRUB_TERMINFO}\" The first word should be terminfo." + exit 1 + fi + + check_terminfo ${GRUB_TERMINFO} +fi + +cat << EOF + terminfo -g ${X}x${Y} ${TERMINAL} +EOF -- 1.7.7.2 ++++++ grub2-stdio.in.patch ++++++ From: Andreas Jaeger Date: Sat Jul 28 14:17:56 UTC 2012 Subject: [PATCH] Fix stdio.in.h with glibc 2.16 stdio.in.h expects that gets is declared but this is not the case with ISO C11 anymore which glibc 2.16 follows. This is a patch to a file that grub takes from gnulib - and is fixed in upstream gnulib and will thus be in grub2 once this file gets regenerated with a newer grub release. Patch-Mainline: no Index: grub-2.00/grub-2.00/grub-core/gnulib/stdio.in.h =================================================================== --- grub-2.00.orig/grub-2.00/grub-core/gnulib/stdio.in.h +++ grub-2.00/grub-2.00/grub-core/gnulib/stdio.in.h @@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not so any use of gets warrants an unconditional warning. Assume it is always declared, since it is required by C89. */ #undef gets +#if HAVE_RAW_DECL_GETS _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +#endif #if @GNULIB_FOPEN@ # if @REPLACE_FOPEN@ ++++++ grub2.rpmlintrc ++++++ addFilter("zero-length /boot/grub2/grub.cfg") addFilter("zero-length /boot/grub2-efi/grub.cfg") addFilter("non-etc-or-var-file-marked-as-conffile /boot/grub2/grub.cfg") addFilter("non-etc-or-var-file-marked-as-conffile /boot/grub2-efi/grub.cfg") addFilter("non-conffile-in-etc /etc/bash_completion.d/grub") addFilter("non-conffile-in-etc /etc/grub.d/README") addFilter("statically-linked-binary .*/grub2/i386-pc/kernel.img") # We need to supply unstripped files for grub addFilter("unstripped-binary-or-object .*/grub2/i386-pc/.*.mod") addFilter("unstripped-binary-or-object .*/grub2-efi/.*/.*.mod") ++++++ not-display-menu-when-boot-once.patch ++++++

From 78270522e8b8c0674941e0752c245dd8468e5bf8 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 1 Aug 2012 15:46:34 +0800 Subject: [PATCH] not display menu when boot once

References: bnc#771587 Patch-Mainline: no We should prevent the menu from being displayed if boot once is specified. This is in order to compliant with Grub1's behavior and is better than current as it's not make any sense to bother user to make decision when decision has been made. --- util/grub.d/00_header.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in index f495f85..d1c7916 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -280,13 +280,19 @@ make_timeout () verbose=" --verbose" fi cat << EOF -if sleep$verbose --interruptible ${1} ; then +if [ x\${boot_once} = xtrue ]; then + set timeout=0 +elif sleep$verbose --interruptible ${1} ; then set timeout=${2} fi EOF else cat << EOF -set timeout=${2} +if [ x\${boot_once} = xtrue ]; then + set timeout=0 +else + set timeout=${2} +fi EOF fi } -- 1.7.10.4 ++++++ rename-grub-info-file-to-grub2.patch ++++++

From 031abf80020b2fa75850d6e09f4489b687a5cb19 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sun, 24 Jun 2012 15:40:40 +0200 Subject: [PATCH] rename grub info file to grub2

Signed-off-by: Jiri Slaby --- docs/Makefile.am | 2 +- docs/Makefile.in | 46 ++++++++++++++++++++-------------------- docs/{grub.texi => grub2.texi} | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) rename docs/{grub.texi => grub2.texi} (99%) diff --git a/docs/Makefile.am b/docs/Makefile.am index 93eb396..4143042 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = subdir-objects # AM_MAKEINFOFLAGS = --no-split --no-validate -info_TEXINFOS = grub.texi grub-dev.texi +info_TEXINFOS = grub2.texi grub-dev.texi grub_TEXINFOS = fdl.texi EXTRA_DIST = font_char_metrics.png font_char_metrics.txt diff --git a/docs/Makefile.in b/docs/Makefile.in index 217ea7e..49dc477 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -35,8 +35,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = docs -DIST_COMMON = $(grub_TEXINFOS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/stamp-1 $(srcdir)/stamp-vti \ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/stamp-1 $(srcdir)/stamp-vti \ $(srcdir)/version-dev.texi $(srcdir)/version.texi mdate-sh \ texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -91,14 +91,14 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = -INFO_DEPS = $(srcdir)/grub.info $(srcdir)/grub-dev.info +INFO_DEPS = $(srcdir)/grub2.info $(srcdir)/grub-dev.info TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux -DVIS = grub.dvi grub-dev.dvi -PDFS = grub.pdf grub-dev.pdf -PSS = grub.ps grub-dev.ps -HTMLS = grub.html grub-dev.html -TEXINFOS = grub.texi grub-dev.texi +DVIS = grub2.dvi grub-dev.dvi +PDFS = grub2.pdf grub-dev.pdf +PSS = grub2.ps grub-dev.ps +HTMLS = grub2.html grub-dev.html +TEXINFOS = grub2.texi grub-dev.texi TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html @@ -767,7 +767,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = subdir-objects # AM_MAKEINFOFLAGS = --no-split --no-validate -info_TEXINFOS = grub.texi grub-dev.texi +info_TEXINFOS = grub2.texi grub-dev.texi grub_TEXINFOS = fdl.texi EXTRA_DIST = font_char_metrics.png font_char_metrics.txt all: all-am @@ -850,14 +850,14 @@ $(am__aclocal_m4_deps): rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -$(srcdir)/grub.info: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.dvi: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.pdf: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) -grub.html: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS) +$(srcdir)/grub2.info: grub2.texi $(srcdir)/version.texi +grub2.dvi: grub2.texi $(srcdir)/version.texi +grub2.pdf: grub2.texi $(srcdir)/version.texi +grub2.html: grub2.texi $(srcdir)/version.texi $(srcdir)/version.texi: $(srcdir)/stamp-vti -$(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure - @(dir=.; test -f ./grub.texi || dir=$(srcdir); \ - set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub.texi`; \ +$(srcdir)/stamp-vti: grub2.texi $(top_srcdir)/configure + @(dir=.; test -f ./grub2.texi || dir=$(srcdir); \ + set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub2.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ @@ -979,16 +979,16 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: - -rm -rf grub.aux grub.cp grub.cps grub.fn grub.ky grub.log grub.pg grub.tmp \ - grub.toc grub.tp grub.vr grub-dev.aux grub-dev.cp \ - grub-dev.cps grub-dev.fn grub-dev.ky grub-dev.log \ - grub-dev.pg grub-dev.tmp grub-dev.toc grub-dev.tp \ - grub-dev.vr + -rm -rf grub2.aux grub2.cp grub2.cps grub2.fn grub2.ky grub2.log grub2.pg \ + grub2.tmp grub2.toc grub2.tp grub2.vr grub-dev.aux \ + grub-dev.cp grub-dev.cps grub-dev.fn grub-dev.ky \ + grub-dev.log grub-dev.pg grub-dev.tmp grub-dev.toc \ + grub-dev.tp grub-dev.vr clean-aminfo: - -test -z "grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \ + -test -z "grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \ grub-dev.ps grub-dev.html" \ - || rm -rf grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \ + || rm -rf grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \ grub-dev.ps grub-dev.html maintainer-clean-aminfo: diff --git a/docs/grub.texi b/docs/grub2.texi similarity index 99% rename from docs/grub.texi rename to docs/grub2.texi index 26944ac..fb7fb0e 100644 --- a/docs/grub.texi +++ b/docs/grub2.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header -@setfilename grub.info +@setfilename grub2.info @include version.texi @settitle GNU GRUB Manual @value{VERSION} @c Unify all our little indices for now. -- 1.7.10.4 ++++++ use-grub2-as-a-package-name.patch ++++++

From 3729b131ef1dcaa043242e8074418249695d381b Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sun, 24 Jun 2012 20:51:52 +0200 Subject: [PATCH] use grub2 as a package name

This will ease all of the renaming of directories and all the pkgdata hacks. Signed-off-by: Jiri Slaby --- configure | 24 ++++++++++++------------ configure.ac | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 50e6bf6..544c16a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GRUB 2.00. +# Generated by GNU Autoconf 2.68 for GRUB2 2.00. # # Report bugs to . # @@ -558,10 +558,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='GRUB' -PACKAGE_TARNAME='grub' +PACKAGE_NAME='GRUB2' +PACKAGE_TARNAME='grub2' PACKAGE_VERSION='2.00' -PACKAGE_STRING='GRUB 2.00' +PACKAGE_STRING='GRUB2 2.00' PACKAGE_BUGREPORT='bug-grub@gnu.org' PACKAGE_URL='' @@ -1904,7 +1904,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GRUB 2.00 to adapt to many kinds of systems. +\`configure' configures GRUB2 2.00 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1952,7 +1952,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/grub] + --docdir=DIR documentation root [DATAROOTDIR/doc/grub2] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1975,7 +1975,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GRUB 2.00:";; + short | recursive ) echo "Configuration of GRUB2 2.00:";; esac cat <<\_ACEOF @@ -2108,7 +2108,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GRUB configure 2.00 +GRUB2 configure 2.00 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2812,7 +2812,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GRUB $as_me 2.00, which was +It was created by GRUB2 $as_me 2.00, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3789,7 +3789,7 @@ fi # Define the identity of the package. - PACKAGE='grub' + PACKAGE='grub2' VERSION='2.00' @@ -23344,7 +23344,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GRUB $as_me 2.00, which was +This file was extended by GRUB2 $as_me 2.00, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23414,7 +23414,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GRUB config.status 2.00 +GRUB2 config.status 2.00 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1b5132c..5ea7ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ dnl type, so there is no conflict. Variables with the prefix "TARGET_" dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target dnl type. -AC_INIT([GRUB],[2.00],[bug-grub@gnu.org]) +AC_INIT([GRUB2],[2.00],[bug-grub@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) -- 1.7.10.4 ++++++ use-grub2-efi-as-a-package-name.patch ++++++ From: Michael Chang Date: Wed, 4 Jun 2012 18:33:52 +0800 Subject: [PATCH] use grub2-efi as a package name References: bnc#769916 Patch-Mainline: no Use grub2-efi as package name when building grub2-efi package, this fixes inconsistent @PACKAGE@ used by the scripts, for example. Just fix those scripts one-by-one is probably not a good idea and maybe tedious, as we can't know how many potential problem related with it, better use same approach building grub2 to prevent such discrete result. Index: grub-2.00/configure =================================================================== --- grub-2.00.orig/configure +++ grub-2.00/configure @@ -558,10 +558,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='GRUB2' -PACKAGE_TARNAME='grub2' +PACKAGE_NAME='GRUB2-EFI' +PACKAGE_TARNAME='grub2-efi' PACKAGE_VERSION='2.00' -PACKAGE_STRING='GRUB2 2.00' +PACKAGE_STRING='GRUB2-EFI 2.00' PACKAGE_BUGREPORT='bug-grub@gnu.org' PACKAGE_URL='' @@ -1904,7 +1904,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GRUB2 2.00 to adapt to many kinds of systems. +\`configure' configures GRUB2-EFI 2.00 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1952,7 +1952,7 @@ Fine tuning of the installation director --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/grub2] + --docdir=DIR documentation root [DATAROOTDIR/doc/grub2-efi] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1975,7 +1975,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GRUB2 2.00:";; + short | recursive ) echo "Configuration of GRUB2-EFI 2.00:";; esac cat <<\_ACEOF @@ -2108,7 +2108,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GRUB2 configure 2.00 +GRUB2-EFI configure 2.00 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2812,7 +2812,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GRUB2 $as_me 2.00, which was +It was created by GRUB2-EFI $as_me 2.00, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3789,7 +3789,7 @@ fi # Define the identity of the package. - PACKAGE='grub2' + PACKAGE='grub2-efi' VERSION='2.00' Index: grub-2.00/configure.ac =================================================================== --- grub-2.00.orig/configure.ac +++ grub-2.00/configure.ac @@ -32,7 +32,7 @@ dnl type, so there is no conflict. Varia dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target dnl type. -AC_INIT([GRUB2],[2.00],[bug-grub@gnu.org]) +AC_INIT([GRUB2-EFI],[2.00],[bug-grub@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org