[svn] r3164 - trunk/tools/yam

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu Apr 28 17:48:20 CEST 2005


Author: dag
Date: 2005-04-28 17:48:19 +0200 (Thu, 28 Apr 2005)
New Revision: 3164

Modified:
   trunk/tools/yam/ChangeLog
   trunk/tools/yam/TODO
   trunk/tools/yam/yam
   trunk/tools/yam/yam-complex.conf
   trunk/tools/yam/yam-example.conf
   trunk/tools/yam/yam.conf
   trunk/tools/yam/yam.httpd
   trunk/tools/yam/yam.spec
Log:
Updates, prepare for release 0.8.0

Modified: trunk/tools/yam/ChangeLog
===================================================================
--- trunk/tools/yam/ChangeLog	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/ChangeLog	2005-04-28 15:48:19 UTC (rev 3164)
@@ -1,7 +1,12 @@
-* 0.7.4
--
+* 0.8.0 - Meerenhof - released ../../2005
+- Allow to specify metadata per distribution (Jason Kim)
+- Get rid of apt, createrepo and yum options in [main], replaced by metadata option
+- Fixed description for EL4 and FC3 in httpd config file (Ian Forde)
+- Removed [repos] support
+- Changed regexp to .+[\._]i386.rpm$, allowing rpm apt cache (Franky Van Liedekerke)
+- Added repoindex option to create a repository index
 
-* 0.7.3
+* 0.7.3 - released 25/03/2005
 - Added ia64 support (Gareth Armstrong)
 - Use chkconfig to enable Yam in SPEC file (Bert de Bruijn)
 - Fixed a typo in the CentOS sample in yam-complex.conf (Doug Dionne)
@@ -12,7 +17,7 @@
 - Added selinux configuration for Yam (David Hampton)
 - Fixed a bug that caused not all ISOs to be handled (Gavin Carr)
 
-* 0.7.2
+* 0.7.2 - released 31/12/2004
 - Enabled createrepo support by default
 - Added support for hardlink++
 - Added example config for Yellow Dog 4 (Jarod Wilson)
@@ -24,14 +29,14 @@
 - Documentation fixes (Dries Verachtert)
 - VirtualHost now only uses hostname 'yam', please define on your network or disable it
 
-* 0.7.1
+* 0.7.1 - released 07/11/2004
 - Number the ISOs in the order they are listed (globs are sorted)
 - Look for ISOs in resp. $srcdir/$nick, $srcdir/$dist, $srcdir/iso and $srcdir
 - Added -r or --remount option to simplify resetting mounts
 - Small bugfixes for lftp and rsync options (Greg Cope)
 - Added --partial to the default rsync options (Andreas Mueller)
 
-* 0.7
+* 0.7 - released 10/10/2004
 - Added shareiso config option (enabled by default)
 - Allow empty (URL-less) repositories (useful for placeholder repositories)
 - Added support for hardlinking duplicate RPMs (disabled by default)
@@ -43,7 +48,7 @@
 - Improved handling of ISOs that are mounted multiple times
 - Get rid of os.tempname()
 
-* 0.6.1
+* 0.6.1 - released 27/08/2004
 - Removed a silly debug message :)
 - Fixed an unknown variable in Dist.taglink()
 - Fixed a bug in handling tags
@@ -51,7 +56,7 @@
 - Fixed a bug in handling [repos]
 - Now each repo can hold a list of URLs (useful to list a local and a remote repo, or merge 2 repos)
 
-* 0.6
+* 0.6 - released 25/08/2004
 - Fixed the default example httpd config file
 - Added a check to see if any metadata tools are installed
 - Smartly sort the available ISOs, still keep the preferred order
@@ -63,7 +68,7 @@
 - Intercept user input and exit when asked
 - Fix for mounting SuSE ISO images to CD? directories
 
-* 0.5
+* 0.5 - released 19/08/2004
 - Skipped a 0.4 release to indicate this is an important update.
 - Rewrote most of the code to allow for smoother dist/arch configuration
 - Fixed rsync exclude problem (Bert de Bruijn)
@@ -73,7 +78,7 @@
 - Better handling of external commands
 - Verbosity output improved (-v or -vv)
 
-* 0.4
+* 0.4 - released 16/08/2004
 - Added noarch by default to all dists
 - Added i?86 to all x86_64 dists
 - Make i?86 the default (when omitted)
@@ -91,7 +96,7 @@
 - Split extras directory into separate local directory (see README.dirs)
 - Added 0 as special repotag (see README.naming)
 
-* 0.3
+* 0.3 - released 21/05/2004
 - Remove dangling symlinks (crashes yum/apt)
 - Improved symlinking code
 - Add -g/--generate and --unmount options for more fine-grained commands
@@ -101,5 +106,5 @@
 - Added information to integrate with dnsmasq (on-going), see README.dnsmasq
 - Added SYSV script to automatically mount on boot and unmount on shutdown
 
-* 0.2
+* 0.2 - released 14/05/2004
 - Initial public release

Modified: trunk/tools/yam/TODO
===================================================================
--- trunk/tools/yam/TODO	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/TODO	2005-04-28 15:48:19 UTC (rev 3164)
@@ -3,17 +3,20 @@
 + Add support for SRPM files (just put them into one directory /SRPMS)
 + Allow to symlink the whole ISO disc in order to replace package-lists
 + Allow to mirror rawhide when eg. rawhide=yes
++ Check files that do not match the regexp and compare filename to rpm headers
++ Make rsync/lftp download requests from the same server into 1 request (hardlinks)
 
 ### Repository metadata
 + Think of a way to speed up generating repositories (new basegendir should improve)
 + Add URPMI and Red Carpet support (help needed)
 + Add YaST/YOU support (both for mirroring as providing metadata, seems impossible ?)
 + Create anaconda-style metadata for booting an updated installation
++ Create group information (createrepo -g comps.xml RPMS.os)   
 
 ### Configuration
 + Allow to specify rsync/lftp options on a per distribution basis
 + Get rid of iso= and allow each repo to include ISOs (eg. file:///mnt/iso/*.iso)
-  This would be very useful to have a separate gfs, lacd, rhaps, rhds2 repo
+  This would be very useful to have a separate gfs, lacd, rhaps, rhds2 CD repo
 + Add more working distributions to yam-complex.conf
 + Allow multiple dist sections (if arch is different)
 
@@ -23,14 +26,15 @@
 + Add cron-script for automatic updating
 + Generate sample yum.conf and apt .list files for people to use
 + Generate yam-chain.conf for more easily chaining Yam servers
-+ Would like to display only file-transfers, sadly rsync does not allow that
++ Would like to display only file-transfers, sadly rsync/lftp do not allow that
 + Make 'name=' not mandatory (if missing, make it pretty using nick, release and arch)
++ Add selinux support
 
 ### Web front-end
 + Improve SHTML output (more condensed and useful information)
 + New website should contain nice logo, menu and help
 + New website should contain also remote boot info, repo information and new RPMs
-+ Maybe allow to add external html generators (repoview, repojanitor)
++ Allow to add external html generators (repoview, repojanitor)
 
 ### Documentation
 + Add integration/documentation with ISC dhcpd
@@ -44,13 +48,11 @@
 + File-operations may need to go to a separate class, use shutil ? (needs python 2.3)
 + Arguments are ignored, do something with them
 
-### Misc
-+ Correct file permissions of packages in /var/www/yam
-
 ### Bugs
 + basegendir stumbles on broken symlinks (Apt already fixed upstream, thx to Panu)
 + yum-arch stumbles on broken symlinks (https://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=280)
 + rsync synchronizes userids, most people don't want that
++ Correct file permissions/ownerships of packages in /var/yam
 
 ### Yamenu tool / remote installation
 + Create small curses tool to manage systems / MAC-addresses / profiles (kickstart)

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/yam	2005-04-28 15:48:19 UTC (rev 3164)
@@ -17,7 +17,7 @@
 import os, sys, glob, re, shutil, getopt, popen2
 import ConfigParser, urlparse
 
-VERSION = '0.7.4'
+VERSION = '0.8.0'
 
 archs = {
 	'i386': ['i386', 'i486', 'i586', 'i686', 'athlon'],
@@ -42,7 +42,7 @@
 		self.verbose = 1
 
 		try:
-			opts, args = getopt.getopt (args, 'c:d:ghqruvx',
+			opts, args = getopt.getopt (args, 'c:d:ghquvx',
 				['config=', 'dist=', 'generate=', 'help', 'quiet', 'remount',
 				'umount', 'unmount', 'update', 'verbose', 'version', 'extras'])
 		except getopt.error, exc:
@@ -62,7 +62,9 @@
 				sys.exit(0)
 			elif opt in ['-q', '--quiet']:
 				self.quiet = True
-			elif opt in ['-r', '--remount']:
+#			elif opt in ['-r', '--repo']:
+#				self.repo = arg.split(',')
+			elif opt in ['--remount']:
 				self.remount = True
 			elif opt in ['-u', '--update']:
 				self.update = True
@@ -138,16 +140,12 @@
 		self.wwwdir = self.getoption('main', 'wwwdir', '/var/www/yam')
 
 		self.arch = self.getoption('main', 'arch', 'i386')
+		self.metadata = self.getoption('main', 'metadata', ('apt', 'yum', 'createrepo'))
 
 		self.quiet = not self.getoption('main', 'quiet', 'no') in disable
 		if op.verbose == 1 and self.quiet:
 			op.verbose = 0
 
-		self.repo = {}
-		self.repo['apt'] = not self.getoption('main', 'apt', 'yes') in disable
-		self.repo['createrepo'] = not self.getoption('main', 'createrepo', 'yes') in disable
-		self.repo['yum'] = not self.getoption('main', 'yum', 'yes') in disable
-
 		self.hardlink = not self.getoption('main', 'hardlink', 'no') in disable
 
 		self.cmd = {}
@@ -157,6 +155,7 @@
 		self.cmd['hardlink++'] = self.getoption('main', 'hardlinkpluscmd', '/usr/bin/hardlink++')
 		self.cmd['lftp'] = self.getoption('main', 'lftpcmd', '/usr/bin/lftp')
 		self.cmd['mount'] = self.getoption('main', 'mountcmd', '/bin/mount')
+		self.cmd['repoindex'] = self.getoption('main', 'repoindexcmd', '')
 		self.cmd['rsync'] = self.getoption('main', 'rsynccmd', '/usr/bin/rsync')
 		self.cmd['umount'] = self.getoption('main', 'umountcmd', '/bin/umount')
 		self.cmd['yumarch'] = self.getoption('main', 'yumarchcmd', '/usr/bin/yum-arch')
@@ -177,7 +176,6 @@
 
 		self.shareiso = not self.getoption('main', 'shareiso', 'yes') in disable
 
-		self.repos = self.getrepos()
 		self.dists = []
 
 		for section in self.cfg.sections():
@@ -185,14 +183,17 @@
 				continue
 			else:
 				archs = self.getoption(section, 'arch', self.arch).split()
+				metadata = self.getoption(section, 'metadata', self.metadata).split()
 				for arch in archs:
 					self.dists.append(Dist(self.srcdir, self.wwwdir, section, arch))
 					self.dists[-1].arch = arch;
 					for option in self.cfg.options(section):
-						if option in ['iso', 'name', 'release', 'repo', 'tag']:
+						if option in ('iso', 'name', 'release', 'repo', 'tag'):
 							setattr(self.dists[-1], option, self.cfg.get(section, option))
-						elif option in ['arch', 'dist', 'nick']:
-							continue
+						elif option in ('arch', 'dist', 'nick'):
+							pass
+						elif option in ('metadata',):
+							setattr(self.dists[-1], option, self.cfg.get(section, option).split())
 						else:
 							self.dists[-1].repos[option] = self.cfg.get(section, option)
 					self.dists[-1].rewrite()
@@ -209,14 +210,6 @@
 			info(4, 'Setting option %s in section [%s] to: %s (default)' % (option, section, var))
 		return var
 
-	def getrepos(self):
-		"Return all main repositories"
-		repos={}
-		if self.cfg.has_section('repos'):
-			for repo in self.cfg.options('repos'):
-				repos[repo]=self.getoption('repos', repo, None)
-		return repos
-
 class Dist:
 	def __init__(self, srcdir, wwwdir, dist, arch):
 		global cf
@@ -370,6 +363,15 @@
 				info(1, '%s: Create new-style Yum repository for %s' % (self.nick, repo))
 				run('%s %s %s' % (cf.cmd['createrepo'], opts, repodir))
 
+	def repoindex(self):
+		"Create a repository index"
+		if not cf.cmd['repoindex']: return
+		for repo in self.repos.keys() + ['local']:
+			repodir = os.path.join(self.dir, 'RPMS.' + repo)
+			if os.path.exists(repodir):
+				info(1, '%s: Create repository index for %s' % (self.nick, repo))
+				run('%s %s' % (cf.cmd['repoindex'], repodir))
+
 	def html(self):
 		"Put html information in repository"
 		mkdir(self.dir)
@@ -511,7 +513,7 @@
 		return
 	mkdir(path)
 
-	opts = '-aHL --partial' + cf.rsyncoptions
+	opts = '-aHL --partial ' + cf.rsyncoptions
 	if op.verbose <= 1: opts = opts + ' -q'
 	elif op.verbose == 3: opts = opts + ' -v'
 	elif op.verbose >= 4: opts = opts + ' -v --progress'
@@ -584,7 +586,7 @@
 	if archs.has_key(dist.arch): as=archs[dist.arch] + [ 'noarch', ]
 	else: as=[dist.arch, 'noarch']
 	for arch in as:
-		regexp = re.compile('.+\.' + arch + '\.rpm$')
+		regexp = re.compile('.+[\._]' + arch + '\.rpm$')
 		for file in filelist:
 			srcdir = os.path.join(dirpath, file)
 			if os.path.islink(srcdir):
@@ -598,7 +600,7 @@
 		if archs.has_key(dist.arch): as=archs[dist.arch] + [ 'noarch', ]
 		else: as=[dist.arch, 'noarch']
 		for arch in as:
-			regexp = re.compile('.+\.' + tag + '(\.[a-zA-Z]+)?\.' + arch + '\.rpm$')
+			regexp = re.compile('.+\.' + tag + '(\.[a-zA-Z]+)?[\._]' + arch + '\.rpm$')
 			for file in filelist:
 				if regexp.match(file, 1):
 					srcdir = os.path.join(dirpath, file)
@@ -621,16 +623,15 @@
 def main():
 	### Check availability of commands
 	for cmd in cf.cmd.keys():
-		if not os.path.isfile(cf.cmd[cmd]):
-			cf.cmd[cmd] = which(cmd)
-		if cf.cmd[cmd] and not os.path.isfile(cf.cmd[cmd]):
-			if cmd in ['createrepo', 'genbasedir', 'yum-arch']:
-				error(4, '%s command not found as %s, disabling %s' % (cmd, cf.cmd[cmd], cmd))
-				cf.repo[cmd] = False
-			else:
-				error(4, '%s command not found as %s, support disabled' % (cmd, cf.cmd[cmd]))
-				cf.cmd[cmd] = ''
-	if not cf.repo['createrepo'] and not cf.repo['yum'] and not cf.repo['apt']:
+		list = cf.cmd[cmd].split()
+		if not os.path.isfile(list[0]):
+			list[0] = which(list[0])
+		if list[0] and not os.path.isfile(list[0]):
+			error(4, '%s command not found as %s, support disabled' % (cmd, list[0]))
+			cf.cmd[cmd] = ''
+		else:
+			cf.cmd[cmd] = ' '.join(list)
+	if not cf.cmd['createrepo'] and not cf.cmd['yum'] and not cf.cmd['apt']:
 		error(1, 'No tools found to generate repository metadata. Please install apt, yum or createrepo.')
 		
 	### Iterate over the available distributions
@@ -664,11 +665,6 @@
 				if op.extra:
 					mirror(dist.repos[repo], srcdir)
 
-	### Handle [repos]
-	for repo in cf.repos:
-		srcdir = os.path.join(cf.srcdir, 'all', repo)
-		mirror(cf.repos[repo], srcdir)
-
 	if not op.generate:
 		sys.exit(0)
 
@@ -697,8 +693,6 @@
 			dist.clean('os')
 		for repo in dist.repos.keys():
 			dist.clean(repo)
-		for repo in cf.repos:
-			dist.clean(repo)
 		dist.clean('local')
 
 		for repo in dist.repos.keys():
@@ -727,19 +721,13 @@
 		if os.path.exists(srcdir):
 			dist.link(srcdir, 'local')
 
-		### Link global repos
-		for repo in cf.repos:
-			srcdir = os.path.join(cf.srcdir, 'all', repo)
-			if os.path.exists(srcdir):
-				dist.taglink(srcdir, repo)
+		for md in dist.metadata:
+			if md == 'apt': dist.apt()
+			elif md == 'yum': dist.yum()
+			elif md == 'createrepo': dist.createrepo()
+			else: info(1, 'The %s metadata is unknown.' % md)
 
-		### Create apt/yum repository
-		if cf.repo['apt']:
-			dist.apt()
-		if cf.repo['yum']:
-			dist.yum()
-		if cf.repo['createrepo']:
-			dist.createrepo()
+		dist.repoindex()
 
 		### Create pxe boot
 		if cf.tftpdir and os.path.isdir(cf.tftpdir):

Modified: trunk/tools/yam/yam-complex.conf
===================================================================
--- trunk/tools/yam/yam-complex.conf	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/yam-complex.conf	2005-04-28 15:48:19 UTC (rev 3164)
@@ -16,6 +16,7 @@
 [fc3]
 name = Fedora Core $release ($arch)
 release = 3
+metadata = apt createrepo
 iso = FC$release-$arch-disc?.iso
 core = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/fedora/linux/$release/$arch/RPMS.$repo/
 updates = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/fedora/linux/$release/$arch/RPMS.$repo/
@@ -27,6 +28,7 @@
 #[rhes3]
 #name = Red Hat Enterprise Server $release U3 ($arch)
 #release = 3
+#metadata = apt yum
 #iso = rhel-$release-U4-$arch-es-disc?.iso
 #updates = file:///var/spool/up2date/
 #dag = rsync://apt.sw.be/pub/freshrpms/pub/dag/redhat/el$release/en/$arch/RPMS.$repo/
@@ -34,6 +36,7 @@
 #[centos3]
 #name = CentOS $release ($arch)
 #release = 3
+#metadata = apt yum
 #arch = i386 ia64 s390 s390x x86_64
 #iso = CentOS-$version-$arch-disc?.iso
 #os = rsync://ftp.heanet.ie/pub/cAos/centos/$release/$repo/$arch/RedHat/RPMS/
@@ -47,6 +50,7 @@
 #name = Tao Linux $release ($arch)
 #release = 1.0
 #arch = i386
+#metadata = apt yum
 #iso = mooch-$arch-disc?.iso
 #os = http://dist.taolinux.org/tao-$release-$arch/RPMS.$repo/
 #updates = http://dist.taolinux.org/tao-$release-$arch/RPMS.$repo/
@@ -58,6 +62,7 @@
 #[rh73]
 #name = Red Hat $release ($arch)
 #release = 7.3
+#metadata = apt yum
 #iso = valhalla-$arch-disc?.iso
 #os = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/redhat/$release/$arch/$repo/RPMS/
 #updates = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/redhat/$release/$arch/$repo/RPMS/
@@ -66,6 +71,7 @@
 #[rhas21]
 #name = Red hat Advanced Server $release U5 ($arch)
 #release = 2.1
+#metadata = apt
 #iso = RHEL2.1AS-U5-re0810.RC.0-$arch-disc?.iso
 #updates = file:///var/spool/up2date/
 #dag = rsync://apt.sw.be/pub/freshrpms/pub/dag/redhat/el$release/en/$arch/RPMS.$repo/
@@ -74,6 +80,7 @@
 #name=Yellow Dog Linux $release ($arch)
 #arch=ppc
 #release=4.0
+#metadata = apt createrepo
 #iso=yellowdog-$release-orion-20041107-install?.iso
 #updates=http://ftp.sunsite.utk.edu/ftp/pub/linux/yellowdog/$repo/yellowdog-$release/$arch/
 #extras=http://ftp.sunsite.utk.edu/ftp/pub/linux/yellowdog/$repo/yellowdog-$release/$arch/

Modified: trunk/tools/yam/yam-example.conf
===================================================================
--- trunk/tools/yam/yam-example.conf	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/yam-example.conf	2005-04-28 15:48:19 UTC (rev 3164)
@@ -35,9 +35,7 @@
 yumarchcmd = /usr/bin/yum-arch
 
 ## What repository metadata do you want to generate ?
-apt = yes
-createrepo = yes
-yum = yes
+metadata = apt createrepo yum
 
 ## Hardlink files in the srcdir before ending Yam
 hardlink = no
@@ -45,6 +43,9 @@
 ## Do you want to share the ISO files in wwwdir ?
 shareiso = yes
 
+## Do you want to create repo indexes ?
+repoindexcmd =
+
 ## Limit the bandwidth used by lftp (in B/secs)
 lftp-bandwidth-limit = 
 
@@ -77,33 +78,30 @@
 ## Set the I/O timeout in seconds
 rsync-timeout = 
 
-### The [repos] section allows for defining global repositories
-### ie. repositories that have packages for multiple distributions
-### BEWARE: packages need to be tagged to work with this and you
-### can add extra tags using tag= per distribution
-[repos]
-dag = rsync://apt.sw.be/pub/freshrpms/pub/dag/packages/
-dries = http://dries.studentenweb.org/apt/packages/
-freshrpms = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/redhat/
-newrpms = rsync://newrpms.sunsite.dk/projects/newrpms/www/htdocs/apt/redhat/en/$arch/
 
 ### Example1: Using ISO files (put ISOs in /var/yam/dist1-i386), i386 is default arch
 [dist1]
+name = Distribution example $release ($arch)
 release = 1
+metadata = apt
 iso = dist$release-$arch-disc?.iso
 updates = rsync://rsync.dist1.org/pub/dist/$release/$arch/$repo/
 
 ### Example2: Using multiple archs for a single definition
 [dist2]
+name = Distribution example $release ($arch)
 release = 2
 arch = i386 i586 i686 x86_64
+metadata = createrepo
 os = rsync://rsync.dist2.org/pub/dist/$release/$arch/$repo/
 updates = rsync://rsync.dist2.org/pub/dist/$release/$arch/$repo/
 
 ### Example3: Using extra repositories and updates from Example1
 [dist3]
+name = Distribution example $release ($arch)
 release = 3
 arch = x86_64
+metadata = apt createrepo
 iso = dist$release-$arch-disc?.iso
 os = rsync://rsync.dist3.org/pub/dist/$release/$arch/$repo/
 updates = yam://dist1-$arch/$repo/
@@ -111,7 +109,9 @@
 
 ### Example4: Merging repositories
 [dist4]
+name = Distribution example $release ($arch)
 release = 4
+metadata = apt createrepo yum
 contrib = rsync://rsync.dist4.org/dist/$release/$arch/$repo/
 extras = rsync://rsync.dist4.org/dist/$release/$arch/$repo/
 merge = yam://$nick/contrib/

Modified: trunk/tools/yam/yam.conf
===================================================================
--- trunk/tools/yam/yam.conf	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/yam.conf	2005-04-28 15:48:19 UTC (rev 3164)
@@ -12,6 +12,7 @@
 [fc3]
 name = Fedora Core $release ($arch)
 release = 3
+metadata = apt createrepo
 iso = FC$release-$arch-disc?.iso
 core = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/fedora/linux/$release/$arch/RPMS.$repo/
 updates = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/fedora/linux/$release/$arch/RPMS.$repo/
@@ -20,6 +21,7 @@
 [rhes4]
 name = Red Hat Enterprise Server $release ($arch)
 release = 3
+metadata = apt createrepo
 arch = i386 x86_64
 iso = RHEL$release-$arch-ES-disc?.iso
 updates = file:///var/spool/up2date/
@@ -28,6 +30,7 @@
 [rhes3]
 name = Red Hat Enterprise Server $release U4 ($arch)
 release = 3
+metadata = apt yum
 iso = rhel-$release-U4-$arch-es-disc?.iso
 updates = file:///var/spool/up2date/
 dag = rsync://apt.sw.be/pub/freshrpms/pub/dag/redhat/el$release/en/$arch/RPMS.$repo/

Modified: trunk/tools/yam/yam.httpd
===================================================================
--- trunk/tools/yam/yam.httpd	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/yam.httpd	2005-04-28 15:48:19 UTC (rev 3164)
@@ -43,8 +43,8 @@
 	AddDescription "Fedora Core 1 for x86_64" fc1-x86_64
 	AddDescription "Fedora Core 2 for x86" fc2-i386
 	AddDescription "Fedora Core 2 for x86_64" fc2-x86_64
-	AddDescription "Fedora Core 3 for x86" fc2-i386
-	AddDescription "Fedora Core 3 for x86_64" fc2-x86_64
+	AddDescription "Fedora Core 3 for x86" fc3-i386
+	AddDescription "Fedora Core 3 for x86_64" fc3-x86_64
 	AddDescription "Red Hat Linux 6.2 for x86" rh62-i386
 	AddDescription "Red Hat Linux 7.3 for x86" rh73-i386
 	AddDescription "Red Hat Linux 8.0 for x86" rh80-i386
@@ -54,18 +54,18 @@
 	AddDescription "Red Hat Advanced Server 3 for x86_64" rhas3-x86_64
 	AddDescription "Red Hat Advanced Server 3 for PPC" rhas3-ppc
 	AddDescription "Red Hat Advanced Server 3 for s/390" rhas3-s390
-	AddDescription "Red Hat Advanced Server 4 for x86" rhas3-i386
-	AddDescription "Red Hat Advanced Server 4 for x86_64" rhas3-x86_64
-	AddDescription "Red Hat Advanced Server 4 for PPC" rhas3-ppc
-	AddDescription "Red Hat Advanced Server 4 for s/390" rhas3-s390
+	AddDescription "Red Hat Advanced Server 4 for x86" rhas4-i386
+	AddDescription "Red Hat Advanced Server 4 for x86_64" rhas4-x86_64
+	AddDescription "Red Hat Advanced Server 4 for PPC" rhas4-ppc
+	AddDescription "Red Hat Advanced Server 4 for s/390" rhas4-s390
 	AddDescription "Red Hat Enterprise Server 3 for x86" rhes3-i386
 	AddDescription "Red Hat Enterprise Server 3 for x86_64" rhes3-x86_64
-	AddDescription "Red Hat Enterprise Server 4 for x86" rhes3-i386
-	AddDescription "Red Hat Enterprise Server 4 for x86_64" rhes3-x86_64
+	AddDescription "Red Hat Enterprise Server 4 for x86" rhes4-i386
+	AddDescription "Red Hat Enterprise Server 4 for x86_64" rhes4-x86_64
 	AddDescription "Red Hat Workstation 3 for x86" rhws3-i386
 	AddDescription "Red Hat Workstation 3 for x86" rhws3-i386
-	AddDescription "Red Hat Workstation 4 for x86_64" rhws3-x86_64
-	AddDescription "Red Hat Workstation 4 for x86_64" rhws3-x86_64
+	AddDescription "Red Hat Workstation 4 for x86_64" rhws4-x86_64
+	AddDescription "Red Hat Workstation 4 for x86_64" rhws4-x86_64
 	AddDescription "SuSE Enterprise Server 8 for i386" sles8-i386
 	AddDescription "SuSE Enterprise Server 9 for i386" sles9-i386
 	AddDescription "Tao Linux 1 for i386" tao1-i386

Modified: trunk/tools/yam/yam.spec
===================================================================
--- trunk/tools/yam/yam.spec	2005-04-28 14:21:25 UTC (rev 3163)
+++ trunk/tools/yam/yam.spec	2005-04-28 15:48:19 UTC (rev 3164)
@@ -4,7 +4,7 @@
 
 Summary: Tool to set up a Yum/Apt mirror from various sources (ISO, rsync, http, ftp, ...)
 Name: yam
-Version: 0.7.4
+Version: 0.8.0
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -67,6 +67,9 @@
 %{_localstatedir}/www/yam/
 
 %changelog
+* Tue Apr 26 2005 Dag Wieers <dag at wieers.com> - 0.8.0-1
+- Updated to release 0.8.0.
+
 * Fri Mar 25 2005 Dag Wieers <dag at wieers.com> - 0.7.3-1
 - Updated to release 0.7.3.
 




More information about the commits mailing list