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 diff --git a/dummy-backlight.spec.in b/dummy-backlight.spec.in index 9fb8d57..35e5643 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}. @@ -71,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