diff --git a/.cvsignore b/.cvsignore index 4cad17f..477a4e6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dracut-0.9.tar.bz2 +dracut-001.tar.bz2 diff --git a/dracut.spec b/dracut.spec index 29aefd2..1a06670 100644 --- a/dracut.spec +++ b/dracut.spec @@ -5,15 +5,15 @@ %endif %if %{defined gittag} -%define rdist 1.git%{gittag}%{?dist} +%define rdist .git%{gittag}%{?dist} %define dashgittag -%{gittag} %else %define rdist %{?dist} %endif Name: dracut -Version: 0.9 -Release: 6%{?rdist} +Version: 001 +Release: 1%{?rdist} Summary: Initramfs generator using udev Group: System Environment/Base License: GPLv2+ @@ -40,9 +40,9 @@ Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0 Requires: cryptsetup-luks -Requires: bridge-utils Requires: file Requires: bzip2 +Requires: policycoreutils Requires: dmraid Requires: kbd @@ -54,20 +54,29 @@ BuildArch: noarch %description dracut is a new, event-driven initramfs infrastructure based around udev. -%package generic -Summary: Metapackage to build a generic initramfs with dracut +%package network +Summary: dracut modules to build a dracut initramfs with network support Requires: %{name} = %{version}-%{release} Requires: rpcbind nfs-utils Requires: iscsi-initiator-utils Requires: nbd Requires: net-tools iproute -Requires: plymouth-system-theme plymouth-theme-charge plymouth-theme-solar -Requires: plymouth-theme-fade-in plymouth-theme-spinfinity +Requires: bridge-utils + +%description network +This package requires everything which is needed to build a generic +all purpose initramfs with network support with dracut. + +%package generic +Summary: Metapackage to build a generic initramfs with dracut +Requires: %{name} = %{version}-%{release} +Requires: %{name}-network = %{version}-%{release} %description generic This package requires everything which is needed to build a generic all purpose initramfs with dracut. + %package kernel Summary: Metapackage to build generic initramfs with dracut with only kernel modules Requires: %{name} = %{version}-%{release} @@ -100,7 +109,8 @@ make %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin sysconfdir=/etc mandir=%{_mandir} +make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \ + sysconfdir=/etc mandir=%{_mandir} %if ! 0%{?with_switch_root} rm -f $RPM_BUILD_ROOT/sbin/switch_root @@ -114,28 +124,54 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) -%doc README HACKING TODO COPYING AUTHORS +%doc README HACKING TODO COPYING AUTHORS NEWS /sbin/dracut %if 0%{?with_switch_root} /sbin/switch_root %endif %dir %{_datadir}/dracut %{_datadir}/dracut/dracut-functions -%{_datadir}/dracut/modules.d %config(noreplace) /etc/dracut.conf %{_mandir}/man8/dracut.8* - -%files generic +%{_datadir}/dracut/modules.d/00dash +%{_datadir}/dracut/modules.d/10redhat-i18n +%{_datadir}/dracut/modules.d/10rpmversion +%{_datadir}/dracut/modules.d/50plymouth +%{_datadir}/dracut/modules.d/90crypt +%{_datadir}/dracut/modules.d/90dmraid +%{_datadir}/dracut/modules.d/90dmsquash-live +%{_datadir}/dracut/modules.d/90kernel-modules +%{_datadir}/dracut/modules.d/90lvm +%{_datadir}/dracut/modules.d/90mdraid +%{_datadir}/dracut/modules.d/95debug +%{_datadir}/dracut/modules.d/95resume +%{_datadir}/dracut/modules.d/95rootfs-block +%{_datadir}/dracut/modules.d/95s390 +%{_datadir}/dracut/modules.d/95terminfo +%{_datadir}/dracut/modules.d/95udev-rules +%{_datadir}/dracut/modules.d/95udev-rules.ub810 +%{_datadir}/dracut/modules.d/98syslog +%{_datadir}/dracut/modules.d/99base + +%files network %defattr(-,root,root,0755) -%doc README.generic +%{_datadir}/dracut/modules.d/40network +%{_datadir}/dracut/modules.d/95fcoe +%{_datadir}/dracut/modules.d/95iscsi +%{_datadir}/dracut/modules.d/95nbd +%{_datadir}/dracut/modules.d/95nfs %files kernel %defattr(-,root,root,0755) %doc README.kernel +%files generic +%defattr(-,root,root,0755) +%doc README.generic + %files tools %defattr(-,root,root,0755) -%doc COPYING +%doc COPYING NEWS /sbin/dracut-gencmdline /sbin/dracut-catimages %dir /boot/dracut @@ -143,50 +179,36 @@ rm -rf $RPM_BUILD_ROOT %dir /var/lib/dracut/overlay %changelog -* Wed Aug 26 2009 Dennis Gilmore 0.9-6 -- add BuildArch: noarch to actually make dracut noarch again - -* Wed Aug 26 2009 Karsten Hopp 0.9-5 -- make it noarch again, just excluding kbd on s390x doesn't - work as code needs to be changed as well. - -* Wed Aug 26 2009 Dennis Gilmore 0.9-4 -- its kbd not kdb - -* Wed Aug 26 2009 Dennis Gilmore 0.9-3 -- make arch specific. There are arch specific dependancies. -- add back kdb requirement on arches where its used. - -* Mon Aug 24 2009 Harald Hoyer 0.9-2 -- removed kdb requirement (because s390x does not have it) +* Wed Sep 02 2009 Harald Hoyer 001-1 +- version 001 +- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS * Fri Aug 14 2009 Harald Hoyer 0.9-1 - version 0.9 -- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS * Thu Aug 06 2009 Harald Hoyer 0.8-1 - version 0.8 -- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS +- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS * Fri Jul 24 2009 Harald Hoyer 0.7-1 - version 0.7 -- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS +- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS * Wed Jul 22 2009 Harald Hoyer 0.6-1 - version 0.6 -- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS +- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS * Fri Jul 17 2009 Harald Hoyer 0.5-1 - version 0.5 -- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS +- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS * Sat Jul 04 2009 Harald Hoyer 0.4-1 - version 0.4 -- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS +- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS * Thu Jul 02 2009 Harald Hoyer 0.3-1 - version 0.3 -- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut;a=blob_plain;f=NEWS +- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS * Wed Jul 01 2009 Harald Hoyer 0.2-1 - version 0.2 diff --git a/sources b/sources index 15680bc..eeb405a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e672a50435520c078e4b064f789850ce dracut-0.9.tar.bz2 +12d60478b28876747bee3d7c8c04be95 dracut-001.tar.bz2