- Apply sparc patches (spot)

This commit is contained in:
Jesse Keating 2007-05-15 13:06:34 -04:00 committed by Jesse Keating
parent df3900d944
commit 59ce91800b
4 changed files with 13 additions and 0 deletions

View File

@ -7,3 +7,4 @@ Contributors:
Will Woods <wwoods at redhat dot com>
Essien Ita Essien <essien at wazobialinux dot com>
James Bowes <jbowes at redhat dot com>
Tom Callaway <tcallawa at redhat dot com>

View File

@ -1,5 +1,6 @@
* Tue May 15 2007 Jesse Keating <jkeating@redhat.com>
- Don't quote ISO label, not running mkisofs in shell
- Apply sparc patches (spot)
* Fri Apr 06 2007 Jesse Keating <jkeating@redhat.com>
- Fix comments in config file

View File

@ -40,6 +40,9 @@ class Gather(yum.YumBase):
elif config.get('default', 'arch') == 'ppc':
arches = yum.rpmUtils.arch.getArchList('ppc64')
self.compatarch = 'ppc64'
elif config.get('default', 'arch') == 'sparc':
arches = yum.rpmUtils.arch.getArchList('sparc64v')
self.compatarch = 'sparc64v'
else:
arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch'))
self.compatarch = config.get('default', 'arch')

View File

@ -338,6 +338,8 @@ class Pungi:
ppcbootargs.append('-hfs-bless') # must be last
sparcbootargs = ['-G', '/boot/isofs.b', '-B', '...', '-s', '/boot/silo.conf', '-sparc-label', '"sparc"']
if self.config.getint('default', 'discs') > 1:
for disc in range(1, self.config.getint('default', 'discs') + 1): # cycle through the CD isos
isoname = '%s-%s-%s-disc%s.iso' % (self.config.get('default', 'iso_basename'), self.config.get('default', 'version'),
@ -354,6 +356,8 @@ class Pungi:
elif self.config.get('default', 'arch') == 'ppc':
extraargs.extend(ppcbootargs)
extraargs.append(os.path.join('%s-disc%s' % (self.topdir, disc), "ppc/mac"))
elif self.config.get('default', 'arch') == 'sparc':
extraargs.extend(sparcbootargs)
extraargs.append('-V')
extraargs.append('%s %s %s Disc %s' % (self.config.get('default', 'product_name'),
@ -415,6 +419,8 @@ class Pungi:
extraargs.append(os.path.join(self.topdir, "ppc/mac")) # this may work for both cases.. test
else:
extraargs.append(os.path.join('%s-disc%s' % (self.topdir, disc), "ppc/mac"))
elif self.config.get('default', 'arch') == 'sparc':
extraargs.extend(sparcbootargs)
extraargs.append('-V')
extraargs.append('%s %s %s DVD' % (self.config.get('default', 'product_name'),
@ -481,6 +487,8 @@ class Pungi:
elif self.config.get('default', 'arch') == 'ppc':
extraargs.extend(ppcbootargs)
extraargs.append(os.path.join(self.workdir, "%s-rescueimage" % self.config.get('default', 'arch'), "ppc/mac"))
elif self.config.get('default', 'arch') == 'sparc':
extraargs.extend(sparcbootargs)
extraargs.append('-V')
extraargs.append('%s %s %s Rescue' % (self.config.get('default', 'product_name'),