Browse Source

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

Waldemar Brodkorb 10 years ago
parent
commit
0147fd4a45
3 changed files with 18 additions and 3 deletions
  1. 4 0
      mk/modules.mk
  2. 3 3
      package/heimdal/Makefile
  3. 11 0
      target/linux/config/Config.in.netdevice

+ 4 - 0
mk/modules.mk

@@ -135,6 +135,10 @@ $(eval $(call KMOD_template,RT61PCI,rt61pci,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt61pci \
 ,20, kmod-leds-class kmod-rt2x00 rt2x00pci))
 
+$(eval $(call KMOD_template,RTL8192CU,rtl8192cu,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/rtl8192cu/8192cu \
+,20))
+
 #
 # Networking
 #

+ 3 - 3
package/heimdal/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		heimdal
 PKG_VERSION:=		1.5.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		bb23d9dbdafd395d816f7abc598481a1
 PKG_DESCR:=		Kerberos 5 server
 PKG_SECTION:=		crypto
@@ -42,12 +42,14 @@ $(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RE
 $(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBHEIMDAL},${PKGSC_LIBHEIMDAL},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_OPTS:=	--with-hdbdir=/etc/heimdal \
 			--disable-otp \
 			--disable-ndbm-db \
 			--libdir=/usr/lib/heimdal \
 			--libexecdir=/usr/sbin \
 			--without-sqlite3 \
+			--without-libedit \
 			--disable-sqlite-cache \
 			--with-openssl=${STAGING_TARGET_DIR}/usr \
 			--with-readline=${STAGING_TARGET_DIR}/usr \
@@ -161,8 +163,6 @@ endif
 	${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* \
 		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
 	${INSTALL_DIR} ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
-	${CP} ${WRKINST}/usr/lib/heimdal/libheimedit.so* \
-		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
 	${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* \
 		${IDIR_LIBHEIMDAL}/usr/lib/heimdal
 	${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* \

+ 11 - 0
target/linux/config/Config.in.netdevice

@@ -499,6 +499,17 @@ config ADK_KPACKAGE_KMOD_RT2800USB
 	help
 	  Driver for Ralink RT2800 USB.
 
+config ADK_KPACKAGE_KMOD_RTL8192CU
+	prompt "kmod-rtl8192cu............... Realtek RTL8192CU USB"
+	tristate
+	select ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KERNEL_CFG80211_WEXT
+	select ADK_KERNEL_WIRELESS_EXT
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
+	help
+	  Driver for Realtek RTL8192CU USB
+
 config ADK_KPACKAGE_KMOD_RT2400PCI
 	prompt "kmod-rt2400pci............... Ralink rt2400"
 	tristate