From 3f9ba927911c7d3f51b47046b7d4ddacdd6beb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 8 Feb 2024 01:20:52 +0100 Subject: [PATCH] Update Linux version --- .qubesbuilder | 4 ++-- Makefile.vars | 2 +- linux/config/05-base | 1 + ...01-tty-hvc-setup-hvc-consoles-in-RAW-mode-by-default.patch | 2 +- rpm_spec/xen-hvm-stubdom-linux.spec.in | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.qubesbuilder b/.qubesbuilder index b4ab3c9..7aa4b17 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -13,8 +13,8 @@ source: pubkeys: - keys/qemu/mdroth.asc - keys/qemu/pbonzini.asc - - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.200.tar.xz - signature: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.200.tar.sign + - url: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.44.tar.xz + signature: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.44.tar.sign uncompress: true pubkeys: - keys/linux/greg.asc diff --git a/Makefile.vars b/Makefile.vars index ff47157..6296aff 100644 --- a/Makefile.vars +++ b/Makefile.vars @@ -1,5 +1,5 @@ QEMU_VERSION := 8.1.2 -LINUX_VERSION := 5.10.200 +LINUX_VERSION := 6.6.44 BUSYBOX_VERSION := 1.31.1 PULSEAUDIO_VERSION := 14.2 LIBUSB_VERSION := 1.0.23 diff --git a/linux/config/05-base b/linux/config/05-base index 2aecc3b..a7da635 100644 --- a/linux/config/05-base +++ b/linux/config/05-base @@ -75,6 +75,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_DEVTMPFS=y +CONFIG_TMPFS=y CONFIG_PRINTK=y CONFIG_BUG=y diff --git a/linux/patches/0001-tty-hvc-setup-hvc-consoles-in-RAW-mode-by-default.patch b/linux/patches/0001-tty-hvc-setup-hvc-consoles-in-RAW-mode-by-default.patch index e58294c..5bcbf59 100644 --- a/linux/patches/0001-tty-hvc-setup-hvc-consoles-in-RAW-mode-by-default.patch +++ b/linux/patches/0001-tty-hvc-setup-hvc-consoles-in-RAW-mode-by-default.patch @@ -31,9 +31,9 @@ index 27284a2dcd2b..cd063b3c6903 100644 + * buffered data */ + drv->init_termios.c_iflag = 0; + drv->init_termios.c_lflag &= ~(ISIG | ICANON); - drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS; tty_set_operations(drv, &hvc_ops); + /* Always start the kthread because there can be hotplug vty adapters -- 2.17.2 diff --git a/rpm_spec/xen-hvm-stubdom-linux.spec.in b/rpm_spec/xen-hvm-stubdom-linux.spec.in index b4c3ade..ef2b9ab 100644 --- a/rpm_spec/xen-hvm-stubdom-linux.spec.in +++ b/rpm_spec/xen-hvm-stubdom-linux.spec.in @@ -1,5 +1,5 @@ %define QEMU_VERSION 8.1.2 -%define LINUX_VERSION 5.10.200 +%define LINUX_VERSION 6.6.44 %define BUSYBOX_VERSION 1.31.1 %define PULSEAUDIO_VERSION 14.2 %define LIBUSB_VERSION 1.0.23