diff --git a/.gitmodules b/.gitmodules index e57789d..0cf7ae0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Makefile b/Makefile index e401886..037ffa0 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/src/Makefile b/src/Makefile index 44dbf1d..d51a588 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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 diff --git a/src/patches/kernel/0001-OVERRIDE-do-not-build-xr-usb-serial.patch b/src/patches/kernel/0001-OVERRIDE-do-not-build-xr-usb-serial.patch deleted file mode 100644 index 7873602..0000000 --- a/src/patches/kernel/0001-OVERRIDE-do-not-build-xr-usb-serial.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4cf77185b43a29ad2d70749648cac83330030cf9 Mon Sep 17 00:00:00 2001 -From: Stefan Reiter -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 ---- - 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 - diff --git a/src/patches/kernel/0002-FIXUP-syntax-error-in-Ubuntu-Sauce.patch b/src/patches/kernel/0002-FIXUP-syntax-error-in-Ubuntu-Sauce.patch deleted file mode 100644 index 6273847..0000000 --- a/src/patches/kernel/0002-FIXUP-syntax-error-in-Ubuntu-Sauce.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2c972569ef5b641846773bee3b3a0191ba66165e Mon Sep 17 00:00:00 2001 -From: Stefan Reiter -Date: Tue, 16 Feb 2021 17:14:41 +0100 -Subject: [PATCH] FIXUP: syntax error in Ubuntu Sauce - -Signed-off-by: Stefan Reiter ---- - 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 - diff --git a/src/submodules/ubuntu-jammy b/src/submodules/ubuntu-jammy deleted file mode 160000 index 4f32dea..0000000 --- a/src/submodules/ubuntu-jammy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f32dead2e302c1fdd963831e8ad6096248ae4e2 diff --git a/src/submodules/ubuntu-kernel b/src/submodules/ubuntu-kernel new file mode 160000 index 0000000..1978bab --- /dev/null +++ b/src/submodules/ubuntu-kernel @@ -0,0 +1 @@ +Subproject commit 1978bab71596981268838efebf801f03fdce9d3a diff --git a/src/submodules/zfsonlinux b/src/submodules/zfsonlinux index 6a6bd49..e25f913 160000 --- a/src/submodules/zfsonlinux +++ b/src/submodules/zfsonlinux @@ -1 +1 @@ -Subproject commit 6a6bd493988c75331deab06e5352a9bed035a87d +Subproject commit e25f9131d679692704c11dc0c1df6d4585b70c35