diff --git a/packages/linux/build b/packages/linux/build index 8f9f2f0aee..e760f9170b 100755 --- a/packages/linux/build +++ b/packages/linux/build @@ -7,7 +7,7 @@ $SCRIPTS/build module-init-tools export INSTALL=$(kernel_path) $SCRIPTS/install busybox initramfs -# $SCRIPTS/install uClibc initramfs +$SCRIPTS/install uClibc initramfs unset LDFLAGS DEPMOD=`ls -d $ROOT/$BUILD/module-init-tool*/build/depmod` diff --git a/packages/linux/config/initramfs b/packages/linux/config/initramfs index 9bea835e1a..33ec887a83 100644 --- a/packages/linux/config/initramfs +++ b/packages/linux/config/initramfs @@ -46,9 +46,9 @@ dir /bin 755 1000 1000 slink /bin/sh busybox 777 0 0 file /bin/busybox initramfs/bin/busybox 755 0 0 -# dir /lib 755 1000 1000 -# file /lib/ld-uClibc.so.0 initramfs/lib/ld-uClibc.so.0 755 0 0 -# file /lib/libc.so.0 initramfs/lib/libc.so.0 755 0 0 +dir /lib 755 1000 1000 +file /lib/ld-uClibc.so.0 initramfs/lib/ld-uClibc.so.0 755 0 0 +file /lib/libc.so.0 initramfs/lib/libc.so.0 755 0 0 dir /proc 755 0 0 dir /sys 755 0 0 diff --git a/packages/sysutils/busybox/config/busybox-initramfs.conf b/packages/sysutils/busybox/config/busybox-initramfs.conf index f91988ad0f..9baee6c6b5 100644 --- a/packages/sysutils/busybox/config/busybox-initramfs.conf +++ b/packages/sysutils/busybox/config/busybox-initramfs.conf @@ -40,7 +40,7 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # -CONFIG_STATIC=y +# CONFIG_STATIC is not set # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set diff --git a/packages/toolchain/devel/uClibc/install b/packages/toolchain/devel/uClibc/install index a0ed9e099d..540ffa18df 100755 --- a/packages/toolchain/devel/uClibc/install +++ b/packages/toolchain/devel/uClibc/install @@ -9,12 +9,12 @@ if [ "$2" = toolchain ]; then exit 0 fi -# if [ "$2" = initramfs ]; then -# mkdir -p $INSTALL/$2/lib -# cp $PKG_BUILD/lib/ld-uClibc.so.0 $INSTALL/$2/lib -# cp $PKG_BUILD/lib/libc.so.0 $INSTALL/$2/lib -# exit 0 -# fi +if [ "$2" = initramfs ]; then + mkdir -p $INSTALL/$2/lib + cp $PKG_BUILD/lib/ld-uClibc.so.0 $INSTALL/$2/lib + cp $PKG_BUILD/lib/libc.so.0 $INSTALL/$2/lib + exit 0 +fi mkdir -p $INSTALL/lib cp $PKG_BUILD/lib/ld*-uClibc.so.0 $INSTALL/lib