Selaa lähdekoodia

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

Waldemar Brodkorb 9 vuotta sitten
vanhempi
commit
3c236d9262

+ 2 - 2
package/patch/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		patch
-PKG_VERSION:=		2.7.1
+PKG_VERSION:=		2.7.5
 PKG_RELEASE:=		1
-PKG_HASH:=		9124ba46db0abd873d0995c2ca880e81252676bb6c03e0a37dfc5f608a9b0ceb
+PKG_HASH:=		fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299
 PKG_DESCR:=		patch utility
 PKG_SECTION:=		sys/utils
 PKG_URL:=		http://www.gnu.org/software/patch/

+ 2 - 2
package/strace/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.9
+PKG_VERSION:=		4.10
 PKG_RELEASE:=		1
-PKG_HASH:=		095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65
+PKG_HASH:=		e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2
 PKG_DESCR:=		system call trace program
 PKG_SECTION:=		app/debug
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}

+ 5 - 5
package/wget/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		wget
-PKG_VERSION:=		1.16
+PKG_VERSION:=		1.16.3
 PKG_RELEASE:=		1
-PKG_HASH:=		b977fc10ac7a72d987d48136251aeb332f2dced1aabd50d6d56bdf72e2b79101
+PKG_HASH:=		9f1c6d09d7148c1c2d9fd0ea655dcf4dcc407deb2db32d4126251ca0245cb670
 PKG_DESCR:=		retrieving files using http(s) and ftp
 PKG_SECTION:=		net/http
 PKG_URL:=		http://www.gnu.org/software/wget/
@@ -16,11 +16,11 @@ PKG_BB:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_CHOICES_WGET:=	WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL
-PKGCD_WITHOUT_SSL:=	use no SSL
-PKGCD_WITH_OPENSSL:=	use OpenSSL for crypto
+PKGCD_WITHOUT_SSL:=	use no ssl
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates libgmp
 PKGCB_WITH_OPENSSL:=	openssl
-PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
+PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls ca-certificates libgmp
 PKGCB_WITH_GNUTLS:=	gnutls
 

+ 12 - 6
target/c6x/uclibc.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# uClibc 1.0.0-git C Library Configuration
+# uClibc 1.0.1 C Library Configuration
 #
 # TARGET_arc is not set
 # TARGET_arm is not set
@@ -10,7 +10,9 @@ TARGET_c6x=y
 # TARGET_cris is not set
 # TARGET_i386 is not set
 # TARGET_m68k is not set
+# TARGET_microblaze is not set
 # TARGET_mips is not set
+# TARGET_nios2 is not set
 # TARGET_powerpc is not set
 # TARGET_sh is not set
 # TARGET_sparc is not set
@@ -63,14 +65,17 @@ LDSO_BASE_FILENAME="ld.so"
 # LDSO_PRELINK_SUPPORT is not set
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
+# LDSO_RUNPATH_OF_EXECUTABLE is not set
 LDSO_SAFE_RUNPATH=y
 LDSO_SEARCH_INTERP_PATH=y
 LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
+LDSO_NO_CLEANUP=y
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
-HAS_NO_THREADS=y
-# LINUXTHREADS_OLD is not set
+# HAS_NO_THREADS is not set
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 MALLOC=y
@@ -124,8 +129,8 @@ UCLIBC_HAS_EPOLL=y
 UCLIBC_HAS_XATTR=y
 # UCLIBC_HAS_PROFILING is not set
 UCLIBC_HAS_CRYPT_IMPL=y
-# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
-# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
+UCLIBC_HAS_SHA256_CRYPT_IMPL=y
+UCLIBC_HAS_SHA512_CRYPT_IMPL=y
 UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
@@ -221,6 +226,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
+# DODEBUG_PT is not set
 # DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set

+ 1 - 0
target/config/Config.in.kernelversion.choice

@@ -11,6 +11,7 @@ config ADK_KERNEL_VERSION_3_19_1
 	select ADK_KERNEL_VERSION_3_19
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 
 config ADK_KERNEL_VERSION_3_18_9
 	bool "3.18.9"

+ 1 - 1
toolchain/Makefile

@@ -39,7 +39,7 @@ TARGETS+=elf2flt
 ELF2FLT:=elf2flt-install
 endif
 
-# disable gdb for arc and avr32
+# disable gdb for arc
 ifeq ($(ADK_TARGET_ARCH_ARC),)
 TARGETS+=gdb
 GDB:=gdb-install