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 5218f081de12b420175b419d1f96f0c9b7a3e56b (commit) via 9763a93ca15a78f51e059e5ca511aa62f2d70669 (commit) via b7923add2f053fd0b89e6bf019f0a73337204f17 (commit) via a12e68242c16f46b1f0268d081ccd9c39fc86c63 (commit) via f2f0bf3978ec22ef866a17d10adc2229156851fa (commit) via 9c53ee69d7985ee7e222838e140ece4780a54f3a (commit) via 4ae04e6cb5f74575102e6582287dba27277de09e (commit) from e3642ca4cac087f13b2e85596dc967070c395a10 (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 5218f081de12b420175b419d1f96f0c9b7a3e56b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 7 17:41:39 2012 +0100
grub: Fix build on x86_64.
commit 9763a93ca15a78f51e059e5ca511aa62f2d70669 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 7 17:10:54 2012 +0100
gcc: Update to 4.6.3.
A bugfix release with a great amount of fixes.
commit b7923add2f053fd0b89e6bf019f0a73337204f17 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 7 17:04:16 2012 +0100
util-linux: Update to 2.21.
commit a12e68242c16f46b1f0268d081ccd9c39fc86c63 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 7 17:01:35 2012 +0100
libpipeline: Update to 1.2.1.
commit f2f0bf3978ec22ef866a17d10adc2229156851fa Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 7 16:56:14 2012 +0100
qt: Fix build for x86_64.
commit 9c53ee69d7985ee7e222838e140ece4780a54f3a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 7 16:25:19 2012 +0100
grep: Update to 2.11.
commit 4ae04e6cb5f74575102e6582287dba27277de09e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 7 15:45:28 2012 +0100
kmod: Update to 6.
Mostly a maintainance release. Source files are now located at kernel.org.
-----------------------------------------------------------------------
Summary of changes: gcc/gcc.nm | 4 +- grep/grep.nm | 4 +- grub/grub.nm | 46 ++++++++++++++++++++++++++++++++----------- kmod/kmod.nm | 7 ++--- libpipeline/libpipeline.nm | 5 +-- qt/qt.nm | 32 +++++++++++++++++++----------- util-linux/util-linux.nm | 4 +- 7 files changed, 65 insertions(+), 37 deletions(-)
Difference in files: diff --git a/gcc/gcc.nm b/gcc/gcc.nm index b32e028..e25258c 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -7,8 +7,8 @@ build_cloog_ppl = 1
name = gcc -version = 4.6.2 -release = 14 +version = 4.6.3 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers diff --git a/grep/grep.nm b/grep/grep.nm index f50b4cb..2057f8b 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,8 +4,8 @@ ###############################################################################
name = grep -version = 2.10 -release = 2 +version = 2.11 +release = 1
groups = Applications/Text url = http://www.gnu.org/software/grep/ diff --git a/grub/grub.nm b/grub/grub.nm index feb62ba..b3a0c6d 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,7 +5,7 @@
name = grub version = 1.99 -release = 4 +release = 5 sup_arches = x86_64 i686
groups = System/Boot @@ -36,15 +36,11 @@ build zlib-devel end
- # Can only use very basic CFLAGS. - export CFLAGS = -Os -pipe - export CXXFLAGS = %{CFLAGS} - prepare_cmds # Replace pkglib_DATA (automake 1.11.2 incompatibility) sed -i -e "s/pkglib_DATA/pkgdata_DATA/g" \ -e "s/pkglib_SCRIPTS/pkgdata_SCRIPTS/g" \ - Makefile.am conf/Makefile.common \ + Makefile* */Makefile* \ gentpl.py util/grub-*.in
./autogen.sh @@ -54,16 +50,40 @@ build cp -R . %{DIR_SRC}/%{thisapp}-efi end
+ # As the modules contain always 32 bit code, they + # should be living in /usr/lib. + libdir = %{prefix}/lib + configure_options += \ + --target="i386" \ --sbindir=/sbin \ - --with-platform=pc + --datadir=%{libdir} \ + --with-platform=pc \ + --program-transform-name=s,grub,grub, \ + --disable-werror \ + CFLAGS="$(echo %{CFLAGS} | sed \ + -e 's/-fstack-protector//g' \ + -e 's/--param=ssp-buffer-size=4//g' \ + -e 's/-mregparm=3/-mregparm=4/g' \ + -e 's/-fexceptions//g' \ + -e 's/-m64//g' \ + -e 's/-fasynchronous-unwind-tables//g' )"
build_cmds cd ../%{thisapp}-efi - #./autogen.sh - ./configure %{configure_options} \ + ./configure \ + %{configure_options} \ --with-platform=efi \ - --program-transform-name=s,grub,grub-efi, + --program-transform-name=s,grub,grub-efi, \ + CFLAGS="$(echo %{CFLAGS} | sed \ + -e 's/-O.//g' \ + -e 's/-fstack-protector//g' \ + -e 's/--param=ssp-buffer-size=4//g' \ + -e 's/-mregparm=3/-mregparm=4/g' \ + -e 's/-fexceptions//g' \ + -e 's/-m64//g' \ + -e 's/-fasynchronous-unwind-tables//g' )" + make %{PARALLELISMFLAGS}
./grub-mkimage \ @@ -75,12 +95,11 @@ build search font gfxterm echo video efi_gop efi_uga end
- install_cmds + install cd ../%{thisapp}-efi make install DESTDIR=%{BUILDROOT}
mv -v %{BUILDROOT}/etc/bash_completion.d/grub{,-efi} - mv -v %{BUILDROOT}/usr/lib/grub{,-efi} sed -e "s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib," \ -i %{BUILDROOT}/sbin/grub-efi-mkconfig
@@ -90,6 +109,9 @@ build ln -svf ../boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.cfg %{BUILDROOT}/etc/grub-efi.cfg install -m 755 grub.efi %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi/grub.efi
+ cd - + make install DESTDIR=%{BUILDROOT} + # Install theme file install -m 0744 %{DIR_SOURCE}/05_theme %{BUILDROOT}/etc/grub.d/
diff --git a/kmod/kmod.nm b/kmod/kmod.nm index b6f1326..00233cf 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -4,8 +4,8 @@ ###############################################################################
name = kmod -version = 5 -release = 2 +version = 6 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Kernel @@ -20,8 +20,7 @@ description filesystems are two examples of loaded and unloaded modules. end
-# Will eventually move to kernel.org. -source_dl = http://packages.profusion.mobi/kmod/ +source_dl = ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/ sources = %{thisapp}.tar.xz
build diff --git a/libpipeline/libpipeline.nm b/libpipeline/libpipeline.nm index c536452..706de27 100644 --- a/libpipeline/libpipeline.nm +++ b/libpipeline/libpipeline.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libpipeline -version = 1.2.0 +version = 1.2.1 release = 1
groups = Development/Libraries @@ -17,11 +17,10 @@ description in a flexible and convenient way. end
-source_dl = +source_dl = http://download.savannah.gnu.org/releases/libpipeline/
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/qt/qt.nm b/qt/qt.nm index b9a952f..7df524b 100644 --- a/qt/qt.nm +++ b/qt/qt.nm @@ -5,7 +5,7 @@
name = qt version = 4.7.0 -release = 3 +release = 4
groups = System/Libraries url = http://www.qtsoftware.com/ @@ -44,10 +44,11 @@ build
configure_options = -v \ -prefix /usr \ - -datadir /usr/lib/qt4 \ - -headerdir /usr/include \ - -plugindir /usr/lib/qt4/plugins \ - -translationdir /usr/share/qt4/translations \ + -libdir %{libdir} \ + -datadir %{datadir}/qt4 \ + -headerdir %{includedir} \ + -plugindir %{libdir}/qt4/plugins \ + -translationdir %{datadir}/qt4/translations \ -confirm-license \ -fontconfig \ -largefile \ @@ -107,6 +108,9 @@ build
prepare_cmds sed -e "s/-O2/%{CFLAGS}/g" -i mkspecs/*/qmake.conf + + # Disable the strip command to get a useful debuginfo package. + sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" mkspecs/common/linux.conf end
install @@ -116,18 +120,22 @@ end
packages package %{name} + + package %{name}-libs + template LIBS + + files += %{libdir}/qt4/plugins + files += %{datadir}/qt4/phrasebooks + files += %{datadir}/qt4/translations end
package %{name}-devel template DEVEL
- files - /usr/lib/*.prl \ - /usr/lib/qt4/q3porting.xml \ - /usr/bin \ - /usr/lib/qt4/*.prl \ - /usr/lib/qt4/mkspecs - end + files += %{libdir}/*.prl + files += %{libdir}/qt4/q3porting.xml + files += %{libdir}/qt4/*.prl + files += %{datadir}/qt4/mkspecs end
package %{name}-debuginfo diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index ade2ab4..dd825c9 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -4,9 +4,9 @@ ###############################################################################
name = util-linux -major_ver = 2.20 +major_ver = 2.21 version = %{major_ver} -release = 3 +release = 1
groups = System/Base url = http://kernel.org/~kzak/util-linux/
hooks/post-receive -- IPFire 3.x development tree