fixes
This commit is contained in:
parent
dbf57fda83
commit
d459972144
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -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 <rockdrilla@gmail.com> Tue, 28 Jan 2025 09:10:17 +0300
|
||||
|
||||
|
4
debian/config/amd64/config.cloud
vendored
4
debian/config/amd64/config.cloud
vendored
@ -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
|
||||
|
4
debian/config/amd64/config.mobile
vendored
4
debian/config/amd64/config.mobile
vendored
@ -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
|
||||
|
4
debian/config/amd64/config.vm
vendored
4
debian/config/amd64/config.vm
vendored
@ -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
|
||||
|
2
debian/config/config
vendored
2
debian/config/config
vendored
@ -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=""
|
||||
|
11
debian/patches/krd/0005-certs-genkey.patch
vendored
Normal file
11
debian/patches/krd/0005-certs-genkey.patch
vendored
Normal file
@ -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)
|
@ -138,7 +138,7 @@ Signed-off-by: Vinay Banakar <vny@google.com>
|
||||
+ 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;
|
||||
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -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
|
||||
|
||||
|
4
debian/templates/source.control.in
vendored
4
debian/templates/source.control.in
vendored
@ -24,16 +24,12 @@ Build-Depends-Arch:
|
||||
# linux-kbuild), perf (host arch)
|
||||
libelf-dev:native <!pkg.linux.nokernel>,
|
||||
libelf-dev <!pkg.linux.notools>,
|
||||
lz4 [amd64 arm64] <!pkg.linux.nokernel>,
|
||||
# used for bft debug info
|
||||
pahole <!pkg.linux.nokernel> | dwarves:native (>= 1.16~) <!pkg.linux.nokernel>,
|
||||
# used by debian/rules.real to build linux-headers
|
||||
cpio <!pkg.linux.nokernel>,
|
||||
# used by upstream to compress kernel
|
||||
xz-utils <!pkg.linux.nokernel>,
|
||||
bzip2 <!pkg.linux.nokernel>,
|
||||
lzop <!pkg.linux.nokernel>,
|
||||
zstd <!pkg.linux.nokernel>,
|
||||
# used by upstream to build genksyms, kconfig, and perf
|
||||
bison <!pkg.linux.nokernel>,
|
||||
bison <!pkg.linux.notools>,
|
||||
|
Loading…
x
Reference in New Issue
Block a user