proxmox-mirrors/proxmox-backup-restore-image
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-backup-restore-image synced 2025-04-28 05:38:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update kernel to 6.2.16 & ZFS to 2.1.11, drop outdated patches

Browse Source 
switch to our new unified ubuntu-kernels git origin, allows for
simpler update (no buildsys change required anymore)

The two patches dropped are:

- removal of xr-usb-uart, which was patched in by ubuntu (thus no
  KConfig switch, and got now removed, see:
  https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1945938
- a fix for a syntax error in Ubuntu patches, which is fixed in newer
  repo already

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-05-30 09:31:52 +02:00
parent 52e7aecda3
commit 09e46f60f1
8 changed files with 7 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "submodules/zfsonlinux"]
path = src/submodules/zfsonlinux
url = git://git.proxmox.com/git/mirror_zfs.git
[submodule "src/submodules/ubuntu-jammy"]
path = src/submodules/ubuntu-jammy
url = git://git.proxmox.com/git/mirror_ubuntu-jammy-kernel.git
[submodule "src/submodules/ubuntu-kernel"]
path = src/submodules/ubuntu-kernel
url = git://git.proxmox.com/git/mirror_ubuntu-kernels.git

2
Makefile
View File

@ -14,7 +14,7 @@ DSC_DBG=$(PACKAGE_DBG)_$(DEB_VERSION).dsc
all: deb
ZFSONLINUX_SUBMODULE=src/submodules/zfsonlinux
KERNEL_SUBMODULE=src/submodules/ubuntu-jammy
KERNEL_SUBMODULE=src/submodules/ubuntu-kernel
submodules.prepared:
git submodule update --init $(KERNEL_SUBMODULE)

2
src/Makefile
View File

@ -4,7 +4,7 @@ BUILDDIR=build
INITRAMFS_BUILDDIR=build/initramfs
ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
KERNEL_SUBMODULE=submodules/ubuntu-jammy
KERNEL_SUBMODULE=submodules/ubuntu-kernel
SHIM_DIR=init-shim-rs
KERNEL_IMG=$(BUILDDIR)/bzImage

30
src/patches/kernel/0001-OVERRIDE-do-not-build-xr-usb-serial.patch
View File

@ -1,30 +0,0 @@
From 4cf77185b43a29ad2d70749648cac83330030cf9 Mon Sep 17 00:00:00 2001
From: Stefan Reiter <s.reiter@proxmox.com>
Date: Tue, 17 Nov 2020 14:42:52 +0100
Subject: [PATCH] OVERRIDE: do not build xr-usb-serial
We don't have USB support in the kernel, so this will fail - and for
some reason there's no Kconfig setting for this...
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
ubuntu/Makefile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index 67c6d5b98b53..6e7264845b66 100644
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -19,9 +19,6 @@ obj-$(CONFIG_HIO) += hio/
##
##
##
-ifeq ($(ARCH),x86)
-obj-y += xr-usb-serial/
-endif
##
##
##
--
2.20.1

26
src/patches/kernel/0002-FIXUP-syntax-error-in-Ubuntu-Sauce.patch
View File

@ -1,26 +0,0 @@
From 2c972569ef5b641846773bee3b3a0191ba66165e Mon Sep 17 00:00:00 2001
From: Stefan Reiter <s.reiter@proxmox.com>
Date: Tue, 16 Feb 2021 17:14:41 +0100
Subject: [PATCH] FIXUP: syntax error in Ubuntu Sauce
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
include/linux/audit.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 55cc03c1bed8..8f84c9503827 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -253,7 +253,7 @@ static inline void audit_log_path_denied(int type, const char *operation)
static inline void audit_log_lsm(struct lsmblob *blob, bool exiting)
{ }
static inline int audit_log_task_context(struct audit_buffer *ab,
- struct lsmblob *blob);
+ struct lsmblob *blob)
{
return 0;
}
--
2.20.1

1
src/submodules/ubuntu-jammy

@ -1 +0,0 @@
Subproject commit 4f32dead2e302c1fdd963831e8ad6096248ae4e2

1
src/submodules/ubuntu-kernel Submodule

@ -0,0 +1 @@
Subproject commit 1978bab71596981268838efebf801f03fdce9d3a

2
src/submodules/zfsonlinux

@ -1 +1 @@
Subproject commit 6a6bd493988c75331deab06e5352a9bed035a87d
Subproject commit e25f9131d679692704c11dc0c1df6d4585b70c35