utils/spacewalk-common-channels | 10 --
utils/spacewalk-common-channels.ini | 167 ++++++++++++++++++++----------------
2 files changed, 99 insertions(+), 78 deletions(-)
New commits:
commit 0fa04e3a7800041ad83b57db51f6e2ac77820f07
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 16:12:47 2010 +0200
spacewalk gpgkey_{url,id,fingerprint} defined as macro
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index b30c560..fd2e4a5 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -30,6 +30,9 @@ gpgkey_fingerprint = %(base_channel_gpgkey_fingerprint)s
_f12_archs = i386, x86_64, ppc
_x86_archs = i386, x86_64
_centos4_archs = alpha, i386, ia64, s390, s390x, x86_64
+_spacewalk_gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
+_spacewalk_gpgkey_id = 430A1C35
+_spacewalk_gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
[fedora12]
checksum = sha256
@@ -242,27 +245,27 @@ yumrepo_url =
http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arc
name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
-gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url =
http://spacewalk.redhat.com/yum/1.1/RHEL/5/%(arch)s/
[spacewalk11-server-fedora12]
name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora12-%(arch)s
-gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url =
http://spacewalk.redhat.com/yum/1.1/Fedora/12/%(arch)s/
[spacewalk11-server-fedora13]
name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora13-%(arch)s
-gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url =
http://spacewalk.redhat.com/yum/1.1/Fedora/13/%(arch)s/
@@ -270,26 +273,26 @@ yumrepo_url =
http://spacewalk.redhat.com/yum/1.1/Fedora/13/%(arch)s/
name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
-gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url =
http://spacewalk.redhat.com/yum/1.1-client/RHEL/5/%(arch)s/
[spacewalk11-client-fedora12]
name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora12-%(arch)s
-gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url =
http://spacewalk.redhat.com/yum/1.1-client/Fedora/12/%(arch)s/
[spacewalk11-client-fedora13]
name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = fedora13-%(arch)s
-gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
-gpgkey_id = 430A1C35
-gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url =
http://spacewalk.redhat.com/yum/1.1-client/Fedora/13/%(arch)s/
commit 54b6f15a6b046b4e4a49ebdd00973a9b3b8fd858
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 16:06:06 2010 +0200
updated spacewalk channels to 1.1, removed Fedora 11, added Fedora 13
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index fb6520e..b30c560 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -238,58 +238,58 @@ gpgkey_id = 217521F6
gpgkey_fingerprint = B940 BE07 7D71 0A28 7D7F 2DD1 119C C036 2175 21F6
yumrepo_url =
http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arch)s
-[spacewalk08-server-centos5]
-name = Spacewalk Server 0.8 for %(base_channel_name)s
+[spacewalk11-server-centos5]
+name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url =
http://spacewalk.redhat.com/yum/0.8/RHEL/5/%(arch)s/
+yumrepo_url =
http://spacewalk.redhat.com/yum/1.1/RHEL/5/%(arch)s/
-[spacewalk08-server-fedora11]
-name = Spacewalk Server 0.8 for %(base_channel_name)s
+[spacewalk11-server-fedora12]
+name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora11-%(arch)s
+base_channels = fedora12-%(arch)s
gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url =
http://spacewalk.redhat.com/yum/0.8/Fedora/11/%(arch)s/
+yumrepo_url =
http://spacewalk.redhat.com/yum/1.1/Fedora/12/%(arch)s/
-[spacewalk08-server-fedora12]
-name = Spacewalk Server 0.8 for %(base_channel_name)s
+[spacewalk11-server-fedora13]
+name = Spacewalk Server 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora12-%(arch)s
+base_channels = fedora13-%(arch)s
gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url =
http://spacewalk.redhat.com/yum/0.8/Fedora/12/%(arch)s/
+yumrepo_url =
http://spacewalk.redhat.com/yum/1.1/Fedora/13/%(arch)s/
-[spacewalk08-client-centos5]
-name = Spacewalk Client 0.8 for %(base_channel_name)s
+[spacewalk11-client-centos5]
+name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
base_channels = centos5-%(arch)s
gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url =
http://spacewalk.redhat.com/yum/0.8-client/RHEL/5/%(arch)s/
+yumrepo_url =
http://spacewalk.redhat.com/yum/1.1-client/RHEL/5/%(arch)s/
-[spacewalk08-client-fedora11]
-name = Spacewalk Client 0.8 for %(base_channel_name)s
+[spacewalk11-client-fedora12]
+name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora11-%(arch)s
+base_channels = fedora12-%(arch)s
gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url =
http://spacewalk.redhat.com/yum/0.8-client/Fedora/11/%(arch)s/
+yumrepo_url =
http://spacewalk.redhat.com/yum/1.1-client/Fedora/12/%(arch)s/
-[spacewalk08-client-fedora12]
-name = Spacewalk Client 0.8 for %(base_channel_name)s
+[spacewalk11-client-fedora13]
+name = Spacewalk Client 1.1 for %(base_channel_name)s
archs = i386, x86_64
-base_channels = fedora12-%(arch)s
+base_channels = fedora13-%(arch)s
gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk
gpgkey_id = 430A1C35
gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-yumrepo_url =
http://spacewalk.redhat.com/yum/0.8-client/Fedora/12/%(arch)s/
+yumrepo_url =
http://spacewalk.redhat.com/yum/1.1-client/Fedora/13/%(arch)s/
commit b7f48e32f98973aa93ce25966525eaa497c85ee8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 16:01:59 2010 +0200
removed Fedora 11 added Fedora 13 and 14 channels
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 53ad8f6..fb6520e 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -26,39 +26,11 @@ gpgkey_url = %(base_channel_gpgkey_url)s
gpgkey_id = %(base_channel_gpgkey_id)s
gpgkey_fingerprint = %(base_channel_gpgkey_fingerprint)s
## now define some "macros"
-#_f11_archs = i386, x86_64, ppc, ppc64, s390x, sparc, sparc64
-_f11_archs = i386, x86_64, ppc, s390x, sparc
#_f12_archs = i386, x86_64, ppc, ppc64
_f12_archs = i386, x86_64, ppc
_x86_archs = i386, x86_64
_centos4_archs = alpha, i386, ia64, s390, s390x, x86_64
-[fedora11]
-checksum = sha256
-archs = %(_f11_archs)s
-checksum = sha256
-name = Fedora 11 (%(arch)s)
-gpgkey_url =
http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i38...
-gpgkey_id = D22E77F2
-gpgkey_fingerprint = AEE4 0C04 E345 60A7 1F04 3D7C 1DC5 C758 D22E 77F2
-yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=fedora-11&arch=%(arch)s
-
-[fedora11-updates]
-label = %(base_channel)s-updates
-name = Fedora 11 Updates (%(arch)s)
-archs = %(_f11_archs)s
-checksum = sha256
-base_channels = fedora11-%(arch)s
-yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=updates-released-f11&...
-
-[fedora11-debug]
-label = %(base_channel)s-debug
-name = Fedora 11 Debug (%(arch)s)
-archs = %(_f11_archs)s
-checksum = sha256
-base_channels = fedora11-%(arch)s
-yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-11&arch=...
-
[fedora12]
checksum = sha256
archs = %(_f12_archs)s
@@ -85,6 +57,58 @@ checksum = sha256
base_channels = fedora12-%(arch)s
yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-12&arch=...
+[fedora13]
+checksum = sha256
+archs = %(_x86_archs)s
+checksum = sha256
+name = Fedora 13 (%(arch)s)
+gpgkey_url =
http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i38...
+gpgkey_id = E8E40FDE
+gpgkey_fingerprint = 8E5F 73FF 2A18 1765 4D35 8FCA 7EDC 6AD6 E8E4 0FDE
+yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=fedora-13&arch=%(arch)s
+
+[fedora13-updates]
+label = %(base_channel)s-updates
+name = Fedora 13 Updates (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora13-%(arch)s
+yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=updates-released-f13&...
+
+[fedora13-debug]
+label = %(base_channel)s-debug
+name = Fedora 13 Debug (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora13-%(arch)s
+yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-13&arch=...
+
+[fedora14]
+checksum = sha256
+archs = %(_x86_archs)s
+checksum = sha256
+name = Fedora 14 (%(arch)s)
+gpgkey_url =
http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i38...
+gpgkey_id = 97A1071F
+gpgkey_fingerprint = 235C 2936 B4B7 0E61 B373 A020 421C ADDB 97A1 071F
+yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=fedora-14&arch=%(arch)s
+
+[fedora14-updates]
+label = %(base_channel)s-updates
+name = Fedora 14 Updates (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora14-%(arch)s
+yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=updates-released-f14&...
+
+[fedora14-debug]
+label = %(base_channel)s-debug
+name = Fedora 14 Debug (%(arch)s)
+archs = %(_x86_archs)s
+checksum = sha256
+base_channels = fedora14-%(arch)s
+yumrepo_url =
https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-14&arch=...
+
[centos5]
archs = %(_x86_archs)s
name = CentOS 5 (%(arch)s)
commit 6f9adadfe9052ec9511dacac8d5a67bef258666a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 15:08:49 2010 +0200
repo creation has been removed from channel.software.create
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index 61eea36..9a14f00 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -228,10 +228,7 @@ Create everything as well as unlimited activation key for every
channel:
channel_arch[base_info['arch']], '',
base_info['checksum'],
{ 'url': base_info['gpgkey_url'],
'id' : base_info['gpgkey_id'],
- 'fingerprint':
base_info['gpgkey_fingerprint']},
- { 'url': base_info['yumrepo_url'],
- 'label': 'X',
- 'sync': False})
+ 'fingerprint':
base_info['gpgkey_fingerprint']})
except xmlrpclib.Fault, e:
if e.faultCode != 1200: # ignore if channel exists
sys.stderr.write("ERROR: %s: %s\n" % (
@@ -287,10 +284,7 @@ Create everything as well as unlimited activation key for every
channel:
child_info['checksum'],
{ 'url': child_info['gpgkey_url'],
'id' : child_info['gpgkey_id'],
- 'fingerprint':
child_info['gpgkey_fingerprint']},
- { 'url': child_info['yumrepo_url'],
- 'label': 'X',
- 'sync': False})
+ 'fingerprint':
child_info['gpgkey_fingerprint']})
except xmlrpclib.Fault, e:
if e.faultCode != 1200: # ignore if channel exists
sys.stderr.write("ERROR: %s: %s\n" % (