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 bf2879f5169ea911b949556075c593af19cd4983 (commit) via 13f2619ed74970406e4775b332f9f26ee54babfb (commit) via cb83db38d50a50f248f1cf1e6a3bd8d0a01ddfa2 (commit) via 09560bd325622aaa2f9fb5cd01e26a8546d728ff (commit) from 7eaea6f86888140c1771dac0f359ce49841a2d44 (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 bf2879f5169ea911b949556075c593af19cd4983 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 27 01:51:46 2010 +0100

cairo: Update to 0.10.2.

Closes #116.

commit 13f2619ed74970406e4775b332f9f26ee54babfb Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 27 01:45:43 2010 +0100

ccache: Create a bash profile file.

This configures ccache and there is no more action needed on the buildsystem.

The actual cache has moved to /var/cache/ccache.

Closes issue #114.

commit cb83db38d50a50f248f1cf1e6a3bd8d0a01ddfa2 Merge: 09560bd 7eaea6f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 27 01:26:24 2010 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts: pkgs/core/kernel/config

commit 09560bd325622aaa2f9fb5cd01e26a8546d728ff Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 8 23:53:45 2010 +0100

kernel: Remove support for wimax.

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

Summary of changes: pkgs/core/cairo/cairo.nm | 2 +- pkgs/core/ccache/ccache.nm | 16 ++++++++++++---- pkgs/core/ccache/ccache.sh | 18 ++++++++++++++++++ pkgs/core/kernel/config | 10 ++-------- 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 pkgs/core/ccache/ccache.sh

Difference in files: diff --git a/pkgs/core/cairo/cairo.nm b/pkgs/core/cairo/cairo.nm index 066bb1d..34db8f4 100644 --- a/pkgs/core/cairo/cairo.nm +++ b/pkgs/core/cairo/cairo.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = cairo -PKG_VER = 1.10.0 +PKG_VER = 1.10.2 PKG_REL = 0

PKG_MAINTAINER = diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm index b4d71ba..a0cfdcd 100644 --- a/pkgs/core/ccache/ccache.nm +++ b/pkgs/core/ccache/ccache.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = ccache PKG_VER = 3.1.3 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = Development/Compilers @@ -48,6 +48,8 @@ PKG_TARBALL = $(THISAPP).tar.xz # Sets ccache max size up to 2 GB CFLAGS += -DDEFAULT_MAXSIZE=2097152

+CCACHE_CACHE = /var/cache/ccache + CONFIGURE_OPTIONS += \ --mandir=/usr/share/man

@@ -61,9 +63,15 @@ define STAGE_TEST endef

define STAGE_INSTALL_CMDS - mkdir -pv $(BUILDROOT)/usr/ccache/bin + mkdir -pv $(BUILDROOT)/usr/lib/ccache for i in gcc g++ cc c++; do \ - ln -svf ../../bin/ccache $(BUILDROOT)/usr/ccache/bin/$${i}; \ - ln -svf ../../bin/ccache $(BUILDROOT)/usr/ccache/bin/$(TARGET)-$${i}; \ + ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$${i}; \ + ln -svf ../../bin/ccache $(BUILDROOT)/usr/lib/ccache/$(TARGET)-$${i}; \ done + + -mkdir -pv $(BUILDROOT)/etc/profile.d + sed -e "s|@LIBDIR@|/usr/lib|g" -e "s|@CACHEDIR@|$(CCACHE_CACHE)|g" \ + < $(DIR_SOURCE)/ccache.sh > $(BUILDROOT)/etc/profile.d/ccache.sh + + -mkdir -pv -m770 $(BUILDROOT)/$(CCACHE_CACHE) endef diff --git a/pkgs/core/ccache/ccache.sh b/pkgs/core/ccache/ccache.sh new file mode 100644 index 0000000..603434b --- /dev/null +++ b/pkgs/core/ccache/ccache.sh @@ -0,0 +1,18 @@ +# Use ccache by default. Users who don't want that can set the CCACHE_DISABLE +# environment variable in their personal profile. + +case ":${PATH:-}:" in + *:@LIBDIR@/ccache:*) ;; + *) PATH="@LIBDIR@/ccache${PATH:+:$PATH}" ;; +esac + +# If @CACHEDIR@ is writable, use a shared cache there. Users who don't +# want that even if they have that write permission can set the CCACHE_DIR +# and unset the CCACHE_UMASK environment variables in their personal profile. + +if [ -z "${CCACHE_DIR:-}" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then + export CCACHE_DIR=@CACHEDIR@ + export CCACHE_UMASK=002 + unset CCACHE_HARDLINK +fi + diff --git a/pkgs/core/kernel/config b/pkgs/core/kernel/config index b78b5b9..2d4809f 100644 --- a/pkgs/core/kernel/config +++ b/pkgs/core/kernel/config @@ -945,8 +945,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 +# CONFIG_WIMAX is not set CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y @@ -1625,15 +1624,10 @@ CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set

# -# WiMAX Wireless Broadband devices +# Enable WiMAX (Networking options) to see the WiMAX drivers #

# -# Enable MMC support to see WiMAX SDIO drivers -# -# CONFIG_WIMAX_I2400M_USB is not set - -# # USB Network Adapters # CONFIG_USB_CATC=m

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