Update to 1.5.1

- New upstream release
- Rebase sb2 patches

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

1 files changed, 39 insertions, 0 deletions

diff --git a/0001-Add-sb2install-support-to-osc.patch b/0001-Add-sb2install-support-to-osc.patch
new file mode 100644
index 000000000000..efdb5898e9f6
--- /dev/null
+++ b/0001-Add-sb2install-support-to-osc.patch
@@ -0,0 +1,39 @@
+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 | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/osc/build.py b/osc/build.py
+index c93072af1d98e8ba4575f3084a39087a7920d483..096e6c40998e35650b857d09cce41cfc95e10f67 100644
+--- a/osc/build.py
++++ b/osc/build.py
+@@ -192,6 +192,7 @@ 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]
+@@ -237,7 +238,8 @@ class Pac:
+                   'project', 'repository', 'sysroot',
+                   'preinstall', 'vminstall', 'runscripts',
+                   'noinstall', 'installonly', 'notmeta',
+-                  ]:
++                  'sb2install',
++                 ]:
+             self.mp[i] = node.get(i)
+ 
+         self.mp['buildarch'] = buildarch
+@@ -1430,6 +1432,7 @@ def main(apiurl, store, 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: