Hello community, here is the log from the commit of package grubby for openSUSE:Factory checked in at 2013-08-19 13:33:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grubby (Old) and /work/SRC/openSUSE:Factory/.grubby.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grubby" Changes: -------- New Changes file: --- /dev/null 2013-07-23 23:44:04.804033756 +0200 +++ /work/SRC/openSUSE:Factory/.grubby.new/grubby.changes 2013-08-19 13:33:27.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Thu Aug 8 14:57:33 UTC 2013 - [email protected] + +- Initial version 8.25-1 +- SUSE port - Added /boot/grub2/grub.cfg & /boot/grub2-efi/grub.cfg + to grub2config file list (fate#315181) New: ---- grubby-8.25.tar.bz2 grubby.changes grubby.spec suse-port.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grubby.spec ++++++ # # spec file for package grubby # # Copyright (c) 2013 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: grubby Version: 8.25 Release: 1 Summary: Command line tool for updating bootloader configs License: GPL-2.0+ Group: System Environment/Base Url: http://git.fedorahosted.org/git/grubby.git # we only pull git snaps at the moment # git clone git://git.fedorahosted.org/git/grubby.git # git archive --format=tar --prefix=grubby-%{version}/ HEAD |bzip2 > grubby-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 Patch: suse-port.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: git BuildRequires: glib2-devel BuildRequires: libblkid-devel BuildRequires: pkgconfig BuildRequires: popt-devel # for make test / getopt: BuildRequires: util-linux %ifarch s390 s390x Requires: s390utils-base %endif %ifarch %{arm} Requires: uboot-tools %endif %description grubby is a command line tool for updating and displaying information about the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) and zipl (s390) boot loaders. It is primarily designed to be used from scripts which install new kernels and need to find information about the current boot environment. %prep %setup -q %patch -p1 %build make %{?_smp_mflags} %check make test %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} # Remove installkernel as it is provided with mkinitrd package rm $RPM_BUILD_ROOT/sbin/installkernel rm $RPM_BUILD_ROOT%{_mandir}/man8/installkernel.8 %ifarch %{arm} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ install -p uboot $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/uboot mkdir -p $RPM_BUILD_ROOT/boot echo " " >> $RPM_BUILD_ROOT/boot/boot.scr %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING /sbin/new-kernel-pkg /sbin/grubby %{_mandir}/man8/*.8* %ifarch %{arm} %config(noreplace) %{_sysconfdir}/sysconfig/uboot %config(noreplace) /boot/boot.scr %endif %changelog ++++++ suse-port.patch ++++++ Index: grubby-8.25/grubby.c =================================================================== --- grubby-8.25.orig/grubby.c +++ grubby-8.25/grubby.c @@ -225,6 +225,8 @@ const char *grub2FindConfig(struct confi static const char *configFiles[] = { "/etc/grub2-efi.cfg", "/etc/grub2.cfg", + "/boot/grub2/grub.cfg", + "/boot/grub2-efi/grub.cfg", NULL }; static int i = -1; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
