[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d0c38f2d93d56f1d43329ae5ac82cead01a3a11e

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d0c38f2d93d56f1d43329ae5ac82cead01a3a11e

[git]

[-- Attachment #1: Type: text/plain, Size: 5304 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  d0c38f2d93d56f1d43329ae5ac82cead01a3a11e (commit)
       via  2ce4d5f0b5c7f7663e9cbd61649f88b6c8f49838 (commit)
       via  cf36d19d68120f3b3976b36c7a44e9036053b8a9 (commit)
      from  42df4334881e7e78db24973bf3e312f2e7d28003 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d0c38f2d93d56f1d43329ae5ac82cead01a3a11e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 17 19:53:13 2012 +0100

    dracut: Update to 016.

commit 2ce4d5f0b5c7f7663e9cbd61649f88b6c8f49838
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 17 19:52:03 2012 +0100

    htop: Update to 1.0.1.
    
    Contains minor bugfixes.

commit cf36d19d68120f3b3976b36c7a44e9036053b8a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Feb 16 23:43:24 2012 +0100

    hdparm: Don't strip the binary when it is built.
    
    The debugging information is extracted to the -debuginfo package
    for debugging on the target system.

-----------------------------------------------------------------------

Summary of changes:
 dracut/dracut.nm |   43 +++++++++++++++++++++++++++++++------------
 hdparm/hdparm.nm |    5 +++--
 htop/htop.nm     |    6 +++---
 3 files changed, 37 insertions(+), 17 deletions(-)

Difference in files:
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index d24abd6..792d155 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = dracut
-version    = 015
+version    = 016
 release    = 1
 arch       = noarch
 
@@ -26,13 +26,31 @@ build
 		docbook-xsl
 	end
 
+	dracutlibdir = %{prefix}/lib/dracut
+
 	install
 		make install DESTDIR=%{BUILDROOT} \
-			sbindir=/sbin sysconfdir=/etc mandir=/usr/share/man
+			sysconfdir=/etc mandir=/usr/share/man
 
 		# Install local configuration.
 		mkdir -pv %{BUILDROOT}/etc/dracut.conf.d
 		cp -vf %{DIR_SOURCE}/ipfire.conf %{BUILDROOT}/etc/dracut.conf.d/ipfire.conf
+
+		# Save package version.
+		echo "%{name}-%{version}-%{release}" > \
+			%{BUILDROOT}%{dracutlibdir}/modules.d/10rpmversion/dracut-version
+
+		# Remove Gentoo specific module.
+		rm -rvf %{BUILDROOT}%{dracutlibdir}/modules.d/50gensplash
+
+		mkdir -pv %{BUILDROOT}/boot/dracut
+		mkdir -pv %{BUILDROOT}/var/lib/dracut/overlay
+		mkdir -pv %{BUILDROOT}/var/lib/initramfs
+		mkdir -pv %{BUILDROOT}%{localstatedir}/log
+		touch %{BUILDROOT}%{localstatedir}/log/dracut.log
+
+		mkdir -pv %{BUILDROOT}/etc/logrotate.d
+		install -m 0644 dracut.logrotate %{BUILDROOT}/etc/logrotate.d/dracut_log
 	end
 end
 
@@ -76,24 +94,25 @@ packages
 		end
 
 		files
-			/usr/share/dracut/modules.d/40network
-			/usr/share/dracut/modules.d/95fcoe
-			/usr/share/dracut/modules.d/95iscsi
-			/usr/share/dracut/modules.d/95nbd
-			/usr/share/dracut/modules.d/95nfs
-			/usr/share/dracut/modules.d/45ifcfg
-			/usr/share/dracut/modules.d/95znet
+			/usr/lib/dracut/modules.d/40network
+			/usr/lib/dracut/modules.d/95fcoe
+			/usr/lib/dracut/modules.d/95iscsi
+			/usr/lib/dracut/modules.d/95nbd
+			/usr/lib/dracut/modules.d/95nfs
+			/usr/lib/dracut/modules.d/45ifcfg
+			/usr/lib/dracut/modules.d/95znet
 		end
 	end
 
-
 	package %{name}-utils
 		summary = Command line utils for dracut.
 		description = %{summary}
 
 		files
-			/sbin/dracut-*
-			/sbin/*initrd
+			/boot/dracut
+			/usr/bin/dracut-*
+			/usr/share/man/man8/dracut-*
+			/var/lib/dracut
 		end
 	end
 end
diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm
index dfd2621..4394809 100644
--- a/hdparm/hdparm.nm
+++ b/hdparm/hdparm.nm
@@ -5,7 +5,7 @@
 
 name       = hdparm
 version    = 9.38
-release    = 1
+release    = 2
 
 groups     = Applications/Hardware
 url        = http://sourceforge.net/projects/hdparm/
@@ -22,7 +22,8 @@ source_dl  = http://sourceforge.net/projects/%{name}/files/%{name}/
 
 build
 	build
-		cd %{DIR_APP} && CFLAGS="%{CFLAGS}" make %{PARALELLIAMFLAGS} LDFLAGS=
+		CFLAGS="%{CFLAGS}" make %{PARALELLIAMFLAGS} \
+			STRIP=/bin/true LDFLAGS=
 	end
 
 	install
diff --git a/htop/htop.nm b/htop/htop.nm
index b823f48..c6b26ca 100644
--- a/htop/htop.nm
+++ b/htop/htop.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = htop
-version    = 1.0
-release    = 2
+version    = 1.0.1
+release    = 1
 
 groups     = Applications/System
 url        = http://htop.sourceforge.net/
@@ -13,7 +13,7 @@ license    = GPL+
 summary    = Interactive process viewer.
 
 description
-	htop is an interactive text-mode process viewer for Linux, similar to \
+	htop is an interactive text-mode process viewer for Linux, similar to
 	top(1).
 end
 


hooks/post-receive
--
IPFire 3.x development tree