From 2562729de2d81e26cee2187613702c68bb07b2b7 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Thu, 4 Feb 2021 23:41:43 +0000 Subject: [PATCH] Rebased onto Ubuntu-raspi-5.4.0-1028.31 --- ....0-1026.29-switch-to-CONFIG_PREEMPT_.patch | 22 +++++++++---------- ...-the-v-switch-from-running-run-parts.patch | 4 ++-- ...0003-Ignore-errors-from-dh_shlibdeps.patch | 6 ++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patches/ubuntu-linux-raspi/0001-Ubuntu-raspi-5.4.0-1026.29-switch-to-CONFIG_PREEMPT_.patch b/patches/ubuntu-linux-raspi/0001-Ubuntu-raspi-5.4.0-1026.29-switch-to-CONFIG_PREEMPT_.patch index 07efcf3..c7f139f 100644 --- a/patches/ubuntu-linux-raspi/0001-Ubuntu-raspi-5.4.0-1026.29-switch-to-CONFIG_PREEMPT_.patch +++ b/patches/ubuntu-linux-raspi/0001-Ubuntu-raspi-5.4.0-1026.29-switch-to-CONFIG_PREEMPT_.patch @@ -1,4 +1,4 @@ -From 25ac12095a13fd3aa9e67ca1f2c1867b6527bea2 Mon Sep 17 00:00:00 2001 +From f99cd55af6f1c615ac66f10be169f437535b1552 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Thu, 4 Feb 2021 23:09:11 +0000 Subject: [PATCH 1/3] Ubuntu-raspi-5.4.0-1026.29: switch to @@ -10,7 +10,7 @@ Signed-off-by: Hin-Tak Leung 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 +index 519f1ec25160..8aef7d8ddff7 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -250,6 +250,32 @@ CONFIG_ARCH_HIBERNATION_HEADER=y @@ -54,7 +54,7 @@ index 000ee79a9737..57a7552ba9d9 100644 CONFIG_BPF_EVENTS=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y -@@ -1050,7 +1075,6 @@ CONFIG_CB710_CORE=m +@@ -1052,7 +1077,6 @@ CONFIG_CB710_CORE=m CONFIG_CB710_DEBUG_ASSUMPTIONS=y CONFIG_CC10001_ADC=m CONFIG_CCS811=m @@ -62,7 +62,7 @@ index 000ee79a9737..57a7552ba9d9 100644 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 +@@ -1068,7 +1092,6 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_CEC_CORE=y @@ -70,7 +70,7 @@ index 000ee79a9737..57a7552ba9d9 100644 CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FS=m -@@ -1568,7 +1591,6 @@ CONFIG_DEBUG_MISC=y +@@ -1570,7 +1593,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 @@ -78,7 +78,7 @@ index 000ee79a9737..57a7552ba9d9 100644 # 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 +@@ -2376,7 +2398,16 @@ CONFIG_GAMEPORT=m CONFIG_GAMEPORT_L4=m CONFIG_GAMEPORT_NS558=m CONFIG_GARP=m @@ -96,7 +96,7 @@ index 000ee79a9737..57a7552ba9d9 100644 # 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 +@@ -3073,6 +3104,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 @@ -128,7 +128,7 @@ index 000ee79a9737..57a7552ba9d9 100644 CONFIG_INOTIFY_USER=y CONFIG_INPUT=y CONFIG_INPUT_88PM80X_ONKEY=m -@@ -5225,7 +5281,7 @@ CONFIG_PLATFORM_MHU=m +@@ -5228,7 +5284,7 @@ CONFIG_PLATFORM_MHU=m CONFIG_PLATFORM_SI4713=m # CONFIG_PLAT_SPEAR is not set CONFIG_PLIP=m @@ -137,7 +137,7 @@ index 000ee79a9737..57a7552ba9d9 100644 CONFIG_PM=y CONFIG_PMBUS=m CONFIG_PMIC_ADP5520=y -@@ -5293,17 +5349,13 @@ CONFIG_PPS_CLIENT_LDISC=m +@@ -5296,17 +5352,13 @@ CONFIG_PPS_CLIENT_LDISC=m CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPTP=m @@ -157,7 +157,7 @@ index 000ee79a9737..57a7552ba9d9 100644 CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PRINTER=m CONFIG_PRINTK=y -@@ -7117,6 +7169,7 @@ CONFIG_TRACING=y +@@ -7122,6 +7174,7 @@ CONFIG_TRACING=y CONFIG_TRACING_MAP=y CONFIG_TRACING_SUPPORT=y # CONFIG_TRANSPARENT_HUGEPAGE is not set @@ -165,7 +165,7 @@ index 000ee79a9737..57a7552ba9d9 100644 CONFIG_TREE_SRCU=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_TRUSTED_KEYS=y -@@ -7189,7 +7242,6 @@ CONFIG_ULTRIX_PARTITION=y +@@ -7194,7 +7247,6 @@ CONFIG_ULTRIX_PARTITION=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNICODE=y # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set diff --git a/patches/ubuntu-linux-raspi/0002-Remove-the-v-switch-from-running-run-parts.patch b/patches/ubuntu-linux-raspi/0002-Remove-the-v-switch-from-running-run-parts.patch index 38240ff..e1f8a9b 100644 --- a/patches/ubuntu-linux-raspi/0002-Remove-the-v-switch-from-running-run-parts.patch +++ b/patches/ubuntu-linux-raspi/0002-Remove-the-v-switch-from-running-run-parts.patch @@ -1,4 +1,4 @@ -From cfd75084418a849794bb361c399c72c2cb0c903b Mon Sep 17 00:00:00 2001 +From 069038f1ab1a368d2dff10d19d6b2d1742506b6c Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Thu, 4 Feb 2021 23:11:52 +0000 Subject: [PATCH 2/3] Remove the -v switch from running run-parts @@ -13,7 +13,7 @@ Signed-off-by: Hin-Tak Leung 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 +index 703fd2ade338..fa31ddf0e401 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -332,7 +332,7 @@ endif diff --git a/patches/ubuntu-linux-raspi/0003-Ignore-errors-from-dh_shlibdeps.patch b/patches/ubuntu-linux-raspi/0003-Ignore-errors-from-dh_shlibdeps.patch index d61de04..5e3bcd5 100644 --- a/patches/ubuntu-linux-raspi/0003-Ignore-errors-from-dh_shlibdeps.patch +++ b/patches/ubuntu-linux-raspi/0003-Ignore-errors-from-dh_shlibdeps.patch @@ -1,4 +1,4 @@ -From dc847d816d5ca6f2e5258b5b82c3e95e91391066 Mon Sep 17 00:00:00 2001 +From 4cf671deb86f6b6ab4766dcbd5a1c6a869ca78db Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Thu, 4 Feb 2021 23:16:54 +0000 Subject: [PATCH 3/3] Ignore errors from dh_shlibdeps @@ -19,10 +19,10 @@ Signed-off-by: Hin-Tak Leung 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 +index fa31ddf0e401..6d65ffa7a436 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk -@@ -537,7 +537,7 @@ define dh_all +@@ -538,7 +538,7 @@ define dh_all dh_installdocs -p$(1) dh_compress -p$(1) dh_fixperms -p$(1) -X/boot/