summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--dracut.spec40
2 files changed, 34 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index af0a4f00..3ea1d28c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.6
+VERSION=0.7
GITVERSION=$(shell [ -d .git ] && git rev-list --abbrev-commit -n 1 HEAD |cut -b 1-8)
prefix = /usr
diff --git a/dracut.spec b/dracut.spec
index f0a7f939..5157e2fa 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -12,7 +12,7 @@
%endif
Name: dracut
-Version: 0.6
+Version: 0.7
Release: 1%{?rdist}
Summary: Initramfs generator using udev
Group: System Environment/Base
@@ -38,6 +38,7 @@ 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
%ifnarch s390 s390x
Requires: dmraid
Requires: kbd
@@ -52,21 +53,20 @@ BuildArch: noarch
dracut is a new, event-driven initramfs infrastructure based around udev.
%package generic
-Summary: Metapackage to build a generic initramfs
+Summary: Metapackage to build a generic initramfs with dracut
Requires: %{name} = %{version}-%{release}
Requires: rpcbind nfs-utils
Requires: iscsi-initiator-utils
Requires: nbd
-Requires: bridge-utils
Requires: net-tools iproute
Requires: plymouth-system-theme plymouth-theme-charge plymouth-theme-solar
%description generic
This package requires everything which is needed to build a generic
-all purpose initramfs.
+all purpose initramfs with dracut.
%package kernel
-Summary: Metapackage to build generic initramfs with only kernel modules
+Summary: Metapackage to build generic initramfs with dracut with only kernel modules
Requires: %{name} = %{version}-%{release}
Requires: ql2100-firmware
Requires: ql2200-firmware
@@ -78,6 +78,18 @@ Requires: ql2500-firmware
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: ql2100-firmware
+Requires: ql2200-firmware
+Requires: ql23xx-firmware
+Requires: ql2400-firmware
+Requires: ql2500-firmware
+
+%description tools
+This package contains tools to assemble the local initrd and host configuration.
+
%prep
%setup -q -n %{name}-%{version}%{?dashgittag}
@@ -93,6 +105,9 @@ make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin sysconfdir=/etc mandir=%{_man
rm -f $RPM_BUILD_ROOT/sbin/switch_root
%endif
+mkdir -p $RPM_BUILD_ROOT/boot/dracut
+mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -100,7 +115,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,0755)
%doc README HACKING TODO COPYING AUTHORS
/sbin/dracut
-/sbin/dracut-gencmdline
%if 0%{?with_switch_root}
/sbin/switch_root
%endif
@@ -118,8 +132,20 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,0755)
%doc README.kernel
+%files tools
+%defattr(-,root,root,0755)
+%doc COPYING
+/sbin/dracut-gencmdline
+/sbin/dracut-catimages
+%dir /boot/dracut
+%dir /var/lib/dracut
+%dir /var/lib/dracut/overlay
+
%changelog
-* Wed Jul 22 2009 Harald Hoyer harald@redhat.com 0.6-1
+* Fri Jul 24 2009 Harald Hoyer <harald@redhat.com> 0.7-1
+- version 0.7
+
+* Wed Jul 22 2009 Harald Hoyer <harald@redhat.com> 0.6-1
- version 0.6
* Fri Jul 17 2009 Harald Hoyer <harald@redhat.com> 0.5-1