/[smeserver]/rpms/smeserver-mock/sme10/smeserver-mock-1.0-20220630.patch
ViewVC logotype

Contents of /rpms/smeserver-mock/sme10/smeserver-mock-1.0-20220630.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Thu Jun 30 20:23:51 2022 UTC (2 years, 5 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-mock-1_0-14_el7_sme, smeserver-mock-1_0-22_el7_sme, smeserver-mock-1_0-15_el7_sme, smeserver-mock-1_0-16_el7_sme, smeserver-mock-1_0-21_el7_sme, smeserver-mock-1_0-19_el7_sme, smeserver-mock-1_0-20_el7_sme, smeserver-mock-1_0-18_el7_sme, smeserver-mock-1_0-17_el7_sme, HEAD
* Thu Jun 30 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0-14.sme
- update sme10 mock files  [SME: ]
- remove python scl dependencies blocks a lot from using the rpm
  almost never needed
- cleaning remove sme8 and sme9 mock files
- added workaround to perl.prov not working [SME: 11958]
  added mock plugin copy.py and an updated perl.prov
- update embded bins

1 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/perl.prov smeserver-mock-1.0/root/etc/mock/perl.prov
2 --- smeserver-mock-1.0.old/root/etc/mock/perl.prov 1969-12-31 19:00:00.000000000 -0500
3 +++ smeserver-mock-1.0/root/etc/mock/perl.prov 2022-06-30 11:34:44.562000000 -0400
4 @@ -0,0 +1,222 @@
5 +#!/usr/bin/perl
6 +
7 +# RPM (and it's source code) is covered under two separate licenses.
8 +
9 +# The entire code base may be distributed under the terms of the GNU
10 +# General Public License (GPL), which appears immediately below.
11 +# Alternatively, all of the source code in the lib subdirectory of the
12 +# RPM source code distribution as well as any code derived from that
13 +# code may instead be distributed under the GNU Library General Public
14 +# License (LGPL), at the choice of the distributor. The complete text
15 +# of the LGPL appears at the bottom of this file.
16 +
17 +# This alternative is allowed to enable applications to be linked
18 +# against the RPM library (commonly called librpm) without forcing
19 +# such applications to be distributed under the GPL.
20 +
21 +# Any questions regarding the licensing of RPM should be addressed to
22 +# Erik Troan <ewt@redhat.com>.
23 +
24 +# a simple script to print the proper name for perl libraries.
25 +
26 +# To save development time I do not parse the perl grammar but
27 +# instead just lex it looking for what I want. I take special care to
28 +# ignore comments and pod's.
29 +
30 +# it would be much better if perl could tell us the proper name of a
31 +# given script.
32 +
33 +# The filenames to scan are either passed on the command line or if
34 +# that is empty they are passed via stdin.
35 +
36 +# If there are lines in the file which match the pattern
37 +# (m/^\s*\$VERSION\s*=\s+/)
38 +# then these are taken to be the version numbers of the modules.
39 +# Special care is taken with a few known idioms for specifying version
40 +# numbers of files under rcs/cvs control.
41 +
42 +# If there are strings in the file which match the pattern
43 +# m/^\s*\$RPM_Provides\s*=\s*["'](.*)['"]/i
44 +# then these are treated as additional names which are provided by the
45 +# file and are printed as well.
46 +
47 +# I plan to rewrite this in C so that perl is not required by RPM at
48 +# build time.
49 +
50 +# by Ken Estes Mail.com kestes@staff.mail.com
51 +
52 +if ("@ARGV") {
53 + foreach (@ARGV) {
54 + next if !/\.pm$/;
55 + process_file($_);
56 + }
57 +} else {
58 +
59 + # notice we are passed a list of filenames NOT as common in unix the
60 + # contents of the file.
61 +
62 + foreach (<>) {
63 + next if !/\.pm$/;
64 + process_file($_);
65 + }
66 +}
67 +
68 +
69 +foreach $module (sort keys %require) {
70 + if (length($require{$module}) == 0) {
71 + print "perl($module)\n";
72 + } else {
73 +
74 + # I am not using rpm3.0 so I do not want spaces around my
75 + # operators. Also I will need to change the processing of the
76 + # $RPM_* variable when I upgrade.
77 +
78 + print "perl($module) = $require{$module}\n";
79 + }
80 +}
81 +
82 +exit 0;
83 +
84 +
85 +
86 +sub process_file {
87 +
88 + my ($file) = @_;
89 + chomp $file;
90 +
91 + if (!open(FILE, $file)) {
92 + warn("$0: Warning: Could not open file '$file' for reading: $!\n");
93 + return;
94 + }
95 +
96 + my ($package, $version, $incomment, $inover, $inheredoc) = ();
97 +
98 + while (<FILE>) {
99 +
100 + # Skip contents of HEREDOCs
101 + if (! defined $inheredoc) {
102 + # skip the documentation
103 +
104 + # we should not need to have item in this if statement (it
105 + # properly belongs in the over/back section) but people do not
106 + # read the perldoc.
107 +
108 + if (m/^=(head[1-4]|pod|for|item)/) {
109 + $incomment = 1;
110 + }
111 +
112 + if (m/^=(cut)/) {
113 + $incomment = 0;
114 + $inover = 0;
115 + }
116 +
117 + if (m/^=(over)/) {
118 + $inover = 1;
119 + }
120 +
121 + if (m/^=(back)/) {
122 + $inover = 0;
123 + }
124 +
125 + if ($incomment || $inover || m/^\s*#/) {
126 + next;
127 + }
128 +
129 + # skip the data section
130 + if (m/^__(DATA|END)__$/) {
131 + last;
132 + }
133 +
134 + # Find the start of a HEREDOC
135 + if (m/<<\s*[\"\'](\w+)[\"\']\s*;\s*$/) {
136 + $inheredoc = $1;
137 + }
138 + } else {
139 + # We're in a HEREDOC; continue until the end of it
140 + if (m/^$inheredoc\s*$/) {
141 + $inheredoc = undef;
142 + }
143 + next;
144 + }
145 +
146 + # not everyone puts the package name of the file as the first
147 + # package name so we report all namespaces except some common
148 + # false positives as if they were provided packages (really ugly).
149 +
150 + if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*(?:v?([0-9_.]+)\s*)?[;{]/) {
151 + $package = $1;
152 + $version = $2;
153 + if ($package eq 'main') {
154 + undef $package;
155 + } else {
156 + # If $package already exists in the $require hash, it means
157 + # the package definition is broken up over multiple blocks.
158 + # In that case, don't stomp a previous $VERSION we might have
159 + # found. (See BZ#214496.)
160 + $require{$package} = $version unless (exists $require{$package});
161 + }
162 + }
163 +
164 + # after we found the package name take the first assignment to
165 + # $VERSION as the version number. Exporter requires that the
166 + # variable be called VERSION so we are safe.
167 +
168 + # here are examples of VERSION lines from the perl distribution
169 +
170 + #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision: 1.9 $ =~ /(\d+)\.(\d+)/);
171 + #ExtUtils/Install.pm:$VERSION = substr q$Revision: 1.9 $, 10;
172 + #CGI/Apache.pm:$VERSION = (qw$Revision: 1.9 $)[1];
173 + #DynaLoader.pm:$VERSION = $VERSION = "1.03"; # avoid typo warning
174 + #General.pm:$Config::General::VERSION = 2.33;
175 + #
176 + # or with the new "our" pragma you could (read will) see:
177 + #
178 + # our $VERSION = '1.00'
179 + if ($package && m/^\s*(our\s+)?\$(\Q$package\E::)?VERSION\s*=\s+/) {
180 +
181 + # first see if the version string contains the string
182 + # '$Revision' this often causes bizarre strings and is the most
183 + # common method of non static numbering.
184 +
185 + if (m/\$Revision: (\d+[.0-9]+)/) {
186 + $version = $1;
187 + } elsif (m/=\s*['"]?(\d+[._0-9]+)['"]?/) {
188 +
189 + # look for a static number hard coded in the script
190 +
191 + $version = $1;
192 + }
193 + $require{$package} = $version;
194 + }
195 +
196 + # Allow someone to have a variable that defines virtual packages
197 + # The variable is called $RPM_Provides. It must be scoped with
198 + # "our", but not "local" or "my" (just would not make sense).
199 + #
200 + # For instance:
201 + #
202 + # $RPM_Provides = "blah bleah"
203 + #
204 + # Will generate provides for "blah" and "bleah".
205 + #
206 + # Each keyword can appear multiple times. Don't
207 + # bother with datastructures to store these strings,
208 + # if we need to print it print it now.
209 +
210 + if (m/^\s*(our\s+)?\$RPM_Provides\s*=\s*["'](.*)['"]/i) {
211 + foreach $_ (split(/\s+/, $2)) {
212 + print "$_\n";
213 + }
214 + }
215 +
216 + }
217 +
218 + if (defined $inheredoc) {
219 + die "Unclosed HEREDOC [$inheredoc] in file: '$file'\n";
220 + }
221 +
222 + close(FILE) ||
223 + die("$0: Could not close file: '$file' : $!\n");
224 +
225 + return;
226 +}
227 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-8-i386-base.cfg smeserver-mock-1.0/root/etc/mock/smeserver-8-i386-base.cfg
228 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-i386-base.cfg 2022-06-30 11:01:08.996000000 -0400
229 +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-i386-base.cfg 1969-12-31 19:00:00.000000000 -0500
230 @@ -1,77 +0,0 @@
231 -config_opts['package_manager'] = 'yum'
232 -config_opts['use_nspawn'] = False
233 -
234 -config_opts['root'] = 'smeserver-8-i386'
235 -config_opts['target_arch'] = 'i386'
236 -config_opts['dist'] = '.el5.sme'
237 -
238 -config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/ccache/i386/"
239 -
240 -config_opts['macros']['%distribution'] = "SME Server v8"
241 -config_opts['macros']['%packager'] = "Contribs.org <http://contribs.org>"
242 -config_opts['macros']['%vendor'] = "Contribs.org <http://contribs.org>"
243 -config_opts['macros']['%dist'] = ".el5.sme"
244 -
245 -config_opts['yum.conf'] = """
246 -[main]
247 -cachedir=/var/cache/yum
248 -debuglevel=1
249 -logfile=/var/log/yum.log
250 -reposdir=/dev/null
251 -retries=20
252 -obsoletes=1
253 -gpgcheck=0
254 -assumeyes=1
255 -syslog_ident=mock
256 -syslog_device=
257 -exclude=*.x86_64
258 -
259 -[os]
260 -name=os
261 -baseurl=http://buildsys.koozali.org/build/5/os/i386
262 -exclude=buildsys-macros
263 -
264 -[updates]
265 -name=updates
266 -baseurl=http://buildsys.koozali.org/build/5/updates/i386
267 -exclude=buildsys-macros
268 -
269 -[fastrack]
270 -name=fastrack
271 -baseurl=http://buildsys.koozali.org/build/5/fastrack/i386
272 -
273 -
274 -# centos cr
275 -[opt1]
276 -name=opt1
277 -baseurl=http://buildsys.koozali.org/build/5/opt1/i386
278 -
279 -# centos extra
280 -[opt2]
281 -name=opt2
282 -baseurl=http://buildsys.koozali.org/build/5/opt2/i386
283 -
284 -# Not used
285 -[opt3]
286 -name=opt3
287 -baseurl=http://buildsys.koozali.org/build/5/opt3/i386
288 -
289 -[epel]
290 -name=epel
291 -baseurl=http://buildsys.koozali.org/build/5/epel/i386
292 -includepkgs=ccache fakeroot* rpmdevtools perl-Crypt-GPG perl-IPC-Run
293 -
294 -[buildsys-core]
295 -name=buildsys-core
296 -baseurl=http://buildsys.koozali.org/build/8/smeserver-core/i386
297 -includepkgs=bglibs buildsys-macros cvm* dietlibc* e-smith-devtools perl-Test-Inline perl-Ezmlm
298 -
299 -[buildsys-contribs]
300 -name=buildsys-core
301 -baseurl=http://buildsys.koozali.org/build/8/smeserver-contribs/i386
302 -includepkgs=perl-Ezmlm
303 -
304 -[groups]
305 -name=groups
306 -baseurl=http://buildsys.koozali.org/build/8/smeserver-groups/i386
307 -"""
308 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-8-i386-iso.cfg smeserver-mock-1.0/root/etc/mock/smeserver-8-i386-iso.cfg
309 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-i386-iso.cfg 2022-06-30 11:01:08.996000000 -0400
310 +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-i386-iso.cfg 1969-12-31 19:00:00.000000000 -0500
311 @@ -1,92 +0,0 @@
312 -config_opts['package_manager'] = 'yum'
313 -config_opts['use_nspawn'] = False
314 -
315 -config_opts['root'] = 'smeserver-8-i386'
316 -config_opts['target_arch'] = 'i386'
317 -
318 -config_opts['yum.conf'] = """
319 -[main]
320 -cachedir=/var/cache/yum
321 -debuglevel=1
322 -logfile=/var/log/yum.log
323 -reposdir=/dev/null
324 -retries=20
325 -obsoletes=1
326 -gpgcheck=0
327 -assumeyes=1
328 -syslog_ident=mock
329 -syslog_device=
330 -exclude=*.x86_64
331 -
332 -[os]
333 -name=os
334 -baseurl=http://buildsys.koozali.org/build/5/os/i386
335 -exclude=buildsys-macros
336 -
337 -[updates]
338 -name=updates
339 -baseurl=http://buildsys.koozali.org/build/5/updates/i386
340 -exclude=buildsys-macros
341 -
342 -[fastrack]
343 -name=fastrack
344 -baseurl=http://buildsys.koozali.org/build/5/fastrack/i386
345 -
346 -# centos cr
347 -[opt1]
348 -name=opt1
349 -baseurl=http://buildsys.koozali.org/build/5/opt1/i386
350 -
351 -# centos extra
352 -[opt2]
353 -name=opt2
354 -baseurl=http://buildsys.koozali.org/build/5/opt2/i386
355 -
356 -# Not used
357 -[opt3]
358 -name=opt3
359 -baseurl=http://buildsys.koozali.org/build/5/opt3/i386
360 -
361 -[epel]
362 -name=epel
363 -baseurl=http://buildsys.koozali.org/build/5/epel/i386
364 -includepkgs=deltaiso deltarpm jigdo python-hashlib python-kid repoview xz-libs
365 -
366 -[rpmforge]
367 -name=rpmforge
368 -baseurl=http://buildsys.koozali.org/build/5/rpmforge/i386
369 -includepkgs=zsync jigdo
370 -
371 -[rpmforge-extras]
372 -name=rpmforge-extras
373 -baseurl=http://buildsys.koozali.org/build/5/rpmforge-extras/i386
374 -includepkgs=rsync
375 -
376 -[groups]
377 -name=groups
378 -baseurl=http://buildsys.koozali.org/build/8/smeserver-groups/i386
379 -"""
380 -
381 -config_opts['cleanup_on_failure'] = 0
382 -config_opts['cleanup_on_success'] = 0
383 -
384 -config_opts['plugin_conf']['ccache_enable'] = False
385 -config_opts['plugin_conf']['root_cache_enable'] = False
386 -config_opts['plugin_conf']['tmpfs_enable'] = False
387 -
388 -config_opts['chroot_setup_cmd'] = 'groupinstall build iso-build'
389 -
390 -config_opts['chrootuid'] = os.getuid()
391 -
392 -config_opts['plugins'].append('iso_prepare')
393 -
394 -config_opts['plugin_conf']['iso_prepare_enable'] = True
395 -config_opts['plugin_conf']['iso_prepare_opts'] = {}
396 -
397 -config_opts['plugin_conf']['mount_enable'] = True
398 -config_opts['plugin_conf']['mount_opts'] = {}
399 -config_opts['plugin_conf']['mount_opts']['dirs'] = []
400 -
401 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/build', '/build', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
402 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/mirrors', '/mirrors', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
403 -
404 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-8-x86_64-base.cfg smeserver-mock-1.0/root/etc/mock/smeserver-8-x86_64-base.cfg
405 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-x86_64-base.cfg 2022-06-30 11:01:08.996000000 -0400
406 +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-x86_64-base.cfg 1969-12-31 19:00:00.000000000 -0500
407 @@ -1,78 +0,0 @@
408 -config_opts['package_manager'] = 'yum'
409 -config_opts['use_nspawn'] = False
410 -
411 -config_opts['root'] = 'smeserver-8-x86_64'
412 -config_opts['target_arch'] = 'x86_64'
413 -config_opts['dist'] = '.el5.sme'
414 -
415 -config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/ccache/x86_64/"
416 -
417 -config_opts['macros']['%distribution'] = "SME Server v8"
418 -config_opts['macros']['%packager'] = "Contribs.org <http://contribs.org>"
419 -config_opts['macros']['%vendor'] = "Contribs.org <http://contribs.org>"
420 -config_opts['macros']['%dist'] = ".el5.sme"
421 -
422 -config_opts['yum.conf'] = """
423 -[main]
424 -cachedir=/var/cache/yum
425 -debuglevel=1
426 -logfile=/var/log/yum.log
427 -reposdir=/dev/null
428 -retries=20
429 -obsoletes=1
430 -gpgcheck=0
431 -assumeyes=1
432 -syslog_ident=mock
433 -syslog_device=
434 -exclude=[1-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
435 -
436 -[os]
437 -name=os
438 -baseurl=http://buildsys.koozali.org/build/5/os/x86_64
439 -#baseurl=http://centos.bhs.mirrors.ovh.net/ftp.centos.org/5/os/x86_64
440 -exclude=buildsys-macros
441 -
442 -[updates]
443 -name=updates
444 -baseurl=http://buildsys.koozali.org/build/5/updates/x86_64
445 -exclude=buildsys-macros
446 -
447 -[fastrack]
448 -name=fastrack
449 -baseurl=http://buildsys.koozali.org/build/5/fastrack/x86_64
450 -
451 -# centos cr
452 -[opt1]
453 -name=opt1
454 -baseurl=http://buildsys.koozali.org/build/5/opt1/x86_64
455 -
456 -# centos extra
457 -[opt2]
458 -name=opt2
459 -baseurl=http://buildsys.koozali.org/build/5/opt2/x86_64
460 -
461 -# Not used
462 -[opt3]
463 -name=opt3
464 -baseurl=http://buildsys.koozali.org/build/5/opt3/x86_64
465 -
466 -[epel]
467 -name=epel
468 -baseurl=http://buildsys.koozali.org/build/5/epel/x86_64
469 -includepkgs=ccache fakeroot* rpmdevtools perl-IPC-Run perl-Crypt-GPG
470 -
471 -[buildsys-core]
472 -name=buildsys-core
473 -baseurl=http://buildsys.koozali.org/build/8/smeserver-core/x86_64
474 -includepkgs=bglibs buildsys-macros clam* cvm* dietlibc* e-smith-devtools perl-Test-Inline
475 -
476 -[buildsys-contribs]
477 -name=buildsys-core
478 -baseurl=http://buildsys.koozali.org/build/8/smeserver-contribs/x86_64
479 -includepkgs=perl-Ezmlm
480 -
481 -
482 -[groups]
483 -name=groups
484 -baseurl=http://buildsys.koozali.org/build/8/smeserver-groups/x86_64
485 -"""
486 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-8-x86_64-iso.cfg smeserver-mock-1.0/root/etc/mock/smeserver-8-x86_64-iso.cfg
487 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-x86_64-iso.cfg 2022-06-30 11:01:08.996000000 -0400
488 +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-x86_64-iso.cfg 1969-12-31 19:00:00.000000000 -0500
489 @@ -1,92 +0,0 @@
490 -config_opts['package_manager'] = 'yum'
491 -config_opts['use_nspawn'] = False
492 -
493 -config_opts['root'] = 'smeserver-8-x86_64'
494 -config_opts['target_arch'] = 'x86_64'
495 -
496 -config_opts['yum.conf'] = """
497 -[main]
498 -cachedir=/var/cache/yum
499 -debuglevel=1
500 -logfile=/var/log/yum.log
501 -reposdir=/dev/null
502 -retries=20
503 -obsoletes=1
504 -gpgcheck=0
505 -assumeyes=1
506 -syslog_ident=mock
507 -syslog_device=
508 -exclude=[1-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
509 -
510 -[os]
511 -name=os
512 -baseurl=http://buildsys.koozali.org/build/5/os/x86_64
513 -exclude=buildsys-macros
514 -
515 -[updates]
516 -name=updates
517 -baseurl=http://buildsys.koozali.org/build/5/updates/x86_64
518 -exclude=buildsys-macros
519 -
520 -[fastrack]
521 -name=fastrack
522 -baseurl=http://buildsys.koozali.org/build/5/fastrack/x86_64
523 -
524 -# centos cr
525 -[opt1]
526 -name=opt1
527 -baseurl=http://buildsys.koozali.org/build/5/opt1/x86_64
528 -
529 -# centos extra
530 -[opt2]
531 -name=opt2
532 -baseurl=http://buildsys.koozali.org/build/5/opt2/x86_64
533 -
534 -# Not used
535 -[opt3]
536 -name=opt3
537 -baseurl=http://buildsys.koozali.org/build/5/opt3/x86_64
538 -
539 -[epel]
540 -name=epel
541 -baseurl=http://buildsys.koozali.org/build/5/epel/x86_64
542 -includepkgs=deltaiso deltarpm jigdo python-hashlib python-kid repoview xz-libs
543 -
544 -[rpmforge]
545 -name=rpmforge
546 -baseurl=http://buildsys.koozali.org/build/5/rpmforge/x86_64
547 -includepkgs=zsync jigdo
548 -
549 -[rpmforge-extras]
550 -name=rpmforge-extras
551 -baseurl=http://buildsys.koozali.org/build/5/rpmforge-extras/x86_64
552 -includepkgs=rsync
553 -
554 -[groups]
555 -name=groups
556 -baseurl=http://buildsys.koozali.org/build/8/smeserver-groups/x86_64
557 -"""
558 -
559 -config_opts['cleanup_on_failure'] = 0
560 -config_opts['cleanup_on_success'] = 0
561 -
562 -config_opts['plugin_conf']['ccache_enable'] = False
563 -config_opts['plugin_conf']['root_cache_enable'] = False
564 -config_opts['plugin_conf']['tmpfs_enable'] = False
565 -
566 -config_opts['chroot_setup_cmd'] = 'groupinstall build iso-build'
567 -
568 -config_opts['chrootuid'] = os.getuid()
569 -
570 -config_opts['plugins'].append('iso_prepare')
571 -
572 -config_opts['plugin_conf']['iso_prepare_enable'] = True
573 -config_opts['plugin_conf']['iso_prepare_opts'] = {}
574 -
575 -config_opts['plugin_conf']['mount_enable'] = True
576 -config_opts['plugin_conf']['mount_opts'] = {}
577 -config_opts['plugin_conf']['mount_opts']['dirs'] = []
578 -
579 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/build', '/build', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
580 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/mirrors', '/mirrors', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
581 -
582 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-9-i386-base.cfg smeserver-mock-1.0/root/etc/mock/smeserver-9-i386-base.cfg
583 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-i386-base.cfg 2022-06-30 11:01:08.997000000 -0400
584 +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-i386-base.cfg 1969-12-31 19:00:00.000000000 -0500
585 @@ -1,91 +0,0 @@
586 -config_opts['package_manager'] = 'yum'
587 -config_opts['use_nspawn'] = False
588 -
589 -config_opts['root'] = 'smeserver-9-i386'
590 -config_opts['target_arch'] = 'i386'
591 -config_opts['dist'] = '.el6.sme'
592 -
593 -config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/ccache/i386/"
594 -
595 -config_opts['macros']['%distribution'] = "SME Server v9"
596 -config_opts['macros']['%packager'] = "Contribs.org <http://contribs.org>"
597 -config_opts['macros']['%vendor'] = "Contribs.org <http://contribs.org>"
598 -config_opts['macros']['%dist'] = ".el6.sme"
599 -
600 -config_opts['yum.conf'] = """
601 -[main]
602 -cachedir=/var/cache/yum
603 -debuglevel=1
604 -logfile=/var/log/yum.log
605 -reposdir=/dev/null
606 -retries=20
607 -obsoletes=1
608 -gpgcheck=0
609 -assumeyes=1
610 -syslog_ident=mock
611 -syslog_device=
612 -
613 -[os]
614 -name=os
615 -baseurl=http://buildsys.koozali.org/build/6/os/i386
616 -exclude=buildsys-macros
617 -
618 -[updates]
619 -name=updates
620 -baseurl=http://buildsys.koozali.org/build/6/updates/i386
621 -exclude=buildsys-macros
622 -
623 -[fastrack]
624 -name=fastrack
625 -baseurl=http://buildsys.koozali.org/build/6/fastrack/i386
626 -
627 -# centos cr
628 -[opt1]
629 -name=opt1
630 -baseurl=http://buildsys.koozali.org/build/6/opt1/i386
631 -
632 -# centos extra
633 -[opt2]
634 -name=opt2
635 -baseurl=http://buildsys.koozali.org/build/6/opt2/i386
636 -
637 -# Not used
638 -[opt3]
639 -name=opt3
640 -baseurl=http://buildsys.koozali.org/build/6/opt3/i386
641 -
642 -[epel]
643 -name=epel
644 -baseurl=http://buildsys.koozali.org/build/6/epel/i386
645 -includepkgs=ccache mhash* pyzor perl-Perl-OSType perl-IPC-Run perl-File-ShareDir perl-Email-Simple perl-Email-MIME perl-Email-MIME-Creator perl-Email-MIME-Encodings perl-Email-MIME-ContentType perl-EMail-MIME-Modifier perl-Email-MessageID perl-Email-Address perl-Email-Date perl-Mail-SPF perl-Net-IMAP-Simple perl-Razor-Agent perl-Net-SMTPS jansson* vala* fdupes js-devel js celt* libevent2* libarchive3 libva* celt enca fribidi libass openal-soft lame* schroedinger dirac-libs libmp4v2* liblastfm* id3lib* libupnp* perl-Class-Method-Modifiers perl-Devel-GlobalDestruction perl-Module-Runtime perl-Test-Fatal perl-Crypt-Random-TESHA2 perl-Crypt-Random-Seed perl-Math-Random-ISAAC kmodtool libmaxminddb-devel libmaxminddb python2-numpy
646 -
647 -
648 -#[rpmforge]
649 -#name=rpmforge
650 -#baseurl=http://buildsys.koozali.org/build/6/rpmforge/i386
651 -#includepkgs=perl-Taint-Util perl-IP-Country perl-Geography-Countries perl-Razor-Agent perl-Net-Ident
652 -
653 -[atrpms]
654 -name=atrpms
655 -baseurl=http://buildsys.koozali.org/build/6/atrpms/i386
656 -includepkgs=perl-Mail-SPF DCC
657 -
658 -[rpmfusion]
659 -name=rpmfusion
660 -baseurl=http://download1.rpmfusion.org/free/el/updates/6/i386
661 -includepkgs=ffmpeg* libva* x264-libs xvidcore librtmp buildsys-build-rpmfusion*
662 -
663 -[buildsys-core]
664 -name=buildsys-core
665 -baseurl=http://buildsys.koozali.org/build/9/smeserver-core/i386
666 -includepkgs=bglibs buildsys-macros cvm* DCC dietlibc* e-smith-devtools perl-Geography-Countries perl-Test-Inline perl-ExtUtils-Constant perl-Socket perl-IO-Socket-IP perl-IP-Country perl-Time-Local perl-Net-Ident perl-Net-SSLeay clamav* perl-Regexp-Common perl-Bytes-Random-Secure perl-Razor-Agent
667 -
668 -[buildsys-contribs]
669 -name=buildsys-contribs
670 -baseurl=http://buildsys.koozali.org/build/9/smeserver-contribs/i386
671 -includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* libccnet* libzdb* ccnet* evhtp* sqlite* rtl-sdr* ocaml camlp5
672 -
673 -[groups]
674 -name=groups
675 -baseurl=http://buildsys.koozali.org/build/9/smeserver-groups/i386
676 -"""
677 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-9-i386-iso.cfg smeserver-mock-1.0/root/etc/mock/smeserver-9-i386-iso.cfg
678 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-i386-iso.cfg 2022-06-30 11:01:08.997000000 -0400
679 +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-i386-iso.cfg 1969-12-31 19:00:00.000000000 -0500
680 @@ -1,96 +0,0 @@
681 -config_opts['package_manager'] = 'yum'
682 -config_opts['use_nspawn'] = False
683 -
684 -config_opts['root'] = 'smeserver-9-i386'
685 -config_opts['target_arch'] = 'i386'
686 -
687 -config_opts['yum.conf'] = """
688 -[main]
689 -cachedir=/var/cache/yum
690 -debuglevel=1
691 -logfile=/var/log/yum.log
692 -reposdir=/dev/null
693 -retries=20
694 -obsoletes=1
695 -gpgcheck=0
696 -assumeyes=1
697 -syslog_ident=mock
698 -syslog_device=
699 -
700 -[os]
701 -name=os
702 -baseurl=http://buildsys.koozali.org/build/6/os/i386
703 -exclude=buildsys-macros
704 -
705 -[updates]
706 -name=updates
707 -baseurl=http://buildsys.koozali.org/build/6/updates/i386
708 -exclude=buildsys-macros
709 -
710 -[fastrack]
711 -name=fastrack
712 -baseurl=http://buildsys.koozali.org/build/6/fastrack/i386
713 -
714 -# centos cr
715 -[opt1]
716 -name=opt1
717 -baseurl=http://buildsys.koozali.org/build/6/opt1/i386
718 -
719 -# centos extra
720 -[opt2]
721 -name=opt2
722 -baseurl=http://buildsys.koozali.org/build/6/opt2/i386
723 -
724 -# Not used
725 -[opt3]
726 -name=opt3
727 -baseurl=http://buildsys.koozali.org/build/6/opt3/i386
728 -
729 -[epel]
730 -name=epel
731 -baseurl=http://buildsys.koozali.org/build/6/epel/i386
732 -includepkgs=ccache mhash* pyzor
733 -
734 -[rpmforge]
735 -name=rpmforge
736 -baseurl=http://buildsys.koozali.org/build/6/rpmforge/i386
737 -includepkgs=perl-Taint-Util perl-IP-Country perl-Geography-Countries perl-Razor-Agent perl-Net-Ident
738 -
739 -#[atrpms]
740 -#name=atrpms
741 -#baseurl=http://buildsys.koozali.org/build/6/atrpms/i386
742 -#includepkgs=perl-Mail-SPF DCC
743 -
744 -[buildsys-core]
745 -name=buildsys-core
746 -baseurl=http://buildsys.koozali.org/build/9/smeserver-core/i386
747 -includepkgs=jigdo anaconda
748 -
749 -[groups]
750 -name=groups
751 -baseurl=http://buildsys.koozali.org/build/9/smeserver-groups/x86_64
752 -"""
753 -
754 -config_opts['cleanup_on_failure'] = 0
755 -config_opts['cleanup_on_success'] = 0
756 -
757 -config_opts['plugin_conf']['ccache_enable'] = False
758 -config_opts['plugin_conf']['root_cache_enable'] = False
759 -config_opts['plugin_conf']['tmpfs_enable'] = False
760 -
761 -config_opts['chroot_setup_cmd'] = 'groupinstall iso-build'
762 -
763 -config_opts['chrootuid'] = os.getuid()
764 -
765 -config_opts['plugins'].append('iso_prepare')
766 -
767 -config_opts['plugin_conf']['iso_prepare_enable'] = True
768 -config_opts['plugin_conf']['iso_prepare_opts'] = {}
769 -
770 -config_opts['plugin_conf']['mount_enable'] = True
771 -config_opts['plugin_conf']['mount_opts'] = {}
772 -config_opts['plugin_conf']['mount_opts']['dirs'] = []
773 -
774 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/build', '/build', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
775 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/mirrors', '/mirrors', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
776 -
777 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-9-x86_64-base.cfg smeserver-mock-1.0/root/etc/mock/smeserver-9-x86_64-base.cfg
778 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-x86_64-base.cfg 2022-06-30 11:01:08.997000000 -0400
779 +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-x86_64-base.cfg 1969-12-31 19:00:00.000000000 -0500
780 @@ -1,102 +0,0 @@
781 -config_opts['package_manager'] = 'yum'
782 -config_opts['use_nspawn'] = False
783 -
784 -config_opts['root'] = 'smeserver-9-x86_64'
785 -config_opts['target_arch'] = 'x86_64'
786 -config_opts['dist'] = '.el6.sme'
787 -config_opts['chroot_setup_cmd'] = ' install @buildsys-build @buildsys scl-utils-build python27-build '
788 -
789 -config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/ccache/x86_64/"
790 -
791 -config_opts['macros']['%distribution'] = "SME Server v9"
792 -config_opts['macros']['%packager'] = "Contribs.org <http://contribs.org>"
793 -config_opts['macros']['%vendor'] = "Contribs.org <http://contribs.org>"
794 -config_opts['macros']['%dist'] = ".el6.sme"
795 -
796 -config_opts['yum.conf'] = """
797 -[main]
798 -cachedir=/var/cache/yum
799 -debuglevel=4
800 -logfile=/var/log/yum.log
801 -reposdir=/dev/null
802 -retries=20
803 -obsoletes=1
804 -gpgcheck=0
805 -assumeyes=1
806 -syslog_ident=mock
807 -syslog_device=
808 -
809 -[os]
810 -name=os
811 -baseurl=http://buildsys.koozali.org/build/6/os/x86_64
812 -exclude=buildsys-macros
813 -
814 -[updates]
815 -name=updates
816 -baseurl=http://buildsys.koozali.org/build/6/updates/x86_64
817 -exclude=buildsys-macros
818 -
819 -[fastrack]
820 -name=fastrack
821 -baseurl=http://buildsys.koozali.org/build/6/fastrack/x86_64
822 -
823 -# centos cr
824 -#[opt1]
825 -#name=opt1
826 -#baseurl=http://buildsys.koozali.org/build/6/opt1/x86_64
827 -
828 -# centos extra
829 -[opt2]
830 -name=opt2
831 -baseurl=http://buildsys.koozali.org/build/6/opt2/x86_64
832 -
833 -# Not used
834 -[opt3]
835 -name=opt3
836 -baseurl=http://buildsys.koozali.org/build/6/opt3/x86_64
837 -
838 -[epel]
839 -name=epel
840 -baseurl=http://buildsys.koozali.org/build/6/epel/x86_64
841 -includepkgs=ccache mhash* pyzor perl-Perl-OSType perl-IPC-Run perl-File-ShareDir perl-Email-Simple perl-Email-MIME perl-Email-MIME-Creator perl-Email-MIME-Encodings perl-Email-MIME-ContentType perl-EMail-MIME-Modifier perl-Email-MessageID perl-Email-Address perl-Email-Date perl-Mail-SPF perl-Net-IMAP-Simple perl-Razor-Agent perl-Net-SMTPS jansson* vala* fdupes js-devel js celt* libevent2* libarchive3 libva* celt enca fribidi libass openal-soft lame* schroedinger dirac-libs libmp4v2* liblastfm* id3lib* libupnp* perl-Class-Method-Modifiers perl-Devel-GlobalDestruction perl-Module-Runtime perl-Test-Fatal perl-Crypt-Random-TESHA2 perl-Crypt-Random-Seed perl-Math-Random-ISAAC kmodtool libmaxminddb-devel libmaxminddb python2-numpy
842 -
843 -#[rpmforge]
844 -#name=rpmforge
845 -#baseurl=http://buildsys.koozali.org/build/6/rpmforge/x86_64
846 -#includepkgs=perl-Taint-Util perl-IP-Country perl-Geography-Countries perl-Razor-Agent perl-Net-Ident
847 -
848 -[atrpms]
849 -name=atrpms
850 -baseurl=http://buildsys.koozali.org/build/6/atrpms/x86_64
851 -includepkgs=perl-Mail-SPF DCC
852 -
853 -[rpmfusion]
854 -name=rpmfusion
855 -baseurl=http://download1.rpmfusion.org/free/el/updates/6/x86_64
856 -includepkgs=ffmpeg* libva* x264-libs xvidcore librtmp libmpeg2* mpeg2dec buildsys-build-rpmfusion*
857 -
858 -[sclo-sclo]
859 -name=sclo-sclo
860 -baseurl=http://mirror.centos.org/centos/6/sclo/x86_64/sclo
861 -includepkgs=python27*
862 -
863 -[sclo-rh]
864 -name=sclo-rh
865 -baseurl=http://mirror.centos.org/centos/6/sclo/x86_64/rh
866 -includepkgs=python27* python33* rh-mongodb26* rh-mongodb32* rh-mongodb34* nodejs010* rh-nodejs6*
867 -# issue if you put the three following : nodejs010* rh-nodejs4* rh-nodejs6*
868 -
869 -[buildsys-core]
870 -name=buildsys-core
871 -baseurl=http://buildsys.koozali.org/build/9/smeserver-core/x86_64
872 -includepkgs=bglibs buildsys-macros cvm* DCC dietlibc* e-smith-devtools perl-Geography-Countries perl-Test-Inline perl-ExtUtils-Constant perl-Socket perl-IO-Socket-IP perl-IP-Country perl-Time-Local perl-Net-Ident perl-Net-SSLeay clamav* perl-Regexp-Common perl-Bytes-Random-Secure perl-Razor-Agent
873 -
874 -[buildsys-contribs]
875 -name=buildsys-contribs
876 -baseurl=http://buildsys.koozali.org/build/9/smeserver-contribs/x86_64
877 -includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* ccnet* libccnet* libzdb* evhtp* sqlite* python27-python-versiontools rtl-sdr* ocaml camlp5
878 -
879 -[groups]
880 -name=groups
881 -baseurl=http://buildsys.koozali.org/build/9/smeserver-groups/x86_64
882 -"""
883 diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-9-x86_64-iso.cfg smeserver-mock-1.0/root/etc/mock/smeserver-9-x86_64-iso.cfg
884 --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-x86_64-iso.cfg 2022-06-30 11:01:08.997000000 -0400
885 +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-x86_64-iso.cfg 1969-12-31 19:00:00.000000000 -0500
886 @@ -1,97 +0,0 @@
887 -config_opts['package_manager'] = 'yum'
888 -config_opts['use_nspawn'] = False
889 -
890 -config_opts['root'] = 'smeserver-9-x86_64'
891 -config_opts['target_arch'] = 'x86_64'
892 -
893 -config_opts['yum.conf'] = """
894 -[main]
895 -cachedir=/var/cache/yum
896 -debuglevel=1
897 -logfile=/var/log/yum.log
898 -reposdir=/dev/null
899 -retries=20
900 -obsoletes=1
901 -gpgcheck=0
902 -assumeyes=1
903 -syslog_ident=mock
904 -syslog_device=
905 -exclude=[1-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
906 -
907 -[os]
908 -name=os
909 -baseurl=http://buildsys.koozali.org/build/6/os/x86_64
910 -exclude=buildsys-macros
911 -
912 -[updates]
913 -name=updates
914 -baseurl=http://buildsys.koozali.org/build/6/updates/x86_64
915 -exclude=buildsys-macros
916 -
917 -[fastrack]
918 -name=fastrack
919 -baseurl=http://buildsys.koozali.org/build/6/fastrack/x86_64
920 -
921 -# centos cr
922 -[opt1]
923 -name=opt1
924 -baseurl=http://buildsys.koozali.org/build/6/opt1/x86_64
925 -
926 -# centos extra
927 -[opt2]
928 -name=opt2
929 -baseurl=http://buildsys.koozali.org/build/6/opt2/x86_64
930 -
931 -# Not used
932 -[opt3]
933 -name=opt3
934 -baseurl=http://buildsys.koozali.org/build/6/opt3/x86_64
935 -
936 -[epel]
937 -name=epel
938 -baseurl=http://buildsys.koozali.org/build/6/epel/x86_64
939 -includepkgs=ccache mhash* pyzor
940 -
941 -#[rpmforge]
942 -#name=rpmforge
943 -#baseurl=http://buildsys.koozali.org/build/6/rpmforge/x86_64
944 -#includepkgs=perl-Taint-Util perl-IP-Country perl-Geography-Countries perl-Razor-Agent perl-Net-Ident
945 -
946 -#[atrpms]
947 -#name=atrpms
948 -#baseurl=http://buildsys.koozali.org/build/6/atrpms/x86_64
949 -#includepkgs=perl-Mail-SPF DCC
950 -
951 -[buildsys-core]
952 -name=buildsys-core
953 -baseurl=http://buildsys.koozali.org/build/9/smeserver-core/x86_64
954 -includepkgs=jigdo anaconda
955 -
956 -[groups]
957 -name=groups
958 -baseurl=http://buildsys.koozali.org/build/9/smeserver-groups/x86_64
959 -"""
960 -
961 -config_opts['cleanup_on_failure'] = 0
962 -config_opts['cleanup_on_success'] = 0
963 -
964 -config_opts['plugin_conf']['ccache_enable'] = False
965 -config_opts['plugin_conf']['root_cache_enable'] = False
966 -config_opts['plugin_conf']['tmpfs_enable'] = False
967 -
968 -config_opts['chroot_setup_cmd'] = 'groupinstall build iso-build'
969 -
970 -config_opts['chrootuid'] = os.getuid()
971 -
972 -config_opts['plugins'].append('iso_prepare')
973 -
974 -config_opts['plugin_conf']['iso_prepare_enable'] = True
975 -config_opts['plugin_conf']['iso_prepare_opts'] = {}
976 -
977 -config_opts['plugin_conf']['mount_enable'] = True
978 -config_opts['plugin_conf']['mount_opts'] = {}
979 -config_opts['plugin_conf']['mount_opts']['dirs'] = []
980 -
981 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/build', '/build', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
982 -config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/mirrors', '/mirrors', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
983 -
984 diff -Nur --no-dereference smeserver-mock-1.0.old/root/usr/bin/change-log smeserver-mock-1.0/root/usr/bin/change-log
985 --- smeserver-mock-1.0.old/root/usr/bin/change-log 2022-06-30 11:01:09.000000000 -0400
986 +++ smeserver-mock-1.0/root/usr/bin/change-log 2022-06-30 16:19:27.345000000 -0400
987 @@ -55,7 +55,7 @@
988 cat $specfile.tmp > $specfile;
989
990 echo "updating changelog $specfile";
991 -entete="* $dateH Jean-Philipe Pialasse <tests@pialasse.com> $version-$release.sme"
992 +entete="* $dateH ME MYSELF <myemail@koozali.org> $version-$release.sme"
993 changelog="- fix [SME: ]"
994 cat $specfile |sed "/^%changelog/a $entete\n$changelog\n" >$specfile.tmp;
995 cat $specfile.tmp>$specfile;
996 diff -Nur --no-dereference smeserver-mock-1.0.old/root/usr/bin/importNew smeserver-mock-1.0/root/usr/bin/importNew
997 --- smeserver-mock-1.0.old/root/usr/bin/importNew 2022-06-30 11:01:09.001000000 -0400
998 +++ smeserver-mock-1.0/root/usr/bin/importNew 2022-06-30 16:20:42.501000000 -0400
999 @@ -78,7 +78,7 @@
1000 then
1001 # update current tree
1002 cd ~/$packageroot/rpms
1003 - cvs -Q update -dPA 1>/dev/null
1004 + cvs -Q update -dPA $pkgname common 1>/dev/null
1005 else
1006 # checkout rpms
1007 cd ~/$packageroot
1008 @@ -169,7 +169,7 @@
1009 cd CVSROOT/;
1010 cvs -Q update -dPA 1>/dev/null;
1011 cd ../rpms/;
1012 - cvs -Q update -dPA 1>/dev/null ;
1013 + cvs -Q update -dPA common $pkgname 1>/dev/null ;
1014 cd ~/$packageroot;
1015 ./common/cvs-import.sh -b $sme$ver -m 'Initial import' /tmp/$(basename $rpmpath)
1016 else
1017 @@ -178,18 +178,17 @@
1018
1019 else
1020 echo "##########################"
1021 - echo "sending $rpmpath to shell.koozali.org ..."
1022 if [[ $rpmpath != "" ]]
1023 then
1024 + echo "sending $rpmpath to shell.koozali.org ..."
1025 echo "scp $rpmpath shell.koozali.org:/tmp/"
1026 cd $curpwd
1027 - scp $rpmpath shell.koozali.org:/tmp/
1028 + scp $rpmpath shell.koozali.org:~
1029 echo "now trying to push this on shell.koozali.org and run ./common/cvs-import.sh"
1030 echo "this could fails if your srpm was not initially on ~/smecontrib/ and if you have not ForwardAgent yes and user set in your .ss/config file for shell.koozali.org"
1031 - ssh shell.koozali.org "cd ~/$packageroot;cd CVSROOT/; cvs -Q update -dPA 1>/dev/null; cd ../rpms/; cvs -Q update -dPA $pkgname 1>/dev/null ;cd ~/$packageroot; ./common/cvs-import.sh -b $sme$ver -m 'Initial import' /tmp/$(basename $rpmpath)"
1032 - fi
1033 - cd ~/$packageroot/rpms/$pkgname/$sme$ver
1034 - cvs update -dPA; make prep
1035 +# ssh shell.koozali.org "cd ~/$packageroot;cd CVSROOT/; echo 'updating CVSROOT/modules...'; cvs -Q update -dPA modules; cd ../rpms/;echo 'checkout $pkgname ...' cvs co $pkgname 1>/dev/null ;cd ~/$packageroot; if [[ -f ~/$(basename $rpmpath) ]]; then ./common/cvs-import.sh -b $sme$ver -m 'Initial import' ~/$(basename $rpmpath); fi "
1036 + ssh shell.koozali.org "cd ~/$packageroot;cd CVSROOT/; echo 'updating CVSROOT/modules...'; cvs -Q update -dPA modules && cd ../rpms/ && echo 'checkout $pkgname ...' && cvs co $pkgname 1>/dev/null && cd ~/$packageroot && if [[ -f ~/$(basename $rpmpath) ]]; then echo './common/cvs-import.sh -b $sme$ver -m Initial import ~/$(basename $rpmpath)'; ./common/cvs-import.sh -b $sme$ver -m 'Initial import' ~/$(basename $rpmpath); fi "
1037 +
1038 echo "in case of failure do:"
1039 echo "scp $rpmpath shell.koozali.org:/tmp/"
1040 echo "ssh shell.koozali.org"
1041 @@ -201,7 +200,18 @@
1042 echo "./common/cvs-import.sh -b $sme$ver -m 'Initial import' YOURSRPM "
1043 fi
1044 echo "exit"
1045 - echo "cd ~/$packageroot/rpms/$pkgname/$sme$ver ; cvs update -dPA; make prep"
1046 + fi
1047 + cd ~/$packageroot/rpms/$pkgname/$sme$ver
1048 + if [ -f $pkgname}.spec ]
1049 + then
1050 + ### if there is no spec file this will fail : make prep
1051 + cvs update -dPA; make prep
1052 + else
1053 + echo "# now do:"
1054 + echo "cd ~/$packageroot/rpms/$pkgname/$sme$ver ; cvs update -dPA;"
1055 + echo "then create your own spec file and cvs add it."
1056 + echo "then create your own archive and import it to lookaside cache if needed"
1057 + fi
1058 fi
1059
1060 echo "##########################"
1061 diff -Nur --no-dereference smeserver-mock-1.0.old/root/usr/bin/prepa smeserver-mock-1.0/root/usr/bin/prepa
1062 --- smeserver-mock-1.0.old/root/usr/bin/prepa 2022-06-30 11:01:09.006000000 -0400
1063 +++ smeserver-mock-1.0/root/usr/bin/prepa 2022-06-30 16:21:38.757000000 -0400
1064 @@ -3,9 +3,9 @@
1065 make clean
1066 make prep
1067 if [ -f 'sources' ] ; then
1068 -folder=`sed -rn 's/^[a-z0-9]{32}\s+(.+)\.(tar|t)\.?(gz|xz|bz)*$/\1/p' sources`
1069 +folder=`sed -rn 's/^[a-z0-9]{32}\s+(.+)\.(tar|t)\.?(gz|xz|bz|bz2)*$/\1/p' sources`
1070 oldy="$folder.old"
1071 -if [ -d $folder ] ; then
1072 +if [ -d "$folder" ] ; then
1073 echo "$folder exist"
1074 if [ -d $oldy ] ; then
1075 rm -rf $oldy && echo "removing $oldy"
1076 diff -Nur --no-dereference smeserver-mock-1.0.old/root/usr/lib/python3.6/site-packages/mockbuild/plugins/copy.py smeserver-mock-1.0/root/usr/lib/python3.6/site-packages/mockbuild/plugins/copy.py
1077 --- smeserver-mock-1.0.old/root/usr/lib/python3.6/site-packages/mockbuild/plugins/copy.py 1969-12-31 19:00:00.000000000 -0500
1078 +++ smeserver-mock-1.0/root/usr/lib/python3.6/site-packages/mockbuild/plugins/copy.py 2022-06-30 11:34:15.759000000 -0400
1079 @@ -0,0 +1,83 @@
1080 +# -*- coding: utf-8 -*-
1081 +# vim:expandtab:autoindent:tabstop=4:shiftwidth=4:filetype=python:textwidth=0:
1082 +# License: GPL2 or later see COPYING
1083 +# Written by Jean-Philippe Pialasse
1084 +# Copyright (C) 2022 Jean-Philippe Pialasse <jpp@koozali.org>
1085 +
1086 +
1087 +"""
1088 +# The copy plugin is enabled by default.
1089 +# To disable it, use following option:
1090 +config_opts['plugin_conf']['copy'] = False
1091 +# To configure the copy plugin, for each file use following option:
1092 +config_opts['plugin_conf']['copy_opts']['files'].append(
1093 + ("/usr/local/myfile", "/usr/bin/myfile_inchroot"))
1094 +# A real life example:
1095 +config_opts['plugin_conf']['copy_opts']['files'].append(
1096 + ("/usr/lib/rpm/redhat/perl.prov", "/usr/lib/rpm/redhat/perl.prov"))
1097 +"""
1098 +import shutil
1099 +import os
1100 +from mockbuild.mounts import FileSystemMountPoint
1101 +from mockbuild.trace_decorator import getLog, traceLog
1102 +#from mockbuild.buildroot import make_chroot_path
1103 +from mockbuild import file_util
1104 +
1105 +requires_api_version = "1.1"
1106 +
1107 +
1108 +# plugin entry point
1109 +@traceLog()
1110 +def init(plugins, conf, buildroot):
1111 + Copy(plugins, conf, buildroot)
1112 +
1113 +
1114 +class Copy(object):
1115 + """copy files into chroot"""
1116 + # pylint: disable=too-few-public-methods
1117 + @traceLog()
1118 + def __init__(self, plugins, conf, buildroot):
1119 + self.buildroot = buildroot
1120 + self.config = buildroot.config
1121 + self.state = buildroot.state
1122 + self.opts = conf
1123 + # Skip copy user-specified files if we're in the boostrap chroot
1124 + if buildroot.is_bootstrap:
1125 + return
1126 + getLog().info(conf['files'])
1127 + getLog().info("enabled package copy")
1128 + plugins.add_hook("postinit", self._copyFiles)
1129 + plugins.add_hook('postyum', self._copyFiles)
1130 + self._copyFiles
1131 + #for ori_file, dest_file in self.opts['files']:
1132 + # getLog().info(ori_file)
1133 + # self._copyFiles
1134 +
1135 + @traceLog()
1136 + def _copyFiles(self):
1137 + # pylint: disable=unused-variable
1138 + for ori_file, dest_file in self.opts['files']:
1139 + cdest_file = self.buildroot.make_chroot_path(dest_file)
1140 + try:
1141 + os.remove(cdest_file)
1142 + except FileNotFoundError:
1143 + pass
1144 + file_util.mkdirIfAbsent(os.path.dirname(cdest_file))
1145 + if os.path.exists(ori_file):
1146 + shutil.copy2(ori_file, cdest_file)
1147 + getLog().info("File %s copied to %s !",ori_file , cdest_file )
1148 + elif warn:
1149 + getlog.warning("File %s not present. It is not copied into the chroot.", ori_file)
1150 +
1151 +
1152 +
1153 +
1154 +
1155 +
1156 +
1157 +
1158 +
1159 +
1160 +
1161 +
1162 +

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed