--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: bookworm-pu: package nvidia-open-gpu-kernel-modules/525.147.05-1~deb12u1
- From: Andreas Beckmann <anbe@debian.org>
- Date: Sat, 25 Nov 2023 19:59:43 +0100
- Message-id: <170093878337.916629.14578443298127022818.reportbug@zam504.zam.kfa-juelich.de>
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
[ Reason ]
In order to fix CVE-2023-31022 we need to upgrade
nvidia-open-gpu-kernel-modules to a new upstream release.
(This package must match the version of src:nvidia-graphics-drivers
and/or src:nvidia-graphics-drivers-tesla to be useful, and these two
packages in non-free need to be updated for CVE-2023-31022, too.)
[ Impact ]
An unusable package with open CVEs.
[ Tests ]
Only module building has been tested. Anything else would require
certain hardware and driver usage.
[ Risks ]
Low. Upgrading to a new nvidia driver release in (old-)stable is an
established procedure.
[ Checklist ]
[*] *all* changes are documented in the d/changelog
[ ] I reviewed all changes and I approve them
I didn't read the upstream diff (114 files changed, 7240
insertions(+), 830 deletions(-)), but this corresponds to the
changes in the driver blobs in non-free.
[*] attach debdiff against the package in (old)stable
only for debian/*, upstream changes are excessive
[*] the issue is verified as fixed in unstable
[ Changes ]
Mainly patch refresh for the new upstream release. This is a subset of
the changes also found in the pu requests for
src:nvidia-graphics-drivers{-tesla}.
Upstream changes diffstat, changes not included in the patch
(500kb uncompressed)
CHANGELOG.md | 6 +
README.md | 15 +-
kernel-open/Kbuild | 3 +-
kernel-open/common/inc/nv-hypervisor.h | 1 +
kernel-open/common/inc/nv-mm.h | 59 +-
kernel-open/conftest.sh | 327 ++++++++--
kernel-open/nvidia-drm/nvidia-drm-drv.c | 15 +
kernel-open/nvidia-drm/nvidia-drm.Kbuild | 2 +
kernel-open/nvidia-modeset/nvidia-modeset-linux.c | 8 +
kernel-open/nvidia-modeset/nvidia-modeset-os-interface.h | 2 +
kernel-open/nvidia-uvm/nvidia-uvm.Kbuild | 2 +-
kernel-open/nvidia-uvm/uvm_ce_test.c | 4 +-
kernel-open/nvidia-uvm/uvm_migrate_pageable.h | 2 +-
kernel-open/nvidia/nv-p2p.c | 5 +
kernel-open/nvidia/nv.c | 14 +-
kernel-open/nvidia/nvlink_export.h | 5 +
kernel-open/nvidia/nvlink_os.h | 3 +
src/common/displayport/src/dp_evoadapter.cpp | 6 +-
src/common/inc/nvBldVer.h | 20 +-
src/common/inc/nvUnixVersion.h | 2 +-
src/common/inc/nvlog_defs.h | 17 +-
src/common/inc/swref/published/hopper/gh100/dev_fb.h | 23 +-
src/common/inc/swref/published/hopper/gh100/dev_fbpa.h | 29 +
src/common/inc/swref/published/hopper/gh100/dev_ltc.h | 33 +
src/common/inc/swref/published/hopper/gh100/dev_nv_xpl.h | 52 ++
src/common/inc/swref/published/hopper/gh100/dev_xtl_ep_pri.h | 3 +
src/common/inc/swref/published/hopper/gh100/hwproject.h | 6 +
src/common/inc/swref/published/hopper/gh100/pri_nv_xal_ep.h | 12 +
src/common/inc/swref/published/nvswitch/ls10/dev_nvlipt_lnk_ip.h | 5 +-
src/common/inc/swref/published/nvswitch/ls10/ptop_discovery_ip.h | 28 +
src/common/nvlink/interface/nvlink.h | 5 +
src/common/nvlink/interface/nvlink_export.h | 5 +
src/common/nvlink/interface/nvlink_os.h | 3 +
src/common/nvlink/kernel/nvlink/nvlink_lib_mgmt.c | 50 +-
src/common/nvlink/kernel/nvlink/nvlink_lock.c | 32 +-
src/common/nvswitch/common/inc/soe/soeifcore.h | 24 +-
src/common/nvswitch/common/inc/soe/soeififr.h | 116 +++-
src/common/nvswitch/interface/ctrl_dev_nvswitch.h | 198 +++++-
src/common/nvswitch/kernel/inc/haldef_nvswitch.h | 7 +
src/common/nvswitch/kernel/inc/inforom/inforom_nvl_v3_nvswitch.h | 94 +++
src/common/nvswitch/kernel/inc/inforom/inforom_nvl_v4_nvswitch.h | 37 ++
src/common/nvswitch/kernel/inc/inforom/inforom_nvswitch.h | 12 +-
src/common/nvswitch/kernel/inc/lr10/inforom_lr10.h | 33 +-
src/common/nvswitch/kernel/inc/lr10/lr10.h | 6 +-
src/common/nvswitch/kernel/inc/ls10/inforom_ls10.h | 46 +-
src/common/nvswitch/kernel/inc/ls10/ls10.h | 26 +-
src/common/nvswitch/kernel/inc/ls10/minion_nvlink_defines_public_ls10.h | 7 +-
src/common/nvswitch/kernel/inc/soe/bin/g_soeuc_lr10_dbg.h | 206 +++----
src/common/nvswitch/kernel/inc/soe/bin/g_soeuc_lr10_prd.h | 206 +++----
src/common/nvswitch/kernel/inforom/ifrbbx_nvswitch.c | 22 +-
src/common/nvswitch/kernel/inforom/ifrnvlink_nvswitch.c | 398 +++++++++++-
src/common/nvswitch/kernel/inforom/inforom_nvl_v3_nvswitch.c | 619 +++++++++++++++++++
src/common/nvswitch/kernel/inforom/inforom_nvl_v4_nvswitch.c | 108 ++++
src/common/nvswitch/kernel/lr10/inforom_lr10.c | 490 ++++++++++++++-
src/common/nvswitch/kernel/lr10/intr_lr10.c | 412 ++++++++++++-
src/common/nvswitch/kernel/lr10/link_lr10.c | 117 +++-
src/common/nvswitch/kernel/lr10/lr10.c | 40 +-
src/common/nvswitch/kernel/ls10/inforom_ls10.c | 769 ++++++++++++++++++++++-
src/common/nvswitch/kernel/ls10/intr_ls10.c | 511 ++++++++++++----
src/common/nvswitch/kernel/ls10/link_ls10.c | 160 ++++-
src/common/nvswitch/kernel/ls10/ls10.c | 191 +++++-
src/common/nvswitch/kernel/nvswitch.c | 91 ++-
src/common/sdk/nvidia/inc/class/cl2080_notification.h | 3 +-
src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080event.h | 53 +-
src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080nvlink.h | 1 +
src/common/sdk/nvidia/inc/nv-hypervisor.h | 1 +
src/common/sdk/nvidia/inc/nverror.h | 4 +-
src/common/unix/nvidia-3d/src/nvidia-3d-surface.c | 3 +
src/nvidia-modeset/include/nvkms-types.h | 6 +
src/nvidia-modeset/os-interface/include/nvidia-modeset-os-interface.h | 2 +
src/nvidia-modeset/src/dp/nvdp-connector.cpp | 27 +-
src/nvidia-modeset/src/nvkms-evo.c | 2 +
src/nvidia/arch/nvalloc/common/inc/flcnretval.h | 3 +-
src/nvidia/arch/nvalloc/common/inc/inforom/ifrnvl.h | 1271 +++++++++++++++++++++++++++++++++++++++
src/nvidia/arch/nvalloc/common/inc/inforom/ifrstruct.h | 3 +-
src/nvidia/arch/nvalloc/unix/src/os-hypervisor.c | 40 +-
src/nvidia/arch/nvalloc/unix/src/osapi.c | 5 +
src/nvidia/generated/g_client_resource_nvoc.c | 24 +-
src/nvidia/generated/g_gpu_nvoc.c | 11 +
src/nvidia/generated/g_gpu_nvoc.h | 29 +
src/nvidia/generated/g_kern_fsp_nvoc.c | 14 +
src/nvidia/generated/g_kern_mem_sys_nvoc.c | 22 +
src/nvidia/generated/g_kern_mem_sys_nvoc.h | 26 +
src/nvidia/generated/g_kernel_gsp_nvoc.h | 19 +-
src/nvidia/generated/g_kernel_vgpu_mgr_nvoc.h | 5 +-
src/nvidia/generated/g_nv_name_released.h | 7 +
src/nvidia/generated/g_subdevice_nvoc.h | 2 +-
src/nvidia/inc/libraries/mmu/mmu_walk.h | 2 +-
src/nvidia/inc/libraries/nvlog/nvlog.h | 21 +
src/nvidia/kernel/vgpu/nv/rpc.c | 1 +
src/nvidia/src/kernel/diagnostics/nvlog.c | 76 +++
src/nvidia/src/kernel/gpu/arch/hopper/kern_gpu_gh100.c | 23 +
src/nvidia/src/kernel/gpu/bus/arch/maxwell/kern_bus_gm107.c | 16 +-
src/nvidia/src/kernel/gpu/fsp/arch/hopper/kern_fsp_gh100.c | 15 +-
src/nvidia/src/kernel/gpu/fsp/kern_fsp.c | 6 +-
src/nvidia/src/kernel/gpu/gpu.c | 22 +-
src/nvidia/src/kernel/gpu/gpu_registry.c | 20 +-
src/nvidia/src/kernel/gpu/gsp/arch/hopper/kernel_gsp_gh100.c | 24 +-
src/nvidia/src/kernel/gpu/gsp/arch/turing/kernel_gsp_tu102.c | 37 +-
src/nvidia/src/kernel/gpu/gsp/kernel_gsp.c | 222 +++++--
src/nvidia/src/kernel/gpu/gsp/message_queue_cpu.c | 2 +-
src/nvidia/src/kernel/gpu/intr/intr.c | 6 -
src/nvidia/src/kernel/gpu/mem_mgr/arch/ampere/mem_mgr_ga100.c | 2 +-
src/nvidia/src/kernel/gpu/mem_mgr/mem_mgr_regions.c | 2 +-
src/nvidia/src/kernel/gpu/mem_sys/arch/hopper/kern_mem_sys_gh100.c | 176 +++++-
src/nvidia/src/kernel/gpu/nvlink/kernel_nvlink.c | 22 +-
src/nvidia/src/kernel/gpu/nvlink/kernel_nvlinkcorelibtrain.c | 2 +-
src/nvidia/src/kernel/mem_mgr/gpu_vaspace.c | 4 +-
src/nvidia/src/kernel/mem_mgr/mem_fabric.c | 15 +-
src/nvidia/src/kernel/rmapi/client_resource.c | 7 +-
src/nvidia/src/kernel/virtualization/kernel_vgpu_mgr.c | 5 +-
src/nvidia/src/libraries/mmu/mmu_walk.c | 5 +-
src/nvidia/srcs.mk | 2 +
version.mk | 2 +-
114 files changed, 7240 insertions(+), 830 deletions(-)
[ Other info ]
This is a rebuild of the package from sid with no further changes.
Andreas
diff --git a/debian/changelog b/debian/changelog
index 450cd9e8..ae046c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+nvidia-open-gpu-kernel-modules (525.147.05-1~deb12u1) bookworm; urgency=medium
+
+ * Rebuild for bookworm.
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 25 Nov 2023 14:13:56 +0100
+
+nvidia-open-gpu-kernel-modules (525.147.05-1) unstable; urgency=medium
+
+ * New upstream production branch release 525.147.05 (2023-10-31).
+ * Fixed CVE-2023-31022. (Closes: #1055144)
+ https://nvidia.custhelp.com/app/answers/detail/a_id/5491
+ * Refresh patches.
+ * Fix FTBFS with quilt 0.67.
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 22 Nov 2023 01:17:56 +0100
+
+nvidia-open-gpu-kernel-modules (525.125.06-2) unstable; urgency=medium
+
+ * Backport get_user_pages changes from 535.86.05 to fix kernel module build
+ for Linux 6.5.
+
+ -- Andreas Beckmann <anbe@debian.org> Tue, 19 Sep 2023 16:28:49 +0200
+
nvidia-open-gpu-kernel-modules (525.125.06-1~deb12u1) bookworm; urgency=medium
* Rebuild for bookworm.
diff --git a/debian/nvidia-options.conf.in b/debian/nvidia-options.conf.in
index 5f878850..014bb5d9 100644
--- a/debian/nvidia-options.conf.in
+++ b/debian/nvidia-options.conf.in
@@ -1,4 +1,10 @@
#options #MODULE# NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=44 NVreg_DeviceFileMode=0660
-# To enable FastWrites and Sidebus addressing, uncomment these lines
-# options #MODULE# NVreg_EnableAGPSBA=1
-# options #MODULE# NVreg_EnableAGPFW=1
+
+# To grant performance counter access to unprivileged users, uncomment the following line:
+#options #MODULE# NVreg_RestrictProfilingToAdminUsers=0
+
+# Uncomment to enable this power management feature:
+#options #MODULE# NVreg_PreserveVideoMemoryAllocations=1
+
+# Uncomment to enable this power management feature:
+#options #MODULE# NVreg_EnableS0ixPowerManagement=1
diff --git a/debian/patches/module/0001-bump-minimum-supported-kernel-version-to-3.10.patch b/debian/patches/module/0001-bump-minimum-supported-kernel-version-to-3.10.patch
index ec28d6bd..a015484d 100644
--- a/debian/patches/module/0001-bump-minimum-supported-kernel-version-to-3.10.patch
+++ b/debian/patches/module/0001-bump-minimum-supported-kernel-version-to-3.10.patch
@@ -1,4 +1,4 @@
-From 07730be40239a5ec2c1c3754807e026a1b41fcfe Mon Sep 17 00:00:00 2001
+From fe3344d88a7c56419d42de6efef5161031c77928 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Mon, 31 Oct 2022 15:10:08 +0100
Subject: [PATCH] bump minimum supported kernel version to 3.10
@@ -9,7 +9,7 @@ conftest.sh has dropped several tests for features predating 3.10
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
-index eeba17d..782e42a 100644
+index 792287b..9f32e4e 100644
--- a/common/inc/nv-linux.h
+++ b/common/inc/nv-linux.h
@@ -57,8 +57,8 @@
diff --git a/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch b/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
index 401122ef..a61d4db4 100644
--- a/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
+++ b/debian/patches/module/0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
@@ -1,4 +1,4 @@
-From 25d430ed866f0622b602fa42f6d49a0fb4237679 Mon Sep 17 00:00:00 2001
+From 40b15aa3ac67bfefa097f6a28b24e9d5cd9013a2 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Mon, 31 Oct 2022 14:40:42 +0100
Subject: [PATCH] conftest.sh: remove empty lines from uts_release output
@@ -8,10 +8,10 @@ Subject: [PATCH] conftest.sh: remove empty lines from uts_release output
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conftest.sh b/conftest.sh
-index a629eb9..9f58818 100755
+index 0ea3f3d..4af088d 100755
--- a/conftest.sh
+++ b/conftest.sh
-@@ -5288,7 +5288,7 @@ compile_test() {
+@@ -5489,7 +5489,7 @@ compile_test() {
echo "#include <generated/utsrelease.h>
UTS_RELEASE" > conftest$$.c
diff --git a/debian/patches/module/0010-backport-pci-dma-changes-for-ppc64el.patch b/debian/patches/module/0010-backport-pci-dma-changes-for-ppc64el.patch
deleted file mode 100644
index 2184736f..00000000
--- a/debian/patches/module/0010-backport-pci-dma-changes-for-ppc64el.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 5858598d5d8a465c28805a3bc572c81b8c97679f Mon Sep 17 00:00:00 2001
-From: Andreas Beckmann <anbe@debian.org>
-Date: Mon, 20 Jun 2022 10:14:54 +0200
-Subject: [PATCH] backport pci/dma changes for ppc64el
-
----
- nvidia/nv.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/nvidia/nv.c b/nvidia/nv.c
-index a467943..83765b9 100644
---- a/nvidia/nv.c
-+++ b/nvidia/nv.c
-@@ -4455,7 +4455,7 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
- * Otherwise, the DMA start address only needs to be set once, and it
- * won't change afterward. Just return the cached value if asked again,
- * to avoid the kernel printing redundant messages to the kernel
-- * log when we call pci_set_dma_mask().
-+ * log when we call dma_set_mask().
- */
- if ((nv_tce_bypass_mode == NV_TCE_BYPASS_MODE_DISABLE) ||
- (nvl->tce_bypass_enabled))
-@@ -4505,19 +4505,19 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
- * as the starting address for all DMA mappings.
- */
- saved_dma_mask = pci_dev->dma_mask;
-- if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64)) != 0)
-+ if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64)) != 0)
- {
- goto done;
- }
-
-- dma_addr = pci_map_single(pci_dev, NULL, 1, DMA_BIDIRECTIONAL);
-- if (pci_dma_mapping_error(pci_dev, dma_addr))
-+ dma_addr = dma_map_single(&pci_dev->dev, NULL, 1, DMA_BIDIRECTIONAL);
-+ if (dma_mapping_error(&pci_dev->dev, dma_addr))
- {
-- pci_set_dma_mask(pci_dev, saved_dma_mask);
-+ dma_set_mask(&pci_dev->dev, saved_dma_mask);
- goto done;
- }
-
-- pci_unmap_single(pci_dev, dma_addr, 1, DMA_BIDIRECTIONAL);
-+ dma_unmap_single(&pci_dev->dev, dma_addr, 1, DMA_BIDIRECTIONAL);
-
- /*
- * From IBM: "For IODA2, native DMA bypass or KVM TCE-based implementation
-@@ -4549,7 +4549,7 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
- */
- nv_printf(NV_DBG_WARNINGS,
- "NVRM: DMA window limited by platform\n");
-- pci_set_dma_mask(pci_dev, saved_dma_mask);
-+ dma_set_mask(&pci_dev->dev, saved_dma_mask);
- goto done;
- }
- else if ((dma_addr & saved_dma_mask) != 0)
-@@ -4568,7 +4568,7 @@ NvU64 NV_API_CALL nv_get_dma_start_address(
- */
- nv_printf(NV_DBG_WARNINGS,
- "NVRM: DMA window limited by memory size\n");
-- pci_set_dma_mask(pci_dev, saved_dma_mask);
-+ dma_set_mask(&pci_dev->dev, saved_dma_mask);
- goto done;
- }
- }
---
-2.20.1
-
diff --git a/debian/patches/module/bashisms.patch b/debian/patches/module/bashisms.patch
index b637ba07..98f178a5 100644
--- a/debian/patches/module/bashisms.patch
+++ b/debian/patches/module/bashisms.patch
@@ -3,7 +3,7 @@ Description: fix bashisms in conftest.sh
--- a/conftest.sh
+++ b/conftest.sh
-@@ -5818,7 +5818,7 @@ case "$5" in
+@@ -6019,7 +6019,7 @@ case "$5" in
if [ -n "$VGX_BUILD" ]; then
if [ -f /proc/xen/capabilities ]; then
diff --git a/debian/patches/module/cc_version_check-gcc5.patch b/debian/patches/module/cc_version_check-gcc5.patch
index 15828bd4..15f1caa1 100644
--- a/debian/patches/module/cc_version_check-gcc5.patch
+++ b/debian/patches/module/cc_version_check-gcc5.patch
@@ -5,7 +5,7 @@ Description: ignore __GNUC_MINOR__ from GCC 5 onwards
--- a/conftest.sh
+++ b/conftest.sh
-@@ -5648,7 +5648,7 @@ case "$5" in
+@@ -5849,7 +5849,7 @@ case "$5" in
kernel_cc_minor=`echo ${kernel_cc_version} | cut -d '.' -f 2`
echo "
diff --git a/debian/patches/module/conftest-verbose.patch b/debian/patches/module/conftest-verbose.patch
index d5ad8ab4..469a1278 100644
--- a/debian/patches/module/conftest-verbose.patch
+++ b/debian/patches/module/conftest-verbose.patch
@@ -42,7 +42,7 @@ Description: dump the generated conftest headers
# Each of these headers is checked for presence with a test #include; a
-@@ -308,6 +322,7 @@ NV_HEADER_PRESENCE_PART = $(addprefix $(
+@@ -309,6 +323,7 @@ NV_HEADER_PRESENCE_PART = $(addprefix $(
define NV_HEADER_PRESENCE_CHECK
$$(call NV_HEADER_PRESENCE_PART,$(1)): $$(NV_CONFTEST_SCRIPT) $(obj)/conftest/uts_release
@mkdir -p $$(dir $$@)
@@ -50,7 +50,7 @@ Description: dump the generated conftest headers
@$$(NV_CONFTEST_CMD) test_kernel_header '$$(NV_CONFTEST_CFLAGS)' '$(1)' > $$@
endef
-@@ -317,6 +332,8 @@ $(foreach header,$(NV_HEADER_PRESENCE_TE
+@@ -318,6 +333,8 @@ $(foreach header,$(NV_HEADER_PRESENCE_TE
# Concatenate all of the parts into headers.h.
$(obj)/conftest/headers.h: $(call NV_HEADER_PRESENCE_PART,$(NV_HEADER_PRESENCE_TESTS))
@cat $^ > $@
@@ -59,7 +59,7 @@ Description: dump the generated conftest headers
clean-dirs := $(obj)/conftest
-@@ -337,7 +354,8 @@ BUILD_SANITY_CHECKS = \
+@@ -338,7 +355,8 @@ BUILD_SANITY_CHECKS = \
.PHONY: $(BUILD_SANITY_CHECKS)
@@ -69,7 +69,7 @@ Description: dump the generated conftest headers
@$(NV_CONFTEST_CMD) $@ full_output
# Perform all sanity checks before generating the conftest headers
-@@ -346,11 +364,13 @@ $(NV_CONFTEST_HEADERS): | $(BUILD_SANITY
+@@ -347,11 +365,13 @@ $(NV_CONFTEST_HEADERS): | $(BUILD_SANITY
# Make the conftest headers depend on the kernel version string
diff --git a/debian/patches/module/series.in b/debian/patches/module/series.in
index 957fb354..5cfcef65 100644
--- a/debian/patches/module/series.in
+++ b/debian/patches/module/series.in
@@ -4,7 +4,6 @@ bashisms.patch
# kernel support
0001-bump-minimum-supported-kernel-version-to-3.10.patch
0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
-0010-backport-pci-dma-changes-for-ppc64el.patch
ppc64el.patch
# build system updates
diff --git a/debian/rules b/debian/rules
index ffe4cf63..94fc5a85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,7 @@ override_dh_auto_clean:
$(RM) -r test-module-build
execute_after_dh_clean:
- cd kernel-open && QUILT_PATCHES=../debian/patches/module quilt --quiltrc /dev/null pop -a || test $$? = 2
+ if [ -f debian/patches/module/series ]; then cd kernel-open && QUILT_PATCHES=../debian/patches/module quilt --quiltrc /dev/null pop -a || test $$? = 2 ; fi
$(RM) -r kernel-open/.pc/
$(RM) $(filter-out $(AUTOKEEP),$(AUTOGEN))
$(if $(AUTOKEEP),$(MAKE) -f debian/rules $(AUTOKEEP))
diff --git a/debian/rules.defs b/debian/rules.defs
index 07c852d4..daf8a69a 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1,6 +1,6 @@
LINUX_KMOD_VARIANT = -open
-LINUX_KMOD_TESTED = 6.4
+LINUX_KMOD_TESTED = 6.6
ARCH_LIST = amd64
ARCH_LIST += arm64
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 85e74d40..e0e8dbc3 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -1,7 +1,6 @@
---
include:
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
variables:
SALSA_CI_COMPONENTS: 'main contrib non-free non-free-firmware'
--- End Message ---