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

mk/kernel-ver.mk

@@ -1,38 +1,44 @@
-ifeq ($(ADK_KERNEL_VERSION_3_19_1),y)
-KERNEL_VERSION:=	3.19.1
+ifeq ($(ADK_KERNEL_VERSION_4_0_1),y)
+KERNEL_VERSION:=	4.0.1
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_HASH:=		717f36a65735bdd7afcb452578cc221c7fde8f6a0073e2feb62473466bdfa763
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_18_10),y)
-KERNEL_VERSION:=	3.18.10
+ifeq ($(ADK_KERNEL_VERSION_3_19_5),y)
+KERNEL_VERSION:=	3.19.5
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_HASH:=		d03015f01235ae046d9d39c0a70ad21a7a97fec0620741ea2d8306289707b04e
+KERNEL_HASH:=		3d36d9d3643f3dd8e395a192c112dcde55732734e52185a4131fe819a68f5e68
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_14_35),y)
-KERNEL_VERSION:=	3.14.35
+ifeq ($(ADK_KERNEL_VERSION_3_18_12),y)
+KERNEL_VERSION:=	3.18.12
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_HASH:=		c8d7d23a434688db94e9faed2e73b31e8b9722d7ffc6fbce2b0f6d1f91a825b4
+KERNEL_HASH:=		82eab56bd3e416b12771908edbe000a8bf58d78da88457f716aab00dc07b8e1b
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_12_38),y)
-KERNEL_VERSION:=	3.12.38
+ifeq ($(ADK_KERNEL_VERSION_3_14_40),y)
+KERNEL_VERSION:=	3.14.40
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_HASH:=		930dcae882f402015b21a3c2e73ef84352b46ae58a9e5348b3a46343bfdc9b6f
+KERNEL_HASH:=		2a89cce6ca7c574f17d44dcb541036d29725a102dd047963b850ede2ed28b2f0
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_71),y)
-KERNEL_VERSION:=	3.10.71
+ifeq ($(ADK_KERNEL_VERSION_3_12_40),y)
+KERNEL_VERSION:=	3.12.40
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_HASH:=		1b2ef99de33bf5d8c6aaba202dd951f2c13277a8efa7522d3f331c7aee32dac0
+KERNEL_HASH:=		85c3f531a1607f5b21dfe5fb6db324e2a31a01880c0dcc853f056460c3deb1b1
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_106),y)
-KERNEL_VERSION:=	3.4.106
+ifeq ($(ADK_KERNEL_VERSION_3_10_75),y)
+KERNEL_VERSION:=	3.10.75
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_HASH:=		4ca37aad495d7a670c9f4435a98460d795fbdb8675f0613c1541824feb1433d0
+KERNEL_HASH:=		18987c2e9a8f5e2583b1ac5c2bed52777b8730ab29612a5b70c94fa17c659803
+endif
+ifeq ($(ADK_KERNEL_VERSION_3_4_107),y)
+KERNEL_VERSION:=	3.4.107
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
+KERNEL_RELEASE:=	1
+KERNEL_HASH:=		18decdeec4d7f3c0a8874d49b6b1c4980fcb92b5f62e13889ce35bd674ec75f8
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_2_68),y)
 KERNEL_VERSION:=	3.2.68

mk/modules-3.12.mk

@@ -0,0 +1,5 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+USBMODULES:=drivers/usb/usb-common drivers/usb/core/usbcore
+USBUDC:=gadget/udc

mk/modules-3.14.mk

@@ -0,0 +1,5 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+USBMODULES:=drivers/usb/usb-common drivers/usb/core/usbcore
+USBUDC:=gadget/udc

mk/modules-3.18.mk

@@ -0,0 +1,5 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+USBMODULES:=drivers/usb/common/usb-common drivers/usb/core/usbcore
+USBUDC:=gadget/udc

mk/modules-3.19.mk

@@ -0,0 +1,6 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+USBMODULES+=drivers/usb/common/usb-common
+USBMODULES+=drivers/usb/core/usbcore
+USBUDC:=gadget/udc

mk/modules.mk

@@ -1,9 +1,21 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-KERNEL_BASE:=$(word 1,$(subst ., ,$(ADK_KERNEL_VERSION)))
-KERNEL_MAJ:=$(word 2,$(subst ., ,$(ADK_KERNEL_VERSION)))
-KERNEL_MIN:=$(word 3,$(subst ., ,$(ADK_KERNEL_VERSION)))
+ifeq ($(ADK_KERNEL_VERSION_3_19),y)
+include $(ADK_TOPDIR)/mk/modules-3.19.mk
+endif
+
+ifeq ($(ADK_KERNEL_VERSION_3_18),y)
+include $(ADK_TOPDIR)/mk/modules-3.18.mk
+endif
+
+ifeq ($(ADK_KERNEL_VERSION_3_14),y)
+include $(ADK_TOPDIR)/mk/modules-3.14.mk
+endif
+
+ifeq ($(ADK_KERNEL_VERSION_3_12),y)
+include $(ADK_TOPDIR)/mk/modules-3.12.mk
+endif
 
 #
 # Virtualization
@@ -1217,27 +1229,6 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
 #
 # USB
 #
-
-USBMODULES:=
-USBMODULES+=drivers/usb/usb-common
-USBMODULES+=drivers/usb/core/usbcore
-USBUDC:=gadget
-
-ifeq ($(KERNEL_BASE),3)
-ifeq ($(KERNEL_MAJ),18)
-USBMODULES:=
-USBMODULES+=drivers/usb/common/usb-common
-USBMODULES+=drivers/usb/core/usbcore
-USBUDC:=gadget/udc
-endif
-ifeq ($(KERNEL_MAJ),19)
-USBMODULES:=
-USBMODULES+=drivers/usb/common/usb-common
-USBMODULES+=drivers/usb/core/usbcore
-USBUDC:=gadget/udc
-endif
-endif
-
 $(eval $(call KMOD_template,USB,usb,\
 	$(foreach mod, $(USBMODULES),$(MODULES_DIR)/kernel/$(mod)) \
 ,50))

package/curl/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.42.0
+PKG_VERSION:=		7.42.1
 PKG_RELEASE:=		1
-PKG_HASH:=		088f6a63289dbdcf23d692fdfaaf6262c19e373beb5237b9b9e7bcf9815a8f49
+PKG_HASH:=		4fc504f4fac56d091162707941d06c72a4222fc6fa48ca8193e44ee74baf079c
 PKG_DESCR:=		client-side url transfer tool
 PKG_SECTION:=		net/http
 PKG_DEPENDS:=		libcurl

package/curl/patches/patch-lib_url_c

@@ -1,28 +0,0 @@
---- curl-7.42.0.orig/lib/url.c	2015-04-22 07:55:54.000000000 +0200
-+++ curl-7.42.0/lib/url.c	2015-04-24 18:00:21.000000000 +0200
-@@ -3069,9 +3069,11 @@ ConnectionExists(struct SessionHandle *d
-   struct connectdata *check;
-   struct connectdata *chosen = 0;
-   bool canPipeline = IsPipeliningPossible(data, needle);
-+#ifdef USE_NTLM
-   bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) ||
-                        (data->state.authhost.want & CURLAUTH_NTLM_WB)) &&
-     (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE;
-+#endif
-   struct connectbundle *bundle;
- 
-   *force_reuse = FALSE;
-@@ -3208,8 +3210,11 @@ ConnectionExists(struct SessionHandle *d
-           continue;
-       }
- 
--      if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) ||
--         (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) {
-+      if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST))
-+#ifdef USE_NTLM
-+         || (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)
-+#endif
-+	) {
-         /* This protocol requires credentials per connection or is HTTP+NTLM,
-            so verify that we're using the same name and password as well */
-         if(!strequal(needle->user, check->user) ||

package/gawk/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		gawk
-PKG_VERSION:=		4.1.1
+PKG_VERSION:=		4.1.2
 PKG_RELEASE:=		1
-PKG_HASH:=		efd4c6aafb1ce996309fc903ceb625e7012221c464eb72483dbb23adef1ee8db
+PKG_HASH:=		ea8b53c5834ee27012fecba7273f97fca7104884975cf81ddae6f85c5581f481
 PKG_DESCR:=		awk programming language interpreter
 PKG_SECTION:=		dev/lang
 PKG_URL:=		http://www.gnu.org/software/gawk/

package/libmicrohttpd/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libmicrohttpd
-PKG_VERSION:=		0.9.38
+PKG_VERSION:=		0.9.41
 PKG_RELEASE:=		1
-PKG_HASH:=		8df2b4dd863c98799a4775a530d905363fbc02fec850af9094da890b28b9e721
+PKG_HASH:=		9798be637d4a1d76a377e1d805d142e6edcfd3ec99c443926448f647af1a7a7c
 PKG_DESCR:=		library make it easy to run an webserver
 PKG_SECTION:=		libs/net
 PKG_URL:=		http://www.gnu.org/software/libmicrohttpd/

package/libtasn1/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libtasn1
-PKG_VERSION:=		4.4
+PKG_VERSION:=		4.5
 PKG_RELEASE:=		1
-PKG_HASH:=		f8349db1b4fe634105c77e11d26b2173e587827e86e1a489b5e38ffa822e0c5d
+PKG_HASH:=		89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda
 PKG_DESCR:=		asn.1 and der structures manipulation library
 PKG_SECTION:=		libs/crypto
 PKG_URL:=		http://www.gnupg.org/

package/pcre/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		pcre
-PKG_VERSION:=		8.36
+PKG_VERSION:=		8.37
 PKG_RELEASE:=		1
-PKG_HASH:=		b37544f33caed0cc502a1e729c3b1d3df5086dcc819b9125c30700c239246c9e
+PKG_HASH:=		19d490a714274a8c4c9d131f651489b8647cdb40a159e9fb7ce17ba99ef992ab
 PKG_DESCR:=		perl compatible regular expression library
 PKG_SECTION:=		libs/misc
 PKG_BUILDDEPS:=		gettext-tiny

package/qemu/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		qemu
-PKG_VERSION:=		2.2.1
+PKG_VERSION:=		2.3.0
 PKG_RELEASE:=		1
-PKG_HASH:=		4617154c6ef744b83e10b744e392ad111dd351d435d6563ce24d8da75b1335a0
+PKG_HASH:=		b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		zlib glib alsa-lib

package/stunnel/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		stunnel
-PKG_VERSION:=		5.16
+PKG_VERSION:=		5.17
 PKG_RELEASE:=		1
-PKG_HASH:=		b6b7e93fb2626eaabae1c8474e1dfa23962cfde8fa35c8602289fcaa4f53608d
+PKG_HASH:=		c3e79e582621a0827125e35e1c00450190104fc02dc3c5274cb02b05859fd472
 PKG_DESCR:=		encryption wrapper
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		libopenssl

package/util-linux/Makefile

@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.26.1
-PKG_RELEASE:=		2
+PKG_VERSION:=		2.26.2
+PKG_RELEASE:=		1
 PKG_EXTRAVER:=		v2.26
-PKG_HASH:=		22dc1c957262e2cbdfb4d524a63d5cd4f219d3ac9b5eab570fc771076799bb6e
+PKG_HASH:=		0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666
 PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		ncurses

package/util-linux/patches/patch-sys-utils_setarch_c

@@ -1,11 +0,0 @@
---- util-linux-2.26.1.orig/sys-utils/setarch.c	2015-02-19 10:55:10.000000000 +0100
-+++ util-linux-2.26.1/sys-utils/setarch.c	2015-03-29 11:46:25.000000000 +0200
-@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
- #if defined(__sparc64__) || defined(__sparc__)
- 	if (archwrapper && strcmp(arch, "sparc32bash") == 0) {
- 		if (set_arch(arch, 0L, 0))
--			err(EXIT_FAILURE, _("Failed to set personality to %s"), p);
-+			err(EXIT_FAILURE, _("Failed to set personality to %s"), arch);
- 		execl("/bin/bash", NULL);
- 		err(EXIT_FAILURE, _("failed to execute %s"), "/bin/bash");
- 	}

target/config/Config.in.kernelversion.choice

@@ -4,33 +4,40 @@
 choice
 prompt "Kernel Version"
 depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_KERNEL_VERSION_3_19_1 if ADK_TARGET_SYSTEM_QEMU_SPARC
-default ADK_KERNEL_VERSION_3_18_10
+default ADK_KERNEL_VERSION_3_19_5 if ADK_TARGET_SYSTEM_QEMU_SPARC
+default ADK_KERNEL_VERSION_3_18_12
 
-config ADK_KERNEL_VERSION_3_19_1
-	bool "3.19.1"
+config ADK_KERNEL_VERSION_4_0_1
+	bool "4.0.1"
+	select ADK_KERNEL_VERSION_4_0
+	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_19_5
+	bool "3.19.5"
 	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_10
-	bool "3.18.10"
+config ADK_KERNEL_VERSION_3_18_12
+	bool "3.18.12"
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_VERSION_3_18
 
-config ADK_KERNEL_VERSION_3_14_35
-	bool "3.14.35"
+config ADK_KERNEL_VERSION_3_14_40
+	bool "3.14.40"
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_VERSION_3_14
 
-config ADK_KERNEL_VERSION_3_12_38
-	bool "3.12.38"
+config ADK_KERNEL_VERSION_3_12_40
+	bool "3.12.40"
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_ARCH_NIOS2
@@ -39,8 +46,8 @@ config ADK_KERNEL_VERSION_3_12_38
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	select ADK_KERNEL_VERSION_3_12
 
-config ADK_KERNEL_VERSION_3_10_71
-	bool "3.10.71"
+config ADK_KERNEL_VERSION_3_10_75
+	bool "3.10.75"
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -49,8 +56,8 @@ config ADK_KERNEL_VERSION_3_10_71
 	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_VERSION_3_10
 
-config ADK_KERNEL_VERSION_3_4_106
-	bool "3.4.106"
+config ADK_KERNEL_VERSION_3_4_107
+	bool "3.4.107"
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6

target/config/Config.in.kernelversion.default

@@ -1,6 +1,9 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+config ADK_KERNEL_VERSION_4_0
+	bool
+
 config ADK_KERNEL_VERSION_3_19
 	bool
 
@@ -27,12 +30,13 @@ config ADK_KERNEL_VERSION_2_6_32
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.19.1" if ADK_KERNEL_VERSION_3_19_1
-	default "3.18.10" if ADK_KERNEL_VERSION_3_18_10
-	default "3.14.35" if ADK_KERNEL_VERSION_3_14_35
-	default "3.12.38" if ADK_KERNEL_VERSION_3_12_38
-	default "3.10.71" if ADK_KERNEL_VERSION_3_10_71
-	default "3.4.106" if ADK_KERNEL_VERSION_3_4_106
+	default "4.0.1" if ADK_KERNEL_VERSION_4_0
+	default "3.19.5" if ADK_KERNEL_VERSION_3_19_5
+	default "3.18.12" if ADK_KERNEL_VERSION_3_18_12
+	default "3.14.40" if ADK_KERNEL_VERSION_3_14_40
+	default "3.12.40" if ADK_KERNEL_VERSION_3_12_40
+	default "3.10.75" if ADK_KERNEL_VERSION_3_10_75
+	default "3.4.107" if ADK_KERNEL_VERSION_3_4_107
 	default "3.2.68" if ADK_KERNEL_VERSION_3_2_68
 	default "2.6.32.65" if ADK_KERNEL_VERSION_2_6_32_65
 	help

target/linux/config/Config.in.misc

@@ -29,6 +29,12 @@ config ADK_KERNEL_KEYS
 config ADK_KERNEL_SBUS
 	bool
 
+config ADK_KERNEL_FSL_OTP
+	bool
+	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default n
+
 config ADK_KERNEL_IMX_WEIM
 	bool
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6