From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e2c672b4c842e01784242b2afed28a73f7c170e9 Date: Thu, 05 Apr 2012 19:37:46 +0200 Message-ID: <20120405173749.7E74020145@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2447051339417353306==" List-Id: --===============2447051339417353306== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Thu Apr 5 19:36:30 2012 +0200 audit: Move libs and all others to /usr. commit c8f9fe35a3ed738c49e9f26c6e12997c0ed1054a Author: Michael Tremer Date: Thu Apr 5 19:35:15 2012 +0200 kernel: Compile in virtio modules. =20 Basic virtio modules should be present without loading an extra module. virtio_console and virtio_pci benefit a lot of an early initialization. =20 However, it is not possible to compile them in on armv7hl-omap. commit 278ecf9f4c5028ce21cc23fe8d416f3fc3c48da8 Author: Michael Tremer Date: Thu Apr 5 19:12:03 2012 +0200 dbus: Move libs to /usr. commit 7384056b270d814444c83614073748e2a3204c92 Author: Michael Tremer Date: Thu Apr 5 00:37:50 2012 +0200 libcap: Move libs to /usr. commit 57b0ba3a728d744192de881d2ab876b136c57ea9 Author: Michael Tremer Date: Thu Apr 5 00:29:25 2012 +0200 bash: Does not need coreutils prior to installation. commit 916d4d0d8c49d1363277b04a351cfc980971f6e8 Author: Michael Tremer Date: Tue Apr 3 18:26:04 2012 +0200 attr: Move libs to /usr. commit b594e75f722847fa44fac4dd9901599d0ae66a9e Author: Michael Tremer 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 @@ =20 name =3D attr version =3D 2.4.43 -release =3D 3 +release =3D 4 =20 groups =3D System/Filesystems url =3D http://oss.sgi.com/projects/xfs/ @@ -26,20 +26,19 @@ build end =20 configure_options +=3D \ - --bindir=3D/bin \ --enable-shared =20 make_build_targets +=3D LIBTOOL=3D"libtool --tag=3DCC" =20 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 =20 # 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 @@ =20 name =3D audit version =3D 2.2 -release =3D 1 +release =3D 2 =20 groups =3D System/Daemons url =3D http://people.redhat.com/sgrubb/audit/ @@ -32,9 +32,6 @@ build end =20 configure_options +=3D \ - --sysconfdir=3D/etc \ - --sbindir=3D/sbin \ - --libdir=3D/%{lib} \ --without-prelude \ --without-libwrap \ --enable-gssapi-krb5=3Dno \ @@ -45,13 +42,6 @@ build end =20 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 =20 rm -rfv %{BUILDROOT}/etc/{rc.d,sysconfig} @@ -100,7 +90,7 @@ packages description =3D %{summary} =20 files - /usr/lib/python*/ + %{libdir}/python*/ end end =20 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 @@ =20 name =3D bash version =3D 4.2 -release =3D 7 +release =3D 8 =20 groups =3D System/Tools url =3D http://www.gnu.org/software/bash/ @@ -69,8 +69,8 @@ packages package %{name} groups +=3D Base Build =20 - prerequires =3D 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 @@ =20 name =3D dbus version =3D 1.4.16 -release =3D 2 +release =3D 3 =20 groups =3D System/Daemons url =3D http://www.freedesktop.org/software/dbus/ @@ -29,29 +29,10 @@ build end =20 configure_options +=3D \ - --sysconfdir=3D/etc \ - --localstatedir=3D/var \ - --libdir=3D/%{lib} \ - --libexecdir=3D/%{lib} \ --enable-libaudit \ --enable-selinux=3Dyes \ --with-systemdsystemunitdir=3D/lib/systemd/system/ \ --with-dbus-user=3Ddbus - - 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(a)-I${libdir}@-I${prefix}/%{lib}@' -i %{BUILDROOT}%{libdir}/pkgc= onfig/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 =20 packages @@ -99,7 +80,7 @@ packages package %{name}-devel template DEVEL =20 - files +=3D /usr/lib/dbus-1.0 + files +=3D %{libdir}/dbus-1.0 end =20 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=3Dy CONFIG_SERIAL_AMBA_PL011_CONSOLE=3Dy CONFIG_SERIAL_OF_PLATFORM=3Dm # CONFIG_HVC_DCC is not set -CONFIG_VIRTIO_CONSOLE=3Dm =20 # # 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=3Dy # CONFIG_SERIAL_AMBA_PL010 is not set CONFIG_SERIAL_OMAP=3Dy CONFIG_SERIAL_OMAP_CONSOLE=3Dy +CONFIG_VIRTIO_CONSOLE=3Dm CONFIG_I2C=3Dy =20 # @@ -539,6 +540,12 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=3Dy # CONFIG_RTC_DRV_TWL4030 is not set =20 # +# DMA Clients +# +CONFIG_VIRTIO=3Dm +CONFIG_VIRTIO_RING=3Dm + +# # 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=3Dm CONFIG_LP_CONSOLE=3Dy CONFIG_PPDEV=3Dm CONFIG_HVC_DRIVER=3Dy +CONFIG_VIRTIO_CONSOLE=3Dy CONFIG_IPMI_HANDLER=3Dm # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=3Dm @@ -3444,13 +3445,13 @@ CONFIG_UIO_AEC=3Dm CONFIG_UIO_SERCOS3=3Dm CONFIG_UIO_PCI_GENERIC=3Dm # CONFIG_UIO_NETX is not set -CONFIG_VIRTIO=3Dm -CONFIG_VIRTIO_RING=3Dm +CONFIG_VIRTIO=3Dy +CONFIG_VIRTIO_RING=3Dy =20 # # Virtio drivers # -CONFIG_VIRTIO_PCI=3Dm +CONFIG_VIRTIO_PCI=3Dy CONFIG_VIRTIO_BALLOON=3Dm # CONFIG_VIRTIO_MMIO is not set =20 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=3Dy # CONFIG_HVC_IRQ=3Dy CONFIG_HVC_XEN=3Dy -# CONFIG_VIRTIO_CONSOLE is not set CONFIG_HW_RANDOM_INTEL=3Dm CONFIG_HW_RANDOM_AMD=3Dm CONFIG_HW_RANDOM_VIA=3Dm 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 @@ =20 name =3D kernel version =3D 3.2.12 -release =3D 1 +release =3D 2 thisapp =3D linux-%{version} =20 maintainer =3D Michael Tremer @@ -359,8 +359,8 @@ packages end =20 _posttrans - /sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmo= d --update %{kernel_release} || exit $? - /sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_rel= ease} || exit $? + /sbin/new-kernel-pkg --package %{kernel_name} --mkinitrd --dracut --depmo= d --update %{kernel_release} + /sbin/new-kernel-pkg --package %{kernel_name} --rpmposttrans %{kernel_rel= ease} end =20 script posttransin @@ -372,7 +372,7 @@ packages end =20 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 =20 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 @@ =20 name =3D libcap version =3D 2.22 -release =3D 2 +release =3D 3 =20 groups =3D System/Libraries url =3D http://ftp.kernel.org/pub/linux/libs/security/linux-privs/ker= nel-2.6/ @@ -33,13 +33,8 @@ build end =20 install - make install DESTDIR=3D%{BUILDROOT} lib=3D/%{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=3D%{BUILDROOT} prefix=3D%{prefix} lib=3D%{lib} + chmod 755 %{BUILDROOT}/%{libdir}/libcap.so.%{version} end end =20 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 @@ =20 name =3D readline version =3D 6.2 -release =3D 5 +release =3D 6 =20 groups =3D System/Libraries url =3D ftp://ftp.gnu.org/gnu/readline/ @@ -29,9 +29,6 @@ build ncurses-devel end =20 - configure_options +=3D \ - --libdir=3D/%{lib} \ - make_build_targets +=3D \ SHLIB_LIBS=3D-lncurses =20 @@ -39,11 +36,6 @@ build # Remove a bunch of *.c files rm -rfv %{BUILDROOT}/usr/share/readline =20 - 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 --===============2447051339417353306==--