1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Marko Lemmetty <marko.lemmetty@jollamobile.com>
Date: Fri, 15 May 2020 13:46:20 +0300
Subject: [PATCH] Add sb2install support to osc
---
osc/build.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/osc/build.py b/osc/build.py
index e2a5f423ad1059758d1816f4525c99bdf1eca98f..544f159456f1697319f3db4ddb69db294bbd988a 100644
--- a/osc/build.py
+++ b/osc/build.py
@@ -190,12 +190,13 @@ class Buildinfo:
self.urls[node.get('project') + "/" + node.get('repository')] = baseurl + '/%(arch)s/%(filename)s'
self.vminstall_list = [dep.name for dep in self.deps if dep.vminstall]
+ self.sb2install_list = [ dep.name for dep in self.deps if dep.sb2install ]
self.preinstall_list = [dep.name for dep in self.deps if dep.preinstall]
self.runscripts_list = [dep.name for dep in self.deps if dep.runscripts]
self.noinstall_list = [dep.name for dep in self.deps if dep.noinstall]
self.installonly_list = [dep.name for dep in self.deps if dep.installonly]
- if root.find('preinstallimage') is not None:
+ if root.find('preinstallimage') != None:
self.preinstallimage = root.find('preinstallimage')
else:
self.preinstallimage = None
@@ -235,7 +236,8 @@ class Pac:
'project', 'repository', 'sysroot',
'preinstall', 'vminstall', 'runscripts',
'noinstall', 'installonly', 'notmeta',
- ]:
+ 'sb2install',
+ ]:
self.mp[i] = node.get(i)
self.mp['buildarch'] = buildarch
@@ -1401,6 +1403,7 @@ def main(apiurl, opts, argv):
rpmlist.append('preinstall: ' + ' '.join(bi.preinstall_list) + '\n')
rpmlist.append('vminstall: ' + ' '.join(bi.vminstall_list) + '\n')
+ rpmlist.append('sb2install: ' + ' '.join(bi.sb2install_list) + '\n')
rpmlist.append('runscripts: ' + ' '.join(bi.runscripts_list) + '\n')
if build_type != 'kiwi' and build_type != 'docker' and build_type != 'podman' and build_type != 'fissile':
if bi.noinstall_list:
|