From d459972144317b8e48f84b93e53043a3a794385f Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Wed, 29 Jan 2025 11:02:24 +0300 Subject: [PATCH] fixes --- debian/changelog | 1 + debian/config/amd64/config.cloud | 4 ---- debian/config/amd64/config.mobile | 4 ---- debian/config/amd64/config.vm | 4 ---- debian/config/config | 2 ++ debian/patches/krd/0005-certs-genkey.patch | 11 +++++++++++ ...-mm-Optimize-TLB-flushes-during-page-reclaim.patch | 2 +- debian/patches/series | 1 + debian/templates/source.control.in | 4 ---- 9 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 debian/patches/krd/0005-certs-genkey.patch diff --git a/debian/changelog b/debian/changelog index 038ae8b..a8ee183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux (6.12.11-1) sid; urgency=medium * New upstream stable update: https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.11 + * Compress vmlinux with xz for all flavours. -- Konstantin Demin Tue, 28 Jan 2025 09:10:17 +0300 diff --git a/debian/config/amd64/config.cloud b/debian/config/amd64/config.cloud index 0a21e5d..c101633 100644 --- a/debian/config/amd64/config.cloud +++ b/debian/config/amd64/config.cloud @@ -2100,10 +2100,6 @@ CONFIG_PROC_VMCORE=y ## ## file: init/Kconfig ## -## choice: Kernel compression mode -# CONFIG_KERNEL_XZ is not set -CONFIG_KERNEL_LZ4=y -## end choice CONFIG_DEFAULT_HOSTNAME="debian-cloud" CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 diff --git a/debian/config/amd64/config.mobile b/debian/config/amd64/config.mobile index cda250f..489e61a 100644 --- a/debian/config/amd64/config.mobile +++ b/debian/config/amd64/config.mobile @@ -7230,10 +7230,6 @@ CONFIG_XFS_SUPPORT_V4=y ## ## file: init/Kconfig ## -## choice: Kernel compression mode -CONFIG_KERNEL_XZ=y -# CONFIG_KERNEL_LZ4 is not set -## end choice CONFIG_DEFAULT_HOSTNAME="debian-mobile" CONFIG_LOG_BUF_SHIFT=18 CONFIG_LOG_CPU_MAX_BUF_SHIFT=14 diff --git a/debian/config/amd64/config.vm b/debian/config/amd64/config.vm index f8baf9b..40d6b9d 100644 --- a/debian/config/amd64/config.vm +++ b/debian/config/amd64/config.vm @@ -3563,10 +3563,6 @@ CONFIG_VBOXSF_FS=m ## ## file: init/Kconfig ## -## choice: Kernel compression mode -CONFIG_KERNEL_XZ=y -# CONFIG_KERNEL_LZ4 is not set -## end choice CONFIG_DEFAULT_HOSTNAME="debian-vm" CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 diff --git a/debian/config/config b/debian/config/config index d4a6791..347b363 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2007,7 +2007,9 @@ CONFIG_LOCALVERSION="" # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set +CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_ZSTD is not set ## end choice CONFIG_DEFAULT_INIT="" diff --git a/debian/patches/krd/0005-certs-genkey.patch b/debian/patches/krd/0005-certs-genkey.patch new file mode 100644 index 0000000..5b454ca --- /dev/null +++ b/debian/patches/krd/0005-certs-genkey.patch @@ -0,0 +1,11 @@ +--- a/certs/Makefile ++++ b/certs/Makefile +@@ -47,7 +47,7 @@ keytype-$(CONFIG_MODULE_SIG_KEY_TYPE_ECD + quiet_cmd_gen_key = GENKEY $@ + cmd_gen_key = openssl req -new -nodes -utf8 -$(CONFIG_MODULE_SIG_HASH) -days 36500 \ + -batch -x509 -config $< \ +- -outform PEM -out $@ -keyout $@ $(keytype-y) 2>&1 ++ -outform PEM -out $@ -keyout $@ $(keytype-y) 2>/dev/null + + $(obj)/signing_key.pem: $(obj)/x509.genkey FORCE + $(call if_changed,gen_key) diff --git a/debian/patches/patchset-zen/tlb/0001-mm-Optimize-TLB-flushes-during-page-reclaim.patch b/debian/patches/patchset-zen/tlb/0001-mm-Optimize-TLB-flushes-during-page-reclaim.patch index 69708ac..ec8a11f 100644 --- a/debian/patches/patchset-zen/tlb/0001-mm-Optimize-TLB-flushes-during-page-reclaim.patch +++ b/debian/patches/patchset-zen/tlb/0001-mm-Optimize-TLB-flushes-during-page-reclaim.patch @@ -138,7 +138,7 @@ Signed-off-by: Vinay Banakar + goto skip_pageout_locked; + + mapping = folio_mapping(folio); -+ pageout_t pageout_res = pageout(folio, mapping, &plug); ++ pageout_t pageout_res = pageout(folio, mapping, &plug, &pageout_list); + switch (pageout_res) { + case PAGE_KEEP: + goto skip_pageout_locked; diff --git a/debian/patches/series b/debian/patches/series index 2bc6155..52d7828 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -113,6 +113,7 @@ krd/0001-Revert-objtool-dont-fail-the-kernel-build-on-fatal-errors.patch krd/0002-established-timeout.patch krd/0003-local-ports.patch krd/0004-bridge-group_fwd_mask.patch +krd/0005-certs-genkey.patch ## 3rd party patches diff --git a/debian/templates/source.control.in b/debian/templates/source.control.in index 47a9d23..f8cafd3 100644 --- a/debian/templates/source.control.in +++ b/debian/templates/source.control.in @@ -24,16 +24,12 @@ Build-Depends-Arch: # linux-kbuild), perf (host arch) libelf-dev:native , libelf-dev , - lz4 [amd64 arm64] , # used for bft debug info pahole | dwarves:native (>= 1.16~) , # used by debian/rules.real to build linux-headers cpio , # used by upstream to compress kernel xz-utils , - bzip2 , - lzop , - zstd , # used by upstream to build genksyms, kconfig, and perf bison , bison ,