diff --git a/config/uClibc/busybox.config b/config/uClibc/busybox.config index 2d2885ee3..77448a5c7 100644 --- a/config/uClibc/busybox.config +++ b/config/uClibc/busybox.config @@ -36,8 +36,8 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_FEATURE_FULL_LIBBUSYBOX is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set # CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -CROSS_COMPILER_PREFIX="" +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="/opt/i586-uClibc/bin/i586-linux-" # CONFIG_BUILD_AT_ONCE is not set # @@ -53,7 +53,7 @@ CROSS_COMPILER_PREFIX="" # # Installation Options # -# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_NO_USR=y CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_APPLET_HARDLINKS is not set # CONFIG_INSTALL_APPLET_DONT is not set diff --git a/lfs/busybox b/lfs/busybox index 5c5d8e569..6a6ed0833 100644 --- a/lfs/busybox +++ b/lfs/busybox @@ -1,4 +1,3 @@ - ############################################################################### # This file is part of the IPCop Firewall. # # # diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index b4b2d71d5..e43b3b908 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -90,7 +90,7 @@ ifeq "$(LFS_PASS)" "install" cd $(DIR_APP)/lib/uuid && make cd $(DIR_APP)/lib/uuid && make install - cd $(DIR_APP)/lib/uuid && install -m 755 libuuid.a /opt/$(MACHINE)-uClibc/lib + cd $(DIR_APP)/lib/uuid && install -m 755 libuuid.a /opt/$(MACHINE)-uClibc/lib/libuuid.a cd $(DIR_APP) && unset LD_LIBRARY_PATH else cd $(DIR_SRC) && mkdir build diff --git a/lfs/newt b/lfs/newt index 659a1bad7..61be6830f 100644 --- a/lfs/newt +++ b/lfs/newt @@ -86,7 +86,7 @@ ifeq "$(LFS_PASS)" "install" cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile cd $(DIR_APP) && make libnewt.a -mkdir -p /install/$(MACHINE)-uClibc/{include,lib} - cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib + cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib/libnewt.a cd $(DIR_APP) && install -m 0644 newt.h /install/$(MACHINE)-uClibc/include/newt.h else cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support diff --git a/lfs/slang b/lfs/slang index 1da31b899..7aad75641 100644 --- a/lfs/slang +++ b/lfs/slang @@ -77,7 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) ifeq "$(LFS_PASS)" "install" - -mkdir -p /install/lib cd $(DIR_APP) && ./configure --prefix="" cd $(DIR_APP) && make $(MAKETUNING) elf cd $(DIR_APP)/src && make install-elf DESTDIR="/opt/$(MACHINE)-uClibc" diff --git a/lfs/uClibc b/lfs/uClibc index 217410c58..8eb0831c6 100644 --- a/lfs/uClibc +++ b/lfs/uClibc @@ -95,5 +95,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd /lib && ln -sf ld-uClibc-$(VER).so ld-uClibc.so.0 cd /lib && ln -sf libuClibc-$(VER).so libc.so.0 cd /lib && ln -sf libc.so.0 libc.so - @rm -rf $(DIR_SRC)/buildroot + @rm -rf $(DIR_APP) $(DIR_SRC)/buildroot @$(POSTBUILD) diff --git a/tools/make-functions b/tools/make-functions index 79fa1b388..451fde415 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -412,7 +412,7 @@ installmake() { local PKG_TIME_START=`date +%s` chroot $LFS /tools/bin/env -i HOME=/root \ TERM=$TERM PS1='\u:\w\$ ' \ - PATH=/usr/local/bin:/opt/$MACHINE-uClibc/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin \ + PATH=/opt/$MACHINE-uClibc/bin:/bin:/usr/bin:/sbin:/usr/sbin \ VERSION=$VERSION \ CONFIG_ROOT=$CONFIG_ROOT \ LFS_PASS="install" \