Package: osc / 0.156.0-1

osc-build.patch Patch series | download
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
47
From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Subject: [PATCH] Default build-cmd to /usr/bin/obs-build
Forwarded: no, debian specific

Unlike upstream packaging the "build" tool has been renamed to
"obs-build" in debian. Thus, if "obs-build" package is install "$ osc
build" will work on Debian, if the build-cmd is adjusted by default
and/or in the user's ~/.oscrc file.

I would also like to request for osc to recommend or depend on
obs-build, as you see most appropriate, to enable local build of osc
checked out packages against any distribution out of the box.

Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
---
 osc/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/osc/conf.py
+++ b/osc/conf.py
@@ -28,7 +28,7 @@
                                                'http_headers':(('Host','api.suse.de'),
                                                                ('User','faye'))},
                       'foo.opensuse.org': {'user': 'foo', 'pass': 'foo'}},
- 'build-cmd': '/usr/bin/build',
+ 'build-cmd': '/usr/bin/obs-build',
  'build-root': '/abuild/oscbuild-%(repo)s-%(arch)s',
  'packagecachedir': '/var/cache/osbuild',
  'su-wrapper': 'sudo',
@@ -103,7 +103,7 @@
             'su-wrapper': 'sudo',
 
             # build type settings
-            'build-cmd': '/usr/bin/build',
+            'build-cmd': '/usr/bin/obs-build',
             'build-type': '',                   # may be empty for chroot, kvm or xen
             'build-root': '/var/tmp/build-root/%(repo)s-%(arch)s',
             'build-uid': '',                    # use the default provided by build
@@ -178,7 +178,7 @@
             'maintained_update_project_attribute': 'OBS:UpdateProject',
             'show_download_progress': '0',
             # path to the vc script
-            'vc-cmd': '/usr/lib/build/vc'
+            'vc-cmd': '/usr/lib/obs-build/vc'
 }
 
 # being global to this module, this dict can be accessed from outside