Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-02-11 10:27:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-01-14 16:35:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-02-11 10:27:07.000000000 +0100 @@ -1,0 +2,21 @@ +Sun Feb 9 12:41:01 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner. + +------------------------------------------------------------------- +Sun Feb 9 12:38:52 UTC 2014 - [email protected] + +- Version bump to 036 removing the need for patching from git. + +- removed patch: + * dracut_git_v034_to_head.patch + +------------------------------------------------------------------- +Fri Jan 31 13:49:27 UTC 2014 - [email protected] + +- Do not show usage error when no kernel was found. + This may happen several times at package installation time and floods + the logs. + Modify dracut_do_not_update_booloader_if_no_kernel_is_found.patch + +------------------------------------------------------------------- Old: ---- dracut-034.tar.xz dracut_git_v034_to_head.patch New: ---- dracut-036.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.5Mv66U/_old 2014-02-11 10:27:07.000000000 +0100 +++ /var/tmp/diff_new_pack.5Mv66U/_new 2014-02-11 10:27:07.000000000 +0100 @@ -16,12 +16,10 @@ # -%define dracutlibdir %{_prefix}/lib/dracut - +%define dracutlibdir %{_libexecdir}/dracut Name: dracut -Version: 034 +Version: 036 Release: 0 - Summary: Initramfs generator using udev License: GPL-2.0+ and LGPL-2.1+ Group: System/Base @@ -34,23 +32,15 @@ Source3: mkinitrd_setup_dummy Source4: purge-kernels Source5: purge-kernels.service - -Patch1: dracut_git_v034_to_head.patch Patch10: 0006-Install-bin-mount.patch Patch11: 0013-Correct-paths-for-openSUSE.patch Patch12: 0014-Check-for-plymouth-lib-directories.patch Patch13: dracut_do_not_update_booloader_if_no_kernel_is_found.patch -BuildRequires: bash - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: asciidoc +BuildRequires: bash BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt BuildRequires: pkgconfig(systemd) >= 199 -Obsoletes: mkinitrd < 2.8.2 -Provides: mkinitrd = 2.8.2 - Requires: bash Requires: coreutils Requires: cpio @@ -60,17 +50,19 @@ Requires: grep Requires: hardlink Requires: modutils +Requires: pigz Requires: sed Requires: systemd >= 200 +# systemd-sysvinit provides: poweroff, reboot, halt +Requires: systemd-sysvinit Requires: udev > 166 Requires: util-linux >= 2.21 Requires: xz -# systemd-sysvinit provides: poweroff, reboot, halt -Requires: systemd-sysvinit Recommends: binutils Recommends: logrotate -Requires: pigz - +Obsoletes: mkinitrd < 2.8.2 +Provides: mkinitrd = 2.8.2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %description @@ -111,7 +103,6 @@ %prep %setup -q -%patch1 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -125,7 +116,7 @@ make all -e CFLAGS="%{optflags}" %{?_smp_mflags} %install -make %{?_smp_mflags} install DESTDIR=%{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh @@ -137,8 +128,8 @@ # add suse cmline conversion mkdir -p %{buildroot}%{dracutlibdir}/modules.d/99suse -install -m 0755 %{S:1} %{buildroot}%{dracutlibdir}/modules.d/99suse/module-setup.sh -install -m 0755 %{S:2} %{buildroot}%{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh +install -m 0755 %{SOURCE1} %{buildroot}%{dracutlibdir}/modules.d/99suse/module-setup.sh +install -m 0755 %{SOURCE2} %{buildroot}%{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh # remove gentoo specific modules rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash @@ -167,16 +158,13 @@ mkdir -p %{buildroot}/sbin install -m 0755 mkinitrd-suse.sh %{buildroot}/sbin/mkinitrd mv %{buildroot}%{_mandir}/man8/mkinitrd-suse.8 %{buildroot}%{_mandir}/man8/mkinitrd.8 -install -m 0755 %{S:3} %{buildroot}/sbin/mkinitrd_setup +install -m 0755 %{SOURCE3} %{buildroot}/sbin/mkinitrd_setup mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 0644 dracut.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/dracut install -D -m 0755 %{SOURCE4} %{buildroot}/sbin/purge-kernels -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/purge-kernels.service - -%clean -rm -rf %{buildroot} +install -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/purge-kernels.service %pre %service_add_pre purge-kernels.service @@ -192,9 +180,10 @@ /sbin/mkinitrd /sbin/mkinitrd_setup %{_bindir}/lsinitrd -%config /etc/bash_completion.d/lsinitrd +%config %{_sysconfdir}/bash_completion.d/lsinitrd %dir %{dracutlibdir} %dir %{dracutlibdir}/modules.d +%{dracutlibdir}/skipcpio %{dracutlibdir}/dracut-functions.sh %{dracutlibdir}/dracut-functions %{dracutlibdir}/dracut-version.sh @@ -225,10 +214,10 @@ %{_mandir}/man8/dracut-pre-mount.service.8.* %{_mandir}/man8/dracut-shutdown.service.8.* %{_mandir}/man5/dracut.conf.5* -%dir /usr/lib/kernel -%dir /usr/lib/kernel/install.d -/usr/lib/kernel/install.d/50-dracut.install -/usr/lib/kernel/install.d/51-dracut-rescue.install +%dir %{_libexecdir}/kernel +%dir %{_libexecdir}/kernel/install.d +%{_libexecdir}/kernel/install.d/50-dracut.install +%{_libexecdir}/kernel/install.d/51-dracut-rescue.install %dir %{dracutlibdir}/modules.d/00systemd-bootchart %dir %{dracutlibdir}/modules.d/03rescue %{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh ++++++ dracut-034.tar.xz -> dracut-036.tar.xz ++++++ ++++ 15340 lines of diff (skipped) ++++++ dracut_do_not_update_booloader_if_no_kernel_is_found.patch ++++++ --- /var/tmp/diff_new_pack.5Mv66U/_old 2014-02-11 10:27:08.000000000 +0100 +++ /var/tmp/diff_new_pack.5Mv66U/_new 2014-02-11 10:27:08.000000000 +0100 @@ -2,14 +2,13 @@ =================================================================== --- dracut-034.orig/mkinitrd-suse.sh +++ dracut-034/mkinitrd-suse.sh -@@ -291,7 +291,10 @@ while (($# > 0)); do +@@ -291,7 +291,9 @@ while (($# > 0)); do done [[ $targets && $kernels ]] || default_kernel_images -[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage) +if [[ ! $targets || ! $kernels ]];then + error "No kernel found in $boot_dir" -+ usage -n +fi # We can have several targets/kernels, transform the list to an array -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
