Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/311'

Browse Source 
* origin/pr/311:
  Properly handle CentOS Stream
This commit is contained in:
Marek Marczykowski-Górecki 2021-05-24 04:16:41 +02:00
commit 40c81566e7
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-managers/Makefile
View File

@ -13,6 +13,12 @@ QUBESSTATEDIR = $(STATEDIR)/qubes
ifneq (,$(wildcard /etc/fedora-release)) ifneq (,$(wildcard /etc/fedora-release))
DIST = fc$(shell rpm --eval %{fedora}) DIST = fc$(shell rpm --eval %{fedora})
else ifneq (,$(wildcard /etc/centos-release))
ifeq (CentOSStream, $(shell lsb_release -is))
DIST = centos-stream
else
DIST = centos
endif
else ifneq (,$(wildcard /etc/os-release)) else ifneq (,$(wildcard /etc/os-release))
DIST = $(shell grep VERSION_CODENAME= /etc/os-release | cut -d'=' -f2) DIST = $(shell grep VERSION_CODENAME= /etc/os-release | cut -d'=' -f2)
endif endif

3
rpm_spec/core-agent.spec.in
View File

@ -176,6 +176,9 @@ BuildRequires: qubes-libvchan-@BACKEND_VMM@-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: systemd BuildRequires: systemd
%if 0%{?rhel} >= 8
BuildRequires: redhat-lsb
%endif
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
%description %description