QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not create a dozen of useless key files

Browse Source
This commit is contained in:
Joanna Rutkowska 2011-04-03 17:11:11 +02:00
parent fa79da2998
commit d61fa50ee8
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes-release/fedora.repo
View File

@ -6,7 +6,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-13&arch=x86_64
enabled=0 enabled=0
metadata_expire=7d metadata_expire=7d
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-x86_64 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-primary
[fedora-debuginfo] [fedora-debuginfo]
name=Fedora 13 - x86_64 - Debug name=Fedora 13 - x86_64 - Debug
@ -16,7 +16,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-13&arch=
enabled=0 enabled=0
metadata_expire=7d metadata_expire=7d
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-x86_64 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-primary
[fedora-source] [fedora-source]
name=Fedora 13 - Source name=Fedora 13 - Source
@ -26,4 +26,4 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-13&arch
enabled=0 enabled=0
metadata_expire=7d metadata_expire=7d
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-x86_64 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-primary

4
qubes-release/qubes-r1-dom0.repo
View File

@ -4,7 +4,7 @@ baseurl = http://qubes-os.org/yum/r1/dom0/rpm
enabled = 1 enabled = 1
metadata_expire = 7d metadata_expire = 7d
gpgcheck = 1 gpgcheck = 1
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-x86_64 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-primary
[qubes-testing] [qubes-testing]
name = Qubes OS Repository name = Qubes OS Repository
@ -12,5 +12,5 @@ baseurl = http://qubes-os.org/yum/r1-testing/dom0/rpm
enabled = 1 enabled = 1
metadata_expire = 7d metadata_expire = 7d
gpgcheck = 1 gpgcheck = 1
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-x86_64 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-primary

13
qubes-release/qubes-release.spec
View File

@ -54,19 +54,6 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
# Install all the keys, link the primary keys to primary arch files
# and to compat qubes location
pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
for dist in qubes-%{dist_version} fedora-%{fedora_base_version}
do
for arch in i386 x86_64 ppc ppc64
do
ln -s RPM-GPG-KEY-${dist}-primary RPM-GPG-KEY-${dist/-*}-$arch
done
ln -s RPM-GPG-KEY-${dist}-primary RPM-GPG-KEY-${dist/-*}
done
popd
install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
for file in {qubes,fedora}*repo ; do for file in {qubes,fedora}*repo ; do
install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d