[svn] r5234 - in trunk/tools/mrepo: . config/dists

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-03-20 11:02:21 +0100 (Tue, 20 Mar 2007)
New Revision: 5234

Added:
   trunk/tools/mrepo/config/dists/rhel5c.conf
   trunk/tools/mrepo/config/dists/rhel5s.conf
Modified:
   trunk/tools/mrepo/ChangeLog
   trunk/tools/mrepo/gensystemid
Log:
Added RHEL5 support, thanks to Oliver Falk

Modified: trunk/tools/mrepo/ChangeLog
===================================================================
--- trunk/tools/mrepo/ChangeLog	2007-03-19 21:57:07 UTC (rev 5233)
+++ trunk/tools/mrepo/ChangeLog	2007-03-20 10:02:21 UTC (rev 5234)
@@ -5,6 +5,8 @@
 - Cleaned up mrepo-example.conf (Gareth Armstrong)
 - gensystemid now uses proxy environment variables
 - rhnget can now --list and --filter packages (useful for searching/downloading)
+- Added 5Server and 5Client products to gensystemid (Oliver Falk)
+- Added rhel5s.conf and rhel5c.conf (Oliver Falk)
 
 * 0.8.4 - Sint-Jacobsplein - released 13/12/2006
 - Renamed Yam to mrepo (Matthew Hannigan)

Added: trunk/tools/mrepo/config/dists/rhel5c.conf
===================================================================
--- trunk/tools/mrepo/config/dists/rhel5c.conf	                        (rev 0)
+++ trunk/tools/mrepo/config/dists/rhel5c.conf	2007-03-20 10:02:21 UTC (rev 5234)
@@ -0,0 +1,33 @@
+### Name: Red Hat Enterprise Client v5
+### URL: http://www.redhat.com/
+
+[rhel5c]
+name = Red Hat Enterprise Client $release ($arch)
+release = 5
+#arch = i386 x86_64 ia64
+arch = i386
+metadata = repomd repoview
+
+### ISO images
+iso = rhel-$release-client-$arch-disc?.iso rhel-$release-client-srpms-disc?.iso
+
+### Additional repositories
+updates = rhns:///rhel-$arch-client-5
+vt = rhns:///rhel-$arch-client-$repo-5
+supplementary = rhns:///rhel-$arch-client-$repo-5
+fastrack = rhns:///rhel-$arch-client-$repo-5
+hts = rhns:///rhel-$arch-client-$repo-5
+rhn-tools = rhns://$repo-rhel-$arch-client-5
+
+### RPMforge repository
+rpmforge = rsync://apt.sw.be/pub/freshrpms/pub/dag/redhat/el$release/en/$arch/RPMS.dag/
+#rpmforge = ftp://apt.sw.be/pub/dag/pub/redhat/el$release/en/$arch/RPMS.dag/
+#rpmforge = http://apt.sw.be/redhat/el$release/en/$arch/RPMS.dag/
+
+### OpenVZ repositories
+#ovzkernel = http://download.openvz.org/kernel/rhel5/
+#ovztemplate = http://download.openvz.org/template/
+#ovzutils = http://download.openvz.org/utils/
+
+### Custom repository for your own RPM packages
+custom =

Added: trunk/tools/mrepo/config/dists/rhel5s.conf
===================================================================
--- trunk/tools/mrepo/config/dists/rhel5s.conf	                        (rev 0)
+++ trunk/tools/mrepo/config/dists/rhel5s.conf	2007-03-20 10:02:21 UTC (rev 5234)
@@ -0,0 +1,33 @@
+### Name: Red Hat Enterprise Server v5
+### URL: http://www.redhat.com/
+
+[rhel5s]
+name = Red Hat Enterprise Server $release ($arch)
+release = 5
+#arch = i386 x86_64 ia64 ppc s390 s390x
+arch = i386
+metadata = repomd repoview
+
+### ISO images
+iso = rhel-$release-server-$arch-disc?.iso rhel-$release-server-srpms-disc?.iso
+
+### Additional repositories
+updates = rhns:///rhel-$arch-server-5
+vt = rhns:///rhel-$arch-server-$repo-5
+supplementary = rhns:///rhel-$arch-server-$repo-5
+fastrack = rhns:///rhel-$arch-server-$repo-5
+hts = rhns:///rhel-$arch-server-$repo-5
+rhn-tools = rhns://$repo-rhel-$arch-server-5
+
+### RPMforge repository
+rpmforge = rsync://apt.sw.be/pub/freshrpms/pub/dag/redhat/el$release/en/$arch/RPMS.dag/
+#rpmforge = ftp://apt.sw.be/pub/dag/pub/redhat/el$release/en/$arch/RPMS.dag/
+#rpmforge = http://apt.sw.be/redhat/el$release/en/$arch/RPMS.dag/
+
+### OpenVZ repositories
+#ovzkernel = http://download.openvz.org/kernel/rhel5/
+#ovztemplate = http://download.openvz.org/template/
+#ovzutils = http://download.openvz.org/utils/
+
+### Custom repository for your own RPM packages
+custom =

Modified: trunk/tools/mrepo/gensystemid
===================================================================
--- trunk/tools/mrepo/gensystemid	2007-03-19 21:57:07 UTC (rev 5233)
+++ trunk/tools/mrepo/gensystemid	2007-03-20 10:02:21 UTC (rev 5234)
@@ -12,6 +12,8 @@
 
 def checkrelease(release, arch):
 	releases = {
+		'5Server': ('i386', 'ia64', 'ppc', 's390', 's390x', 'x86_64'),
+		'5Client': ('i386', 'ia64', 'x86_64'),
 		'4AS': ('i386', 'ia64', 'ppc', 's390', 's390x', 'x86_64'),
 		'4ES': ('i386', 'ia64', 'x86_64'),
 		'4WS': ('i386', 'ia64', 'x86_64'),
@@ -134,7 +136,7 @@
   -a, --arch=arch              specify architecture (i386, x86_64, ppc, ia64)
   -q, --quiet                  minimal output
   -p, --password=password      specify rhn password (asked when not given)
-  -r, --release=rhnrelease     specify rhn release {2.1,3,4}{AS,ES,WS,Desktop}
+  -r, --release=rhnrelease     specify rhn release {2.1,3,4}{AS,ES,WS,Desktop} 5{Server,Client}
   -u, --username=username      specify rhn username (asked when not given)
   -v, --verbose                increase verbosity
   -vv, -vvv, -vvvv..           increase verbosity more