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, master has been updated via 82308f5387a8d4dcc7bc68709f513c7a3d2c1cee (commit) via fbe365b955c08838da1e255318440fc7b7fac1e2 (commit) from c7ded4d5ad1f29017d54572eaf44e2c5b30f90ac (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 82308f5387a8d4dcc7bc68709f513c7a3d2c1cee Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 8 17:23:00 2017 +0200
ncftp: drop addon package
it is outdated and will not build with new gcc/glibc
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fbe365b955c08838da1e255318440fc7b7fac1e2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 8 15:31:15 2017 +0200
make-functions: move MAKETUNING before make
this is needed to edit MAKTUNING in the lfs file which is used by boost and cmake to build on machines with less than 4GB Memory.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/ncftp | 17 --------- lfs/ncftp | 85 ----------------------------------------- make.sh | 1 - tools/make-functions | 5 ++- 4 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 config/rootfiles/packages/ncftp delete mode 100644 lfs/ncftp
Difference in files: diff --git a/config/rootfiles/packages/ncftp b/config/rootfiles/packages/ncftp deleted file mode 100644 index 9543ada..0000000 --- a/config/rootfiles/packages/ncftp +++ /dev/null @@ -1,17 +0,0 @@ -usr/bin/ncftp -usr/bin/ncftpbatch -usr/bin/ncftpbookmarks -usr/bin/ncftpget -usr/bin/ncftpls -usr/bin/ncftpput -usr/bin/ncftpspooler -#usr/include/ncftp.h -#usr/include/ncftp_errno.h -usr/lib/libncftp.so -usr/lib/libncftp.so.2 -#usr/share/man/man1/ncftp.1 -#usr/share/man/man1/ncftpbatch.1 -#usr/share/man/man1/ncftpget.1 -#usr/share/man/man1/ncftpls.1 -#usr/share/man/man1/ncftpput.1 -#usr/share/man/man1/ncftpspooler.1 diff --git a/lfs/ncftp b/lfs/ncftp deleted file mode 100644 index 81f2f54..0000000 --- a/lfs/ncftp +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 3.2.1 - -THISAPP = ncftp-$(VER)-src -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/ncftp-$(VER) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = ncftp -PAK_VER = 2 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = d82cdfe0d5448172c03b434607414fb8 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr && make -C libncftp shared && \ - make -C libncftp soinstall - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 37fafdb..663f23f 100755 --- a/make.sh +++ b/make.sh @@ -704,7 +704,6 @@ buildipfire() { lfsmake2 gnu-netcat lfsmake2 ncat lfsmake2 nmap - lfsmake2 ncftp lfsmake2 etherwake lfsmake2 bwm-ng lfsmake2 sysstat diff --git a/tools/make-functions b/tools/make-functions index 508f5f2..b419253 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -612,6 +612,7 @@ lfsmake1() { CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ + MAKETUNING="${MAKETUNING}" \ make -f $* \ TOOLCHAIN=1 \ CROSSTARGET="${CROSSTARGET}" \ @@ -621,7 +622,6 @@ lfsmake1() { LFS_BASEDIR="${BASEDIR}" \ ROOT="${LFS}" \ KVER="${KVER}" \ - MAKETUNING="${MAKETUNING}" \ install >> $LOGFILE 2>&1
local COMPILE_SUCCESS=$? @@ -645,8 +645,9 @@ lfsmake2() { local PS1='\u:\w$ '
enterchroot \ - bash -x -c "cd /usr/src/lfs && make -f $* \ + bash -x -c "cd /usr/src/lfs && \ MAKETUNING=${MAKETUNING} \ + make -f $* \ LFS_BASEDIR=/usr/src install" \ >> ${LOGFILE} 2>&1
hooks/post-receive -- IPFire 2.x development tree