Browse Source

linux: update to 4.9.6

Waldemar Brodkorb 7 years ago
parent
commit
661b3d8201

+ 3 - 3
mk/fetch.mk

@@ -69,17 +69,17 @@ $(1):
 		  case "$${PKG_GIT}" in \
 		    tag|branch) \
 			git clone --depth 1 --branch $${PKG_VERSION} $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \
-			if [ $$? -ne 0 ]; then echo "git clone error"; exit 1; fi; \
+			if [ $$$$? -ne 0 ]; then echo "git clone error"; exit 1; fi; \
 			;; \
 		    hash) \
 			git clone $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \
-			if [ $$? -ne 0 ]; then echo "git clone error"; exit 1; fi; \
+			if [ $$$$? -ne 0 ]; then echo "git clone error"; exit 1; fi; \
 			(cd $${PKG_NAME}-$${PKG_VERSION}; git checkout $${PKG_VERSION}) $(DL_TRACE); \
 			;; \
 		  esac ;\
 		else \
 		  git clone --depth 1 $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \
-		  if [ $$? -ne 0 ]; then echo "git clone error"; exit 1; fi; \
+		  if [ $$$$? -ne 0 ]; then echo "git clone error"; exit 1; fi; \
 		fi; \
 		tar cJf $${PKG_NAME}-$${PKG_VERSION}.tar.xz $${PKG_NAME}-$${PKG_VERSION}; \
 		touch $$$${filename}.nohash; \

+ 2 - 2
mk/kernel-ver.mk

@@ -16,10 +16,10 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(ADK_TARGET_KERNEL_GIT_VER)
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_9),y)
-KERNEL_FILE_VER:=	4.9.4
+KERNEL_FILE_VER:=	4.9.6
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		9bddafb64cb15a4d3d0400364f3c9cb4b0d777978d5d81ade70c155e86cec084
+KERNEL_HASH:=		f493af770a5b08a231178cbb27ab517369a81f6039625737aa8b36d69bcfce9b
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4),y)
 KERNEL_FILE_VER:=	4.4.38

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

@@ -24,7 +24,7 @@ config ADK_TARGET_KERNEL_VERSION_GIT
 	select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
 config ADK_TARGET_KERNEL_VERSION_4_9
-	bool "4.9.4"
+	bool "4.9.6"
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32

+ 2 - 2
target/linux/config/Config.in.kernel

@@ -168,7 +168,7 @@ config ADK_KERNEL_PREEMPT_RTB
 	depends on !ADK_KERNEL_OPROFILE
 	depends on ADK_TARGET_KERNEL_VERSION_4_1 \
 		|| ADK_TARGET_KERNEL_VERSION_4_4 \
-		|| ADK_TARGET_KERNEL_VERSION_4_8
+		|| ADK_TARGET_KERNEL_VERSION_4_9
         help
 	  Preemptible Kernel (Basic RT)
 
@@ -179,7 +179,7 @@ config ADK_KERNEL_PREEMPT_RT_FULL
 	depends on !ADK_KERNEL_OPROFILE
 	depends on ADK_TARGET_KERNEL_VERSION_4_1 \
 		|| ADK_TARGET_KERNEL_VERSION_4_4 \
-		|| ADK_TARGET_KERNEL_VERSION_4_8
+		|| ADK_TARGET_KERNEL_VERSION_4_9
         help
 	  Fully Preemptible Kernel (RealTime)
 	  https://www.kernel.org/pub/linux/kernel/projects/rt/

+ 0 - 0
target/linux/patches/4.9.4/crisv32_ethernet_driver.patch → target/linux/patches/4.9.6/crisv32_ethernet_driver.patch


+ 0 - 0
target/linux/patches/4.9.4/initramfs-nosizelimit.patch → target/linux/patches/4.9.6/initramfs-nosizelimit.patch


+ 0 - 0
target/linux/patches/4.9.4/ld-or1k.patch → target/linux/patches/4.9.6/ld-or1k.patch


+ 0 - 0
target/linux/patches/4.9.4/macsonic.patch → target/linux/patches/4.9.6/macsonic.patch


+ 0 - 0
target/linux/patches/4.9.4/microblaze-sigaltstack.patch → target/linux/patches/4.9.6/microblaze-sigaltstack.patch


+ 0 - 0
target/linux/patches/4.9.4/or1k-more-ram.patch → target/linux/patches/4.9.6/or1k-more-ram.patch


File diff suppressed because it is too large
+ 244 - 221
target/linux/patches/4.9.6/patch-realtime


+ 0 - 0
target/linux/patches/4.9.4/sh2.patch → target/linux/patches/4.9.6/sh2.patch


+ 0 - 0
target/linux/patches/4.9.4/startup.patch → target/linux/patches/4.9.6/startup.patch


+ 0 - 0
target/linux/patches/4.9.4/vdso2.patch → target/linux/patches/4.9.6/vdso2.patch


Some files were not shown because too many files changed in this diff