diff options
-rw-r--r-- | Config.in | 6 | ||||
-rw-r--r-- | mk/kernel-ver.mk | 8 | ||||
-rw-r--r-- | mk/modules.mk | 1 | ||||
-rw-r--r-- | package/DirectFB/Makefile | 2 | ||||
-rw-r--r-- | package/giblib/Makefile | 2 | ||||
-rw-r--r-- | package/iw/Makefile | 2 | ||||
-rw-r--r-- | package/usbutils/Makefile | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 1 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/bsd-compatibility.patch (renamed from target/linux/patches/3.8.2/bsd-compatibility.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/cris-etrax.patch (renamed from target/linux/patches/3.8.2/cris-etrax.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/defaults.patch (renamed from target/linux/patches/3.8.2/defaults.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/disable-netfilter.patch (renamed from target/linux/patches/3.8.2/disable-netfilter.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/gemalto.patch (renamed from target/linux/patches/3.8.2/gemalto.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/lemote-rfkill.patch (renamed from target/linux/patches/3.8.2/lemote-rfkill.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/mtd-rootfs.patch (renamed from target/linux/patches/3.8.2/mtd-rootfs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/non-static.patch (renamed from target/linux/patches/3.8.2/non-static.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/startup.patch (renamed from target/linux/patches/3.8.2/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/usb-defaults-off.patch (renamed from target/linux/patches/3.8.2/usb-defaults-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/uuid.patch (renamed from target/linux/patches/3.8.2/uuid.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/vga-cons-default-off.patch (renamed from target/linux/patches/3.8.2/vga-cons-default-off.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/wlan-cf.patch (renamed from target/linux/patches/3.8.2/wlan-cf.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.8.6/zlib-inflate.patch (renamed from target/linux/patches/3.8.2/zlib-inflate.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.8.6/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.8.2/cleankernel.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.8.6/microperl.patch (renamed from toolchain/kernel-headers/patches/3.8.2/microperl.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.8.6/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.8.2/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.8.6/relocs.patch (renamed from toolchain/kernel-headers/patches/3.8.2/relocs.patch) | 0 | ||||
-rw-r--r-- | toolchain/kernel-headers/patches/3.8.6/sortext.patch (renamed from toolchain/kernel-headers/patches/3.8.2/sortext.patch) | 0 | ||||
-rw-r--r-- | toolchain/uClibc/patches/0.9.33.2/target_arch.patch | 31 |
28 files changed, 28 insertions, 27 deletions
@@ -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 diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index edd5db9e2..3a67db0a4 100644 --- a/mk/kernel-ver.mk +++ b/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 diff --git a/mk/modules.mk b/mk/modules.mk index 7f36dd514..b526dd596 100644 --- a/mk/modules.mk +++ b/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)) diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 682c763ec..a8ad055e9 100644 --- a/package/DirectFB/Makefile +++ b/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 \ diff --git a/package/giblib/Makefile b/package/giblib/Makefile index 5f36a9860..70743c383 100644 --- a/package/giblib/Makefile +++ b/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 diff --git a/package/iw/Makefile b/package/iw/Makefile index a8eb8e010..9df0fc0b3 100644 --- a/package/iw/Makefile +++ b/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/ diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index ef64d2a94..ce0b0b31e 100644 --- a/package/usbutils/Makefile +++ b/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/ diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 3c917ec00..16db312c0 100644 --- a/target/linux/config/Config.in.usb +++ b/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 diff --git a/target/linux/patches/3.8.2/bsd-compatibility.patch b/target/linux/patches/3.8.6/bsd-compatibility.patch index 9e55150cc..9e55150cc 100644 --- a/target/linux/patches/3.8.2/bsd-compatibility.patch +++ b/target/linux/patches/3.8.6/bsd-compatibility.patch diff --git a/target/linux/patches/3.8.2/cris-etrax.patch b/target/linux/patches/3.8.6/cris-etrax.patch index a80d9a8b8..a80d9a8b8 100644 --- a/target/linux/patches/3.8.2/cris-etrax.patch +++ b/target/linux/patches/3.8.6/cris-etrax.patch diff --git a/target/linux/patches/3.8.2/defaults.patch b/target/linux/patches/3.8.6/defaults.patch index 58aae610b..58aae610b 100644 --- a/target/linux/patches/3.8.2/defaults.patch +++ b/target/linux/patches/3.8.6/defaults.patch diff --git a/target/linux/patches/3.8.2/disable-netfilter.patch b/target/linux/patches/3.8.6/disable-netfilter.patch index 7b1ca013a..7b1ca013a 100644 --- a/target/linux/patches/3.8.2/disable-netfilter.patch +++ b/target/linux/patches/3.8.6/disable-netfilter.patch diff --git a/target/linux/patches/3.8.2/gemalto.patch b/target/linux/patches/3.8.6/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.8.2/gemalto.patch +++ b/target/linux/patches/3.8.6/gemalto.patch diff --git a/target/linux/patches/3.8.2/lemote-rfkill.patch b/target/linux/patches/3.8.6/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.8.2/lemote-rfkill.patch +++ b/target/linux/patches/3.8.6/lemote-rfkill.patch diff --git a/target/linux/patches/3.8.2/mtd-rootfs.patch b/target/linux/patches/3.8.6/mtd-rootfs.patch index 775d5fc80..775d5fc80 100644 --- a/target/linux/patches/3.8.2/mtd-rootfs.patch +++ b/target/linux/patches/3.8.6/mtd-rootfs.patch diff --git a/target/linux/patches/3.8.2/non-static.patch b/target/linux/patches/3.8.6/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.8.2/non-static.patch +++ b/target/linux/patches/3.8.6/non-static.patch diff --git a/target/linux/patches/3.8.2/startup.patch b/target/linux/patches/3.8.6/startup.patch index d23d6d212..d23d6d212 100644 --- a/target/linux/patches/3.8.2/startup.patch +++ b/target/linux/patches/3.8.6/startup.patch diff --git a/target/linux/patches/3.8.2/usb-defaults-off.patch b/target/linux/patches/3.8.6/usb-defaults-off.patch index 54dff2bd4..54dff2bd4 100644 --- a/target/linux/patches/3.8.2/usb-defaults-off.patch +++ b/target/linux/patches/3.8.6/usb-defaults-off.patch diff --git a/target/linux/patches/3.8.2/uuid.patch b/target/linux/patches/3.8.6/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.8.2/uuid.patch +++ b/target/linux/patches/3.8.6/uuid.patch diff --git a/target/linux/patches/3.8.2/vga-cons-default-off.patch b/target/linux/patches/3.8.6/vga-cons-default-off.patch index 178aeeeb9..178aeeeb9 100644 --- a/target/linux/patches/3.8.2/vga-cons-default-off.patch +++ b/target/linux/patches/3.8.6/vga-cons-default-off.patch diff --git a/target/linux/patches/3.8.2/wlan-cf.patch b/target/linux/patches/3.8.6/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.8.2/wlan-cf.patch +++ b/target/linux/patches/3.8.6/wlan-cf.patch diff --git a/target/linux/patches/3.8.2/zlib-inflate.patch b/target/linux/patches/3.8.6/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.8.2/zlib-inflate.patch +++ b/target/linux/patches/3.8.6/zlib-inflate.patch diff --git a/toolchain/kernel-headers/patches/3.8.2/cleankernel.patch b/toolchain/kernel-headers/patches/3.8.6/cleankernel.patch index f8d5448ee..f8d5448ee 100644 --- a/toolchain/kernel-headers/patches/3.8.2/cleankernel.patch +++ b/toolchain/kernel-headers/patches/3.8.6/cleankernel.patch diff --git a/toolchain/kernel-headers/patches/3.8.2/microperl.patch b/toolchain/kernel-headers/patches/3.8.6/microperl.patch index 44c39f6e8..44c39f6e8 100644 --- a/toolchain/kernel-headers/patches/3.8.2/microperl.patch +++ b/toolchain/kernel-headers/patches/3.8.6/microperl.patch diff --git a/toolchain/kernel-headers/patches/3.8.2/mkpiggy.patch b/toolchain/kernel-headers/patches/3.8.6/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.8.2/mkpiggy.patch +++ b/toolchain/kernel-headers/patches/3.8.6/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.8.2/relocs.patch b/toolchain/kernel-headers/patches/3.8.6/relocs.patch index 43c5bb580..43c5bb580 100644 --- a/toolchain/kernel-headers/patches/3.8.2/relocs.patch +++ b/toolchain/kernel-headers/patches/3.8.6/relocs.patch diff --git a/toolchain/kernel-headers/patches/3.8.2/sortext.patch b/toolchain/kernel-headers/patches/3.8.6/sortext.patch index d82b76a2d..d82b76a2d 100644 --- a/toolchain/kernel-headers/patches/3.8.2/sortext.patch +++ b/toolchain/kernel-headers/patches/3.8.6/sortext.patch diff --git a/toolchain/uClibc/patches/0.9.33.2/target_arch.patch b/toolchain/uClibc/patches/0.9.33.2/target_arch.patch index 3f02bb4e0..8bdf1f30f 100644 --- a/toolchain/uClibc/patches/0.9.33.2/target_arch.patch +++ b/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 |