Skip to content

Commit

Permalink
All the patches to Ubuntu-raspi-5.4.0-1026.29
Browse files Browse the repository at this point in the history
  • Loading branch information
HinTak committed Feb 4, 2021
1 parent ebbaadc commit 58c1cf6
Show file tree
Hide file tree
Showing 3 changed files with 244 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
From 25ac12095a13fd3aa9e67ca1f2c1867b6527bea2 Mon Sep 17 00:00:00 2001
From: Hin-Tak Leung <[email protected]>
Date: Thu, 4 Feb 2021 23:09:11 +0000
Subject: [PATCH 1/3] Ubuntu-raspi-5.4.0-1026.29: switch to
CONFIG_PREEMPT_VOLUNTARY in editconfigs

Signed-off-by: Hin-Tak Leung <[email protected]>
---
debian.raspi/config/config.common.ubuntu | 78 ++++++++++++++++++++----
1 file changed, 65 insertions(+), 13 deletions(-)

diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index 000ee79a9737..57a7552ba9d9 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -250,6 +250,32 @@ CONFIG_ARCH_HIBERNATION_HEADER=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
# CONFIG_ARCH_HIGHBANK is not set
# CONFIG_ARCH_HISI is not set
+CONFIG_ARCH_INLINE_READ_LOCK=y
+CONFIG_ARCH_INLINE_READ_LOCK_BH=y
+CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_READ_UNLOCK=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y
+CONFIG_ARCH_INLINE_SPIN_LOCK=y
+CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y
+CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
+CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y
+CONFIG_ARCH_INLINE_WRITE_LOCK=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y
# CONFIG_ARCH_IOP32X is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_K3 is not set
@@ -844,7 +870,6 @@ CONFIG_BOOT_PRINTK_DELAY=y
CONFIG_BOUNCE=y
CONFIG_BPF=y
CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=m
CONFIG_BPF_EVENTS=y
CONFIG_BPF_JIT=y
CONFIG_BPF_JIT_ALWAYS_ON=y
@@ -1050,7 +1075,6 @@ CONFIG_CB710_CORE=m
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
CONFIG_CC10001_ADC=m
CONFIG_CCS811=m
-CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -1066,7 +1090,6 @@ CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
CONFIG_CEC_CORE=y
-# CONFIG_CEC_GPIO is not set
CONFIG_CEC_NOTIFIER=y
CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_CEPH_FS=m
@@ -1568,7 +1591,6 @@ CONFIG_DEBUG_MISC=y
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -2374,7 +2396,16 @@ CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_L4=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GARP=m
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_PLUGINS=y
+CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+CONFIG_GCC_VERSION=100201
# CONFIG_GCOV_KERNEL is not set
CONFIG_GDB_SCRIPTS=y
# CONFIG_GEMINI_ETHERNET is not set
@@ -3070,6 +3101,31 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
CONFIG_INIT_STACK_NONE=y
+CONFIG_INLINE_READ_LOCK=y
+CONFIG_INLINE_READ_LOCK_BH=y
+CONFIG_INLINE_READ_LOCK_IRQ=y
+CONFIG_INLINE_READ_LOCK_IRQSAVE=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_BH=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y
+CONFIG_INLINE_SPIN_LOCK=y
+CONFIG_INLINE_SPIN_LOCK_BH=y
+CONFIG_INLINE_SPIN_LOCK_IRQ=y
+CONFIG_INLINE_SPIN_LOCK_IRQSAVE=y
+CONFIG_INLINE_SPIN_TRYLOCK=y
+CONFIG_INLINE_SPIN_TRYLOCK_BH=y
+CONFIG_INLINE_SPIN_UNLOCK_BH=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE=y
+CONFIG_INLINE_WRITE_LOCK=y
+CONFIG_INLINE_WRITE_LOCK_BH=y
+CONFIG_INLINE_WRITE_LOCK_IRQ=y
+CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_BH=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
CONFIG_INOTIFY_USER=y
CONFIG_INPUT=y
CONFIG_INPUT_88PM80X_ONKEY=m
@@ -5225,7 +5281,7 @@ CONFIG_PLATFORM_MHU=m
CONFIG_PLATFORM_SI4713=m
# CONFIG_PLAT_SPEAR is not set
CONFIG_PLIP=m
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
CONFIG_PM=y
CONFIG_PMBUS=m
CONFIG_PMIC_ADP5520=y
@@ -5293,17 +5349,13 @@ CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPTP=m
-CONFIG_PREEMPT=y
-CONFIG_PREEMPTION=y
+# CONFIG_PREEMPT is not set
# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
# CONFIG_PREEMPTIRQ_EVENTS is not set
CONFIG_PREEMPTIRQ_TRACEPOINTS=y
-CONFIG_PREEMPT_COUNT=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_PREEMPT_TRACER is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_PRINTER=m
CONFIG_PRINTK=y
@@ -7117,6 +7169,7 @@ CONFIG_TRACING=y
CONFIG_TRACING_MAP=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TREE_RCU=y
CONFIG_TREE_SRCU=y
CONFIG_TRUSTED_FOUNDATIONS=y
CONFIG_TRUSTED_KEYS=y
@@ -7189,7 +7242,6 @@ CONFIG_ULTRIX_PARTITION=y
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
CONFIG_UNICODE=y
# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
-CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_UNISYSSPAR=y
CONFIG_UNIX=y
CONFIG_UNIX98_PTYS=y
--
2.29.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From cfd75084418a849794bb361c399c72c2cb0c903b Mon Sep 17 00:00:00 2001
From: Hin-Tak Leung <[email protected]>
Date: Thu, 4 Feb 2021 23:11:52 +0000
Subject: [PATCH 2/3] Remove the -v switch from running run-parts

Fedora's crontabs package comes with a run-parts which is an
earlier clone of the one in debianutils. It is largely compatible
except not having the -v/--verbose switch.

Signed-off-by: Hin-Tak Leung <[email protected]>
---
debian/rules.d/2-binary-arch.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index fe1345d21b1c..0fbab2855339 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -332,7 +332,7 @@ endif
PREV_REVISION="$(prev_revision)" ABI_NUM="$(abinum)" \
PREV_ABI_NUM="$(prev_abinum)" BUILD_DIR="$(builddir)/build-$*" \
INSTALL_DIR="$(pkgdir)" SOURCE_DIR="$(CURDIR)" \
- run-parts -v $(DROOT)/tests-build
+ run-parts $(DROOT)/tests-build

#
# Remove files which are generated at installation by postinst,
--
2.29.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From dc847d816d5ca6f2e5258b5b82c3e95e91391066 Mon Sep 17 00:00:00 2001
From: Hin-Tak Leung <[email protected]>
Date: Thu, 4 Feb 2021 23:16:54 +0000
Subject: [PATCH 3/3] Ignore errors from dh_shlibdeps

On cross-builds, scripts/basic/fixdep and friends get built as
native. dh_shlibdeps identifies them as depending on /lib64/libc.so.6
and fails with
"error: no dependency information found for /lib64/libc.so.6"
.

Suppressing the error is relatively harmless as kernel packages
don't generally depend on other packages, and also dependencies
are already satisfied in an upgrade.

Signed-off-by: Hin-Tak Leung <[email protected]>
---
debian/rules.d/2-binary-arch.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 0fbab2855339..0fb3c22d5fef 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -537,7 +537,7 @@ define dh_all
dh_installdocs -p$(1)
dh_compress -p$(1)
dh_fixperms -p$(1) -X/boot/
- dh_shlibdeps -p$(1) $(shlibdeps_opts)
+ dh_shlibdeps -p$(1) $(shlibdeps_opts) || /bin/true
dh_installdeb -p$(1)
dh_installdebconf -p$(1)
$(lockme) dh_gencontrol -p$(1) -- -Vlinux:rprovides='$(rprovides)'
--
2.29.2

0 comments on commit 58c1cf6

Please sign in to comment.