almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Pungi patch for using lorax

Browse Source
This commit is contained in:
Martin Gracik 2010-11-08 15:41:01 +01:00
parent d9f1f30944
commit d8ba02d894
1 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
0001-Lorax-patch.patch Normal file
View File

@ -0,0 +1,82 @@
From 3daa27d445a3181c3b95ec695af0114b5e7bfa2a Mon Sep 17 00:00:00 2001
From: Martin Gracik <mgracik@redhat.com>
Date: Mon, 8 Nov 2010 15:28:36 +0100
Subject: [PATCH] Lorax patch
Use lorax instead of buildinstall
---
src/pypungi/__init__.py | 52 ++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index 0e3efbd..7a9dbe7 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -773,46 +773,30 @@ class Pungi(pypungi.PungiBase):
self._makeMetadata(path, cachedir, repoview=False)
def doBuildinstall(self):
- """Run anaconda-runtime's buildinstall on the tree."""
+ """Run lorax on the tree."""
+ self._inityum()
+ yb = self.ayum
- # setup the buildinstall call
- buildinstall = ['/usr/libexec/anaconda/buildinstall']
- #buildinstall.append('TMPDIR=%s' % self.workdir) # TMPDIR broken in buildinstall
+ product = self.config.get('pungi', 'name')
+ version = self.config.get('pungi', 'version')
+ release = '%s %s' % (self.config.get('pungi', 'name'), self.config.get('pungi', 'version'))
- buildinstall.append('--product')
- buildinstall.append(self.config.get('pungi', 'name'))
+ variant = self.config.get('pungi', 'flavor')
+ bugurl = self.config.get('pungi', 'bugurl')
- if not self.config.get('pungi', 'flavor') == "":
- buildinstall.append('--variant')
- buildinstall.append(self.config.get('pungi', 'flavor'))
-
- buildinstall.append('--version')
- buildinstall.append(self.config.get('pungi', 'version'))
-
- buildinstall.append('--release')
- buildinstall.append('%s %s' % (self.config.get('pungi', 'name'), self.config.get('pungi', 'version')))
-
- if self.config.has_option('pungi', 'bugurl'):
- buildinstall.append('--bugurl')
- buildinstall.append(self.config.get('pungi', 'bugurl'))
-
- buildinstall.append('--output')
- buildinstall.append(self.topdir)
-
- for mirrorlist in self.mirrorlists:
- buildinstall.append('--mirrorlist')
- buildinstall.append(mirrorlist)
-
- buildinstall.append(self.topdir)
-
- # Add any extra repos of baseurl type
- for repo in self.repos:
- buildinstall.append(repo)
+ workdir = self.workdir
+ outputdir = self.topdir
# run the command
- # TMPDIR is still broken with buildinstall.
- pypungi.util._doRunCommand(buildinstall, self.logger) #, env={"TMPDIR": self.workdir})
+ import pylorax
+ lorax = pylorax.Lorax()
+ lorax.configure()
+
+ # FIXME get the actual is_beta value
+ lorax.run(yb, product=product, version=version, release=release,
+ variant=variant, bugurl=bugurl, is_beta=False,
+ workdir=workdir, outputdir=outputdir)
# write out the tree data for snake
self.writeinfo('tree: %s' % self.mkrelative(self.topdir))
--
1.7.1.1