diff --git a/Makefile b/Makefile index 31a7b4b..7a94845 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,8 @@ install-vm: install -m 0644 vm-systemd/ntpd.service $(DESTDIR)/usr/lib/qubes/init/ install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes - install -D -m 0644 misc/qubes.repo $(DESTDIR)/etc/yum.repos.d/qubes.repo + install -D -m 0644 misc/qubes-r2-beta2.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2-beta2.repo + install -D -m 0644 misc/qubes-r2-beta3.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2-beta3.repo install -D -m 0644 misc/serial.conf $(DESTDIR)/usr/lib/qubes/serial.conf install -D misc/qubes-serial-login $(DESTDIR)/$(SBINDIR)/qubes-serial-login install -d $(DESTDIR)/usr/share/glib-2.0/schemas/ diff --git a/misc/qubes.repo b/misc/qubes-r2-beta2.repo similarity index 56% rename from misc/qubes.repo rename to misc/qubes-r2-beta2.repo index 75dd600..4b4fd71 100644 --- a/misc/qubes.repo +++ b/misc/qubes-r2-beta2.repo @@ -1,19 +1,19 @@ -[qubes-vm-current] +[qubes-vm-r2b2-current] name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r2/current/vm/fc$releasever +baseurl = http://yum.qubes-os.org/r2-beta2/current/vm/fc$releasever gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary gpgcheck = 1 -[qubes-vm-current-testing] +[qubes-vm-r2b2-current-testing] name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r2/current-testing/vm/fc$releasever +baseurl = http://yum.qubes-os.org/r2-beta2/current-testing/vm/fc$releasever gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary gpgcheck = 1 enabled=0 -[qubes-vm-unstable] +[qubes-vm-r2b2-unstable] name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r2/unstable/vm/fc$releasever +baseurl = http://yum.qubes-os.org/r2-beta2/unstable/vm/fc$releasever gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-unstable gpgcheck = 1 enabled=0 diff --git a/misc/qubes-r2-beta3.repo b/misc/qubes-r2-beta3.repo new file mode 100644 index 0000000..d2fcf1d --- /dev/null +++ b/misc/qubes-r2-beta3.repo @@ -0,0 +1,20 @@ +[qubes-vm-r2b3-current] +name = Qubes OS Repository for VM (updates) +baseurl = http://yum.qubes-os.org/r2-beta3/current/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary +gpgcheck = 1 + +[qubes-vm-r2b3-current-testing] +name = Qubes OS Repository for VM (updates-testing) +baseurl = http://yum.qubes-os.org/r2-beta3/current-testing/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary +gpgcheck = 1 +enabled=0 + +[qubes-vm-r2b3-unstable] +name = Qubes OS Repository for VM (unstable) +baseurl = http://yum.qubes-os.org/r2-beta3/unstable/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-unstable +gpgcheck = 1 +enabled=0 + diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index e4dda3f..6664f3d 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -291,7 +291,8 @@ rm -f %{name}-%{version} /etc/xdg/nautilus-actions/nautilus-actions.conf /etc/xen/scripts/vif-route-qubes %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf -%config(noreplace) /etc/yum.repos.d/qubes.repo +%config(noreplace) /etc/yum.repos.d/qubes-r2-beta2.repo +%config(noreplace) /etc/yum.repos.d/qubes-r2-beta3.repo /etc/yum/pluginconf.d/yum-qubes-hooks.conf /etc/yum/post-actions/qubes-trigger-sync-appmenus.action /usr/sbin/qubes-serial-login