optimize libc-dev package

- remove some leftover debug code
- add more header files in libc-dev packages
- fix qemu-mips* hints

10 files changed, 54 insertions, 17 deletions

diff --git a/mk/package.mk b/mk/package.mk
index 318ce3d80..c0b5c04e6 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -174,7 +174,6 @@ endif
 	@mkdir -p $${PACKAGE_DIR} '$${STAGING_PARENT}/pkg' \
 	    '$${STAGING_DIR}/scripts'
 ifneq ($(strip $(7)),noremove)
-	echo "Calling from package.mk"
 	if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \
 		cd '$${STAGING_DIR}'; \
 		while read fn; do \
@@ -215,7 +214,6 @@ clean-targets: clean-dev-$(1)
 
 clean-dev-$(1):
 ifneq ($(strip $(7)),noremove)
-	echo "Calling from package.mk clean-dev"
 	if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \
 		cd '$${STAGING_DIR}'; \
 		while read fn; do \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 05c123ed2..a3692acdd 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -151,7 +151,6 @@ endif
 		echo "scripts/$$(basename "$$fn")" \
 		    >>'${STAGING_PARENT}/pkg/${PKG_NAME}'; \
 	done
-	echo "calling from pkg-bottom.mk"
 	touch $@
 
 ${_IPKGS_COOKIE}:
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 112772a7d..a884cb37f 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -34,13 +34,21 @@ endif
 	cd $(IDIR_EGLIBC)/lib && ln -sf libc.so.6 libc.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so
 	# header package
-	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/usr/include/{sys,bits,gnu}
-	for file in pthread sched wchar _G_config getopt endian features libio stdio error signal time unistd;do \
+	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/usr/include/{sys,bits,gnu,linux,asm,asm-generic}
+	for file in \
+		regex errno limits alloca stdint locale ctype \
+		stdlib string sgidefs fcntl \
+		libintl sched pthread wchar _G_config getopt endian \
+		features libio stdio error signal time unistd \
+	;do \
 		${CP} $(STAGING_DIR)/usr/include/$$file.h \
 		$(IDIR_EGLIBC_DEV)/usr/include; \
 	done
+	${CP} $(STAGING_DIR)/usr/include/asm/*.h $(IDIR_EGLIBC_DEV)/usr/include/asm
+	${CP} $(STAGING_DIR)/usr/include/asm-generic/*.h $(IDIR_EGLIBC_DEV)/usr/include/asm-generic
 	${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_EGLIBC_DEV)/usr/include/sys
 	${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_EGLIBC_DEV)/usr/include/bits
 	${CP} $(STAGING_DIR)/usr/include/gnu/*.h $(IDIR_EGLIBC_DEV)/usr/include/gnu
+	${CP} $(STAGING_DIR)/usr/include/linux/*.h $(IDIR_EGLIBC_DEV)/usr/include/linux
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index 702870201..35e630dc7 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -7,3 +7,12 @@ config ADK_PACKAGE_GLIBC
 	help
 	  GNU C library.
 
+config ADK_PACKAGE_GLIBC_DEV
+	prompt "glibc-dev........................... development files"
+	bool
+	default n
+	depends on ADK_TARGET_LIB_GLIBC
+	help
+	  GNU C library header files.
+
+
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index e8ba0cd91..479c8aab9 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -31,5 +31,22 @@ endif
 	done
 	# create ld.so link for mips gcc linker option
 	cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
+	cd $(IDIR_GLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so
+	# header package
+	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/usr/include/{sys,bits,linux,asm,asm-generic}
+	for file in \
+		regex errno limits alloca stdint locale ctype \
+		stdlib string sgidefs fcntl \
+		libintl sched pthread wchar _G_config getopt endian \
+		features libio stdio error signal time unistd \
+	;do \
+		${CP} $(STAGING_DIR)/usr/include/$$file.h \
+		$(IDIR_GLIBC_DEV)/usr/include; \
+	done
+	${CP} $(STAGING_DIR)/usr/include/asm/*.h $(IDIR_GLIBC_DEV)/usr/include/asm
+	${CP} $(STAGING_DIR)/usr/include/asm-generic/*.h $(IDIR_GLIBC_DEV)/usr/include/asm-generic
+	${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_GLIBC_DEV)/usr/include/sys
+	${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_GLIBC_DEV)/usr/include/bits
+	${CP} $(STAGING_DIR)/usr/include/linux/*.h $(IDIR_GLIBC_DEV)/usr/include/linux
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index c5d2f01a9..e961ee86b 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -33,14 +33,20 @@ do-install:
 	cd $(IDIR_UCLIBC)/lib && ln -sf libc.so.0 libc.so
 	cd $(IDIR_UCLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so
 	# header package
-	${INSTALL_DIR} $(IDIR_UCLIBC_DEV)/usr/include/{sys,bits}
-	for file in alloca stdint locale ctype stdlib string sgidefs \
+	${INSTALL_DIR} $(IDIR_UCLIBC_DEV)/usr/include/{sys,bits,linux,asm,asm-generic}
+	for file in \
+		regex errno limits alloca stdint locale ctype \
+		stdlib string sgidefs fcntl \
 		libintl sched pthread wchar _G_config getopt endian \
-		features libio stdio error signal time unistd;do \
-			${CP} $(STAGING_DIR)/usr/include/$$file.h \
-			$(IDIR_UCLIBC_DEV)/usr/include; \
+		features libio stdio error signal time unistd \
+	;do \
+		${CP} $(STAGING_DIR)/usr/include/$$file.h \
+		$(IDIR_UCLIBC_DEV)/usr/include; \
 	done
+	${CP} $(STAGING_DIR)/usr/include/asm/*.h $(IDIR_UCLIBC_DEV)/usr/include/asm
+	${CP} $(STAGING_DIR)/usr/include/asm-generic/*.h $(IDIR_UCLIBC_DEV)/usr/include/asm-generic
 	${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_UCLIBC_DEV)/usr/include/sys
 	${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_UCLIBC_DEV)/usr/include/bits
+	${CP} $(STAGING_DIR)/usr/include/linux/*.h $(IDIR_UCLIBC_DEV)/usr/include/linux
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/target/qemu-mips/Makefile b/target/qemu-mips/Makefile
index 4bbc03c8f..c76eb46f4 100644
--- a/target/qemu-mips/Makefile
+++ b/target/qemu-mips/Makefile
@@ -17,12 +17,12 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append="root=/dev/hda1 init=/init"'
+	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"'
 endif
 
 ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "init=/init"'
+	@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}
 endif
diff --git a/target/qemu-mips64/Makefile b/target/qemu-mips64/Makefile
index 5e606d7eb..84dfadd2f 100644
--- a/target/qemu-mips64/Makefile
+++ b/target/qemu-mips64/Makefile
@@ -17,12 +17,12 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append="root=/dev/hda1 init=/init"'
+	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"'
 endif
 
 ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "init=/init"'
+	@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
diff --git a/target/qemu-mips64el/Makefile b/target/qemu-mips64el/Makefile
index af8997a8f..f11be66d9 100644
--- a/target/qemu-mips64el/Makefile
+++ b/target/qemu-mips64el/Makefile
@@ -17,12 +17,12 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append="root=/dev/hda1 init=/init"'
+	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"'
 endif
 
 ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "init=/init"'
+	@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile
index 298fcfe7d..0ceb6a768 100644
--- a/target/qemu-mipsel/Makefile
+++ b/target/qemu-mipsel/Makefile
@@ -25,5 +25,5 @@ ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-	@echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "init=/init"'
+	@echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
 endif