Browse Source

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

Waldemar Brodkorb 14 years ago
parent
commit
5012141130

+ 2 - 0
package/xf86-input-evtouch/Makefile

@@ -13,6 +13,8 @@ PKG_DEPENDS:=		xorg-server kmod-input-evdev
 PKG_BUILDDEP:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://www.conan.de/touchscreen/
 PKG_SITES:=		http://www.conan.de/touchscreen/
 
 
+PKG_CFLINE_XF86_INPUT_EVTOUCH:=	depends on ADK_TARGET_WITH_INPUT
+
 DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 
 include $(TOPDIR)/mk/package.mk
 include $(TOPDIR)/mk/package.mk

+ 1 - 0
target/linux/config/Config.in.block

@@ -81,6 +81,7 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on !ADK_KERNEL_SATA_AHCI
 	depends on !ADK_KERNEL_SATA_AHCI
+	depends on ADK_TARGET_WITH_SATA
 	default n
 	default n
 	help
 	help
 	  Enables support for AHCI Serial ATA.
 	  Enables support for AHCI Serial ATA.

+ 3 - 4
toolchain/binutils/Makefile.inc

@@ -2,9 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 # material, please see the LICENCE file in the top-level directory.
 
 
 PKG_NAME:=		binutils
 PKG_NAME:=		binutils
-PKG_VERSION:=		2.20.51
+PKG_VERSION:=		2.21
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7a68af4b5240a04f6947ef40defa4708
-PKG_SITES:=		http://openadk.org/distfiles/
-#PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
+PKG_MD5SUM:=		c84c5acc9d266f1a7044b51c85a823f5
+PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2