Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal HruAeckA (miska)" <miska@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/suse-build/files: suse-build-20131015-libexec-paths.patch
Date: Tue, 28 Jan 2014 13:35:26
Message-Id: 20140128133523.02E692004E@flycatcher.gentoo.org
1 miska 14/01/28 13:35:22
2
3 Added: suse-build-20131015-libexec-paths.patch
4 Log:
5 r1 ebuild with patch replacing paths only where needed
6 * fixes running checks during build of openSUSE packages
7 updated copyright everywhere
8
9 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D39CB7C5)
10
11 Revision Changes Path
12 1.1 dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/suse-build/files/suse-build-20131015-libexec-paths.patch?rev=1.1&content-type=text/plain
16
17 Index: suse-build-20131015-libexec-paths.patch
18 ===================================================================
19 diff -Naru obs-build-20131015.orig/build obs-build-20131015/build
20 --- obs-build-20131015.orig/build 2014-01-28 12:31:51.126824118 +0000
21 +++ obs-build-20131015/build 2014-01-28 12:31:23.973477260 +0000
22 @@ -12,7 +12,7 @@
23 exec /.build/build "$@"
24 fi
25
26 -test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
27 +test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build
28 test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
29 test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
30
31 diff -Naru obs-build-20131015.orig/createarchdeps obs-build-20131015/createarchdeps
32 --- obs-build-20131015.orig/createarchdeps 2014-01-28 12:31:51.128824144 +0000
33 +++ obs-build-20131015/createarchdeps 2014-01-28 12:31:23.976477299 +0000
34 @@ -3,7 +3,7 @@
35 # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@×××××.com>
36
37 BEGIN {
38 - unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build");
39 + unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build");
40 }
41
42 use strict;
43 diff -Naru obs-build-20131015.orig/createrepomddeps obs-build-20131015/createrepomddeps
44 --- obs-build-20131015.orig/createrepomddeps 2014-01-28 12:31:51.128824144 +0000
45 +++ obs-build-20131015/createrepomddeps 2014-01-28 12:31:23.976477299 +0000
46 @@ -1,7 +1,7 @@
47 #!/usr/bin/perl -w
48
49 BEGIN {
50 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
51 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
52 }
53
54 use strict;
55 diff -Naru obs-build-20131015.orig/createrpmdeps obs-build-20131015/createrpmdeps
56 --- obs-build-20131015.orig/createrpmdeps 2014-01-28 12:31:51.129824157 +0000
57 +++ obs-build-20131015/createrpmdeps 2014-01-28 12:31:23.976477299 +0000
58 @@ -1,7 +1,7 @@
59 #!/usr/bin/perl -w
60
61 BEGIN {
62 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
63 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
64 }
65
66 use Build;
67 diff -Naru obs-build-20131015.orig/createyastdeps obs-build-20131015/createyastdeps
68 --- obs-build-20131015.orig/createyastdeps 2014-01-28 12:31:51.127824131 +0000
69 +++ obs-build-20131015/createyastdeps 2014-01-28 12:31:23.974477273 +0000
70 @@ -1,7 +1,7 @@
71 #!/usr/bin/perl -w
72
73 BEGIN {
74 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
75 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
76 }
77
78 use Build;
79 diff -Naru obs-build-20131015.orig/download obs-build-20131015/download
80 --- obs-build-20131015.orig/download 2014-01-28 12:31:51.129824157 +0000
81 +++ obs-build-20131015/download 2014-01-28 12:31:23.976477299 +0000
82 @@ -3,7 +3,7 @@
83 use Net::SSL ();
84 BEGIN {
85 $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0,
86 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
87 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
88 }
89
90 use LWP::UserAgent;
91 diff -Naru obs-build-20131015.orig/expanddeps obs-build-20131015/expanddeps
92 --- obs-build-20131015.orig/expanddeps 2014-01-28 12:31:51.128824144 +0000
93 +++ obs-build-20131015/expanddeps 2014-01-28 12:31:23.975477286 +0000
94 @@ -1,7 +1,7 @@
95 #!/usr/bin/perl -w
96
97 BEGIN {
98 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
99 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
100 }
101
102 use strict;
103 diff -Naru obs-build-20131015.orig/getbinaryid obs-build-20131015/getbinaryid
104 --- obs-build-20131015.orig/getbinaryid 2014-01-28 12:31:51.129824157 +0000
105 +++ obs-build-20131015/getbinaryid 2014-01-28 12:31:23.976477299 +0000
106 @@ -1,7 +1,7 @@
107 #!/usr/bin/perl
108
109 BEGIN {
110 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
111 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
112 }
113
114 use Build;
115 diff -Naru obs-build-20131015.orig/getchangetarget obs-build-20131015/getchangetarget
116 --- obs-build-20131015.orig/getchangetarget 2014-01-28 12:31:51.129824157 +0000
117 +++ obs-build-20131015/getchangetarget 2014-01-28 12:31:23.976477299 +0000
118 @@ -1,7 +1,7 @@
119 #!/usr/bin/perl -w
120
121 BEGIN {
122 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
123 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
124 }
125
126 use strict;
127 diff -Naru obs-build-20131015.orig/getmacros obs-build-20131015/getmacros
128 --- obs-build-20131015.orig/getmacros 2014-01-28 12:31:51.129824157 +0000
129 +++ obs-build-20131015/getmacros 2014-01-28 12:31:23.976477299 +0000
130 @@ -1,7 +1,7 @@
131 #!/usr/bin/perl -w
132
133 BEGIN {
134 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
135 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
136 }
137
138 use Build;
139 diff -Naru obs-build-20131015.orig/getoptflags obs-build-20131015/getoptflags
140 --- obs-build-20131015.orig/getoptflags 2014-01-28 12:31:51.128824144 +0000
141 +++ obs-build-20131015/getoptflags 2014-01-28 12:31:23.976477299 +0000
142 @@ -1,7 +1,7 @@
143 #!/usr/bin/perl -w
144
145 BEGIN {
146 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
147 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
148 }
149
150 use strict;
151 diff -Naru obs-build-20131015.orig/gettype obs-build-20131015/gettype
152 --- obs-build-20131015.orig/gettype 2014-01-28 12:31:51.127824131 +0000
153 +++ obs-build-20131015/gettype 2014-01-28 12:31:23.974477273 +0000
154 @@ -1,7 +1,7 @@
155 #!/usr/bin/perl -w
156
157 BEGIN {
158 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
159 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
160 }
161
162 use strict;
163 diff -Naru obs-build-20131015.orig/changelog2spec obs-build-20131015/changelog2spec
164 --- obs-build-20131015.orig/changelog2spec 2014-01-28 12:31:51.128824144 +0000
165 +++ obs-build-20131015/changelog2spec 2014-01-28 12:31:23.975477286 +0000
166 @@ -5,7 +5,7 @@
167 #
168
169 BEGIN {
170 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
171 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
172 }
173
174 use Date::Parse;
175 diff -Naru obs-build-20131015.orig/init_buildsystem obs-build-20131015/init_buildsystem
176 --- obs-build-20131015.orig/init_buildsystem 2014-01-28 12:31:51.125824105 +0000
177 +++ obs-build-20131015/init_buildsystem 2014-01-28 12:31:23.973477260 +0000
178 @@ -16,7 +16,7 @@
179 export YAST_IS_RUNNING="instsys"
180 export DEBIAN_FRONTEND=noninteractive
181 export DEBIAN_PRIORITY=critical
182 -export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
183 +export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
184 # need to restore build root owner for non-root builds
185 browner=0
186 definesnstuff=()
187 diff -Naru obs-build-20131015.orig/initvm.c obs-build-20131015/initvm.c
188 --- obs-build-20131015.orig/initvm.c 2014-01-28 12:31:51.128824144 +0000
189 +++ obs-build-20131015/initvm.c 2014-01-28 12:31:23.975477286 +0000
190 @@ -53,9 +53,10 @@
191 #define SYSFS_BINFMT_MISC_REG "/proc/sys/fs/binfmt_misc/register"
192 #define SYSFS_BINFMT_MISC_STAT "/proc/sys/fs/binfmt_misc/status"
193
194 -/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */
195 +/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */
196 #define BINFMT_REGF_0 "/.build/qemu-reg"
197 -#define BINFMT_REGF_1 "/usr/lib/build/qemu-reg"
198 +#define BINFMT_REGF_1 "/usr/libexec/suse-build/qemu-reg"
199 +#define BINFMT_REGF_2 "/usr/lib/build/qemu-reg"
200 #define BUILD "/.build/build"
201
202 /* useful constant arrays */
203 @@ -307,9 +308,13 @@
204 fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
205 BINFMT_REGF_0);
206 if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
207 - fprintf(stderr, "%s: binfmt registration failed\n",
208 + fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
209 BINFMT_REGF_1);
210 - exit(1);
211 + if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) {
212 + fprintf(stderr, "%s: binfmt registration failed\n",
213 + BINFMT_REGF_2);
214 + exit(1);
215 + }
216 }
217 }
218 }
219 diff -Naru obs-build-20131015.orig/mkdrpms obs-build-20131015/mkdrpms
220 --- obs-build-20131015.orig/mkdrpms 2014-01-28 12:31:51.127824131 +0000
221 +++ obs-build-20131015/mkdrpms 2014-01-28 12:31:23.974477273 +0000
222 @@ -1,7 +1,7 @@
223 #!/usr/bin/perl -w
224
225 BEGIN {
226 - unshift @INC, '/usr/lib/build';
227 + unshift @INC, '/usr/libexec/suse-build';
228 unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'};
229 }
230
231 diff -Naru obs-build-20131015.orig/order obs-build-20131015/order
232 --- obs-build-20131015.orig/order 2014-01-28 12:31:51.128824144 +0000
233 +++ obs-build-20131015/order 2014-01-28 12:31:23.975477286 +0000
234 @@ -1,7 +1,7 @@
235 #!/usr/bin/perl -w
236
237 BEGIN {
238 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
239 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
240 }
241
242 use Build;
243 diff -Naru obs-build-20131015.orig/spectool obs-build-20131015/spectool
244 --- obs-build-20131015.orig/spectool 2014-01-28 12:31:51.128824144 +0000
245 +++ obs-build-20131015/spectool 2014-01-28 12:31:23.975477286 +0000
246 @@ -116,7 +116,7 @@
247 my $builddir;
248
249 BEGIN {
250 - $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
251 + $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
252 unshift @INC, $builddir;
253 }
254
255 diff -Naru obs-build-20131015.orig/substitutedeps obs-build-20131015/substitutedeps
256 --- obs-build-20131015.orig/substitutedeps 2014-01-28 12:31:51.128824144 +0000
257 +++ obs-build-20131015/substitutedeps 2014-01-28 12:31:23.976477299 +0000
258 @@ -1,7 +1,7 @@
259 #!/usr/bin/perl -w
260
261 BEGIN {
262 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
263 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
264 }
265
266 use strict;
Report Message
Find on MARC Find on Google Groups