ppc fixes for bz#849731 also set the arch to ppc64p7 so that power7 optimised rpms get included on the install disk

This commit is contained in:
Dennis Gilmore 2012-08-31 00:39:48 -05:00
parent 2d37fb2fa9
commit 4b7685daaa

View File

@ -233,7 +233,7 @@ class Pungi(pypungi.PungiBase):
if arch == 'i386': if arch == 'i386':
yumarch = 'athlon' yumarch = 'athlon'
elif arch == 'ppc': elif arch == 'ppc':
yumarch = 'ppc64' yumarch = 'ppc64p7'
elif arch == 'sparc': elif arch == 'sparc':
yumarch = 'sparc64v' yumarch = 'sparc64v'
else: else:
@ -1051,6 +1051,7 @@ class Pungi(pypungi.PungiBase):
isolist=[] isolist=[]
anaruntime = '/usr/share/anaconda/boot' anaruntime = '/usr/share/anaconda/boot'
ppcbootinfo = '/usr/share/lorax/config_files/ppc'
pypungi.util._ensuredir(self.isodir, self.logger, pypungi.util._ensuredir(self.isodir, self.logger,
force=self.config.getboolean('pungi', 'force'), force=self.config.getboolean('pungi', 'force'),
@ -1074,10 +1075,10 @@ class Pungi(pypungi.PungiBase):
ppcbootargs = ['-part', '-hfs', '-r', '-l', '-sysid', 'PPC', '-no-desktop', '-allow-multidot', '-chrp-boot'] ppcbootargs = ['-part', '-hfs', '-r', '-l', '-sysid', 'PPC', '-no-desktop', '-allow-multidot', '-chrp-boot']
ppcbootargs.append('-map') ppcbootargs.append('-map')
ppcbootargs.append(os.path.join(anaruntime, 'mapping')) ppcbootargs.append(os.path.join(ppcbootinfo, 'mapping'))
ppcbootargs.append('-magic') ppcbootargs.append('-magic')
ppcbootargs.append(os.path.join(anaruntime, 'magic')) ppcbootargs.append(os.path.join(ppcbootinfo, 'magic'))
ppcbootargs.append('-hfs-bless') # must be last ppcbootargs.append('-hfs-bless') # must be last