Răsfoiți Sursa

Handle CentOS vm repo

fepitre 5 ani în urmă
părinte
comite
5cb6cc8ebc
2 a modificat fișierele cu 6 adăugiri și 5 ștergeri
  1. 2 1
      Makefile
  2. 4 4
      misc/qubes-r4.repo.in

+ 2 - 1
Makefile

@@ -161,7 +161,8 @@ install-sysvinit: install-init
 	install network/qubes-iptables $(DESTDIR)/etc/init.d/
 
 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 -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

+ 4 - 4
misc/qubes-r4.repo → misc/qubes-r4.repo.in

@@ -1,6 +1,6 @@
 [qubes-vm-r4.0-current]
 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
 skip_if_unavailable=False
 gpgcheck = 1
@@ -8,7 +8,7 @@ enabled=1
 
 [qubes-vm-r4.0-current-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
 skip_if_unavailable=False
 gpgcheck = 1
@@ -16,7 +16,7 @@ enabled=0
 
 [qubes-vm-r4.0-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
 skip_if_unavailable=False
 gpgcheck = 1
@@ -24,7 +24,7 @@ enabled=0
 
 [qubes-vm-r4.0-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
 gpgcheck = 1
 enabled=0