[dracut] git snapshot of pre-version 011
Harald Hoyer
harald at fedoraproject.org
Fri May 20 13:26:27 UTC 2011
commit a600099ac017237719e0725ef274ff1506143292
Author: Harald Hoyer <harald at redhat.com>
Date: Fri May 20 15:26:54 2011 +0200
git snapshot of pre-version 011
.gitignore | 12 +-----
...t-skip-zero-length-string-outfile-argumen.patch | 29 ------------
...-simplify-kernel-version-argument-setting.patch | 39 -----------------
0005-dracut-source-reformat-with-line-breaks.patch | 24 ----------
...dracut-functions-bashified-ret-ret-to-ret.patch | 22 ---------
...oved-extra-char-in-Including-modules-done.patch | 22 ---------
...lib-firmware-updates-to-default-firmware-.patch | 22 ---------
...hcp-root.sh-s-initqueue-finished-initqueu.patch | 20 ---------
0010-Ensure-rpc_pipefs-is-mounted.patch | 26 -----------
...nsplash-check-for-console_init-before-cal.patch | 36 ---------------
0012-base-init-fix-cdrom-polling.patch | 22 ---------
...cut-lib.sh-relax-getargbool-value-parsing.patch | 24 ----------
0014-doc-s-init.log-run-initramfs-init.log-g.patch | 36 ---------------
...ase-init-fixed-compat-dev-.initramfs-copy.patch | 33 --------------
0016-fips-fixed-boot-dev-handling.patch | 41 -----------------
...e-run-plymouth-pid-instead-of-run-initram.patch | 24 ----------
...ve-dmsquash-live-genrules.sh-fixed-udev-r.patch | 23 ----------
...ase-dracut-lib.sh-changed-kmgs-log-levels.patch | 43 ------------------
0020-base-init-reset-PATH-after-the-run-move.patch | 30 -------------
Makefile.git | 6 +++
dracut.spec | 46 ++++++++++++-------
sources | 2 +-
22 files changed, 37 insertions(+), 545 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5fdd565..4470271 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1 @@
-dracut-006.tar.bz2
-dracut-007.tar.bz2
-/dracut-008-353ef76.tar.bz2
-/dracut-008-3871942.tar.bz2
-/dracut-008-5e1898f.tar.bz2
-/dracut-008-325d491.tar.bz2
-/dracut-008-b2415f4.tar.bz2
-/dracut-008.tar.bz2
-/dracut-009-519d339.tar.bz2
-/dracut-009.tar.bz2
-/dracut-010.tar.bz2
+/dracut-011-9b30d47.tar.bz2
diff --git a/Makefile.git b/Makefile.git
new file mode 100644
index 0000000..6160a04
--- /dev/null
+++ b/Makefile.git
@@ -0,0 +1,6 @@
+Patch:
+ @for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "Patch$$n: $$i";done
+
+patch:
+ @for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "%patch$$n -p1";done
+
diff --git a/dracut.spec b/dracut.spec
index 5ee21fa..6d07093 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,3 +1,4 @@
+%define gittag 9b30d47
# Variables must be defined
%define with_nbd 1
@@ -6,20 +7,30 @@
%define with_nbd 0
%endif
+%if %{defined gittag}
+%define rdist .git%{gittag}%{?dist}
+%define dashgittag -%{gittag}
+%else
+%define rdist %{?dist}
+%endif
+
Name: dracut
-Version: 010
-Release: 1%{?dist}
+Version: 011
+%define release_prefix 0.1%{?rdist}
+Release: %{release_prefix}
Summary: Initramfs generator using udev
%if 0%{?fedora}
-Group: System Environment/Base
+Group: System Environment/Base
%endif
%if 0%{?suse_version}
Group: System/Base
%endif
-License: GPLv2+
+License: GPLv2+
URL: https://dracut.wiki.kernel.org/
-Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
+# Source can be generated by
+# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{?dashgittag};sf=tgz
+Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}%{?dashgittag}.tar.bz2
BuildArch: noarch
@@ -83,16 +94,16 @@ Requires: util-linux >= 2.16
%description
-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
+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
Requires: %{name} = %{version}-%{release}
-Requires: rpcbind
+Requires: rpcbind
%if %{with_nbd}
Requires: nbd
%endif
@@ -101,7 +112,7 @@ Requires: bridge-utils
%if 0%{?fedora}
Requires: iscsi-initiator-utils
-Requires: nfs-utils
+Requires: nfs-utils
Requires: dhclient
%endif
@@ -155,14 +166,14 @@ This package contains tools to assemble the local initrd and host configuration.
%setup -q -n %{name}-%{version}%{?dashgittag}
%build
-make WITH_SWITCH_ROOT=0%{?with_switch_root}
+make
%install
%if 0%{?fedora}
rm -rf $RPM_BUILD_ROOT
%endif
make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
- sysconfdir=/etc mandir=%{_mandir} WITH_SWITCH_ROOT=0%{?with_switch_root}
+ sysconfdir=/etc mandir=%{_mandir}
echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{_datadir}/dracut/modules.d/10rpmversion/dracut-version
@@ -203,9 +214,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,0755)
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
/sbin/dracut
-%if 0%{?with_switch_root}
-/sbin/switch_root
-%endif
%if 0%{?fedora} > 12 || 0%{?rhel} >= 6 || 0%{?suse_version} > 9999
/sbin/mkinitrd
/sbin/lsinitrd
@@ -239,6 +247,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/dracut/modules.d/90lvm
%{_datadir}/dracut/modules.d/90mdraid
%{_datadir}/dracut/modules.d/90multipath
+%{_datadir}/dracut/modules.d/91crypt-gpg
%{_datadir}/dracut/modules.d/95debug
%{_datadir}/dracut/modules.d/95resume
%{_datadir}/dracut/modules.d/95rootfs-block
@@ -278,7 +287,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,0755)
%{_datadir}/dracut/modules.d/02caps
-%files tools
+%files tools
%defattr(-,root,root,0755)
%{_mandir}/man8/dracut-gencmdline.8*
%{_mandir}/man8/dracut-catimages.8*
@@ -289,6 +298,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Fri May 20 2011 Harald Hoyer <harald at redhat.com> 011-0.1%{?rdist}
+- git snapshot of pre-version 011
+
* Fri Apr 01 2011 Harald Hoyer <harald at redhat.com> 010-1
- version 010
diff --git a/sources b/sources
index 32d9e47..2e54f2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85775501c6995451d6dbf96bcfe9904e dracut-010.tar.bz2
+927a7872904858049cb8d2131655ebc1 dracut-011-9b30d47.tar.bz2
More information about the scm-commits
mailing list