Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2012-06-29 06:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grub2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2012-06-25 15:24:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2012-06-29 06:59:47.000000000 +0200 @@ -1,0 +2,17 @@ +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 + +------------------------------------------------------------------- Old: ---- gcc46-fixes.patch gccwarn.patch grub-1.99.tar.xz grub2-automake-1-11-2.patch grub2-gcc47.patch grub2-probe-disk-mountby.patch grub2-unused.patch os-prober_osx.patch translations-20111024.tar.bz2 New: ---- grub-2.00.tar.xz grub2-correct-font-path.patch rename-grub-info-file-to-grub2.patch translations-20120622.tar.xz use-grub2-as-a-package-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -33,17 +33,18 @@ 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: ruby -BuildRequires: xz -BuildRequires: autogen BuildRequires: python +BuildRequires: ruby +BuildRequires: xz-devel %if 0%{?suse_version} == 1210 BuildRequires: guile %endif @@ -61,30 +62,27 @@ %global efi %{ix86} x86_64 ia64 %endif -Version: 1.99 +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/ -Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz +%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-20111024.tar.bz2 -Patch0: gcc46-fixes.patch +Source5: translations-20120622.tar.xz +Patch0: grub2-correct-font-path.patch +Patch1: rename-grub-info-file-to-grub2.patch Patch2: grub2-linux.patch -Patch3: gccwarn.patch +Patch3: use-grub2-as-a-package-name.patch Patch4: grub2-linux-submenu.patch -Patch5: grub2-unused.patch Patch6: grub2-iterate-and-hook-for-extended-partition.patch Patch7: grub2-install-opt-skip-fs-probe.patch -Patch8: grub2-gcc47.patch -Patch9: os-prober_osx.patch -Patch10: grub2-probe-disk-mountby.patch -Patch11: grub2-automake-1-11-2.patch PreReq: perl-Bootloader Requires: gettext-runtime Requires: os-prober @@ -127,34 +125,24 @@ %endif %prep -# We create (if we build for efi) two copies of the sources -# in the Builddir -%setup -T -c -n grub-%{version} -%setup -D -T -q -n grub-%{version} -a 0 -(cd grub-%{version};tar xaf %{SOURCE5}) -(cd grub-%{version}/po && ls *.po | cut -d. -f1 | xargs) >grub-%{version}/po/LINGUAS -sed 's,@setfilename grub.info,@setfilename grub2.info,' grub-%{version}/docs/grub.texi >grub-%{version}/docs/grub2.texi -sed -i 's,grub.texi,grub2.texi,' grub-%{version}/docs/Makefile.am -## fix unifont location so grub-mkfont can create *.pf2 files -sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/uni|g' grub-%{version}/configure.ac +# 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 -%patch4 -p1 -%patch5 -p1 +#%%patch4 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 cd .. # README.openSUSE cp %{SOURCE3} grub-%{version}/ %ifarch %{efi} -cp -a grub-%{version} grub-efi-%{version} +(cp -a grub-%{version} grub-efi-%{version}) %endif %build @@ -171,7 +159,7 @@ --target=%{_target_platform} \ --with-platform=efi \ --program-transform-name=s,grub,%{name}-efi, -make %{?_smp_mflags} +make %{?_smp_mflags} pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi %ifarch %{ix86} %define grubefiarch i386-efi %else @@ -182,6 +170,7 @@ loadbios reboot halt search font gfxterm cd .. %endif + cd grub-%{version} ./autogen.sh @@ -210,7 +199,7 @@ %install %ifarch %{efi} cd grub-efi-%{version} -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/%{name}-efi pkgdatadir=%{_datadir}/%{name}-efi install # Ghost config file install -d $RPM_BUILD_ROOT/boot/%{name}-efi @@ -223,7 +212,6 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}-efi/*.h cd .. - %endif cd grub-%{version} @@ -242,7 +230,7 @@ # Defaults install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub -%find_lang grub +%find_lang %{name} %fdupes %buildroot%{_bindir} %post @@ -250,23 +238,16 @@ /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : mkdir -p /boot/%{name}/ 2>/dev/null || true -# Create device.map or reuse one from GRUB Legacy -if [ ! -e /boot/%{name}/device.map ] ; then - cp -u /boot/grub/device.map /boot/%{name}/device.map 2>/dev/null || - %{name}-mkdevicemap -fi -if [ -e /boot/%{name}/device.map ]; then - # 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 -fi +# 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} @@ -300,29 +281,57 @@ fi %endif -%files -f grub-%{version}/grub.lang +%files -f grub-%{version}/%{name}.lang %defattr(-,root,root,-) -%{_libdir}/%{name} -%{_sbindir}/%{name}-* -%{_datadir}/%{name} -%{_datadir}/grub -%ifarch %{efi} -%exclude %{_sbindir}/grub2-efi-* -%endif -%{_bindir}/%{name}-* -%ifarch %{efi} -%exclude %{_bindir}/%{name}-efi-* -%endif +%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/??_* -%dir /boot/%{name} -%ghost /boot/%{name}/grub.cfg -%doc grub-%{version}/COPYING grub-%{version}/NEWS -%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO -%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE +%{_sbindir}/%{name}-bios-setup +%{_sbindir}/%{name}-install +%{_sbindir}/%{name}-mkconfig +%{_sbindir}/%{name}-mknetdir +%{_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}/*/ +%{_libdir}/%{name}/*/*.image +%{_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* @@ -332,41 +341,46 @@ %defattr(-,root,root,-) %dir /boot/efi %dir /boot/efi/EFI -%attr(0755,root,root)/boot/efi/EFI/opensuse -%{_libdir}/grub2-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-mkdevicemap %{_sbindir}/grub2-efi-mknetdir -%{_sbindir}/grub2-efi-install +%{_sbindir}/grub2-efi-ofpathname %{_sbindir}/grub2-efi-probe %{_sbindir}/grub2-efi-reboot %{_sbindir}/grub2-efi-set-default -#%%{_sbindir}/grub2-efi-setup -%{_bindir}/grub2-efi-bin2h +%{_sbindir}/grub2-efi-sparc64-setup %{_bindir}/grub2-efi-editenv %{_bindir}/grub2-efi-fstest %{_bindir}/grub2-efi-kbdcomp %{_bindir}/grub2-efi-menulst2cfg -# %%{_bindir}/grub2-efi-mkelfimage +%{_bindir}/grub2-efi-mkstandalone %{_bindir}/grub2-efi-mkfont %{_bindir}/grub2-efi-mklayout %{_bindir}/grub2-efi-mkimage -# %%{_bindir}/grub2-efi-mkisofs %{_bindir}/grub2-efi-mkpasswd-pbkdf2 %{_bindir}/grub2-efi-mkrelpath %ifnarch %{sparc} ppc ppc64 %{_bindir}/grub2-efi-mkrescue %endif -%ifarch %{sparc} ppc ppc64 -%{_sbindir}/grub2-efi-ofpathname -%endif +%{_bindir}/grub2-efi-mount %{_bindir}/grub2-efi-script-check -%dir /boot/grub2-efi -%ghost /boot/grub2-efi/grub.cfg -%doc grub-%{version}/COPYING grub-%{version}/NEWS -%doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO -%doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE +%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 ++++++ 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-install-opt-skip-fs-probe.patch ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -1,3 +1,7 @@ +References: bnc#750897 + +--- + Index: grub-1.99/util/grub-install.in =================================================================== --- grub-1.99.orig/util/grub-install.in @@ -10,14 +14,14 @@ + setup_skip_fs_probe="--skip-fs-probe" ;; + -*) - echo "Unrecognized option \`$option'" 1>&2 + gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2 usage @@ -581,7 +584,7 @@ fi - # Perform the platform-dependent install - if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then + # 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_setup" ${allow_floppy} ${setup_verbose} ${setup_force} ${setup_skip_fs_probe} --directory="${grubdir}" \ +- "$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 [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then - if [ x"$update_nvram" = xyes ]; then + 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 ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -1,9 +1,12 @@ +References: bnc#750897 + +--- Index: grub-1.99/grub-core/partmap/msdos.c =================================================================== --- grub-1.99.orig/grub-core/partmap/msdos.c +++ grub-1.99/grub-core/partmap/msdos.c @@ -107,11 +107,15 @@ grub_partition_msdos_iterate (grub_disk_ - return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr"); + (unsigned long long) p.len); /* If this partition is a normal one, call the hook. */ - if (! grub_msdos_partition_is_empty (e->type) ++++++ grub2-linux.patch ++++++ --- /var/tmp/diff_new_pack.7gzGYl/_old 2012-06-29 06:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.7gzGYl/_new 2012-06-29 06:59:51.000000000 +0200 @@ -13,10 +13,10 @@ @@ -116,7 +116,7 @@ EOF message="$(gettext_printf "Loading Linux %s ..." ${version})" - cat << EOF + 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 - message="$(gettext_printf "Loading initial ramdisk ...")" + # TRANSLATORS: ramdisk isn't identifier. Should be translated. ++++++ 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
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