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

5 Apr 2012

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  e2c672b4c842e01784242b2afed28a73f7c170e9 (commit)
       via  c8f9fe35a3ed738c49e9f26c6e12997c0ed1054a (commit)
       via  278ecf9f4c5028ce21cc23fe8d416f3fc3c48da8 (commit)
       via  7384056b270d814444c83614073748e2a3204c92 (commit)
       via  57b0ba3a728d744192de881d2ab876b136c57ea9 (commit)
       via  916d4d0d8c49d1363277b04a351cfc980971f6e8 (commit)
       via  b594e75f722847fa44fac4dd9901599d0ae66a9e (commit)
      from  8db58f993c25531d74767e969a65d765bf8c8259 (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 e2c672b4c842e01784242b2afed28a73f7c170e9
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 5 19:36:30 2012 +0200
audit: Move libs and all others to /usr.
commit c8f9fe35a3ed738c49e9f26c6e12997c0ed1054a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 5 19:35:15 2012 +0200
kernel: Compile in virtio modules.
Basic virtio modules should be present without loading an extra
    module. virtio_console and virtio_pci benefit a lot of an early
    initialization.
However, it is not possible to compile them in on armv7hl-omap.
commit 278ecf9f4c5028ce21cc23fe8d416f3fc3c48da8
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 5 19:12:03 2012 +0200
dbus: Move libs to /usr.
commit 7384056b270d814444c83614073748e2a3204c92
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 5 00:37:50 2012 +0200
libcap: Move libs to /usr.
commit 57b0ba3a728d744192de881d2ab876b136c57ea9
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Apr 5 00:29:25 2012 +0200
bash: Does not need coreutils prior to installation.
commit 916d4d0d8c49d1363277b04a351cfc980971f6e8
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 3 18:26:04 2012 +0200
attr: Move libs to /usr.
commit b594e75f722847fa44fac4dd9901599d0ae66a9e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 3 17:37:50 2012 +0200
readline: Move libs to /usr.
-----------------------------------------------------------------------
Summary of changes:
 attr/attr.nm               |   13 ++++++-------
 audit/audit.nm             |   14 ++------------
 bash/bash.nm               |    4 ++--
 dbus/dbus.nm               |   23 ++---------------------
 kernel/config-arm-generic  |    1 -
 kernel/config-armv7hl-omap |    7 +++++++
 kernel/config-generic      |    7 ++++---
 kernel/config-x86-generic  |    1 -
 kernel/kernel.nm           |    8 ++++----
 libcap/libcap.nm           |   11 +++--------
 readline/readline.nm       |   10 +---------
 11 files changed, 31 insertions(+), 68 deletions(-)
Difference in files:

diff --git a/attr/attr.nm b/attr/attr.nm
index 54592c8..740d88f 100644
--- a/attr/attr.nm
+++ b/attr/attr.nm
@@ -5,7 +5,7 @@
name       = attr
 version    = 2.4.43
-release    = 3
+release    = 4
groups     = System/Filesystems
 url        = http://oss.sgi.com/projects/xfs/
@@ -26,20 +26,19 @@ build
    end
configure_options += \
-		--bindir=/bin \
    	--enable-shared
make_build_targets += LIBTOOL="libtool --tag=CC"
install_cmds
    	# Install libraries.
-		mkdir -pv %{BUILDROOT}/%{lib} %{BUILDROOT}%{libdir}
-		install -v -m0755 libattr/.libs/libattr.so.1.1.0 %{BUILDROOT}/%{lib}
-		ln -vsf libattr.so.1.1.0 %{BUILDROOT}/%{lib}/libattr.so.1
-		ln -vsf ../../%{lib}/libattr.so.1 %{BUILDROOT}%{libdir}/libattr.so
+		mkdir -pv %{BUILDROOT}%{libdir}
+		install -v -m0755 libattr/.libs/libattr.so.1.1.0 %{BUILDROOT}/%{libdir}
+		ln -vsf libattr.so.1.1.0 %{BUILDROOT}/%{libdir}/libattr.so.1
+		ln -vsf libattr.so.1 %{BUILDROOT}%{libdir}/libattr.so
# Install includes.
-		install -v -d %{BUILDROOT}%{includedir}/attr
+		mkdir -pv %{BUILDROOT}%{includedir}/attr
    	cp -vf include/{attributes.h,error_context.h,libattr.h,xattr.h} \
    		%{BUILDROOT}%{includedir}/attr/
    end
diff --git a/audit/audit.nm b/audit/audit.nm
index b62a978..de634d8 100644
--- a/audit/audit.nm
+++ b/audit/audit.nm
@@ -5,7 +5,7 @@
name       = audit
 version    = 2.2
-release    = 1
+release    = 2
groups     = System/Daemons
 url        = http://people.redhat.com/sgrubb/audit/
@@ -32,9 +32,6 @@ build
    end
configure_options += \
-		--sysconfdir=/etc \
-		--sbindir=/sbin \
-		--libdir=/%{lib} \
    	--without-prelude \
    	--without-libwrap \
    	--enable-gssapi-krb5=no \
@@ -45,13 +42,6 @@ build
    end
install_cmds
-		rm -vf %{BUILDROOT}/%{lib}/libau{dit,parse}.so
-		ln -svf ../../%{lib}/libaudit.so.1 %{BUILDROOT}%{libdir}/libaudit.so
-		ln -svf ../../%{lib}/libauparse.so.0 %{BUILDROOT}%{libdir}/libauparse.so
-
-		mkdir -pv %{BUILDROOT}/usr/sbin/
-		mv -v %{BUILDROOT}/sbin/audisp*remote %{BUILDROOT}/usr/sbin/
-
    	mkdir -pv %{BUILDROOT}/var/log/audit
rm -rfv %{BUILDROOT}/etc/{rc.d,sysconfig}
@@ -100,7 +90,7 @@ packages
    	description = %{summary}
files
-			/usr/lib/python*/
+			%{libdir}/python*/
    	end
    end
diff --git a/bash/bash.nm b/bash/bash.nm
index 4ba4733..4ea4fb9 100644
--- a/bash/bash.nm
+++ b/bash/bash.nm
@@ -5,7 +5,7 @@
name       = bash
 version    = 4.2
-release    = 7
+release    = 8
groups     = System/Tools
 url        = http://www.gnu.org/software/bash/
@@ -69,8 +69,8 @@ packages
    package %{name}
    	groups += Base Build
-		prerequires = coreutils
    	requires
+			coreutils
    		/etc/bashrc
    		/etc/profile
    	end
diff --git a/dbus/dbus.nm b/dbus/dbus.nm
index 6bfd2ea..168e61f 100644
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@ -5,7 +5,7 @@
name       = dbus
 version    = 1.4.16
-release    = 2
+release    = 3
groups     = System/Daemons
 url        = http://www.freedesktop.org/software/dbus/
@@ -29,29 +29,10 @@ build
    end
configure_options += \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--libdir=/%{lib} \
-		--libexecdir=/%{lib} \
    	--enable-libaudit \
    	--enable-selinux=yes \
    	--with-systemdsystemunitdir=/lib/systemd/system/ \
    	--with-dbus-user=dbus
-
-	install_cmds
-		mkdir -pv %{BUILDROOT}%{libdir}
-		mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
-
-		#change the arch-deps.h include directory to /usr/lib instead of /lib
-		sed -e 's@-I${libdir}@-I${prefix}/%{lib}@' -i %{BUILDROOT}%{libdir}/pkgconfig/dbus-1.pc
-
-		mkdir -pv %{BUILDROOT}%{libdir}/dbus-1.0/include
-		mv -v %{BUILDROOT}/%{lib}/dbus-1.0/include/* %{BUILDROOT}%{libdir}/dbus-1.0/include
-		rm -rvf %{BUILDROOT}/%{lib}/dbus-1.0
-
-		rm -vf %{BUILDROOT}/%{lib}/libdbus-1.so
-		ln -svf ../../%{lib}/libdbus-1.so.3 %{BUILDROOT}%{libdir}/libdbus-1.so
-	end
 end
packages
@@ -99,7 +80,7 @@ packages
    package %{name}-devel
    	template DEVEL
-		files += /usr/lib/dbus-1.0
+		files += %{libdir}/dbus-1.0
    end
package %{name}-debuginfo
diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 1e2f0af..23f6633 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -290,7 +290,6 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_HVC_DCC is not set
-CONFIG_VIRTIO_CONSOLE=m
#
 # PC SMBus host controller drivers
diff --git a/kernel/config-armv7hl-omap b/kernel/config-armv7hl-omap
index 920644c..66aba75 100644
--- a/kernel/config-armv7hl-omap
+++ b/kernel/config-armv7hl-omap
@@ -345,6 +345,7 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_I2C=y
#
@@ -539,6 +540,12 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_RTC_DRV_TWL4030 is not set
#
+# DMA Clients
+#
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+
+#
 # Virtio drivers
 #
 # CONFIG_TIDSPBRIDGE is not set
diff --git a/kernel/config-generic b/kernel/config-generic
index b918e5c..79c38a9 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -1852,6 +1852,7 @@ CONFIG_PRINTER=m
 CONFIG_LP_CONSOLE=y
 CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -3444,13 +3445,13 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_RING=y
#
 # Virtio drivers
 #
-CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=m
 # CONFIG_VIRTIO_MMIO is not set
diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 224fd52..0d70756 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -392,7 +392,6 @@ CONFIG_SERIAL_8250_PNP=y
 #
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
-# CONFIG_VIRTIO_CONSOLE is not set
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index ed507e4..ec46938 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name       = kernel
 version    = 3.2.12
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org
@@ -359,8 +359,8 @@ packages
    	end
_posttrans
-			/sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release} || exit $?
-			/sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release} || exit $?
+			/sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmod --update %{kernel_release}
+			/sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_release}
    	end
script posttransin
@@ -372,7 +372,7 @@ packages
    	end
script postin
-			/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVERREL}%{?-v:.%{-v*}}
+			/sbin/new-kernel-pkg --package %{kernel_name} --install %{kernel_release}
    	end
script postup
diff --git a/libcap/libcap.nm b/libcap/libcap.nm
index a4bd162..6941bda 100644
--- a/libcap/libcap.nm
+++ b/libcap/libcap.nm
@@ -5,7 +5,7 @@
name       = libcap
 version    = 2.22
-release    = 2
+release    = 3
groups     = System/Libraries
 url        = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
@@ -33,13 +33,8 @@ build
    end
install
-		make install DESTDIR=%{BUILDROOT} lib=/%{lib}
-
-		rm -vf %{BUILDROOT}/%{lib}/libcap.so
-		mkdir -pv %{BUILDROOT}%{libdir}
-		ln -svf ../../%{lib}/libcap.so.2 %{BUILDROOT}%{libdir}/libcap.so
-
-		chmod 755 %{BUILDROOT}/%{lib}/libcap.so.%{version}
+		make install DESTDIR=%{BUILDROOT} prefix=%{prefix} lib=%{lib}
+		chmod 755 %{BUILDROOT}/%{libdir}/libcap.so.%{version}
    end
 end
diff --git a/readline/readline.nm b/readline/readline.nm
index d1ade64..4b8c226 100644
--- a/readline/readline.nm
+++ b/readline/readline.nm
@@ -5,7 +5,7 @@
name       = readline
 version    = 6.2
-release    = 5
+release    = 6
groups     = System/Libraries
 url        = ftp://ftp.gnu.org/gnu/readline/
@@ -29,9 +29,6 @@ build
    	ncurses-devel
    end
-	configure_options += \
-		--libdir=/%{lib} \
-
    make_build_targets += \
    	SHLIB_LIBS=-lncurses
@@ -39,11 +36,6 @@ build
    	# Remove a bunch of *.c files
    	rm -rfv %{BUILDROOT}/usr/share/readline
-		mkdir -pv %{BUILDROOT}%{libdir}
-		rm -fv %{BUILDROOT}/%{lib}/lib{readline,history}.so
-		ln -sfv ../../%{lib}/libreadline.so.6 %{BUILDROOT}%{libdir}/libreadline.so
-		ln -sfv ../../%{lib}/libhistory.so.6 %{BUILDROOT}%{libdir}/libhistory.so
-
    	mkdir -pv %{BUILDROOT}/etc/profile.d
    	cp -vf %{DIR_SOURCE}/readline.sh %{BUILDROOT}/etc/profile.d/
    end
hooks/post-receive
--
IPFire 3.x development tree

    