[packaging/kde-buildstream] patches/freedesktop-sdk: add shim patch for freedesktop-sdk
Harald Sitter <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit fc599858d14eb5b79957baa1935785a8b84db6e9 by Harald Sitter. Committed on 29/07/2026 at 02:09. Pushed by sitter into branch 'master'. add shim patch for freedesktop-sdk sets sbat M +1 -1 patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch M +1 -1 patches/freedesktop-sdk/0002-modify-systemd-for-kde-linux.patch M +1 -1 patches/freedesktop-sdk/0003-modify-fwupd-efi-for-kde-linux.patch A +79 -0 patches/freedesktop-sdk/0004-modify-shim-for-kde-linux.patch https://invent.kde.org/packaging/kde-buildstream/-/commit/fc599858d14eb5b79957baa1935785a8b84db6e9 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 7cabc8d..b89305f 100644 --- a/patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch +++ b/patches/freedesktop-sdk/0001-modify-kernel-for-kde-linux.patch @@ -1,7 +1,7 @@ From 24d11aded4103d54c86bc7807b47a636b5898568 Mon Sep 17 00:00:00 2001 From: Harald Sitter <[email protected]> Date: Mon, 27 Jul 2026 15:27:50 +0200 -Subject: [PATCH 1/3] modify kernel for kde linux +Subject: [PATCH 1/4] modify kernel for kde linux --- files/linux/fdsdk-config.sh | 3083 ++++++++++++++++++++++++++++++++++- diff --git a/patches/freedesktop-sdk/0002-modify-systemd-for-kde-linux.patch b/patches/freedesktop-sdk/0002-modify-systemd-for-kde-linux.patch index f78a4dd..61432b7 100644 --- a/patches/freedesktop-sdk/0002-modify-systemd-for-kde-linux.patch +++ b/patches/freedesktop-sdk/0002-modify-systemd-for-kde-linux.patch @@ -1,7 +1,7 @@ From 373c688587d11f6336a22048acecee1224d80065 Mon Sep 17 00:00:00 2001 From: Harald Sitter <[email protected]> Date: Mon, 27 Jul 2026 20:41:19 +0200 -Subject: [PATCH 2/3] modify systemd for kde-linux +Subject: [PATCH 2/4] modify systemd for kde-linux --- elements/components/_private/systemd-base.bst | 7 ++++--- diff --git a/patches/freedesktop-sdk/0003-modify-fwupd-efi-for-kde-linux.patch b/patches/freedesktop-sdk/0003-modify-fwupd-efi-for-kde-linux.patch index 28faa6e..caf93a6 100644 --- a/patches/freedesktop-sdk/0003-modify-fwupd-efi-for-kde-linux.patch +++ b/patches/freedesktop-sdk/0003-modify-fwupd-efi-for-kde-linux.patch @@ -1,7 +1,7 @@ From efb97ec43b7772c0fb8f1240c5e266c13e25ff72 Mon Sep 17 00:00:00 2001 From: Harald Sitter <[email protected]> Date: Mon, 27 Jul 2026 20:43:48 +0200 -Subject: [PATCH 3/3] modify fwupd-efi for kde-linux +Subject: [PATCH 3/4] modify fwupd-efi for kde-linux --- elements/components/_private/fwupd-efi.bst | 6 +++--- diff --git a/patches/freedesktop-sdk/0004-modify-shim-for-kde-linux.patch b/patches/freedesktop-sdk/0004-modify-shim-for-kde-linux.patch new file mode 100644 index 0000000..61965c8 --- /dev/null +++ b/patches/freedesktop-sdk/0004-modify-shim-for-kde-linux.patch @@ -0,0 +1,79 @@ +From c873ab6e0a6da331c1f9d7d813ccdf48c4ceed6e Mon Sep 17 00:00:00 2001 +From: Harald Sitter <[email protected]> +Date: Tue, 28 Jul 2026 04:55:34 +0200 +Subject: [PATCH 4/4] modify shim for kde-linux + +needs dos2unix for the sbat file +--- + elements/components/_private/dos2unix.bst | 21 +++++++++++++++++++++ + elements/components/_private/shim.bst | 6 +++++- + files/shim/sbat.kde-linux.csv | 1 + + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 elements/components/_private/dos2unix.bst + create mode 100644 files/shim/sbat.kde-linux.csv + +diff --git a/elements/components/_private/dos2unix.bst b/elements/components/_private/dos2unix.bst +new file mode 100644 +index 000000000..a144bb58d +--- /dev/null ++++ b/elements/components/_private/dos2unix.bst +@@ -0,0 +1,21 @@ ++# SPDX-FileCopyrightText: Freedesktop-SDK Developers ++# SPDX-License-Identifier: MIT ++ ++kind: make ++ ++description: DOS/Mac to Unix and vice versa text file format converter ++ ++build-depends: ++- components/gettext.bst ++- components/po4a.bst ++- components/perl-pod-parser.bst ++- public-stacks/buildsystem-make.bst ++ ++variables: ++ command-subdir: "%{build-root}/dos2unix" ++ ++sources: ++- kind: git_repo ++ url: sourceforge_git:dos2unix/dos2unix.git ++ track: "dos2unix-*" ++ ref: dos2unix-7.5.6-0-g9c2ea173af3bc49324f8288d81c5a2bbfc0884d0 +diff --git a/elements/components/_private/shim.bst b/elements/components/_private/shim.bst +index 34e681364..4b16b9df0 100644 +--- a/elements/components/_private/shim.bst ++++ b/elements/components/_private/shim.bst +@@ -10,6 +10,7 @@ description: | + + build-depends: + - public-stacks/buildsystem-make.bst ++- components/_private/dos2unix.bst + - components/_private/git-minimal.bst + - components/_private/sbsigntools.bst + - components/openssl.bst +@@ -41,7 +42,7 @@ variables: + + make-args: >- + DEFAULT_LOADER='\\EFI\\systemd\\systemd-boot%{efi-arch}.efi' +- EFIDIR=freedesktopsdk ++ EFIDIR=kde-linux + ESPROOTDIR=boot/ + VENDOR_DB_FILE=VENDOR.esl + +@@ -74,3 +75,6 @@ sources: + ref: shim-16.0-pr660-1-gdc7fd96f23d6b582416f672844362d776d175cf4 + - kind: patch + path: patches/shim/binutils_2_46.patch ++- kind: local ++ path: files/shim/sbat.kde-linux.csv ++ directory: data/ +diff --git a/files/shim/sbat.kde-linux.csv b/files/shim/sbat.kde-linux.csv +new file mode 100644 +index 000000000..899a1e3c0 +--- /dev/null ++++ b/files/shim/sbat.kde-linux.csv +@@ -0,0 +1 @@ ++shim.kde-linux,1,KDE Linux,shim,1,https://linux.kde.org +-- +2.55.0 +