From 084354190e77d0d571f3ac220a1a8a5c5819820f68ff09f6a175ca323e692474 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Tue, 4 Mar 2014 18:26:06 +0000 Subject: [PATCH] Accepting request 224659 from home:trenn:branches:Base:System - Merge all dracut-* packages to one dracut.rpm package. Subpackages only had one or two minor files not worth splitting a package or dracut-network had important modules which should (like former main dracut package) always get installed - libcap does not exist and libcap2 or friends are not needed -> remove Requires: libcap - Reorder (sort) the files section a bit OBS-URL: https://build.opensuse.org/request/show/224659 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=108 --- dracut.changes | 11 +++++++ dracut.spec | 79 ++++++++++++-------------------------------------- 2 files changed, 30 insertions(+), 60 deletions(-) diff --git a/dracut.changes b/dracut.changes index ba2f3ce..d2cd321 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 3 16:51:30 UTC 2014 - trenn@suse.de + +- Merge all dracut-* packages to one dracut.rpm package. + Subpackages only had one or two minor files not worth splitting a package + or dracut-network had important modules which should (like former main + dracut package) always get installed +- libcap does not exist and libcap2 or friends are not needed + -> remove Requires: libcap +- Reorder (sort) the files section a bit + ------------------------------------------------------------------- Mon Mar 3 16:30:48 UTC 2014 - trenn@suse.de diff --git a/dracut.spec b/dracut.spec index efc3812..88e2a9f 100644 --- a/dracut.spec +++ b/dracut.spec @@ -81,35 +81,6 @@ into the initramfs. Dracut contains various modules which are driven by the event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as NFS, iSCSI, NBD, FCoE with the dracut-network package. -%package network -Summary: Dracut modules to build a dracut initramfs with network support -Group: System/Base -Requires: %{name} = %{version} -Obsoletes: dracut-generic < 008 -Provides: dracut-generic = %{version} - -%description network -This package requires everything which is needed to build a generic -all purpose initramfs with network support with dracut. - -%package caps -Summary: Dracut modules to build a dracut initramfs which drops capabilities -Group: System/Base -Requires: %{name} = %{version} -Requires: libcap - -%description caps -This package requires everything which is needed to build an -all purpose initramfs with dracut, which drops capabilities. - -%package tools -Summary: Dracut tools to build the local initramfs -Group: System/Base -Requires: %{name} = %{version} - -%description tools -This package contains tools to assemble the local initrd and host configuration. - %prep %setup -q %patch10 -p1 @@ -200,11 +171,12 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra %defattr(-,root,root,0755) %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg %{_bindir}/dracut +%{_bindir}/dracut-catimages +%{_bindir}/lsinitrd /sbin/purge-kernels /sbin/installkernel /sbin/mkinitrd /sbin/mkinitrd_setup -%{_bindir}/lsinitrd %config %{_sysconfdir}/bash_completion.d/lsinitrd %dir %{dracutlibdir} %dir %{dracutlibdir}/modules.d @@ -239,23 +211,31 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra %{_mandir}/man8/dracut-pre-mount.service.8.* %{_mandir}/man8/dracut-shutdown.service.8.* %{_mandir}/man5/dracut.conf.5* +%{_mandir}/man8/dracut-catimages.8* %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/00bash %{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh -%{dracutlibdir}/modules.d/03rescue/module-setup.sh %{dracutlibdir}/modules.d/00bootchart +%{dracutlibdir}/modules.d/02caps +%{dracutlibdir}/modules.d/03modsign +%{dracutlibdir}/modules.d/03rescue/module-setup.sh %{dracutlibdir}/modules.d/04watchdog %{dracutlibdir}/modules.d/05busybox %{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/30convertfs +%{dracutlibdir}/modules.d/40network %{dracutlibdir}/modules.d/45url-lib +%{dracutlibdir}/modules.d/45ifcfg %{dracutlibdir}/modules.d/50drm %{dracutlibdir}/modules.d/50plymouth %{dracutlibdir}/modules.d/80cms +%{dracutlibdir}/modules.d/90livenet +%{dracutlibdir}/modules.d/90qemu-net %{dracutlibdir}/modules.d/90btrfs %{dracutlibdir}/modules.d/90crypt %{dracutlibdir}/modules.d/90dm @@ -268,6 +248,13 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop +%{dracutlibdir}/modules.d/95znet +%{dracutlibdir}/modules.d/95fcoe-uefi +%{dracutlibdir}/modules.d/95nbd +%{dracutlibdir}/modules.d/95nfs +%{dracutlibdir}/modules.d/95ssh-client +%{dracutlibdir}/modules.d/95fcoe +%{dracutlibdir}/modules.d/95iscsi %{dracutlibdir}/modules.d/95cifs %{dracutlibdir}/modules.d/95debug %{dracutlibdir}/modules.d/95resume @@ -298,11 +285,7 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra %{dracutlibdir}/modules.d/99img-lib %{dracutlibdir}/modules.d/99shutdown %{dracutlibdir}/modules.d/99suse -%dir %{dracutlibdir}/modules.d/03modsign -%{dracutlibdir}/modules.d/03modsign/load-modsign-keys.sh -%{dracutlibdir}/modules.d/03modsign/module-setup.sh -%dir %{dracutlibdir}/modules.d/00bash -%{dracutlibdir}/modules.d/00bash/module-setup.sh +%{dracutlibdir}/modules.d/99uefi-lib %config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %if %{defined _unitdir} @@ -311,30 +294,6 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra %{_unitdir}/*/*.service %endif %config %{_sysconfdir}/bash_completion.d/dracut - -%files network -%defattr(-,root,root,0755) -%{dracutlibdir}/modules.d/40network -%{dracutlibdir}/modules.d/95fcoe -%{dracutlibdir}/modules.d/95iscsi -%{dracutlibdir}/modules.d/90livenet -%{dracutlibdir}/modules.d/90qemu-net -%{dracutlibdir}/modules.d/95nbd -%{dracutlibdir}/modules.d/95nfs -%{dracutlibdir}/modules.d/95ssh-client -%{dracutlibdir}/modules.d/45ifcfg -%{dracutlibdir}/modules.d/95znet -%{dracutlibdir}/modules.d/95fcoe-uefi -%{dracutlibdir}/modules.d/99uefi-lib - -%files caps -%defattr(-,root,root,0755) -%{dracutlibdir}/modules.d/02caps - -%files tools -%defattr(-,root,root,0755) -%{_mandir}/man8/dracut-catimages.8* -%{_bindir}/dracut-catimages %dir /boot/dracut %dir %{_localstatedir}/lib/dracut %dir %{_localstatedir}/lib/dracut/overlay