Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* origin/pr/206:
  Handle CentOS 7 build.
  travis: add CentOS 7 build
  travis: add dom0 and Fedora VM builds for R4.1
  Allow build for VM
This commit is contained in:
Marek Marczykowski-Górecki 2019-10-28 04:44:33 +01:00
commit f24e1538cb
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -11,6 +11,10 @@ script:
- ~/qubes-builder/scripts/travis-build - ~/qubes-builder/scripts/travis-build
env: env:
- DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1 - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- DISTS_VM=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- DISTS_VM=centos7 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
# don't build tags which are meant for code signing only # don't build tags which are meant for code signing only
branches: branches:

2
Makefile.builder
View File

@ -1,3 +1 @@
ifeq ($(PACKAGE_SET),dom0)
RPM_SPEC_FILES := rpm_spec/qmgr.spec RPM_SPEC_FILES := rpm_spec/qmgr.spec
endif

22
rpm_spec/qmgr.spec.in
View File

@ -6,20 +6,24 @@ BuildArch: noarch
Group: Qubes Group: Qubes
Vendor: Invisible Things Lab Vendor: Invisible Things Lab
License: GPL License: GPL
URL: http://fixme URL: https://www.qubes-os.org
Requires: python3 Requires: python%{python3_pkgversion}
Requires: python3-PyQt5 Requires: python%{python3_pkgversion}-PyQt5
Requires: python3-inotify Requires: python%{python3_pkgversion}-inotify
Requires: python3-qubesadmin >= 4.0.19 Requires: python%{python3_pkgversion}-qubesadmin >= 4.0.19
Requires: python3-Quamash Requires: python%{python3_pkgversion}-Quamash
Requires: qubes-desktop-linux-common >= 4.0.16 Requires: qubes-desktop-linux-common >= 4.0.16
Requires: qubes-artwork Requires: qubes-artwork
Requires: pmount Requires: pmount
Requires: cryptsetup Requires: cryptsetup
Requires: wmctrl Requires: wmctrl
BuildRequires: python3-PyQt5-devel BuildRequires: python%{python3_pkgversion}-PyQt5-devel
BuildRequires: python3-devel BuildRequires: python%{python3_pkgversion}-devel
%if 0%{?rhel} == 7
BuildRequires: qt5-qtbase-devel
%else
BuildRequires: qt5-devel BuildRequires: qt5-devel
%endif
BuildRequires: qt5-linguist BuildRequires: qt5-linguist
AutoReq: 0 AutoReq: 0