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

Merge remote-tracking branch 'qubesos/pr/129'

Browse Source 
* qubesos/pr/129:
  Handle CentOS vm repo
This commit is contained in:
Marek Marczykowski-Górecki 2018-09-02 06:29:44 +02:00
commit 30c7d77b94
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -161,7 +161,8 @@ install-sysvinit: install-init
install network/qubes-iptables $(DESTDIR)/etc/init.d/ install network/qubes-iptables $(DESTDIR)/etc/init.d/
install-rh: install-systemd install-systemd-dropins install-sysvinit install-rh: install-systemd install-systemd-dropins install-sysvinit
install -D -m 0644 misc/qubes-r4.repo $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo install -D -m 0644 misc/qubes-r4.repo.in $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo
DIST='$(DIST)'; sed -i "s/@DIST@/$$(echo $${DIST%%[0-9]*})/g" $(DESTDIR)/etc/yum.repos.d/qubes-r4.repo
install -d $(DESTDIR)$(LIBDIR)/yum-plugins/ install -d $(DESTDIR)$(LIBDIR)/yum-plugins/
install -m 0644 misc/yum-qubes-hooks.py* $(DESTDIR)$(LIBDIR)/yum-plugins/ install -m 0644 misc/yum-qubes-hooks.py* $(DESTDIR)$(LIBDIR)/yum-plugins/
install -D -m 0644 misc/yum-qubes-hooks.conf $(DESTDIR)/etc/yum/pluginconf.d/yum-qubes-hooks.conf install -D -m 0644 misc/yum-qubes-hooks.conf $(DESTDIR)/etc/yum/pluginconf.d/yum-qubes-hooks.conf

8
misc/qubes-r4.repo → misc/qubes-r4.repo.in
View File

@ -1,6 +1,6 @@
[qubes-vm-r4.0-current] [qubes-vm-r4.0-current]
name = Qubes OS Repository for VM (updates) name = Qubes OS Repository for VM (updates)
baseurl = https://yum.qubes-os.org/r4.0/current/vm/fc$releasever baseurl = https://yum.qubes-os.org/r4.0/current/vm/@DIST@$releasever
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary
skip_if_unavailable=False skip_if_unavailable=False
gpgcheck = 1 gpgcheck = 1
@ -8,7 +8,7 @@ enabled=1
[qubes-vm-r4.0-current-testing] [qubes-vm-r4.0-current-testing]
name = Qubes OS Repository for VM (updates-testing) name = Qubes OS Repository for VM (updates-testing)
baseurl = https://yum.qubes-os.org/r4.0/current-testing/vm/fc$releasever baseurl = https://yum.qubes-os.org/r4.0/current-testing/vm/@DIST@$releasever
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary
skip_if_unavailable=False skip_if_unavailable=False
gpgcheck = 1 gpgcheck = 1
@ -16,7 +16,7 @@ enabled=0
[qubes-vm-r4.0-security-testing] [qubes-vm-r4.0-security-testing]
name = Qubes OS Repository for VM (security-testing) name = Qubes OS Repository for VM (security-testing)
baseurl = https://yum.qubes-os.org/r4.0/security-testing/vm/fc$releasever baseurl = https://yum.qubes-os.org/r4.0/security-testing/vm/@DIST@$releasever
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-primary
skip_if_unavailable=False skip_if_unavailable=False
gpgcheck = 1 gpgcheck = 1
@ -24,7 +24,7 @@ enabled=0
[qubes-vm-r4.0-unstable] [qubes-vm-r4.0-unstable]
name = Qubes OS Repository for VM (unstable) name = Qubes OS Repository for VM (unstable)
baseurl = https://yum.qubes-os.org/r4.0/unstable/vm/fc$releasever baseurl = https://yum.qubes-os.org/r4.0/unstable/vm/@DIST@$releasever
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-unstable gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-unstable
gpgcheck = 1 gpgcheck = 1
enabled=0 enabled=0