From 804ddf81ea04033e20f2c6aaed3ca0ea09d6b4e9 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 11 Nov 2015 14:18:35 -0600
Subject: [PATCH] scripts: sync with master of:
https://github.com/RobertCNelson/stable-kernel.git
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
3rdparty/packaging/builddeb | 11 +++++++-
patches/debian-armmp | 20 ++++++++------
...0001-packaging-sync-builddeb-changes.patch | 27 ++++++++++++-------
3 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/3rdparty/packaging/builddeb b/3rdparty/packaging/builddeb
index 690996a66..5221d249a 100755
--- a/3rdparty/packaging/builddeb
+++ b/3rdparty/packaging/builddeb
@@ -52,7 +52,16 @@ set_debarch() {
arm64)
debarch=arm64 ;;
arm*)
- debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo hf || true) ;;
+ if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
+ if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
+ debarch=armhf
+ else
+ debarch=armel
+ fi
+ else
+ debarch=arm
+ fi
+ ;;
*)
debarch=$(dpkg --print-architecture)
echo "" >&2
diff --git a/patches/debian-armmp b/patches/debian-armmp
index 4b7732bde..39570c15e 100644
--- a/patches/debian-armmp
+++ b/patches/debian-armmp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.3.0-rc7 Kernel Configuration
+# Linux/arm 4.3.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1167,7 +1167,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
-# CONFIG_NFT_DUP_IPV4 is not set
+CONFIG_NFT_DUP_IPV4=m
CONFIG_NF_TABLES_ARP=m
CONFIG_NF_DUP_IPV4=m
CONFIG_NF_LOG_ARP=m
@@ -1212,7 +1212,7 @@ CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
-# CONFIG_NFT_DUP_IPV6 is not set
+CONFIG_NFT_DUP_IPV6=m
CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
@@ -2504,6 +2504,7 @@ CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
+# CONFIG_DP83848_PHY is not set
CONFIG_DP83867_PHY=m
# CONFIG_MICROCHIP_PHY is not set
# CONFIG_FIXED_PHY is not set
@@ -6732,7 +6733,10 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
# CONFIG_RCU_TRACE is not set
# CONFIG_RCU_EQS_DEBUG is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set
# CONFIG_FAULT_INJECTION is not set
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
@@ -6794,12 +6798,12 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_TEST_RHASHTABLE is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_FIRMWARE is not set
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_FIRMWARE=m
# CONFIG_TEST_UDELAY is not set
# CONFIG_MEMTEST is not set
-# CONFIG_TEST_STATIC_KEYS is not set
+CONFIG_TEST_STATIC_KEYS=m
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
diff --git a/patches/packaging/0001-packaging-sync-builddeb-changes.patch b/patches/packaging/0001-packaging-sync-builddeb-changes.patch
index efa3f5f28..ccc717682 100644
--- a/patches/packaging/0001-packaging-sync-builddeb-changes.patch
+++ b/patches/packaging/0001-packaging-sync-builddeb-changes.patch
@@ -1,27 +1,36 @@
-From 9c0e46543be84a2cd263ecd19f578bc23b3a9a2e Mon Sep 17 00:00:00 2001
+From 3a012344f08efb641e04e5f3690140cc6f1895f7 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 16 Oct 2015 16:34:36 -0500
+Date: Wed, 11 Nov 2015 14:17:46 -0600
Subject: [PATCH] packaging: sync builddeb changes
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- scripts/package/builddeb | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
+ scripts/package/builddeb | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index b967e4f..690996a 100755
+index b967e4f..5221d24 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
-@@ -52,7 +52,7 @@ set_debarch() {
+@@ -52,7 +52,16 @@ set_debarch() {
arm64)
debarch=arm64 ;;
arm*)
- debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
-+ debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo hf || true) ;;
++ if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
++ if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
++ debarch=armhf
++ else
++ debarch=armel
++ fi
++ else
++ debarch=arm
++ fi
++ ;;
*)
debarch=$(dpkg --print-architecture)
echo "" >&2
-@@ -140,9 +140,18 @@ else
+@@ -140,9 +149,18 @@ else
fi
if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
@@ -42,5 +51,5 @@ index b967e4f..690996a 100755
fi
--
-2.6.1
+2.6.2
--
GitLab