several updates to make it work again. more to come next week

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6337 33e552b5-05e3-0310-8538-816dae2090ed

2 files changed, 43 insertions, 60 deletions

diff --git a/rules/klibc.in b/rules/klibc.in
index 02c679a7d..9d76e23f8 100644
--- a/rules/klibc.in
+++ b/rules/klibc.in
@@ -34,80 +34,62 @@ config KLIBC_KINIT
 	prompt "kinit"
 	default y
 	help
-	  It will be installed into /bin/kinit and is intended to configure the network
+	  It will be installed into /kinit and is intended to configure the network
 	  and mounting NFS based filesystems. It will be controlled by the standard kernel
 	  command line, anything else in /arch.cmd and anything else after a -- parameter.
 	  All three parts gets combined into one parameter list and will be used for
 	  configuration.
 
-config KLIBC_SH
+config KLIBC_STATIC_DASH
 	depends on KLIBC
 	bool
-	prompt "sh"
+	prompt "dash"
 	help
-	  FIXME: This item needs to be documented
+	  install a minimum shell (dash) under /bin/sh
 
 config KLIBC_STATIC_CAT
-	depends on KLIBC && !BB_CONFIG_CAT
+	depends on KLIBC
 	bool
 	prompt "cat"
 	help
 	  This is a statically linked "cat" command. It gets installed into /bin/cat
 
-comment "busy box' cat is selected!"
-        depends on BB_CONFIG_CAT && KLIBC
-
 config KLIBC_STATIC_CHROOT
-	depends on KLIBC && !BB_CONFIG_CHROOT
+	depends on KLIBC
 	bool
 	prompt "chroot"
 	help
 	  This is a statically linked "chroot" command. It gets installed into /bin/chroot
 
-comment "busy box' chroot is selected!"
-	depends on BB_CONFIG_CHROOT && KLIBC
-
 
 config KLIBC_STATIC_DD
-	depends on KLIBC && !BB_CONFIG_DD
+	depends on KLIBC
 	bool
 	prompt "dd"
 	help
 	  This is a statically linked "dd" command. It gets installed into /bin/dd
 
-comment "busy box' dd is selected!"
-	depends on BB_CONFIG_DD && KLIBC
-
 config KLIBC_STATIC_FALSE
-	depends on KLIBC && !BB_CONFIG_FALSE
+	depends on KLIBC
 	bool
 	prompt "false"
 	help
 	  This is a statically linked "false" command. It gets installed into /bin/false
 
-comment "busy box' false is selected!"
-	depends on BB_CONFIG_FALSE && KLIBC
-
 config KLIBC_STATIC_INSMOD
-	depends on KLIBC && !BB_CONFIG_INSMOD
+	depends on KLIBC
 	bool
 	prompt "insmod"
 	help
 	  This is a statically linked "insmod" command. It gets installed into /bin/insmod
 
-comment "busy box' insmod is selected!"
-	depends on BB_CONFIG_INSMOD && KLIBC
-
 config KLIBC_STATIC_LN
-	depends on KLIBC && !BB_CONFIG_LN
+	depends on KLIBC
 	bool
 	prompt "ln"
 	help
 	  This is a statically linked "ln" command. It gets installed into /bin/ln
 
-comment "busy box' ln is selected!"
-	depends on BB_CONFIG_LN && KLIBC
-
 config KLIBC_STATIC_MINIPS
 	depends on KLIBC
 	bool
@@ -116,35 +98,26 @@ config KLIBC_STATIC_MINIPS
 	  This is a statically linked "minips" command. It gets installed into /bin/minips
 
 config KLIBC_STATIC_MKDIR
-	depends on KLIBC && !BB_CONFIG_MKDIR
+	depends on KLIBC
 	bool
 	prompt "mkdir"
 	help
 	  This is a statically linked "mkdir" command. It gets installed into /bin/mkdir
 
-comment "busy box' mkdir is selected!"
-	depends on BB_CONFIG_MKDIR && KLIBC
-
 config KLIBC_STATIC_MKFIFO
-	depends on KLIBC && !BB_CONFIG_MKFIFO
+	depends on KLIBC
 	bool
 	prompt "mkfifo"
 	help
 	  This is a statically linked "mkfifo" command. It gets installed into /bin/mkfifo
 
-comment "busy box' mkfifo is selected!"
-	depends on BB_CONFIG_MKFIFO && KLIBC
-
 config KLIBC_STATIC_MOUNT
-	depends on KLIBC && !BB_CONFIG_MOUNT
+	depends on KLIBC
 	bool
 	prompt "mount"
 	help
 	  This is a statically linked "mount" command. It gets installed into /bin/mount
 
-comment "busy box' mount is selected!"
-	depends on BB_CONFIG_MOUNT && KLIBC
-
 config KLIBC_STATIC_NUKE
 	depends on KLIBC
 	bool
@@ -160,45 +133,33 @@ config KLIBC_STATIC_PIVOT_ROOT
 	  This is a statically linked "pivot_root" command. It gets installed into /bin/pivot_root
 
 config KLIBC_STATIC_SLEEP
-	depends on KLIBC && !BB_CONFIG_SLEEP
+	depends on KLIBC
 	bool
 	prompt "sleep"
 	help
 	  This is a statically linked "sleep" command. It gets installed into /bin/sleep
 
-comment "busy box' sleep is selected!"
-	depends on BB_CONFIG_SLEEP && KLIBC
-
 config KLIBC_STATIC_TRUE
-	depends on KLIBC && !BB_CONFIG_TRUE
+	depends on KLIBC
 	bool
 	prompt "true"
 	help
 	  This is a statically linked "true" command. It gets installed into /bin/true
 
-comment "busy box' true is selected!"
-	depends on BB_CONFIG_TRUE && KLIBC
-
 config KLIBC_STATIC_UMOUNT
-	depends on KLIBC && !BB_CONFIG_UMOUNT
+	depends on KLIBC
 	bool
 	prompt "umount"
 	help
 	  This is a statically linked "umount" command. It gets installed into /bin/umount
 
-comment "busy box' umount is selected!"
-	depends on BB_CONFIG_UMOUNT && KLIBC
-
 config KLIBC_STATIC_UNAME
-	depends on KLIBC && !BB_CONFIG_UNAME
+	depends on KLIBC
 	bool
 	prompt "uname"
 	help
 	  This is a statically linked "uname" command. It gets installed into /bin/uname
 
-comment "busy box' uname is selected!"
-	depends on BB_CONFIG_UNAME && KLIBC
-
 #
 # dynamic part
 #
diff --git a/rules/klibc.make b/rules/klibc.make
index 67ab36f04..4d23fd15c 100644
--- a/rules/klibc.make
+++ b/rules/klibc.make
@@ -17,13 +17,16 @@ PACKAGES-$(PTXCONF_KLIBC) += klibc
 #
 # Paths and names
 #
-KLIBC_VERSION	:= 1.4
+KLIBC_VERSION	:= 1.4.30
 KLIBC		:= klibc-$(KLIBC_VERSION)
 KLIBC_SUFFIX	:= tar.gz
-KLIBC_URL	:= http://www.kernel.org/pub/linux/libs/klibc/$(KLIBC).$(KLIBC_SUFFIX)
+KLIBC_URL	:= http://www.kernel.org/pub/linux/libs/klibc/Testing/$(KLIBC).$(KLIBC_SUFFIX)
 KLIBC_SOURCE	:= $(SRCDIR)/$(KLIBC).$(KLIBC_SUFFIX)
 KLIBC_DIR	:= $(BUILDDIR)/$(KLIBC)
 
+ifdef PTXCONF_KLIBC
+$(STATEDIR)/kernel.compile: $(STATEDIR)/klibc.install
+endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -99,6 +102,8 @@ KLIBC_MAKE_PARAM = ARCH=$(PTXCONF_ARCH) \
 
 $(STATEDIR)/klibc.compile: $(klibc_compile_deps)
 	@$(call targetinfo, $@)
+	rm -f $(KLIBC_DIR)/.config
+	ln -sf $(KERNEL_DIR) $(KLIBC_DIR)/linux
 	cd $(KLIBC_DIR) && make $(KLIBC_MAKE_PARAM) $(KLIBC_VERBOSE)
 	@$(call touch, $@)
 
@@ -184,6 +189,14 @@ ifdef PTXCONF_KLIBC_STATIC_UNAME
 	echo "file /bin/uname $(KLIBC_BINSRC)/utils/static/uname 755 0 0" >> $(KLIBC_CONTROL)
 endif
 
+ifdef PTXCONF_KLIBC_STATIC_DASH
+	echo "file /bin/sh $(KLIBC_BINSRC)/dash/sh 755 0 0" >> $(KLIBC_CONTROL)
+endif
+
+ifdef PTXCONF_KLIBC_KINIT
+	echo "file /kinit $(KLIBC_BINSRC)/kinit/kinit 755 0 0" >> $(KLIBC_CONTROL)
+endif
+
 #
 # select the dynamics
 # FIXME: Untested and not fully supported yet!
@@ -193,7 +206,7 @@ ifdef PTXCONF_KLIBC_DYNAMIC_LIB
 	echo "file /lib/klibc.so $(KLIBC_BINSRC)/utils/klibc/klibc.so 755 0 0" >> $(KLIBC_CONTROL)
 endif
 ifdef PTXCONF_KLIBC_SHARED_CAT
-	echo "file /bin/cat $(KLIBC_BINSRC)/utils/shared/cat 755 0 0" >> $(KLIBC_CONTROL)
+	echo "file /bin/sh $(KLIBC_BINSRC)/usr/dash/sh 755 0 0" >> $(KLIBC_CONTROL)
 endif
 
 # FIXME: add remaining possible commands
@@ -228,6 +241,16 @@ endif
 #
 	cd $(KLIBC_DIR) && make  $(KLIBC_MAKE_PARAM) $(KLIBC_VERBOSE) install
 
+#
+# set CONFIG_INITRAMFS_SOURCE in the kernel config to the previously generated spec file
+#
+	sed -i "s^CONFIG_INITRAMFS_SOURCE=.*^CONFIG_INITRAMFS_SOURCE=\"$(KLIBC_CONTROL)\"^" $(KERNEL_DIR)/.config
+
+#
+# make sure the kernel regenerates the initramfs image
+#
+	rm -f $(KERNEL_DIR)/usr/initramfs_data.cpio.gz
+
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -248,7 +271,6 @@ klibc_clean:
 	rm -rf $(STATEDIR)/klibc.*
 	rm -rf $(IMAGEDIR)/klibc_*
 	rm -rf $(KLIBC_DIR)
-	rm -rf $(INSTALLROOT)/usr/lib/klibc
 	rm -rf $(PTXCONF_PREFIX)/bin/klcc
 
 # vim: syntax=make