From a87f2ad716d0f0d97f5eeee44cce49a800699d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 14 Sep 2025 18:18:19 +0200 Subject: [PATCH 1/3] rpm: add BR: systemd-rpm-macros QubesOS/qubes-issues#10102 --- dummy-backlight.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dummy-backlight.spec.in b/dummy-backlight.spec.in index 9fb8d57..044932a 100644 --- a/dummy-backlight.spec.in +++ b/dummy-backlight.spec.in @@ -10,6 +10,7 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: make +BuildRequires: systemd-rpm-macros %description %{summary}. From 06f2da8fa88a1f79f5eac9defbbe289d03070147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 14 Sep 2025 18:18:48 +0200 Subject: [PATCH 2/3] ci: drop R4.1, add R4.3 --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55e8a44..9523015 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,13 @@ include: -- file: /r4.1/gitlab-base.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.1/gitlab-dom0.yml - project: QubesOS/qubes-continuous-integration -- file: /r4.1/gitlab-vm.yml - project: QubesOS/qubes-continuous-integration - file: /r4.2/gitlab-base.yml project: QubesOS/qubes-continuous-integration - file: /r4.2/gitlab-host.yml project: QubesOS/qubes-continuous-integration - file: /r4.2/gitlab-vm.yml project: QubesOS/qubes-continuous-integration +- file: /r4.3/gitlab-base.yml + project: QubesOS/qubes-continuous-integration +- file: /r4.3/gitlab-host.yml + project: QubesOS/qubes-continuous-integration +- file: /r4.3/gitlab-vm.yml + project: QubesOS/qubes-continuous-integration From e2f1ed98942ab25f3e8577d3b58b8a7ceb912ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 14 Sep 2025 20:13:20 +0200 Subject: [PATCH 3/3] rpm: do not build the module on qubes kernel It's included already. --- dummy-backlight.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dummy-backlight.spec.in b/dummy-backlight.spec.in index 044932a..35e5643 100644 --- a/dummy-backlight.spec.in +++ b/dummy-backlight.spec.in @@ -72,7 +72,7 @@ Summary: Dummy backlight VM part %post module dkms add -m %{module} -v %{version} --rpm_safe_upgrade -if [ -e /lib/modules/$(uname -r)/build/include ]; then +if ! uname -r | grep -q qubes && [ -e /lib/modules/$(uname -r)/build/include ]; then dkms build -m %{module} -v %{version} dkms install -m %{module} -v %{version} else