|
 |
57b0f24 |
From 8a3b4e7fa1c02e9ac88678eb31721451672fc022 Mon Sep 17 00:00:00 2001
|
|
|
57b0f24 |
From: Dennis Gilmore <dennis@ausil.us>
|
|
|
57b0f24 |
Date: Wed, 15 Oct 2008 20:32:12 -0500
|
|
|
57b0f24 |
Subject: [PATCH] add handling of sparc arch. make sure all the packages end up in the tree
|
|
|
57b0f24 |
|
|
|
57b0f24 |
---
|
|
|
57b0f24 |
src/pypungi/pungi.py | 21 ++++++++++++++++++---
|
|
|
57b0f24 |
1 files changed, 18 insertions(+), 3 deletions(-)
|
|
|
57b0f24 |
|
|
|
57b0f24 |
diff --git a/src/pypungi/pungi.py b/src/pypungi/pungi.py
|
|
|
57b0f24 |
index 1b22418..452140a 100755
|
|
|
57b0f24 |
--- a/src/pypungi/pungi.py
|
|
|
57b0f24 |
+++ b/src/pypungi/pungi.py
|
|
|
57b0f24 |
@@ -173,13 +173,18 @@ class Pungi(pypungi.PungiBase):
|
|
|
57b0f24 |
def doPackageorder(self):
|
|
|
57b0f24 |
"""Run anaconda-runtime's pkgorder on the tree, used for splitting media."""
|
|
|
57b0f24 |
|
|
|
57b0f24 |
+ if self.config.get('default', 'arch') == "sparc":
|
|
|
57b0f24 |
+ treearch = "sparcv9v"
|
|
|
57b0f24 |
+ else:
|
|
|
57b0f24 |
+ treearch = self.config.get('default', 'arch')
|
|
|
57b0f24 |
+ self.logger.info("Setting treearch to %s" % treearch)
|
|
|
57b0f24 |
|
|
|
57b0f24 |
pkgorderfile = open(os.path.join(self.workdir, 'pkgorder-%s' % self.config.get('default', 'arch')), 'w')
|
|
|
57b0f24 |
# setup the command
|
|
|
57b0f24 |
pkgorder = ['/usr/lib/anaconda-runtime/pkgorder']
|
|
|
57b0f24 |
#pkgorder.append('TMPDIR=%s' % self.workdir)
|
|
|
57b0f24 |
pkgorder.append(self.topdir)
|
|
|
57b0f24 |
- pkgorder.append(self.config.get('default', 'arch'))
|
|
|
57b0f24 |
+ pkgorder.append(treearch)
|
|
|
57b0f24 |
pkgorder.append(self.config.get('default', 'product_path'))
|
|
|
57b0f24 |
|
|
|
57b0f24 |
# run the command
|
|
|
57b0f24 |
@@ -249,9 +254,14 @@ class Pungi(pypungi.PungiBase):
|
|
|
57b0f24 |
"""Use anaconda-runtime's splittree to split the tree into appropriate
|
|
|
57b0f24 |
sized chunks."""
|
|
|
57b0f24 |
|
|
|
57b0f24 |
+ if self.config.get('default', 'arch') == "sparc":
|
|
|
57b0f24 |
+ treearch = "sparcv9v"
|
|
|
57b0f24 |
+ else:
|
|
|
57b0f24 |
+ treearch = self.config.get('default', 'arch')
|
|
|
57b0f24 |
+ self.logger.info("Setting treearch to %s" % treearch)
|
|
|
57b0f24 |
|
|
|
57b0f24 |
timber = splittree.Timber()
|
|
|
57b0f24 |
- timber.arch = self.config.get('default', 'arch')
|
|
|
57b0f24 |
+ timber.arch = treearch
|
|
|
57b0f24 |
timber.target_size = self.config.getfloat('default', 'cdsize') * 1024 * 1024
|
|
|
57b0f24 |
timber.total_discs = self.config.getint('default', 'discs')
|
|
|
57b0f24 |
timber.bin_discs = self.config.getint('default', 'discs')
|
|
|
57b0f24 |
@@ -274,9 +284,14 @@ class Pungi(pypungi.PungiBase):
|
|
|
57b0f24 |
"""Use anaconda-runtime's splittree to split the srpms into appropriate
|
|
|
57b0f24 |
sized chunks."""
|
|
|
57b0f24 |
|
|
|
57b0f24 |
+ if self.config.get('default', 'arch') == "sparc":
|
|
|
57b0f24 |
+ treearch = "sparcv9v"
|
|
|
57b0f24 |
+ else:
|
|
|
57b0f24 |
+ treearch = self.config.get('default', 'arch')
|
|
|
57b0f24 |
+ self.logger.info("Setting treearch to %s" % treearch)
|
|
|
57b0f24 |
|
|
|
57b0f24 |
timber = splittree.Timber()
|
|
|
57b0f24 |
- timber.arch = self.config.get('default', 'arch')
|
|
|
57b0f24 |
+ timber.arch = treearch
|
|
|
57b0f24 |
#timber.total_discs = self.config.getint('default', 'discs')
|
|
|
57b0f24 |
#timber.bin_discs = self.config.getint('default', 'discs')
|
|
|
57b0f24 |
timber.src_discs = self.config.getint('default', 'discs')
|
|
|
57b0f24 |
--
|
|
|
57b0f24 |
1.6.0.1
|
|
|
57b0f24 |
|