[dracut] * Mon Aug 09 2010 Harald Hoyer <harald at redhat.com> 007-1 - version 007
Harald Hoyer
harald at fedoraproject.org
Mon Aug 9 14:33:32 UTC 2010
commit 63c8b553fcfcff97c0e2aec5d0695ebe4f08b67b
Author: Harald Hoyer <harald at redhat.com>
Date: Mon Aug 9 16:33:19 2010 +0200
* Mon Aug 09 2010 Harald Hoyer <harald at redhat.com> 007-1
- version 007
.gitignore | 1 +
0001-fixed-ip-dhcp6.patch | 25 -----
...d-note-about-putting-IPv6-addresses-in-br.patch | 48 ----------
...anged-IPv6-addresses-to-the-documentation.patch | 43 ---------
0004-fips-fixes-copy-paste-error-for-check.patch | 37 -------
0005-crypt-add-fpu-kernel-module.patch | 21 ----
...-for-symlinks-to-dev-.udev-rules.d-for-la.patch | 99 --------------------
...nctions-set-LANG-C-for-ldd-output-parsing.patch | 25 -----
...functions-use-LC_ALL-C-rather-than-LANG-C.patch | 25 -----
dracut.spec | 60 +++---------
sources | 2 +-
11 files changed, 17 insertions(+), 369 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c172c2a..c22e200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
dracut-006.tar.bz2
+dracut-007.tar.bz2
diff --git a/dracut.spec b/dracut.spec
index e287341..6acf4bb 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,26 +1,10 @@
# Variables must be defined
-%define with_switch_root 1
+%define with_switch_root 0
%define with_nbd 1
-# switchroot provided by util-linux-ng in F-12+
-%if 0%{?fedora} > 11 || 0%{?rhel} >= 6
-%define with_switch_root 0
-%endif
-# nbd in Fedora only
-%if 0%{?rhel} >= 6
-%define with_nbd 0
-%endif
-
-%if %{defined gittag}
-%define rdist .git%{gittag}%{?dist}
-%define dashgittag -%{gittag}
-%else
-%define rdist %{?dist}
-%endif
-
Name: dracut
-Version: 006
-Release: 2%{?rdist}
+Version: 007
+Release: 1
Summary: Initramfs generator using udev
Group: System Environment/Base
License: GPLv2+
@@ -28,17 +12,8 @@ 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: 0001-fixed-ip-dhcp6.patch
-Patch2: 0002-dracut.8-add-note-about-putting-IPv6-addresses-in-br.patch
-Patch3: 0003-dracut.8-changed-IPv6-addresses-to-the-documentation.patch
-Patch4: 0004-fips-fixes-copy-paste-error-for-check.patch
-Patch5: 0005-crypt-add-fpu-kernel-module.patch
-Patch6: 0006-Write-rules-for-symlinks-to-dev-.udev-rules.d-for-la.patch
-Patch7: 0007-dracut-functions-set-LANG-C-for-ldd-output-parsing.patch
-Patch8: 0008-dracut-functions-use-LC_ALL-C-rather-than-LANG-C.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: docbook-style-xsl docbook-dtds docbook-style-xsl libxslt
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6
# no "provides", because dracut does not offer
@@ -94,6 +69,7 @@ Requires: nbd
%endif
Requires: net-tools iproute
Requires: bridge-utils
+Requires: vconfig
%description network
This package requires everything which is needed to build a generic
@@ -130,21 +106,13 @@ Requires: coreutils cryptsetup-luks device-mapper
Requires: diffutils dmraid findutils grep lvm2 gawk
Requires: module-init-tools sed
Requires: cpio gzip
+Requires: %{name} = %{version}-%{release}
%description tools
This package contains tools to assemble the local initrd and host configuration.
%prep
%setup -q -n %{name}-%{version}%{?dashgittag}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
%build
make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -156,11 +124,14 @@ make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
rm $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/01fips/check
+# remove gentoo specific modules
+rm -fr $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/50gensplash
mkdir -p $RPM_BUILD_ROOT/boot/dracut
mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log
+install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT/etc/dracut.conf.d/fedora.conf
%if 0%{?fedora} <= 12 && 0%{?rhel} < 6
rm $RPM_BUILD_ROOT/sbin/mkinitrd
@@ -184,11 +155,14 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/dracut
%{_datadir}/dracut/dracut-functions
%config(noreplace) /etc/dracut.conf
+%config(noreplace) /etc/dracut.conf.d/fedora.conf
%dir /etc/dracut.conf.d
%{_mandir}/man8/dracut.8*
+%{_mandir}/man7/dracut.kernel.7*
%{_mandir}/man5/dracut.conf.5*
+%{_datadir}/dracut/modules.d/00bootchart
%{_datadir}/dracut/modules.d/00dash
-%{_datadir}/dracut/modules.d/10redhat-i18n
+%{_datadir}/dracut/modules.d/10i18n
%{_datadir}/dracut/modules.d/10rpmversion
%{_datadir}/dracut/modules.d/50plymouth
%{_datadir}/dracut/modules.d/60xen
@@ -219,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT
%files network
%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
@@ -230,7 +203,6 @@ rm -rf $RPM_BUILD_ROOT
%files fips
%defattr(-,root,root,0755)
-%doc COPYING
%{_datadir}/dracut/modules.d/01fips
%files generic
@@ -239,7 +211,6 @@ rm -rf $RPM_BUILD_ROOT
%files tools
%defattr(-,root,root,0755)
-%doc COPYING NEWS
%{_mandir}/man8/dracut-gencmdline.8*
%{_mandir}/man8/dracut-catimages.8*
/sbin/dracut-gencmdline
@@ -249,9 +220,8 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
-* Wed Jun 23 2010 Harald Hoyer <harald at redhat.com> 006-2
-- bugfixes
-- preserve /dev/live symlink for real root
+* Mon Aug 09 2010 Harald Hoyer <harald at redhat.com> 007-1
+- version 007
* Thu Jun 17 2010 Harald Hoyer <harald at redhat.com> 006-1
- version 006
diff --git a/sources b/sources
index 73069fc..e3b9714 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-016052b57001789ec2acf89d382a82f5 dracut-006.tar.bz2
+e052dda4bdfc4d03915458dce2d86822 dracut-007.tar.bz2
More information about the scm-commits
mailing list