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

Annotation of /rpms/smeserver-mock/sme10/smeserver-mock-1.0-sme10946-mock.patch

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

Revision 1.1 - (hide annotations) (download)
Tue May 19 04:06:23 2020 UTC (4 years, 5 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-mock-1_0-14_el7_sme, smeserver-mock-1_0-11_el7_sme, smeserver-mock-1_0-12_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-13_el7_sme, smeserver-mock-1_0-21_el7_sme, smeserver-mock-1_0-19_el7_sme, smeserver-mock-1_0-10_el7_sme, smeserver-mock-1_0-20_el7_sme, smeserver-mock-1_0-18_el7_sme, smeserver-mock-1_0-9_el7_sme, smeserver-mock-1_0-17_el7_sme, HEAD 
* Thu May 14 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0-9.sme
- fix nspawn and package_manager set to yum [SME: 10946]
- updating list of included packages for SME10 and SME9 repo
- updating the attached bins to help building [SME: ]
1 jpp 1.1 diff -Nur smeserver-mock-1.0.old/root/etc/mock/smeserver-10-x86_64-base.cfg smeserver-mock-1.0/root/etc/mock/smeserver-10-x86_64-base.cfg
2     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-10-x86_64-base.cfg 2020-05-14 22:47:30.431000000 -0400
3     +++ smeserver-mock-1.0/root/etc/mock/smeserver-10-x86_64-base.cfg 2020-05-14 23:28:25.759000000 -0400
4     @@ -1,3 +1,6 @@
5     +config_opts['package_manager'] = 'yum'
6     +config_opts['use_nspawn'] = False
7     +
8     config_opts['root'] = 'smeserver-10-x86_64'
9     config_opts['target_arch'] = 'x86_64'
10     config_opts['dist'] = '.el7.sme'
11     @@ -56,14 +59,13 @@
12     name=epel
13     baseurl=http://download.fedoraproject.org/pub/epel/7/x86_64
14     #baseurl=http://buildsys.koozali.org/build/7/epel/x86_64
15     -includepkgs=ccache mhash* perl-Taint-Util libdb4 libdb4-devel php-channel-horde php-horde-*
16     -#php-phpunit-* libtidy php-composer* php-sebastian* php-symfony* php-pecl* php-tidy php-doctrine* php-pear*
17     -
18     +includepkgs=ccache mhash* perl-Taint-Util libdb4 libdb4-devel php-channel-horde php-horde-* perl-Class-Method-Modifiers perl-Class-XSAccessor perl-Devel-GlobalDestruction perl-Sub-Name perl-indirect perl-B-Hooks-OP-Check perl-ExtUtils-Depends perl-Lexical-SealRequireHints perl-Params-Classify perl-Dist-CheckConflicts perl-Math-Int64 perl-Sort-Naturally perl-Sub-Exporter-Progressive perl-Bytes-Random-Secure perl-Crypt-Random-TESHA2 perl-Crypt-Random-Seed perl-Math-Random-ISAAC kmodtool libmaxminddb-devel libmaxminddb
19     +
20     #[rpmforge]
21     #name=rpmforge
22     #baseurl=http://buildsys.koozali.org/build/7/rpmforge/x86_64
23     #includepkgs=perl-Taint-Util
24     -
25     +
26     [rpmfusion]
27     name=rpmfusion
28     baseurl=http://download1.rpmfusion.org/free/el/updates/7/x86_64
29     @@ -82,12 +84,12 @@
30     [buildsys-core]
31     name=buildsys-core
32     baseurl=http://buildsys.koozali.org/build/10/smeserver-core/x86_64
33     -includepkgs=bglibs buildsys-macros cvm* dietlibc* e-smith-devtools perl-Test-Inline perl-IO-Socket-IP perl-Geography-Countries perl-Object-Persistence
34     +includepkgs=bglibs buildsys-macros cvm* dietlibc* e-smith-devtools perl-Test-Inline perl-IO-Socket-IP perl-Geography-Countries perl-Object-Persistence perl-bareword-filehandles perl-multidimensional perl-strictures perl-Module-Runtime perl-Role-Tiny perl-Sub-Quote perl-Bytes-Random-Secure
35    
36     [buildsys-contribs]
37     name=buildsys-contribs
38     baseurl=http://buildsys.koozali.org/build/10/smeserver-contribs/x86_64
39     -includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* ccnet* libccnet* libzdb* evhtp* sqlite* ocaml camlp5
40     +includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* ccnet* libccnet* libzdb* libccnet* evhtp* sqlite* ocaml camlp5 python27-python-versiontools libarchive*
41    
42     [groups]
43     name=groups
44     diff -Nur smeserver-mock-1.0.old/root/etc/mock/smeserver-10-x86_64-iso.cfg smeserver-mock-1.0/root/etc/mock/smeserver-10-x86_64-iso.cfg
45     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-10-x86_64-iso.cfg 2020-05-14 22:47:30.420000000 -0400
46     +++ smeserver-mock-1.0/root/etc/mock/smeserver-10-x86_64-iso.cfg 2020-05-14 23:28:45.341000000 -0400
47     @@ -1,3 +1,6 @@
48     +config_opts['package_manager'] = 'yum'
49     +config_opts['use_nspawn'] = False
50     +
51     config_opts['root'] = 'smeserver-10-x86_64'
52     config_opts['target_arch'] = 'x86_64'
53     config_opts['dist'] = '.el7.sme'
54     @@ -82,7 +85,6 @@
55     baseurl=http://buildsys.koozali.org/build/10/smeserver-groups/x86_64
56     """
57    
58     -
59     config_opts['cleanup_on_failure'] = 0
60     config_opts['cleanup_on_success'] = 0
61    
62     @@ -105,4 +107,3 @@
63    
64     config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/build', '/build', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
65     config_opts['plugin_conf']['mount_opts']['dirs'].append(('files.koozali.org:/mirrors', '/mirrors', 'nfs', 'defaults,noatime,nodiratime,nosuid'))
66     -#config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/build', '/build' ))
67     diff -Nur 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
68     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-i386-base.cfg 2018-03-10 23:28:24.000000000 -0500
69     +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-i386-base.cfg 2020-05-14 23:17:36.318000000 -0400
70     @@ -1,3 +1,6 @@
71     +config_opts['package_manager'] = 'yum'
72     +config_opts['use_nspawn'] = False
73     +
74     config_opts['root'] = 'smeserver-8-i386'
75     config_opts['target_arch'] = 'i386'
76     config_opts['dist'] = '.el5.sme'
77     diff -Nur 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
78     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-i386-iso.cfg 2018-03-10 23:28:24.000000000 -0500
79     +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-i386-iso.cfg 2020-05-14 23:17:48.660000000 -0400
80     @@ -1,3 +1,6 @@
81     +config_opts['package_manager'] = 'yum'
82     +config_opts['use_nspawn'] = False
83     +
84     config_opts['root'] = 'smeserver-8-i386'
85     config_opts['target_arch'] = 'i386'
86    
87     diff -Nur 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
88     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-x86_64-base.cfg 2018-03-10 23:28:24.000000000 -0500
89     +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-x86_64-base.cfg 2020-05-14 23:17:24.223000000 -0400
90     @@ -1,3 +1,6 @@
91     +config_opts['package_manager'] = 'yum'
92     +config_opts['use_nspawn'] = False
93     +
94     config_opts['root'] = 'smeserver-8-x86_64'
95     config_opts['target_arch'] = 'x86_64'
96     config_opts['dist'] = '.el5.sme'
97     diff -Nur 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
98     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-8-x86_64-iso.cfg 2018-03-10 23:28:24.000000000 -0500
99     +++ smeserver-mock-1.0/root/etc/mock/smeserver-8-x86_64-iso.cfg 2020-05-14 23:17:13.641000000 -0400
100     @@ -1,3 +1,6 @@
101     +config_opts['package_manager'] = 'yum'
102     +config_opts['use_nspawn'] = False
103     +
104     config_opts['root'] = 'smeserver-8-x86_64'
105     config_opts['target_arch'] = 'x86_64'
106    
107     diff -Nur 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
108     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-i386-base.cfg 2020-05-14 22:47:30.432000000 -0400
109     +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-i386-base.cfg 2020-05-18 23:59:42.012000000 -0400
110     @@ -1,3 +1,6 @@
111     +config_opts['package_manager'] = 'yum'
112     +config_opts['use_nspawn'] = False
113     +
114     config_opts['root'] = 'smeserver-9-i386'
115     config_opts['target_arch'] = 'i386'
116     config_opts['dist'] = '.el6.sme'
117     @@ -54,27 +57,33 @@
118     [epel]
119     name=epel
120     baseurl=http://buildsys.koozali.org/build/6/epel/i386
121     -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*
122     +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
123     +
124    
125     #[rpmforge]
126     #name=rpmforge
127     #baseurl=http://buildsys.koozali.org/build/6/rpmforge/i386
128     #includepkgs=perl-Taint-Util perl-IP-Country perl-Geography-Countries perl-Razor-Agent perl-Net-Ident
129     +
130     +[atrpms]
131     +name=atrpms
132     +baseurl=http://buildsys.koozali.org/build/6/atrpms/i386
133     +includepkgs=perl-Mail-SPF DCC
134    
135     [rpmfusion]
136     name=rpmfusion
137     baseurl=http://download1.rpmfusion.org/free/el/updates/6/i386
138     -includepkgs=ffmpeg* libva* x264-libs xvidcore librtmp
139     +includepkgs=ffmpeg* libva* x264-libs xvidcore librtmp buildsys-build-rpmfusion*
140    
141     [buildsys-core]
142     name=buildsys-core
143     baseurl=http://buildsys.koozali.org/build/9/smeserver-core/i386
144     -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
145     +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
146    
147     [buildsys-contribs]
148     name=buildsys-contribs
149     baseurl=http://buildsys.koozali.org/build/9/smeserver-contribs/i386
150     -includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* libccnet* libzdb* ccnet* evhtp* sqlite* ocaml camlp5
151     +includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* libccnet* libzdb* ccnet* evhtp* sqlite* rtl-sdr* ocaml camlp5
152    
153     [groups]
154     name=groups
155     diff -Nur 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
156     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-i386-iso.cfg 2018-03-10 23:28:24.000000000 -0500
157     +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-i386-iso.cfg 2020-05-14 23:15:47.064000000 -0400
158     @@ -1,3 +1,6 @@
159     +config_opts['package_manager'] = 'yum'
160     +config_opts['use_nspawn'] = False
161     +
162     config_opts['root'] = 'smeserver-9-i386'
163     config_opts['target_arch'] = 'i386'
164    
165     diff -Nur 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
166     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-x86_64-base.cfg 2020-05-14 22:47:30.432000000 -0400
167     +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-x86_64-base.cfg 2020-05-18 23:58:24.021000000 -0400
168     @@ -1,7 +1,9 @@
169     +config_opts['package_manager'] = 'yum'
170     +config_opts['use_nspawn'] = False
171     +
172     config_opts['root'] = 'smeserver-9-x86_64'
173     config_opts['target_arch'] = 'x86_64'
174     config_opts['dist'] = '.el6.sme'
175     -config_opts['use_nspawn'] = False
176     config_opts['chroot_setup_cmd'] = ' install @buildsys-build @buildsys scl-utils-build python27-build '
177    
178     config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/ccache/x86_64/"
179     @@ -34,13 +36,6 @@
180     baseurl=http://buildsys.koozali.org/build/6/updates/x86_64
181     exclude=buildsys-macros
182    
183     -[smedev]
184     -name=smedev
185     -baseurl=http://mirror.canada.pialasse.com/releases/9/smedev/x86_64
186     -#baseurl=http://buildsys.koozali.org/build/6/dev/x86_64
187     -includepkgs=clamav-devel
188     -#includepkgs=libevent2-devel
189     -
190     [fastrack]
191     name=fastrack
192     baseurl=http://buildsys.koozali.org/build/6/fastrack/x86_64
193     @@ -63,17 +58,22 @@
194     [epel]
195     name=epel
196     baseurl=http://buildsys.koozali.org/build/6/epel/x86_64
197     -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*
198     +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
199    
200     #[rpmforge]
201     #name=rpmforge
202     #baseurl=http://buildsys.koozali.org/build/6/rpmforge/x86_64
203     #includepkgs=perl-Taint-Util perl-IP-Country perl-Geography-Countries perl-Razor-Agent perl-Net-Ident
204    
205     +[atrpms]
206     +name=atrpms
207     +baseurl=http://buildsys.koozali.org/build/6/atrpms/x86_64
208     +includepkgs=perl-Mail-SPF DCC
209     +
210     [rpmfusion]
211     name=rpmfusion
212     baseurl=http://download1.rpmfusion.org/free/el/updates/6/x86_64
213     -includepkgs=ffmpeg* libva* x264-libs xvidcore librtmp libmpeg2* mpeg2dec
214     +includepkgs=ffmpeg* libva* x264-libs xvidcore librtmp libmpeg2* mpeg2dec buildsys-build-rpmfusion*
215    
216     [sclo-sclo]
217     name=sclo-sclo
218     @@ -89,12 +89,12 @@
219     [buildsys-core]
220     name=buildsys-core
221     baseurl=http://buildsys.koozali.org/build/9/smeserver-core/x86_64
222     -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
223     +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
224    
225     [buildsys-contribs]
226     name=buildsys-contribs
227     baseurl=http://buildsys.koozali.org/build/9/smeserver-contribs/x86_64
228     -includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* ccnet* libccnet* libzdb* evhtp* sqlite* python27-python-versiontools ocaml camlp5
229     +includepkgs=libevent2* perl-Ezmlm perl-Crypt-GPG perl-IPC-Run libevhtp* libsearpc* ccnet* libccnet* libzdb* evhtp* sqlite* python27-python-versiontools rtl-sdr* ocaml camlp5
230    
231     [groups]
232     name=groups
233     diff -Nur 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
234     --- smeserver-mock-1.0.old/root/etc/mock/smeserver-9-x86_64-iso.cfg 2018-03-10 23:28:24.000000000 -0500
235     +++ smeserver-mock-1.0/root/etc/mock/smeserver-9-x86_64-iso.cfg 2020-05-14 23:17:00.322000000 -0400
236     @@ -1,3 +1,6 @@
237     +config_opts['package_manager'] = 'yum'
238     +config_opts['use_nspawn'] = False
239     +
240     config_opts['root'] = 'smeserver-9-x86_64'
241     config_opts['target_arch'] = 'x86_64'
242    
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed