[PATCH 0/4] 2009-06-19 patchset 2

[PATCH 0/4] 2009-06-19 patchset 2

[Harald Hoyer]

Moved dracut to /usr/share/dracut and prepared everything for a first release

Harald Hoyer (4):
  /usr/lib/dracut -> /usr/share/dracut
  add README.generic
  specfile changes
  add target for "dist" and "gitrpm"

 Makefile         |   16 +++++++++++++---
 README.generic   |   10 ++++++++++
 dracut           |    6 +++---
 dracut-functions |    2 +-
 dracut.8         |    4 ++--
 dracut.spec      |   41 +++++++++++++++++++++++++++++++++--------
 6 files changed, 62 insertions(+), 17 deletions(-)
 create mode 100644 README.generic

--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/4] /usr/lib/dracut -> /usr/share/dracut

[Harald Hoyer]

---
 Makefile         |    4 ++--
 dracut           |    6 +++---
 dracut-functions |    2 +-
 dracut.8         |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f693ace..e70f309 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ VERSION=0.1
 GITVERSION=$(shell [ -d .git ] && git rev-list  --abbrev-commit  -n 1 HEAD  |cut -b 1-8)
 
 prefix = /usr
-libdir = ${prefix}/lib
-pkglibdir = ${libdir}/dracut
+datadir = ${prefix}/share
+pkglibdir = ${datadir}/dracut
 sysconfdir = ${prefix}/etc
 sbindir = ${prefix}/sbin
 mandir = ${prefix}/share/man
diff --git a/dracut b/dracut
index 16eae1a..f10af83 100755
--- a/dracut
+++ b/dracut
@@ -17,7 +17,7 @@ Creates initial ramdisk images for preloading modules
   -f, --force           Overwrite existing initramfs file.
   -m, --modules [LIST]  Specify a space-separated list of dracut modules to
                          call when building the initramfs. Modules are located
-                         in /usr/lib/dracut/modules.d.
+                         in /usr/share/dracut/modules.d.
   -o, --omit [LIST]     Omit a space-separated list of dracut modules.
   -d, --drivers [LIST]  Specify a space-separated list of kernel modules to
                          include in the initramfs.
@@ -28,7 +28,7 @@ Creates initial ramdisk images for preloading modules
                          Default: /etc/dracut.conf
   -l, --local           Local mode. Use modules from the current working
                          directory instead of the system-wide installed in
-                         /usr/lib/dracut/modules.d.
+                         /usr/share/dracut/modules.d.
                          Useful when running dracut from a git checkout.
   -H, --hostonly          Host-Only mode: Install only what is needed for
                          booting the local host instead of a generic host.
@@ -74,7 +74,7 @@ done
 [[ $dracutmodules_l ]] && dracutmodules=$dracutmodules_l
 [[ $omit_dracutmodules_l ]] && omit_dracutmodules=$omit_dracutmodules_l
 [[ $drivers_l ]] && drivers=$drivers_l
-[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
+[[ $dracutbasedir ]] || dracutbasedir=/usr/share/dracut
 
 [[ $allowlocal && -f "$(dirname $0)/dracut-functions" ]] && dsrc="$(dirname $0)" || dsrc=$dracutbasedir
 
diff --git a/dracut-functions b/dracut-functions
index 501cf2a..d1c161d 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -30,7 +30,7 @@ strstr() { [[ ! ${1#*$2*} = $1 ]]; }
 
 # Log initrd creation.
 if ! [[ $dracutlogfile ]]; then
-    [[ $dsrc = /usr/lib/dracut ]] && \
+    [[ $dsrc = /usr/share/dracut ]] && \
        dracutlogfile=/var/log/dracut.log || \
        dracutlogfile=/tmp/dracut.log
     [[ -w "$dracutlogfile" ]] || dracutlogfile=/tmp/dracut.log
diff --git a/dracut.8 b/dracut.8
index 0ceccff..b83a3e0 100644
--- a/dracut.8
+++ b/dracut.8
@@ -19,7 +19,7 @@ overwrite existing initramfs file.
 specify a space-separated list of dracut modules to call 
 when building the initramfs. 
 Modules are located in 
-.IR /usr/lib/dracut/modules.d .
+.IR /usr/share/dracut/modules.d .
 .TP
 .BR \-o ", " \-\-omit " \fILIST\fR"
 omit a space-separated list of dracut modules.
@@ -44,7 +44,7 @@ Default:
 .BR \-l ", " \-\-local
 local mode. Use modules from the current working
 directory instead of the system-wide installed in
-.IR /usr/lib/dracut/modules.d .
+.IR /usr/share/dracut/modules.d .
 Useful when running dracut from a git checkout.
 .TP
 .BR \-H ", " \-\-hostonly
-- 
1.6.2.2

--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/4] add README.generic

[Harald Hoyer]

---
 README.generic |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 README.generic

diff --git a/README.generic b/README.generic
new file mode 100644
index 0000000..f393e9f
--- /dev/null
+++ b/README.generic
@@ -0,0 +1,10 @@
+To build a generic initramfs, you have to install the following software packages:
+ * device-mapper
+ * cryptsetup-luks
+ * rpcbind nfs-utils 
+ * lvm2
+ * iscsi-initiator-utils
+ * nbd
+ * mdadm
+ * net-tools iproute
+
-- 
1.6.2.2

--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/4] specfile changes

[Harald Hoyer]

---
 dracut.spec |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/dracut.spec b/dracut.spec
index 83a2f54..6612602 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -16,21 +16,21 @@ URL: http://apps.sourceforge.net/trac/dracut/wiki
 Source0: dracut-%{version}%{?dashgittag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: udev
-Requires: lvm2
-Requires: cryptsetup-luks
+Requires: util-linux-ng
 Requires: module-init-tools
 Requires: cpio
-Requires: device-mapper
 Requires: coreutils
 Requires: findutils
 Requires: grep
 Requires: mktemp
 Requires: mount
 Requires: bash
+
 %if 0%{?replace_mkinitrd}
 Obsoletes: mkinitrd < 7.0
 Provides: mkinitrd = 7.0
 %endif
+
 %if ! 0%{?with_switch_root}
 BuildArch: noarch
 %endif
@@ -38,6 +38,24 @@ BuildArch: noarch
 %description
 dracut is a new, event-driven initramfs infrastructure based around udev.
 
+
+%package generic
+Summary: Metapackage to build a generic initramfs
+Requires: %{name} = %{version}-%{release}
+Requires: device-mapper
+Requires: cryptsetup-luks
+Requires: rpcbind nfs-utils 
+Requires: lvm2
+Requires: iscsi-initiator-utils
+Requires: nbd
+Requires: mdadm
+Requires: net-tools iproute
+
+%description generic
+This package requires everything, which is needed to build a generic
+all purpose initramfs.
+
+
 %prep
 %setup -q -n %{name}-%{version}%{?dashgittag}
 
@@ -65,7 +83,7 @@ rm -f $RPM_BUILD_ROOT/sbin/switch_root
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root,0755)
 %doc README HACKING TODO COPYING
 /sbin/dracut
 %if 0%{?with_switch_root}
@@ -75,13 +93,20 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/mkinitrd
 /usr/libexec/initrd-functions
 %endif
-%dir %{_prefix}/lib/dracut
-%{_prefix}/lib/dracut/dracut-functions
-%{_prefix}/lib/dracut/modules.d
+%dir %{_datadir}/dracut
+%{_datadir}/dracut/dracut-functions
+%{_datadir}/dracut/modules.d
 %config(noreplace) /etc/dracut.conf
 %{_mandir}/man8/dracut.8*
 
+%files generic
+%defattr(-,root,root,0755)
+%doc README.generic
+
 %changelog
-* Thu Dec 18 2008 Jeremy Katz <katzj-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> - 0.0-1.gitc0815e4e%{?dist}
+* Fri Jun 19 2009 Harald Hoyer <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 0.1-1
+- first release
+
+* Thu Dec 18 2008 Jeremy Katz <katzj-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> - 0.0-1
 - Initial build
 
-- 
1.6.2.2

--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 4/4] add target for "dist" and "gitrpm"

[Harald Hoyer]

"make gitrpm" creates an rpm from the last git checkin
"make rpm" creates an rpm for the version tagged with $VERSION
"make dist" creates a tarball for the version tagged with $VERSION
---
 Makefile |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index e70f309..ae4a9d4 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,20 @@ clean:
 
 archive: dracut-$(VERSION)-$(GITVERSION).tar.bz2
 
+dist: dracut-$(VERSION).tar.bz2
+
+dracut-$(VERSION).tar.bz2:
+	git archive --format=tar $(VERSION) --prefix=dracut-$(VERSION)/ |bzip2 > dracut-$(VERSION).tar.bz2
+
 dracut-$(VERSION)-$(GITVERSION).tar.bz2:
 	git archive --format=tar HEAD --prefix=dracut-$(VERSION)-$(GITVERSION)/ |bzip2 > dracut-$(VERSION)-$(GITVERSION).tar.bz2
 
-rpm: dracut-$(VERSION)-$(GITVERSION).tar.bz2
+
+rpm: dracut-$(VERSION).tar.bz2
+	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" -ba dracut.spec 
+	rm -fr BUILD BUILDROOT
+
+gitrpm: dracut-$(VERSION)-$(GITVERSION).tar.bz2
 	rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec 
 	rm -fr BUILD BUILDROOT
 
-- 
1.6.2.2

--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html