Merge branch 'master' of git+ssh://www.openadk.org/git/openadk

6 files changed, 3 insertions, 35 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 489ba0685..2d3525b58 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		80
+PKG_RELEASE:=		81
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -54,7 +54,6 @@ endif
 	mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt}
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d}
 	mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin}
-	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
 	chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces
 	(cd $(IDIR_BASE_FILES)/etc; ln -sf ../tmp/resolv.conf .)
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index fc63d80d9..0a24ef04b 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -15,4 +15,3 @@ snd/controlC0 root:audio 660
 snd/pcmC0D0c root:audio 660
 snd/pcmC0D0p root:audio 660
 msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
-.* 0:0 644 @/lib/mdev/init
diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init
deleted file mode 100644
index a478abecd..000000000
--- a/package/base-files/src/lib/mdev/init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-if [ "$SUBSYSTEM" == "pcmcia_socket" ];then
-	logger "Setting up PCMCIA socket resource database"
-	if [ "$ACTION" == "add" ];then
-		/usr/sbin/pcmcia-socket-startup
-	fi
-fi
-if [ "$SUBSYSTEM" == "usb" ];then
-        if [ "$ACTION" == "add" ];then
-                if [ "$DEVTYPE" == "usb_device" ];then
-                        if [ "$PRODUCT" == "12d1/1003/0" ];then
-				if [ ! -f /tmp/.huawei ];then
-                        		logger "USB device added with: $PRODUCT"
-					usbmods=$(lsmod|grep ^usbserial|awk '{ print $4 }'|sed -e 's/,/ /g')
-					for i in $usbmods;do rmmod $i;done
-					rmmod usbserial
-					lsmod >> /tmp/debug
-                                	test -x /sbin/huawei && /sbin/huawei >> /tmp/debug
-					insmod /lib/modules/$(uname -r)/usbserial.ko product=0x1003 vendor=0x12d1
-					for i in $usbmods;do insmod /lib/modules/$(uname -r)/$i.ko; done
-					
-					touch /tmp/.huawei
-				fi
-                        fi
-                fi
-        fi
-fi
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index cdb84d5fe..9d7806bc5 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -36,6 +36,7 @@ libpthread-install:
 ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
+	(cd ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH); ln -sf libpthread.so.0 libpthread.so)
 endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpthread/files/libpthread.postinst b/package/libpthread/files/libpthread.postinst
deleted file mode 100644
index 76a6c81a4..000000000
--- a/package/libpthread/files/libpthread.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ ! -z $IPKG_INSTROOT ];then 
-	(cd $IPKG_INSTROOT/lib && ln -sf libpthread.so.0 libpthread.so)
-fi
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index a6f504a49..776a1a6f9 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -38,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Start getty or shell after bootup"
-default ADK_RUNTIME_GETTY
 default ADK_RUNTIME_SHELL if ADK_PKG_TEST
+default ADK_RUNTIME_GETTY
 
 config ADK_RUNTIME_GETTY
 	boolean "start a getty after bootup"