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

vm/yum-repo: Use $releasever in repo definition

Browse Source 
Instead of multiple files with only release version different.
This commit is contained in:
Marek Marczykowski 2011-12-12 03:34:20 +01:00
parent d84d64716b
commit 0d32a533e7
4 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/qubes.fc14.repo
View File

@ -1,20 +0,0 @@
[qubes-vm-current]
name = Qubes OS Repository for VM (updates)
baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc14
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1
[qubes-vm-current-testing]
name = Qubes OS Repository for VM (updates-testing)
baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc14
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1
enabled=0
[qubes-vm-unstable]
name = Qubes OS Repository for VM (unstable)
baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc14
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1
enabled=0

20
common/qubes.fc15.repo
View File

@ -1,20 +0,0 @@
[qubes-vm-current]
name = Qubes OS Repository for VM (updates)
baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc15
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1
[qubes-vm-current-testing]
name = Qubes OS Repository for VM (updates-testing)
baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc15
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1
enabled=0
[qubes-vm-unstable]
name = Qubes OS Repository for VM (unstable)
baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc15
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1
enabled=0

6
common/qubes.fc13.repo → common/qubes.repo
View File

@ -1,19 +1,19 @@
[qubes-vm-current] [qubes-vm-current]
name = Qubes OS Repository for VM (updates) name = Qubes OS Repository for VM (updates)
baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc13 baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc$releasever
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
[qubes-vm-current-testing] [qubes-vm-current-testing]
name = Qubes OS Repository for VM (updates-testing) name = Qubes OS Repository for VM (updates-testing)
baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc13 baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc$releasever
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
enabled=0 enabled=0
[qubes-vm-unstable] [qubes-vm-unstable]
name = Qubes OS Repository for VM (unstable) name = Qubes OS Repository for VM (unstable)
baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc13 baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc$releasever
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
gpgcheck = 1 gpgcheck = 1
enabled=0 enabled=0

4
rpm_spec/core-commonvm.spec
View File

@ -66,7 +66,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/qubes
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
cp iptables $RPM_BUILD_ROOT/etc/sysconfig/ cp iptables $RPM_BUILD_ROOT/etc/sysconfig/
mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
cp qubes%{dist}.repo $RPM_BUILD_ROOT/etc/yum.repos.d cp qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
install -m 644 RPM-GPG-KEY-qubes* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ install -m 644 RPM-GPG-KEY-qubes* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/sbin
@ -243,7 +243,7 @@ rm -rf $RPM_BUILD_ROOT
/etc/init.d/qubes_core /etc/init.d/qubes_core
/etc/sysconfig/iptables /etc/sysconfig/iptables
/var/lib/qubes /var/lib/qubes
/etc/yum.repos.d/qubes%{dist}.repo /etc/yum.repos.d/qubes.repo
/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes* /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
/sbin/qubes_serial_login /sbin/qubes_serial_login
/usr/bin/xenstore-watch-qubes /usr/bin/xenstore-watch-qubes