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 2.x development tree".
The branch, next has been updated via 1eec8480e707e862d560a2f257ddbbeb408bfb8a (commit) via 6a697701c27deeee20989529ee59aa4811d23ef1 (commit) from de0ccf8f8c9fc6b695f45a3fdcf0a85c3b3d5299 (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 1eec8480e707e862d560a2f257ddbbeb408bfb8a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 7 22:22:31 2015 +0000
Cleanup left over sources
commit 6a697701c27deeee20989529ee59aa4811d23ef1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 7 22:22:08 2015 +0000
cmake: Limit build to two concurrent compiler processes
Overheats my system :(
-----------------------------------------------------------------------
Summary of changes: lfs/cmake | 4 ++++ lfs/directfb | 2 +- lfs/ffmpeg | 3 +-- lfs/iptables | 4 ++-- lfs/krb5 | 4 ++-- lfs/mISDNuser | 1 + lfs/nagios | 4 ++-- lfs/owncloud | 2 ++ lfs/xvid | 8 ++++---- 9 files changed, 19 insertions(+), 13 deletions(-)
Difference in files: diff --git a/lfs/cmake b/lfs/cmake index 5873965..085d2bf 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -32,6 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
+ifeq "$(MACHINE)" "armv5tel" + MAKETUNING = -j2 +endif + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/directfb b/lfs/directfb index 34acb59..1b5d3a9 100644 --- a/lfs/directfb +++ b/lfs/directfb @@ -88,5 +88,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install ln -s $(THISAPP) /usr/src/directfb -# @rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 7494731..b383886 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -88,6 +88,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/ffmpeg && make install cd $(DIR_SRC)/ffmpeg && make install-libs - ldconfig -# @rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/iptables b/lfs/iptables index 5a1764b..d3c8402 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -83,7 +83,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17 + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-*
@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) # cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux @@ -138,5 +138,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make install
- @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17 + @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-* @$(POSTBUILD) diff --git a/lfs/krb5 b/lfs/krb5 index 64eb670..68be46c 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/mitkrb-1.12.1-db2_fix-1.patch
cd $(DIR_APP) && sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \ @@ -101,5 +101,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod -f -v 755 "/usr/lib/lib$$LIB.so"; \ done
- @rm -rf $(DIR_APP) + @rm -rf $(DIR_SRC)/$(THISAPP) @$(POSTBUILD) diff --git a/lfs/mISDNuser b/lfs/mISDNuser index 4f4edd5..c471c76 100644 --- a/lfs/mISDNuser +++ b/lfs/mISDNuser @@ -74,4 +74,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/mISDNuser && ./configure --prefix=/usr --with-AF_ISDN=34 cd $(DIR_SRC)/mISDNuser && make MISDNDIR=/usr/src/linux cd $(DIR_SRC)/mISDNuser && make install MISDNDIR=/usr/src/linux + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/nagios b/lfs/nagios index 868272b..1a88989 100644 --- a/lfs/nagios +++ b/lfs/nagios @@ -79,7 +79,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ ./configure --prefix=/usr \ --sysconfdir=/etc/nagios \ @@ -110,5 +110,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios ln -s /etc/init.d/nagios /etc/rc.d/rc0.d/K33nagios ln -s /etc/init.d/nagios /etc/rc.d/rc6.d/K33nagios - @rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins* @$(POSTBUILD) diff --git a/lfs/owncloud b/lfs/owncloud index 93ab3a5..3cf8e3c 100644 --- a/lfs/owncloud +++ b/lfs/owncloud @@ -97,4 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /etc/httpd/conf/vhosts.d/ install -v -m 644 $(DIR_SRC)/config/backup/includes/owncloud \ /var/ipfire/backup/addons/includes/owncloud + + @rm -rf $(DIR_SRC)/$(PROG) @$(POSTBUILD) diff --git a/lfs/xvid b/lfs/xvid index f3cf00c..abf03a5 100644 --- a/lfs/xvid +++ b/lfs/xvid @@ -29,7 +29,7 @@ VER = 1.2.1 THISAPP = xvidcore-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/xvidcore TARGET = $(DIR_INFO)/$(THISAPP) PROG = xvid PAK_VER = 2 @@ -77,9 +77,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC)/xvidcore/build/generic && ./configure --prefix=/usr - cd $(DIR_SRC)/xvidcore/build/generic && make - cd $(DIR_SRC)/xvidcore/build/generic && make install + cd $(DIR_APP)/build/generic && ./configure --prefix=/usr + cd $(DIR_APP)/build/generic && make + cd $(DIR_APP)/build/generic && make install chmod -v 755 /usr/lib/libxvidcore.so.4.2 ln -v -sf libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4 ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so
hooks/post-receive -- IPFire 2.x development tree