From 416aea1d238b82f06bc9756c1d74f9d86b310bbc Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Wed, 9 Nov 2011 17:26:37 +0100 Subject: [PATCH] Get rid of the local fedora repo This repo must be creted manually, which is not good for the "one click" make qubes target. The rpms for this repo are downloaded by revisor anyway from the fedora repo and are cached in build/work/revisor-yumchace anyway, so subsequent make iso attempts do not need to download them again. --- conf/qubes-x86_64.conf | 13 ------------- yum/fedora13-repo/.gitignore | 2 -- yum/repos.txt | 4 ++-- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 yum/fedora13-repo/.gitignore diff --git a/conf/qubes-x86_64.conf b/conf/qubes-x86_64.conf index f52ff6d..4f229f4 100644 --- a/conf/qubes-x86_64.conf +++ b/conf/qubes-x86_64.conf @@ -16,19 +16,6 @@ metadata_expire=1800 installroot=/tmp/qubes-installer/build/work/revisor failovermethod=priority -[fedora-local] - -# To speed up the iso building process, copy the Packages/ and repodata/ -# directories from the F13 installation DVD into yum/fedora13-repo/, and then -# enable this repository by setting enabled=1 - -name=Fedora 13 - x86_64 (local) -baseurl=file:///tmp/qubes-installer/yum/fedora13-repo/ -enabled=0 -gpgcheck=1 -gpgkey=file:///tmp/qubes-installer/keys/fedora-13.asc -cost=1 - [fedora] name=Fedora 13 - x86_64 baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything/x86_64/os/ diff --git a/yum/fedora13-repo/.gitignore b/yum/fedora13-repo/.gitignore deleted file mode 100644 index b629d33..0000000 --- a/yum/fedora13-repo/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Packages/ -repodata/ diff --git a/yum/repos.txt b/yum/repos.txt index 0516c41..698c334 100644 --- a/yum/repos.txt +++ b/yum/repos.txt @@ -1,4 +1,4 @@ -fedora13-repo <-- a copy of the fedora repo from F13 installation DVD -dom0-update <-- select updated packages retrieved from F13 'update' repo +dom0-update <-- select update packages from Dom0, such as new Xorg drivers + (see dom0-updates repo) qubes-dom0 <-- all qubes-related packages installer <-- packages needed for anaconda