[packaging/kde-buildstream] patches/freedesktop-sdk: update linux patch

Harald Sitter <[email protected]>
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git commit bd6f3214bba649a2022c8d7c8aa34282929f2b76 by Harald Sitter.
Committed on 29/07/2026 at 02:09.
Pushed by sitter into branch 'master'.

update linux patch

- config-utils now obeys my command mwahaha
- config-utils now tracks removals properly
- we remove some expectations that were implicitly yeeted
- logo is gone again because it didn't do anything useful

M  +45   -8    patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch

https://invent.kde.org/packaging/kde-buildstream/-/commit/bd6f3214bba649a2022c8d7c8aa34282929f2b76

diff --git a/patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch b/patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch
index b89305f..923d0d7 100644
--- a/patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch
+++ b/patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch
@@ -1,17 +1,52 @@
-From 24d11aded4103d54c86bc7807b47a636b5898568 Mon Sep 17 00:00:00 2001
+From bc8bac0013d086b8cd00fdb036a00c93d84108c6 Mon Sep 17 00:00:00 2001
 From: Harald Sitter <[email protected]>
 Date: Mon, 27 Jul 2026 15:27:50 +0200
 Subject: [PATCH 1/4] modify kernel for kde linux
 
 ---
- files/linux/fdsdk-config.sh | 3083 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 3082 insertions(+), 1 deletion(-)
+ files/linux/config-utils.sh |    7 +-
+ files/linux/fdsdk-config.sh | 3088 ++++++++++++++++++++++++++++++++++-
+ 2 files changed, 3093 insertions(+), 2 deletions(-)
 
+diff --git a/files/linux/config-utils.sh b/files/linux/config-utils.sh
+index d892084a9..169437ed5 100644
+--- a/files/linux/config-utils.sh
++++ b/files/linux/config-utils.sh
+@@ -17,13 +17,18 @@ has() {
+   esac
+ }
+ remove() {
++  sed -i "/${1}/d" expected-configs
+   scripts/config --keep-case -d "${1}"
+ }
+ module() {
++  sed -i "/${1}/d" expected-configs
+   echo "${1}" >>expected-configs
+-  has "${1}" || scripts/config --keep-case -m "${1}"
++  # has "${1}" || scripts/config --keep-case -m "${1}"
++  # When I tell you to make something a module you will do so!
++  scripts/config --keep-case -m "${1}"
+ }
+ enable() {
++  sed -i "/${1}/d" expected-configs
+   echo "${1}" >>expected-configs
+   scripts/config --keep-case -e "${1}"
+ }
 diff --git a/files/linux/fdsdk-config.sh b/files/linux/fdsdk-config.sh
-index 5ae4df559..e67eb0a5a 100644
+index 5ae4df559..70614cca1 100644
 --- a/files/linux/fdsdk-config.sh
 +++ b/files/linux/fdsdk-config.sh
-@@ -97,7 +97,8 @@ enable IKCONFIG_PROC
+@@ -6,6 +6,9 @@
+ set -eu
+ # set -x
+ 
++# create the tracking file
++touch expected-configs
++
+ arch=$1
+ 
+ # Modify the kernel config for additional features
+@@ -97,7 +100,8 @@ enable IKCONFIG_PROC
  module CRYPTO_ADIANTUM
  module CRYPTO_AEGIS128
  module CRYPTO_AES
@@ -21,7 +56,7 @@ index 5ae4df559..e67eb0a5a 100644
  module CRYPTO_BLOWFISH
  module CRYPTO_CAMELLIA
  module CRYPTO_CAST5
-@@ -2842,3 +2843,3083 @@ enable MPTCP_IPV6
+@@ -2842,3 +2846,3085 @@ enable MPTCP_IPV6
  if has HAVE_ARCH_TRANSPARENT_HUGEPAGE; then
      enable TRANSPARENT_HUGEPAGE
  fi
@@ -3081,8 +3116,6 @@ index 5ae4df559..e67eb0a5a 100644
 +# Further deviation for KDE Linux (not from Arch)
 +## It's us!
 +value_str DEFAULT_HOSTNAME "kde-linux"
-+enable LOGO
-+enable LOGO_LINUX_CLUT224
 +enable MODULE_COMPRESS_ZSTD
 +# Don't need this in the kernel itself
 +module SQUASHFS
@@ -3105,6 +3138,10 @@ index 5ae4df559..e67eb0a5a 100644
 +remove AF_RXRPC_INJECT_LOSS
 +remove AF_RXRPC_INJECT_RX_DELAY
 +remove AF_RXRPC_IPV6
++
++# Kernel doesn't like these enabled so let's remove them (which is mostly so the expected file doesn't have them)
++remove PCI_NPEM
++remove I2C_DESIGNWARE_AMDPSP
 -- 
 2.55.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.