4 files changed, 18 insertions, 44 deletions
diff --git a/package/simpleinit/Makefile b/package/simpleinit/Makefile
index aeeedfc08..43ea68660 100644
--- a/package/simpleinit/Makefile
+++ b/package/simpleinit/Makefile
@@ -20,10 +20,14 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
+	PATH="${TOOLCHAIN_DIR}/usr/bin:$$PATH" \
 	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/simpleinit ${WRKBUILD}/simpleinit.c
 
 do-install:
+	${INSTALL_DIR} ${IDIR_SIMPLEINIT}/etc
+	${CP} ./files/rc ${IDIR_SIMPLEINIT}/etc
+	${CP} ./files/inittab ${IDIR_SIMPLEINIT}/etc
 	${INSTALL_DIR} ${IDIR_SIMPLEINIT}/sbin
 	${INSTALL_BIN} ${WRKBUILD}/simpleinit ${IDIR_SIMPLEINIT}/sbin/init
 
diff --git a/package/simpleinit/files/inittab b/package/simpleinit/files/inittab
new file mode 100644
index 000000000..1c4744d6a
--- /dev/null
+++ b/package/simpleinit/files/inittab
@@ -0,0 +1,2 @@
+# example
+#inet:unknown:/bin/inetd
diff --git a/package/simpleinit/files/rc b/package/simpleinit/files/rc
index 33d60a4b6..ec8ace337 100755
--- a/package/simpleinit/files/rc
+++ b/package/simpleinit/files/rc
@@ -1,47 +1,15 @@
 #!/bin/sh
-set -x
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-ln -s /proc/self/fd/2 /dev/stderr
-: ${rcquiet=0}
-if [ $rcquiet -ne 1 ];then
-	echo "System initialization ..."
-fi
-
-# remount /dev with smaller size
-mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
-
-# start mdev dynamic device node management
-echo >/dev/mdev.seq
-if [ -f /proc/sys/kernel/hotplug ];then
-	echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-fi
-# creates f.e. /dev/root
-mdev -s
-
-# seed some random
-cat /etc/.rnd >/dev/urandom 2>&1
-
-# setup cfgfs
-[ -x /sbin/cfgfs ] && {
-	cfgfs setup
-	mount -o remount,ro /
-}
-
-# remount /tmp with smaller size
-size=$(cat /etc/tmpfs 2>/dev/null)
-[ -z $size ] && size=2048
-mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
-
-# create some useful directories in tmpfs
+echo Starting OpenADK
+hostname openadk
+mount -t proc proc /proc
+mount -t sysfs sys /sys
+mkdir -m 755 /dev/pts
+mount -t devpts devpts /dev/pts
+mount -t tmpfs -o size=8M tmpfs /tmp
+chmod 1777 /tmp
 mkdir -p /var/log
 mkdir -p /var/run
 mkdir -p /var/tmp
-touch /var/log/lastlog
-touch /var/log/wtmp
-
-HOSTNAME=
-[[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname)
-HOSTNAME=${HOSTNAME%%.*}
-echo ${HOSTNAME:=openadk} >/proc/sys/kernel/hostname
-
-chown 0:0 /tmp; chmod 1777 /tmp
+mdev -s
+mount
+ifconfig lo 127.0.0.1 up
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 9b2fa1da1..c148a19d8 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -34,7 +34,7 @@ do-install:
 	test -z $(ADK_RUNTIME_TIMEZONE) || \
 	    grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \
 	    cut -f 2 > $(IDIR_UCLIBC)/etc/TZ
-ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+ifneq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_UCLINUX),y)
 	$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VERSION).so \
 		$(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)