Merge branch 'master' of git://git.qubes-os.org/marmarek/installer-qubes-os
This commit is contained in:
commit
c3211d3bf7
@ -1,22 +1,22 @@
|
|||||||
[qubes-dom0-current]
|
[qubes-dom0-r2b2-current]
|
||||||
name = Qubes Dom0 Repository (updates)
|
name = Qubes Dom0 Repository (updates)
|
||||||
baseurl = http://yum.qubes-os.org/r$releasever/current/dom0
|
baseurl = http://yum.qubes-os.org/r$releasever-beta2/current/dom0
|
||||||
enabled = 1
|
enabled = 1
|
||||||
metadata_expire = 7d
|
metadata_expire = 7d
|
||||||
gpgcheck = 1
|
gpgcheck = 1
|
||||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
|
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
|
||||||
|
|
||||||
[qubes-dom0-current-testing]
|
[qubes-dom0-r2b2-current-testing]
|
||||||
name = Qubes Dom0 Repository (updates-testing)
|
name = Qubes Dom0 Repository (updates-testing)
|
||||||
baseurl = http://yum.qubes-os.org/r$releasever/current-testing/dom0
|
baseurl = http://yum.qubes-os.org/r$releasever-beta2/current-testing/dom0
|
||||||
enabled = 0
|
enabled = 0
|
||||||
metadata_expire = 7d
|
metadata_expire = 7d
|
||||||
gpgcheck = 1
|
gpgcheck = 1
|
||||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
|
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
|
||||||
|
|
||||||
[qubes-dom0-unstable]
|
[qubes-dom0-r2b2-unstable]
|
||||||
name = Qubes Dom0 Repository (unstable)
|
name = Qubes Dom0 Repository (unstable)
|
||||||
baseurl = http://yum.qubes-os.org/r$releasever/unstable/dom0
|
baseurl = http://yum.qubes-os.org/r$releasever-beta2/unstable/dom0
|
||||||
enabled = 0
|
enabled = 0
|
||||||
metadata_expire = 7d
|
metadata_expire = 7d
|
||||||
gpgcheck = 1
|
gpgcheck = 1
|
24
qubes-release/qubes-dom0-r2-beta3.repo
Normal file
24
qubes-release/qubes-dom0-r2-beta3.repo
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
[qubes-dom0-r2b3-current]
|
||||||
|
name = Qubes Dom0 Repository (updates)
|
||||||
|
baseurl = http://yum.qubes-os.org/r$releasever-beta3/current/dom0
|
||||||
|
enabled = 1
|
||||||
|
metadata_expire = 7d
|
||||||
|
gpgcheck = 1
|
||||||
|
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
|
||||||
|
|
||||||
|
[qubes-dom0-r2b3-current-testing]
|
||||||
|
name = Qubes Dom0 Repository (updates-testing)
|
||||||
|
baseurl = http://yum.qubes-os.org/r$releasever-beta3/current-testing/dom0
|
||||||
|
enabled = 0
|
||||||
|
metadata_expire = 7d
|
||||||
|
gpgcheck = 1
|
||||||
|
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
|
||||||
|
|
||||||
|
[qubes-dom0-r2b3-unstable]
|
||||||
|
name = Qubes Dom0 Repository (unstable)
|
||||||
|
baseurl = http://yum.qubes-os.org/r$releasever-beta3/unstable/dom0
|
||||||
|
enabled = 0
|
||||||
|
metadata_expire = 7d
|
||||||
|
gpgcheck = 1
|
||||||
|
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-unstable
|
||||||
|
|
@ -9,7 +9,7 @@
|
|||||||
Summary: Qubes release files
|
Summary: Qubes release files
|
||||||
Name: qubes-release
|
Name: qubes-release
|
||||||
Version: %{dist_version}
|
Version: %{dist_version}
|
||||||
Release: 3
|
Release: 4
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
@ -115,7 +115,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir /etc/yum.repos.d
|
%dir /etc/yum.repos.d
|
||||||
%config(noreplace) /etc/yum.repos.d/fedora.repo
|
%config(noreplace) /etc/yum.repos.d/fedora.repo
|
||||||
%config(noreplace) /etc/yum.repos.d/fedora-updates.repo
|
%config(noreplace) /etc/yum.repos.d/fedora-updates.repo
|
||||||
%config(noreplace) /etc/yum.repos.d/qubes-dom0.repo
|
%config(noreplace) /etc/yum.repos.d/qubes-dom0-r2-beta2.repo
|
||||||
|
%config(noreplace) /etc/yum.repos.d/qubes-dom0-r2-beta3.repo
|
||||||
%config(noreplace) %attr(0644,root,root) /etc/issue
|
%config(noreplace) %attr(0644,root,root) /etc/issue
|
||||||
%config(noreplace) %attr(0644,root,root) /etc/issue.net
|
%config(noreplace) %attr(0644,root,root) /etc/issue.net
|
||||||
%config %attr(0644,root,root) /etc/rpm/macros.dist
|
%config %attr(0644,root,root) /etc/rpm/macros.dist
|
||||||
|
Loading…
Reference in New Issue
Block a user