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

Conflicts:

	lfs/coreutils
	lfs/kudzu

diff --cc lfs/bash
index f939b0eccfeefb945e0c92e896e8782fdedfe41d,f4eb8f3988ca680cb25be28df530177fc13528d0..0e314b4d37d5cbc02bc9ea8d6381077452ed6b98
--- 1/lfs/bash
--- 2/lfs/bash
+++ b/lfs/bash
@@@ -54,11 -54,10 +54,11 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-8.patch
 +
  ifeq "$(STAGE)" "toolchain" 
 -      cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-7.patch
        cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) --without-bash-malloc
-       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        ln -sf bash $(TOOLS_DIR)/bin/sh
        
@@@ -74,9 -73,10 +74,9 @@@ ifeq "$(STAGE)" "base
        cd $(DIR_APP) && tar -xvf $(DIR_DL)/$(PKG_NAME)-doc-$(VER).tar.gz
        cd $(DIR_APP) && sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/$(THISAPP)|" \
                Makefile.in
 -      cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-7.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/bin \
                --without-bash-malloc --with-installed-readline
-       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
  endif
  

diff --cc lfs/ccache
Simple merge

diff --cc lfs/coreutils
index e39459b2066f090c582e3d2d16a2598af57adff3,cfa4cd9781242e2167a8f7145cb3a16b74b2b80d..6020b8e6dc1774d27ad70492f101e1b7218eec91
--- 1/lfs/coreutils
--- 2/lfs/coreutils
+++ b/lfs/coreutils
@@@ -55,9 -55,8 +55,9 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        
  ifeq "$(STAGE)" "toolchain"   
 -      cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) --enable-install-program=hostname
 +      cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) \
 +                              --enable-install-program=hostname
-       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        
        cd $(DIR_APP) && cp -v src/su $(TOOLS_DIR)/bin/su-tools
@@@ -68,8 -67,8 +68,8 @@@ ifeq "$(STAGE)" "base
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-i18n-1.patch
        
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-install-program=hostname \
 -                                                                              --enable-no-install-program=kill,uptime
 +                              --enable-no-install-program=kill,uptime
-       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        
        mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin

diff --cc lfs/file
Simple merge

diff --cc lfs/findutils
Simple merge

diff --cc lfs/kudzu
index 52e3c0d151b3e5376d608d290491b299d9094be7,6d6527411f86fea57f19edae0c6d12f95419f764..8e4446cbfacb007e25c453f44b5681e218281410
--- 1/lfs/kudzu
--- 2/lfs/kudzu
+++ b/lfs/kudzu
@@@ -69,12 -69,9 +69,12 @@@ ifeq "$(STAGE)" "installer
                ARCH=$(MACHINE) \
                RPM_OPT_FLAGS="$(CFLAGS)" \
                $(U_TOOLS) \
-               make -j $(PARALLELISM)
 +              LDFLAGS=-lintl \
 -      cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install DESTDIR=$(INSTALLER_DIR)
 -      cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install-program DESTDIR=$(INSTALLER_DIR)
+               make $(PARALLELISMFLAGS)
 +      cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" LDFLAGS=-lintl \
 +              $(U_TOOLS) make install DESTDIR=$(INSTALLER_DIR)
 +      cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" LDFLAGS=-lintl \
 +              $(U_TOOLS) make install-program DESTDIR=$(INSTALLER_DIR)
  endif
  
        @rm -rf $(DIR_APP)

diff --cc lfs/m4
Simple merge

diff --cc lfs/openssl
Simple merge

diff --cc lfs/shadow
Simple merge

diff --cc lfs/tar
Simple merge

diff --cc lfs/tcl
Simple merge

diff --cc lfs/texinfo
Simple merge

diff --cc lfs/vim
Simple merge

diff --cc tools/make-include
Simple merge