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-20140220-libexec-paths.patch
Date: Sun, 02 Mar 2014 17:28:43
Message-Id: 20140302172839.B29F82004E@flycatcher.gentoo.org
1 miska 14/03/02 17:28:39
2
3 Added: suse-build-20140220-libexec-paths.patch
4 Log:
5 Updated to new version 20140220
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D39CB7C5)
8
9 Revision Changes Path
10 1.1 dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch?rev=1.1&content-type=text/plain
14
15 Index: suse-build-20140220-libexec-paths.patch
16 ===================================================================
17 diff -Naru obs-build-20140220-bak/build obs-build-20140220/build
18 --- obs-build-20140220-bak/build 2014-03-02 17:04:18.655731128 +0000
19 +++ obs-build-20140220/build 2014-03-02 17:04:56.710281988 +0000
20 @@ -12,7 +12,7 @@
21 exec /.build/build "$@"
22 fi
23
24 -test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
25 +test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build
26 test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
27 test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
28
29 diff -Naru obs-build-20140220-bak/createarchdeps obs-build-20140220/createarchdeps
30 --- obs-build-20140220-bak/createarchdeps 2014-03-02 17:04:18.659731079 +0000
31 +++ obs-build-20140220/createarchdeps 2014-03-02 17:04:56.710281988 +0000
32 @@ -3,7 +3,7 @@
33 # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@×××××.com>
34
35 BEGIN {
36 - unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build");
37 + unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build");
38 }
39
40 use strict;
41 diff -Naru obs-build-20140220-bak/createrepomddeps obs-build-20140220/createrepomddeps
42 --- obs-build-20140220-bak/createrepomddeps 2014-03-02 17:04:18.659731079 +0000
43 +++ obs-build-20140220/createrepomddeps 2014-03-02 17:04:56.710281988 +0000
44 @@ -1,7 +1,7 @@
45 #!/usr/bin/perl -w
46
47 BEGIN {
48 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
49 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
50 }
51
52 use strict;
53 diff -Naru obs-build-20140220-bak/createrpmdeps obs-build-20140220/createrpmdeps
54 --- obs-build-20140220-bak/createrpmdeps 2014-03-02 17:04:18.659731079 +0000
55 +++ obs-build-20140220/createrpmdeps 2014-03-02 17:04:56.710281988 +0000
56 @@ -1,7 +1,7 @@
57 #!/usr/bin/perl -w
58
59 BEGIN {
60 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
61 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
62 }
63
64 use Build;
65 diff -Naru obs-build-20140220-bak/createyastdeps obs-build-20140220/createyastdeps
66 --- obs-build-20140220-bak/createyastdeps 2014-03-02 17:04:18.656731116 +0000
67 +++ obs-build-20140220/createyastdeps 2014-03-02 17:04:56.711281976 +0000
68 @@ -1,7 +1,7 @@
69 #!/usr/bin/perl -w
70
71 BEGIN {
72 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
73 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
74 }
75
76 use Build;
77 diff -Naru obs-build-20140220-bak/download obs-build-20140220/download
78 --- obs-build-20140220-bak/download 2014-03-02 17:04:18.659731079 +0000
79 +++ obs-build-20140220/download 2014-03-02 17:04:56.711281976 +0000
80 @@ -3,7 +3,7 @@
81 use Net::SSL ();
82 BEGIN {
83 $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0,
84 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
85 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
86 }
87
88 use LWP::UserAgent;
89 diff -Naru obs-build-20140220-bak/expanddeps obs-build-20140220/expanddeps
90 --- obs-build-20140220-bak/expanddeps 2014-03-02 17:04:18.658731091 +0000
91 +++ obs-build-20140220/expanddeps 2014-03-02 17:04:56.711281976 +0000
92 @@ -1,7 +1,7 @@
93 #!/usr/bin/perl -w
94
95 BEGIN {
96 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
97 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
98 }
99
100 use strict;
101 diff -Naru obs-build-20140220-bak/getbinaryid obs-build-20140220/getbinaryid
102 --- obs-build-20140220-bak/getbinaryid 2014-03-02 17:04:18.659731079 +0000
103 +++ obs-build-20140220/getbinaryid 2014-03-02 17:04:56.711281976 +0000
104 @@ -1,7 +1,7 @@
105 #!/usr/bin/perl
106
107 BEGIN {
108 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
109 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
110 }
111
112 use Build;
113 diff -Naru obs-build-20140220-bak/getoptflags obs-build-20140220/getoptflags
114 --- obs-build-20140220-bak/getoptflags 2014-03-02 17:04:18.659731079 +0000
115 +++ obs-build-20140220/getoptflags 2014-03-02 17:05:22.777976219 +0000
116 @@ -1,7 +1,7 @@
117 #!/usr/bin/perl -w
118
119 BEGIN {
120 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
121 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
122 }
123
124 use strict;
125 diff -Naru obs-build-20140220-bak/changelog2spec obs-build-20140220/changelog2spec
126 --- obs-build-20140220-bak/changelog2spec 2014-03-02 17:04:18.658731091 +0000
127 +++ obs-build-20140220/changelog2spec 2014-03-02 17:05:24.268958777 +0000
128 @@ -5,7 +5,7 @@
129 #
130
131 BEGIN {
132 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
133 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
134 }
135
136 use Date::Parse;
137 diff -Naru obs-build-20140220-bak/init_buildsystem obs-build-20140220/init_buildsystem
138 --- obs-build-20140220-bak/init_buildsystem 2014-03-02 17:04:18.655731128 +0000
139 +++ obs-build-20140220/init_buildsystem 2014-03-02 17:05:24.268958777 +0000
140 @@ -16,7 +16,7 @@
141 export YAST_IS_RUNNING="instsys"
142 export DEBIAN_FRONTEND=noninteractive
143 export DEBIAN_PRIORITY=critical
144 -export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
145 +export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
146 # need to restore build root owner for non-root builds
147 browner=0
148 definesnstuff=()
149 diff -Naru obs-build-20140220-bak/initvm.c obs-build-20140220/initvm.c
150 --- obs-build-20140220-bak/initvm.c 2014-03-02 17:04:18.658731091 +0000
151 +++ obs-build-20140220/initvm.c 2014-03-02 17:05:24.269958765 +0000
152 @@ -54,9 +54,10 @@
153 #define SYSFS_BINFMT_MISC_REG "/proc/sys/fs/binfmt_misc/register"
154 #define SYSFS_BINFMT_MISC_STAT "/proc/sys/fs/binfmt_misc/status"
155
156 -/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */
157 +/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */
158 #define BINFMT_REGF_0 "/.build/qemu-reg"
159 -#define BINFMT_REGF_1 "/usr/lib/build/qemu-reg"
160 +#define BINFMT_REGF_1 "/usr/libexec/suse-build/qemu-reg"
161 +#define BINFMT_REGF_2 "/usr/lib/build/qemu-reg"
162 #define BUILD "/.build/build"
163
164 /* useful constant arrays */
165 @@ -324,9 +325,13 @@
166 fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
167 BINFMT_REGF_0);
168 if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
169 - fprintf(stderr, "%s: binfmt registration failed\n",
170 + fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
171 BINFMT_REGF_1);
172 - exit(1);
173 + if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) {
174 + fprintf(stderr, "%s: binfmt registration failed\n",
175 + BINFMT_REGF_2);
176 + exit(1);
177 + }
178 }
179 }
180 }
181 diff -Naru obs-build-20140220-bak/mkdrpms obs-build-20140220/mkdrpms
182 --- obs-build-20140220-bak/mkdrpms 2014-03-02 17:04:18.656731116 +0000
183 +++ obs-build-20140220/mkdrpms 2014-03-02 17:05:24.269958765 +0000
184 @@ -1,7 +1,7 @@
185 #!/usr/bin/perl -w
186
187 BEGIN {
188 - unshift @INC, '/usr/lib/build';
189 + unshift @INC, '/usr/libexec/suse-build';
190 unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'};
191 }
192
193 diff -Naru obs-build-20140220-bak/order obs-build-20140220/order
194 --- obs-build-20140220-bak/order 2014-03-02 17:04:18.658731091 +0000
195 +++ obs-build-20140220/order 2014-03-02 17:05:24.269958765 +0000
196 @@ -1,7 +1,7 @@
197 #!/usr/bin/perl -w
198
199 BEGIN {
200 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
201 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
202 }
203
204 use Build;
205 diff -Naru obs-build-20140220-bak/spectool obs-build-20140220/spectool
206 --- obs-build-20140220-bak/spectool 2014-03-02 17:04:18.658731091 +0000
207 +++ obs-build-20140220/spectool 2014-03-02 17:05:24.269958765 +0000
208 @@ -116,7 +116,7 @@
209 my $builddir;
210
211 BEGIN {
212 - $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
213 + $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
214 unshift @INC, $builddir;
215 }
216
217 diff -Naru obs-build-20140220-bak/substitutedeps obs-build-20140220/substitutedeps
218 --- obs-build-20140220-bak/substitutedeps 2014-03-02 17:04:18.659731079 +0000
219 +++ obs-build-20140220/substitutedeps 2014-03-02 17:05:24.269958765 +0000
220 @@ -1,7 +1,7 @@
221 #!/usr/bin/perl -w
222
223 BEGIN {
224 - unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
225 + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
226 }
227
228 use strict;
Report Message
Find on MARC Find on Google Groups