mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-14 17:46:17 +01:00
Code

- support for kiwi appliance builds using obsrepositories:/ directive

Browse Source
This commit is contained in:
Adrian Schröter 2013-07-04 16:41:59 +02:00
parent 87aaa9aac4
commit 0437ab9be0
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,3 +1,6 @@
0.141
- support for kiwi appliance builds using obsrepositories:/ directive
0.140 0.140
- support python 2.7 and python 3 in parallel now - support python 2.7 and python 3 in parallel now
- reworked plugin loading mechanism in order to avoid the (mass) breakage of existing - reworked plugin loading mechanism in order to avoid the (mass) breakage of existing

34
osc/build.py
View File

@ -136,12 +136,15 @@ class Buildinfo:
self.projects = {} self.projects = {}
self.keys = [] self.keys = []
self.prjkeys = [] self.prjkeys = []
self.pathes = []
for node in root.findall('bdep'): for node in root.findall('bdep'):
p = Pac(node, self.buildarch, self.pacsuffix, p = Pac(node, self.buildarch, self.pacsuffix,
apiurl, localpkgs) apiurl, localpkgs)
if p.project: if p.project:
self.projects[p.project] = 1 self.projects[p.project] = 1
self.deps.append(p) self.deps.append(p)
for node in root.findall('path'):
self.pathes.append(node.get('project')+"/"+node.get('repository'))
self.vminstall_list = [ dep.name for dep in self.deps if dep.vminstall ] self.vminstall_list = [ dep.name for dep in self.deps if dep.vminstall ]
self.preinstall_list = [ dep.name for dep in self.deps if dep.preinstall ] self.preinstall_list = [ dep.name for dep in self.deps if dep.preinstall ]
@ -816,7 +819,36 @@ def main(apiurl, opts, argv):
os.link(path + "/" + filename, tffn) os.link(path + "/" + filename, tffn)
else: else:
os.symlink(path + "/" + filename, tffn) os.symlink(path + "/" + filename, tffn)
# most simple kiwi XML parser, has to work for all kind of unknown kiwi files # Is a obsrepositories tag used?
try:
tree = ET.parse(build_descr)
except:
print('could not parse the kiwi file:', file=sys.stderr)
print(open(build_descr).read(), file=sys.stderr)
sys.exit(1)
root = tree.getroot()
# product
for xml in root.findall('instsource'):
if xml.find('instrepo').find('source').get('path') == 'obsrepositories:/':
print("obsrepositories:/ for product builds is not yet supported in osc!")
sys.exit(1)
# appliance
for xml in root.findall('repository'):
if xml.find('source').get('path') == 'obsrepositories:/':
buildargs.append('--kiwi-parameter')
buildargs.append('--ignore-repos')
for path in bi.pathes:
if not os.path.isdir("repos/"+path):
continue
buildargs.append('--kiwi-parameter')
buildargs.append('--add-repo')
buildargs.append('--kiwi-parameter')
buildargs.append("repos/"+path)
buildargs.append('--kiwi-parameter')
buildargs.append('--add-repotype')
buildargs.append('--kiwi-parameter')
buildargs.append('rpm-md')
break
if vm_type == "xen" or vm_type == "kvm" or vm_type == "lxc": if vm_type == "xen" or vm_type == "kvm" or vm_type == "lxc":
print('Skipping verification of package signatures due to secure VM build') print('Skipping verification of package signatures due to secure VM build')