Waldemar Brodkorb 11 роки тому
батько
коміт
d60178f7ef

+ 3 - 3
Config.in

@@ -106,15 +106,15 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
-config ADK_KERNEL_VERSION_3_8_2
-	prompt "3.8.2"
+config ADK_KERNEL_VERSION_3_8_6
+	prompt "3.8.6"
 	boolean
 
 endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.8.1" if ADK_KERNEL_VERSION_3_8_1
+	default "3.8.6" if ADK_KERNEL_VERSION_3_8_6
 	help
 
 choice

+ 4 - 4
mk/kernel-ver.mk

@@ -1,12 +1,12 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.8.2
+KERNEL_VERSION:=	3.8.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		0587d693653dc5e67e3d280278100d1d
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_8_2),y)
-KERNEL_VERSION:=	3.8.2
+ifeq ($(ADK_KERNEL_VERSION_3_8_6),y)
+KERNEL_VERSION:=	3.8.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		0587d693653dc5e67e3d280278100d1d
+KERNEL_MD5SUM:=		0934e6b31931c1832e48a28bd35ef27f
 endif

+ 0 - 1
mk/modules.mk

@@ -71,7 +71,6 @@ $(eval $(call KMOD_template,RFKILL,rfkill,\
 ,10))
 
 $(eval $(call KMOD_template,MAC80211,mac80211,\
-	$(MODULES_DIR)/kernel/net/wireless/lib80211 \
 	$(MODULES_DIR)/kernel/net/wireless/cfg80211 \
 	$(MODULES_DIR)/kernel/net/mac80211/mac80211 \
 ,15, kmod-crypto-arc4 kmod-crypto-ecb))

+ 1 - 1
package/DirectFB/Makefile

@@ -24,7 +24,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 			--with-gfxdrivers=none \
 			--without-tools \

+ 2 - 0
package/giblib/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c810ef5389baf24882a1caca2954385e
 PKG_DESCR:=		imlib2 wrapper library
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		imlib2
+PKG_BUILDDEP:=		imlib2
 PKG_SITES:=		http://linuxbrit.co.uk/downloads/
 
 include $(TOPDIR)/mk/package.mk

+ 1 - 1
package/iw/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		17704d7c41bcb85cb32cb33b07a1c4cc
 PKG_DESCR:=		Tools for setting up WiFi cards via netlink (nl80211)
 PKG_SECTION:=		wifi
-PKG_DEPENDS:=		libnl
+PKG_DEPENDS:=		libnl libgcc
 PKG_BUILDDEP:=		libnl
 PKG_URL:=		http://wireless.kernel.org/en/users/Documentation/iw
 PKG_SITES:=		http://wireless.kernel.org/download/iw/

+ 1 - 1
package/usbutils/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		850790442f5eb487cdc7e35f8ee03e11
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		utils
-PKG_DEPENDS:=		libusb libusb-compat libpthread zlib
+PKG_DEPENDS:=		libusb libusb-compat libpthread zlib librt libgcc
 PKG_BUILDDEP:=		libusb libusb-compat zlib
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/usb/usbutils/
 

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

@@ -110,6 +110,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
+	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing

+ 0 - 0
target/linux/patches/3.8.2/bsd-compatibility.patch → target/linux/patches/3.8.6/bsd-compatibility.patch


+ 0 - 0
target/linux/patches/3.8.2/cris-etrax.patch → target/linux/patches/3.8.6/cris-etrax.patch


+ 0 - 0
target/linux/patches/3.8.2/defaults.patch → target/linux/patches/3.8.6/defaults.patch


+ 0 - 0
target/linux/patches/3.8.2/disable-netfilter.patch → target/linux/patches/3.8.6/disable-netfilter.patch


+ 0 - 0
target/linux/patches/3.8.2/gemalto.patch → target/linux/patches/3.8.6/gemalto.patch


+ 0 - 0
target/linux/patches/3.8.2/lemote-rfkill.patch → target/linux/patches/3.8.6/lemote-rfkill.patch


+ 0 - 0
target/linux/patches/3.8.2/mtd-rootfs.patch → target/linux/patches/3.8.6/mtd-rootfs.patch


+ 0 - 0
target/linux/patches/3.8.2/non-static.patch → target/linux/patches/3.8.6/non-static.patch


+ 0 - 0
target/linux/patches/3.8.2/startup.patch → target/linux/patches/3.8.6/startup.patch


+ 0 - 0
target/linux/patches/3.8.2/usb-defaults-off.patch → target/linux/patches/3.8.6/usb-defaults-off.patch


+ 0 - 0
target/linux/patches/3.8.2/uuid.patch → target/linux/patches/3.8.6/uuid.patch


+ 0 - 0
target/linux/patches/3.8.2/vga-cons-default-off.patch → target/linux/patches/3.8.6/vga-cons-default-off.patch


+ 0 - 0
target/linux/patches/3.8.2/wlan-cf.patch → target/linux/patches/3.8.6/wlan-cf.patch


+ 0 - 0
target/linux/patches/3.8.2/zlib-inflate.patch → target/linux/patches/3.8.6/zlib-inflate.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.8.2/cleankernel.patch → toolchain/kernel-headers/patches/3.8.6/cleankernel.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.8.2/microperl.patch → toolchain/kernel-headers/patches/3.8.6/microperl.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.8.2/mkpiggy.patch → toolchain/kernel-headers/patches/3.8.6/mkpiggy.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.8.2/relocs.patch → toolchain/kernel-headers/patches/3.8.6/relocs.patch


+ 0 - 0
toolchain/kernel-headers/patches/3.8.2/sortext.patch → toolchain/kernel-headers/patches/3.8.6/sortext.patch


+ 15 - 16
toolchain/uClibc/patches/0.9.33.2/target_arch.patch

@@ -1,25 +1,24 @@
-diff -Nur uClibc-0.9.33.2.orig/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in
---- uClibc-0.9.33.2.orig/extra/Configs/Config.in	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/extra/Configs/Config.in	2012-10-01 12:17:14.000000000 +0200
-@@ -235,6 +235,9 @@
- 	default "i486" if CONFIG_486
- 	default "i586" if CONFIG_586 || CONFIG_586MMX
- 	default "i686" if TARGET_ARCH = "i386"
-+	default "mips" if CONFIG_MIPS_N32_ABI
-+	default "mips" if CONFIG_MIPS_O32_ABI
-+	default "mips64" if CONFIG_MIPS_N64_ABI
- 	default ""
- 
- source "extra/Configs/Config.in.arch"
 diff -Nur uClibc-0.9.33.2.orig/Rules.mak uClibc-0.9.33.2/Rules.mak
 --- uClibc-0.9.33.2.orig/Rules.mak	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/Rules.mak	2012-10-01 11:28:26.000000000 +0200
-@@ -118,7 +118,7 @@
++++ uClibc-0.9.33.2/Rules.mak	2013-04-19 12:52:32.000000000 +0200
+@@ -118,12 +118,17 @@
  LIBC := libc
  SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
  UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
 -ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
-+ifneq ($(findstring  $(TARGET_SUBARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
++
++UCLIBC_LDSO_NAME := ld-uClibc
++ARCH_NATIVE_BIT := 32
++ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),)
  UCLIBC_LDSO_NAME := ld64-uClibc
  ARCH_NATIVE_BIT := 64
  else
+-UCLIBC_LDSO_NAME := ld-uClibc
+-ARCH_NATIVE_BIT := 32
++ifeq ($(CONFIG_MIPS_N64_ABI),y)
++UCLIBC_LDSO_NAME := ld64-uClibc
++ARCH_NATIVE_BIT := 64
++endif
+ endif
+ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION)
+ NONSHARED_LIBNAME := uclibc_nonshared.a