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

package/eglibc/Makefile

@@ -84,11 +84,9 @@ eglibc-dev-install:
 	-cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
-	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so
-	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so
-	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so
-	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so
-	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
+	-for file in libc libcrypt libdl libm libresolv librt libutil; do \
+		cd $(IDIR_GLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
+	done
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
 		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \

target/linux/config/Config.in.netdevice

@@ -351,6 +351,7 @@ config ADK_KPACKAGE_KMOD_RT2400PCI
 	prompt "kmod-rt2400pci............... Ralink rt2400"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
@@ -362,6 +363,7 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
 	prompt "kmod-rt2500pci............... Ralink rt2500"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
@@ -373,6 +375,7 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 	prompt "kmod-rt61pci................. Ralink rt2501/rt61"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
 	select ADK_PACKAGE_RT61_FIRMWARE

target/mips/uclibc.config

@@ -88,7 +88,7 @@ UCLIBC_CTOR_DTOR=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set

toolchain/gcc/Makefile

@@ -160,6 +160,8 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install
+	# workaround if you cross-compile binutils
+	@-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
 	(cd $(STAGING_HOST_DIR); \