From bd08b5b162b945dfb0a20223992804f3816b036e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Sun, 16 Aug 2009 18:48:43 +0200
Subject: [PATCH] revert shared build of busybox for initramfs

---
 packages/linux/build                                 |  2 +-
 packages/linux/config/initramfs                      |  6 +++---
 .../sysutils/busybox/config/busybox-initramfs.conf   |  2 +-
 packages/sysutils/busybox/scripts/init.system        |  4 ++++
 packages/toolchain/devel/uClibc/install              | 12 ++++++------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/linux/build b/packages/linux/build
index e760f9170b..8f9f2f0aee 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 33ec887a83..9bea835e1a 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 92cf112801..294f81df7a 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 is not set
+CONFIG_STATIC=y
 # CONFIG_PIE is not set
 # CONFIG_NOMMU is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
diff --git a/packages/sysutils/busybox/scripts/init.system b/packages/sysutils/busybox/scripts/init.system
index f56a1b9067..1dca504473 100755
--- a/packages/sysutils/busybox/scripts/init.system
+++ b/packages/sysutils/busybox/scripts/init.system
@@ -12,6 +12,10 @@
   mount -t ramfs none /var
   mknod /dev/null c 1 3
   mknod /dev/fb0 c 29 0
+  mknod /dev/tty1 c 4 1
+  mknod /dev/tty2 c 4 2
+  mknod /dev/tty3 c 4 3
+  mknod /dev/console c 5 1
 
 # parse command line arguments
   BOOT=`cat /proc/cmdline | sed 's/.*boot=// ; s/ .*//'`
diff --git a/packages/toolchain/devel/uClibc/install b/packages/toolchain/devel/uClibc/install
index 540ffa18df..a0ed9e099d 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