From 775e01a8e472975a5b099408bb25caf1245a55fb Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Fri, 18 Jun 2010 01:41:10 +0200
Subject: [PATCH] Make dom0, appvm, netvm use different qubes.repo

---
 appvm/qubes.repo         | 12 ++++++++++++
 common/qubes.repo        |  6 ------
 dom0/qubes.repo          | 12 ++++++++++++
 netvm/qubes.repo         | 12 ++++++++++++
 rpm_spec/core-appvm.spec |  2 +-
 rpm_spec/core-dom0.spec  |  2 +-
 rpm_spec/core-netvm.spec |  2 +-
 7 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 appvm/qubes.repo
 delete mode 100644 common/qubes.repo
 create mode 100644 dom0/qubes.repo
 create mode 100644 netvm/qubes.repo

diff --git a/appvm/qubes.repo b/appvm/qubes.repo
new file mode 100644
index 00000000..123e0e1c
--- /dev/null
+++ b/appvm/qubes.repo
@@ -0,0 +1,12 @@
+[qubes-appvm]
+name = Qubes OS Repository for AppVM
+baseurl = http://qubes-os.org/yum/r1/appvm/rpm
+gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
+gpgcheck = 1
+
+[qubes-appvm-testing]
+name = Qubes OS Repository for AppVM
+baseurl = http://qubes-os.org/yum/r1-testing/appvm/rpm
+gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
+gpgcheck = 1
+
diff --git a/common/qubes.repo b/common/qubes.repo
deleted file mode 100644
index baf18424..00000000
--- a/common/qubes.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[qubes]
-name = Qubes OS Repository
-baseurl = http://qubes-os.org/yum/rpm
-gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
-gpgcheck = 1
-
diff --git a/dom0/qubes.repo b/dom0/qubes.repo
new file mode 100644
index 00000000..f3eb5e41
--- /dev/null
+++ b/dom0/qubes.repo
@@ -0,0 +1,12 @@
+[qubes-dom0]
+name = Qubes OS Repository for Dom0
+baseurl = http://qubes-os.org/yum/r1/dom0/rpm
+gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
+gpgcheck = 1
+
+[qubes-dom0-testing]
+name = Qubes OS Repository for Dom0
+baseurl = http://qubes-os.org/yum/r1-testing/dom0/rpm
+gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
+gpgcheck = 1
+
diff --git a/netvm/qubes.repo b/netvm/qubes.repo
new file mode 100644
index 00000000..1ec8dc57
--- /dev/null
+++ b/netvm/qubes.repo
@@ -0,0 +1,12 @@
+[qubes-netvm]
+name = Qubes OS Repository for NetVM
+baseurl = http://qubes-os.org/yum/r1/netvm/rpm
+gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
+gpgcheck = 1
+
+[qubes-netvm-testing]
+name = Qubes OS Repository for NetVM
+baseurl = http://qubes-os.org/yum/r1-testing/netvm/rpm
+gpgkey = http://qubes-os.org/keys/qubes-release-1-signing-key.asc
+gpgcheck = 1
+
diff --git a/rpm_spec/core-appvm.spec b/rpm_spec/core-appvm.spec
index 247e9fba..f2f8be4e 100644
--- a/rpm_spec/core-appvm.spec
+++ b/rpm_spec/core-appvm.spec
@@ -68,7 +68,7 @@ mkdir -p $RPM_BUILD_ROOT/mnt/incoming
 mkdir -p $RPM_BUILD_ROOT/mnt/outgoing
 mkdir -p $RPM_BUILD_ROOT/mnt/removable
 mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
-cp ../common/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
+cp ../appvm/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
 mkdir -p $RPM_BUILD_ROOT/sbin   
 cp ../common/qubes_serial_login $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/etc
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 409cfb05..ed1ca802 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -84,7 +84,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/qubes/icons
 cp icons/*.png $RPM_BUILD_ROOT/usr/share/qubes/icons
 
 mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
-cp ../common/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
+cp ../dom0/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
 
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 cp ../common/qubes_setup_dnat_to_ns $RPM_BUILD_ROOT/usr/bin
diff --git a/rpm_spec/core-netvm.spec b/rpm_spec/core-netvm.spec
index 65222165..44358578 100644
--- a/rpm_spec/core-netvm.spec
+++ b/rpm_spec/core-netvm.spec
@@ -62,7 +62,7 @@ ln -s /usr/bin/qubes_setup_dnat_to_ns $RPM_BUILD_ROOT/etc/dhclient.d/qubes_setup
 mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/
 cp ../common/qubes_nmhook $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/
 mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
-cp ../common/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
+cp ../netvm/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
 mkdir -p $RPM_BUILD_ROOT/sbin   
 cp ../common/qubes_serial_login $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/etc