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

Config.in

@@ -94,7 +94,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.13.6"
+	prompt "3.13.7"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 
@@ -106,35 +106,35 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 choice
 prompt "Kernel Version"
 
-config ADK_KERNEL_VERSION_3_13_6
+config ADK_KERNEL_VERSION_3_13_7
-	prompt "3.13.6"
+	prompt "3.13.7"
 	boolean
 
-config ADK_KERNEL_VERSION_3_12_13
+config ADK_KERNEL_VERSION_3_12_14
-	prompt "3.12.13"
+	prompt "3.12.14"
 	boolean
 
 config ADK_KERNEL_VERSION_3_11_10
 	prompt "3.11.10"
 	boolean
 
-config ADK_KERNEL_VERSION_3_10_33
+config ADK_KERNEL_VERSION_3_10_34
-	prompt "3.10.33"
+	prompt "3.10.34"
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_82
+config ADK_KERNEL_VERSION_3_4_84
-	prompt "3.4.82"
+	prompt "3.4.84"
 	boolean
 
 endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.13.6" if ADK_KERNEL_VERSION_3_13_6
+	default "3.13.7" if ADK_KERNEL_VERSION_3_13_7
-	default "3.12.13" if ADK_KERNEL_VERSION_3_12_13
+	default "3.12.14" if ADK_KERNEL_VERSION_3_12_14
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
-	default "3.10.33" if ADK_KERNEL_VERSION_3_10_33
+	default "3.10.34" if ADK_KERNEL_VERSION_3_10_34
-	default "3.4.82" if ADK_KERNEL_VERSION_3_4_82
+	default "3.4.84" if ADK_KERNEL_VERSION_3_4_84
 	help
 
 config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI

Makefile

@@ -224,6 +224,7 @@ NO_ERROR=0
 	@echo "_PATH:=$$PATH" >>prereq.mk
 	@echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk
 	@echo "SHELL:=$$(which bash)" >>prereq.mk
+	@echo "GIT:=$$(which git 2>/dev/null)" >>prereq.mk
 	@env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \
 		CC='${CC}' CPPFLAGS='${CPPFLAGS}' \
 	    	bash scripts/scan-tools.sh

README

@@ -19,7 +19,6 @@ Before you can start you need to install some tools:
 - ncurses5 headers
 - zlib headers
 - perl
-- git
 
 There is a check for the required versions of these tools in advance, though.
 (to re-issue the checks, use "make prereq").

docs/contribute.txt

@@ -82,6 +82,7 @@ Here is a short list of details to provide in such case:
 * target for which the build fails
 * package(s) which the build fails
 * the command that fails and its output
+* the make.log file, generated when make v is used
 * any information you think that may be relevant
 
 Additionally, you can add the +.config+ file.

docs/getting.txt

@@ -5,8 +5,9 @@
 Getting OpenADK
 ---------------
 
-OpenADK does not have any releases. Only direct Git
+OpenADK does not have any releases. We are following the
-access is possible.
+http://en.wikipedia.org/wiki/Rolling_release[rolling release]
+development model.
 
 To download OpenADK using Git just do:
 
@@ -20,3 +21,4 @@ Or if you prefer HTTP or using Git behind a proxy:
  $ git clone http://git.openadk.org/openadk.git
 ---------------------
 
+Or you can get a http://www.openadk.org/snapshots/[snapshot].

docs/introduction.txt

@@ -24,3 +24,9 @@ processors, MIPS processors, ARM processors, etc.
 OpenADK supports numerous processors and their variants; it also comes
 with default configurations for some embedded systems and netbooks.
 (Raspberry PI, Sharp Zaurus, Lemote Yeelong, IBM X40 and more)
+
+OpenADK is not a Linux distribution and there are no releases or binary
+packages available. If you need something like that, better switch to
+something else. OpenADK builds everything from source. There are only a
+few exceptions to this rule (f.e. some bootloaders and firmware files for
+wireless network cards).

docs/patch-policy.txt

@@ -10,8 +10,8 @@ While integrating a new package or updating an existing one, it may be
 necessary to patch the source of the software to get it cross-built within
 OpenADK.  OpenADK offers an infrastructure to automatically handle this during
 the builds.  Patches are provided within OpenADK, in the package directory;
-these typically aim to fix cross-compilation, libc support, or other such
+these typically aim to fix cross-compilation, libc support, portability issues
-issues.
+or other things.
 
 Normally the patches are autogenerated via:
 ------------
@@ -80,3 +80,11 @@ Fetch from: <some url>
 
 It is also sensible to add a few words about any changes to the patch
 that may have been necessary.
+
+Upstreaming patches
+~~~~~~~~~~~~~~~~~~~
+
+OpenADK tries to avoid any patches to the source code. If a patch could
+not be avoided, it should be tried to make the patch of a good quality to
+get it upstream. OpenADK tries to report any found issues and try to send
+in any upstream compatible patches.

mk/kernel-ver.mk

@@ -1,20 +1,20 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.13.6
+KERNEL_VERSION:=	3.13.7
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		445aa27da818617409982f42902a6e41
+KERNEL_MD5SUM:=		370adced5e5c1cb1d0d621c2dae2723f
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_13_6),y)
+ifeq ($(ADK_KERNEL_VERSION_3_13_7),y)
-KERNEL_VERSION:=	3.13.6
+KERNEL_VERSION:=	3.13.7
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		445aa27da818617409982f42902a6e41
+KERNEL_MD5SUM:=		370adced5e5c1cb1d0d621c2dae2723f
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_12_13),y)
+ifeq ($(ADK_KERNEL_VERSION_3_12_14),y)
-KERNEL_VERSION:=	3.12.13
+KERNEL_VERSION:=	3.12.14
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		345f5883cfb906dac4aef87e303d3a2d
+KERNEL_MD5SUM:=		5575e68e287605ad63d3a1444e9b701d
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_11_10),y)
 KERNEL_VERSION:=	3.11.10
@@ -22,15 +22,15 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_33),y)
+ifeq ($(ADK_KERNEL_VERSION_3_10_34),y)
-KERNEL_VERSION:=	3.10.33
+KERNEL_VERSION:=	3.10.34
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		01865f9c129f3c7eee51e25b3781a364
+KERNEL_MD5SUM:=		30991b495a3d75196d5608072d2e62e6
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_82),y)
+ifeq ($(ADK_KERNEL_VERSION_3_4_84),y)
-KERNEL_VERSION:=	3.4.82
+KERNEL_VERSION:=	3.4.84
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		9ee57efa65417a7a9ac931122c2b7377
+KERNEL_MD5SUM:=		b99f88ca356b5003ce44e952baa3e6a3
 endif

package/base-files/Makefile

@@ -77,7 +77,8 @@ endif
 	test -z $(ADK_RUNTIME_PASSWORD) || \
 	    $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \
 	    ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
-	git log -1|head -1|sed -e 's#commit ##' \
+	test -z $(GIT) || \
+	     $(GIT) log -1|head -1|sed -e 's#commit ##' \
 		> $(IDIR_BASE_FILES)/etc/adkversion
 	test -z $(ADK_TARGET_SYSTEM) || \
 	    echo $(ADK_TARGET_SYSTEM) > $(IDIR_BASE_FILES)/etc/adktarget

scripts/scan-tools.sh

@@ -208,12 +208,6 @@ if ! which g++ >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which git >/dev/null 2>&1; then
-	echo  "You need git to continue."
-	echo
-	out=1
-fi
-
 cd $topdir
 rm -rf tmp
 

target/linux/config/Config.in.netfilter.ip4

@@ -36,16 +36,16 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
-	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_34
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_14
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_7
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_4_82
+	depends on ADK_KERNEL_VERSION_3_4_84
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
@@ -54,10 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_10_30 \
+	depends on ADK_KERNEL_VERSION_3_10_34 \
 		|| ADK_KERNEL_VERSION_3_11_10 \
-		|| ADK_KERNEL_VERSION_3_12_13 \
+		|| ADK_KERNEL_VERSION_3_12_14 \
-		|| ADK_KERNEL_VERSION_3_13_6
+		|| ADK_KERNEL_VERSION_3_13_7
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by