rpms/dracut/devel dracut.spec, 1.53, 1.54 sources, 1.32, 1.33 dracut-004-emergency.patch, 1.1, NONE dracut-004-firmware.patch, 1.1, NONE dracut-004-forcepermissive.patch, 1.1, NONE dracut-004-multipath-check.patch, 1.1, NONE

Fri Mar 19 16:49:22 UTC 2010

Author: harald

Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16146

Modified Files:
	dracut.spec sources 
Removed Files:
	dracut-004-emergency.patch dracut-004-firmware.patch 
	dracut-004-forcepermissive.patch 
	dracut-004-multipath-check.patch 
Log Message:
* Fri Mar 19 2010 Harald Hoyer <harald at redhat.com> 005-1
- version 005



Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54

--- dracut.spec	29 Jan 2010 15:42:37 -0000	1.53
+++ dracut.spec	19 Mar 2010 16:49:22 -0000	1.54
@@ -1,6 +1,6 @@
 # Variables must be defined
-%define with_switch_root	1
-%define with_nbd		1
+%define with_switch_root        1
+%define with_nbd                1
 
 # switchroot provided by util-linux-ng in F-12+
 %if 0%{?fedora} > 11 || 0%{?rhel} >= 6
@@ -19,19 +19,15 @@
 %endif
 
 Name: dracut
-Version: 004
-Release: 5%{?rdist}
+Version: 005
+Release: 1%{?rdist}
 Summary: Initramfs generator using udev
-Group: System Environment/Base		
-License: GPLv2+	
+Group: System Environment/Base          
+License: GPLv2+ 
 URL: http://apps.sourceforge.net/trac/dracut/wiki
 # Source can be generated by 
 # http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=snapshot;h=%{?dashgittag};sf=tgz
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
-Patch1:  dracut-004-emergency.patch
-Patch2:  dracut-004-forcepermissive.patch
-Patch3:  dracut-004-multipath-check.patch
-Patch4:  dracut-004-firmware.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} > 12 || 0%{?rhel} >= 6
@@ -42,6 +38,8 @@ Obsoletes: mkinitrd-devel <= 6.0.93
 Obsoletes: nash <= 6.0.93
 Obsoletes: libbdevid-python <= 6.0.93
 %endif
+Obsoletes: dracut-kernel < 005
+Provides:  dracut-kernel = %{version}-%{release}
 
 Requires: udev
 Requires: util-linux-ng
@@ -60,7 +58,7 @@ Requires: /bin/sh 
 Requires: fileutils, gzip, tar
 Requires: lvm2 >= 2.02.33-9, dhclient
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
-Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
+Requires: e2fsprogs >= 1.38-12, coreutils
 Requires: mdadm, elfutils-libelf 
 Requires(pre): plymouth >= 0.8.0-0.2009.29.09.19.1
 Requires: plymouth >= 0.8.0-0.2009.29.09.19.1
@@ -77,7 +75,11 @@ BuildArch: noarch
 %endif
 
 %description
-dracut is a new, event-driven initramfs infrastructure based around udev.
+Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels. 
+Unlike existing implementations, dracut does hard-code as little as possible 
+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
@@ -95,7 +97,7 @@ This package requires everything which i
 all purpose initramfs with network support with dracut.
 
 %package fips
-Summary: dracut modules to build a dracut initramfs with an integrity check.
+Summary: Dracut modules to build a dracut initramfs with an integrity check
 Requires: %{name} = %{version}-%{release}
 Requires: hmaccalc
 %if 0%{?rhel} > 5
@@ -119,23 +121,8 @@ Requires: %{name}-network = %{version}-%
 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}
-Requires: ql2100-firmware
-Requires: ql2200-firmware
-Requires: ql23xx-firmware
-Requires: ql2400-firmware
-Requires: ql2500-firmware
-
-%description kernel
-This package requires everything which is needed to build a initramfs with all
-kernel modules and firmware files needed by dracut modules.
-
 %package tools
 Summary: Dracut tools to build the local initramfs
-Requires: %{name} = %{version}-%{release}
 Requires: coreutils cryptsetup-luks device-mapper
 Requires: diffutils dmraid findutils gawk grep lvm2
 Requires: module-init-tools sed
@@ -146,12 +133,6 @@ This package contains tools to assemble 
 
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 
-%patch4 -p1 
-chmod 0755 modules.d/90multipath/check
-chmod 0755 modules.d/60xen/check
 
 %build
 make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -191,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/dracut
 %{_datadir}/dracut/dracut-functions
 %config(noreplace) /etc/dracut.conf
+%dir /etc/dracut.conf.d
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man5/dracut.conf.5*
 %{_datadir}/dracut/modules.d/00dash
@@ -218,11 +200,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dracut/modules.d/95uswsusp
 %{_datadir}/dracut/modules.d/98syslog
 %{_datadir}/dracut/modules.d/99base
+# logfile needs no logrotate, because it gets overwritten
+# for every dracut run
 %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
 
 %files network
-%doc README HACKING TODO COPYING AUTHORS NEWS
 %defattr(-,root,root,0755)
+%doc README HACKING TODO COPYING AUTHORS NEWS
 %{_datadir}/dracut/modules.d/40network
 %{_datadir}/dracut/modules.d/95fcoe
 %{_datadir}/dracut/modules.d/95iscsi
@@ -235,10 +219,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 %{_datadir}/dracut/modules.d/01fips
 
-%files kernel 
-%defattr(-,root,root,0755)
-%doc README.kernel
-
 %files generic
 %defattr(-,root,root,0755)
 %doc README.generic
@@ -255,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Mar 19 2010 Harald Hoyer <harald at redhat.com> 005-1
+- version 005
+
 * Fri Jan 29 2010 Harald Hoyer <harald at redhat.com> 004-5
 - fixed firmware.sh bug (#559975 #559597)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	15 Jan 2010 14:10:23 -0000	1.32
+++ sources	19 Mar 2010 16:49:22 -0000	1.33
@@ -1 +1 @@
-28a18c64b659be38567966aed84e7dc9  dracut-004.tar.bz2
+c10b32b0b6402f740079f0d8728829bf  dracut-005.tar.bz2


--- dracut-004-emergency.patch DELETED ---


--- dracut-004-firmware.patch DELETED ---


--- dracut-004-forcepermissive.patch DELETED ---


--- dracut-004-multipath-check.patch DELETED ---

