From 22b7d58dad58bbaa34e0fd6115fe70565b8c713d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Fri, 3 Jan 2025 07:28:46 +0000 Subject: [PATCH] linux-hwe-6.5: restore udebs for latest linux-hwe-6.5 release. --- .../udeb/disable_zstd_module_compression.patch | 15 +++++++++++++++ helpers/make-linux-hwe-6.5 | 12 +++++------- 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 helpers/DATA/linux-hwe-6.5/udeb/disable_zstd_module_compression.patch diff --git a/helpers/DATA/linux-hwe-6.5/udeb/disable_zstd_module_compression.patch b/helpers/DATA/linux-hwe-6.5/udeb/disable_zstd_module_compression.patch new file mode 100644 index 0000000..0722b73 --- /dev/null +++ b/helpers/DATA/linux-hwe-6.5/udeb/disable_zstd_module_compression.patch @@ -0,0 +1,15 @@ +diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk_ +index bc873563..d6692ca1 100644 +--- a/debian/rules.d/0-common-vars.mk ++++ b/debian/rules.d/0-common-vars.mk_ +@@ -197,8 +197,9 @@ do_dtbs=false + do_fips_checks=false + + # ZSTD compressed kernel modules ++ifeq ($(filter $(series),jammy aramo),) + do_zstd_ko=true +-ifeq ($(series),jammy) ++else + do_zstd_ko= + endif + diff --git a/helpers/make-linux-hwe-6.5 b/helpers/make-linux-hwe-6.5 index b5f8d45..861f63b 100644 --- a/helpers/make-linux-hwe-6.5 +++ b/helpers/make-linux-hwe-6.5 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2024 Luis Guzman +# Copyright (C) 2025 Luis Guzman # Copyright (C) 2008-2023 Ruben Rodriguez # Copyright (C) 2019 David Trudgian # @@ -19,11 +19,11 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=29 +VERSION=30 HWEKR=6.5 # DI_ENABLED = 1 enables udeb build, 0 or any other value disables them. -DI_ENABLED=0 +DI_ENABLED=1 # HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it. HWE_ENABLED=1 @@ -79,8 +79,7 @@ cp $TMPDIR/* . -av rm -rf $TMPDIR for PATCH in $DATA/*.patch ; do - echo $PATCH - patch --no-backup-if-mismatch -p1 < $PATCH + patch_p1 $PATCH done ## Simple test for finding missing cases of silent_accept_firmware method @@ -97,8 +96,7 @@ enable_udebs() { #Apply udeb/d-i related patches. for PATCH in $DATA/udeb/*.patch ; do - echo $PATCH - patch --no-backup-if-mismatch -p1 < $PATCH + patch_p1 $PATCH done cp $DATA/udeb/5-udebs.mk debian/rules.d