]>
Commit | Line | Data |
---|---|---|
21e9a651 | 1 | diff -urN util-vserver-0.30.214.orig/distrib/Makefile.am util-vserver-0.30.214.pld/distrib/Makefile.am |
2 | --- util-vserver-0.30.214.orig/distrib/Makefile.am 2007-09-02 22:06:42.000000000 +0200 | |
3 | +++ util-vserver-0.30.214.pld/distrib/Makefile.am 2007-11-15 13:47:44.000000000 +0100 | |
4 | @@ -73,7 +73,13 @@ | |
67457f13 | 5 | breezy/debootstrap.script dapper/debootstrap.script \ |
6 | edgy/debootstrap.script feisty/debootstrap.script \ | |
7 | gutsy/debootstrap.script hoary/debootstrap.script \ | |
8 | - warty/debootstrap.script | |
9 | + warty/debootstrap.script \ | |
10 | + pld-ac/pkgs/01 pld-ac/rpm/macros \ | |
909684f7 | 11 | + pld-ac/rpmlist.d/00.lst \ |
21e9a651 | 12 | + pld-th/pkgs/01 pld-th/rpm/macros \ |
13 | + pld-th/rpmlist.d/00.lst \ | |
14 | + pld-ti/pkgs/01 pld-ti/rpm/macros \ | |
15 | + pld-ti/rpmlist.d/00.lst | |
e7229914 JR |
16 | |
17 | nobase_confdistrib_DATA = rh9/apt/sources.list \ | |
18 | fc1/apt/sources.list \ | |
21e9a651 | 19 | @@ -83,7 +89,23 @@ |
fe9ea50c | 20 | fc5/apt/sources.list \ |
21 | fc6/apt/sources.list \ | |
67457f13 | 22 | f7/apt/sources.list \ |
4fadbbef JR |
23 | - suse91/apt/sources.list |
24 | + suse91/apt/sources.list \ | |
25 | + pld-ac/poldek/aliases.conf \ | |
26 | + pld-ac/poldek/fetch.conf \ | |
27 | + pld-ac/poldek/pld-source.conf \ | |
28 | + pld-ac/poldek/poldek.conf \ | |
909684f7 AM |
29 | + pld-ac/poldek/source.conf \ |
30 | + pld-th/poldek/aliases.conf \ | |
31 | + pld-th/poldek/fetch.conf \ | |
32 | + pld-th/poldek/pld-source.conf \ | |
33 | + pld-th/poldek/poldek.conf \ | |
21e9a651 | 34 | + pld-th/poldek/source.conf \ |
35 | + pld-ti/poldek/aliases.conf \ | |
36 | + pld-ti/poldek/fetch.conf \ | |
37 | + pld-ti/poldek/pld-source.conf \ | |
38 | + pld-ti/poldek/poldek.conf \ | |
39 | + pld-ti/poldek/source.conf | |
fe9ea50c | 40 | + |
4fadbbef JR |
41 | |
42 | AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ | |
43 | = $(nobase_distrib_SCRIPTS) | |
21e9a651 | 44 | @@ -107,6 +129,9 @@ |
45 | l="$(sid_style)"; for i in $$l; do \ | |
46 | ln -sf debian $(DESTDIR)$(distribdir)/$$i; \ | |
e7229914 | 47 | done |
4fadbbef JR |
48 | + POLDEKARCH=$(shell rpm -E '%{_target_cpu}' 2>/dev/null); \ |
49 | + if [ -z "$$POLDEKARCH" ] ; then POLDEKARCH=$(shell uname -m) ; fi ; \ | |
2d225a2e | 50 | + sed -i -e "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld-*/poldek/pld-source.conf |
e7229914 JR |
51 | $(mkinstalldirs) $(DESTDIR)$(confdir) \ |
52 | $(DESTDIR)$(confdistribdir)/.common/pubkeys \ | |
53 | $(DESTDIR)$(confdefaultsdir) \ | |
21e9a651 | 54 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/pkgs/01 util-vserver-0.30.214.pld/distrib/pld-ac/pkgs/01 |
55 | --- util-vserver-0.30.214.orig/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100 | |
56 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/pkgs/01 2007-11-15 13:42:58.000000000 +0100 | |
34158836 | 57 | @@ -0,0 +1,5 @@ |
452506e7 | 58 | +basesystem |
e7229914 | 59 | +glibc |
4e5a2018 | 60 | +issue |
f5f1d176 | 61 | +rpm-base |
34158836 | 62 | +vserver-packages |
21e9a651 | 63 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/poldek/aliases.conf util-vserver-0.30.214.pld/distrib/pld-ac/poldek/aliases.conf |
64 | --- util-vserver-0.30.214.orig/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 | |
65 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/poldek/aliases.conf 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
66 | @@ -0,0 +1,30 @@ |
67 | +# System wide aliases | |
68 | +# ls | |
69 | +ll = ls -l | |
70 | +llu = ls -lu | |
71 | +llU = ls -lU | |
72 | +lli = ls -lI | |
73 | + | |
74 | +# install | |
75 | +freshen = install -FN | |
76 | +upgrade = install -F | |
77 | + | |
78 | +# for backward compatybility, greedy is on by default now | |
79 | +greedy-upgrade = install -FG | |
80 | + | |
81 | +just-install = install -IN | |
82 | + | |
83 | +# search | |
84 | +what-requires = search -r | |
85 | +what-provides = search -p | |
86 | +rsearch = search --perlre | |
87 | + | |
88 | +exit = quit | |
89 | + | |
90 | +# for fun | |
91 | +#ls = uninstall kernel | |
92 | + | |
93 | +less = !less | |
94 | +grep = !grep | |
95 | +awk = !awk | |
96 | + | |
21e9a651 | 97 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/poldek/fetch.conf util-vserver-0.30.214.pld/distrib/pld-ac/poldek/fetch.conf |
98 | --- util-vserver-0.30.214.orig/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 | |
99 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/poldek/fetch.conf 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
100 | @@ -0,0 +1,62 @@ |
101 | +# Configuration of poldek external file getters. Each [fetcher] section | |
102 | +# declares one external downloader. The syntax is: | |
103 | +# [fetcher] | |
104 | +# name = NAME | |
105 | +# proto = PROTOCOL[ ,PROTOCOL... ] | |
106 | +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO | |
107 | +# Possible parameters are: | |
108 | +# | |
109 | +#[fetcher] | |
110 | +# Unique name of the fetcher. This is an optional parameter, if not set then | |
111 | +# name is taken from the "cmd" parameter value as "$(basename $cmd)". | |
112 | +#name = foo | |
113 | + | |
114 | +# Protocol or protocols supported by fetcher. Name of the protocol can be | |
115 | +# completely arbitrary, i.e. if you can handle protocol "foo" by writing | |
116 | +# a script which takes URLs in form 'foo://'. | |
117 | +#proto = foo,bar | |
118 | + | |
119 | +# Parameter specifies an external command and its invoking syntax. | |
120 | +# The syntax of "cmd" is: | |
121 | +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] | |
122 | +# Where COMMAND is the name or full path of command, OPTION is command specific | |
123 | +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with | |
124 | +# 'cache directory/file basename', and '%p' with file basename, %P with file full | |
125 | +# path (URL). Optional suffix 'n' with %p and %P means that command can be | |
126 | +# invoked with multiple files at once. | |
127 | +#cmd = foogetter.sh -N %D %Pn | |
128 | + | |
129 | +##Configured fetchers | |
130 | +[fetcher] | |
131 | +proto = cdrom | |
132 | +cmd = vfjuggle %d %Pn | |
133 | + | |
134 | +[fetcher] | |
135 | +proto = http,ftp,https | |
136 | +cmd = wget -N --dot-style=binary -P %d %Pn | |
137 | + | |
138 | +[fetcher] | |
139 | +proto = http,ftp | |
140 | +cmd = snarf %P %D | |
141 | + | |
142 | +[fetcher] | |
143 | +proto = https | |
144 | +cmd = curl %P -o %D | |
145 | + | |
146 | +[fetcher] | |
147 | +proto = rsync | |
148 | +cmd = rsync -v %P %d | |
149 | + | |
150 | +[fetcher] | |
151 | +proto = smb | |
152 | +cmd = vfsmb -v %P %d | |
153 | + | |
154 | +#[fetcher] | |
155 | +#proto = ssh | |
156 | +#cmd = vfssh.sh %d %Pn | |
157 | + | |
158 | +#[fetcher] | |
159 | +#proto = foo | |
160 | +#cmd = foo.sh %d %Pn | |
161 | + | |
162 | + | |
21e9a651 | 163 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/poldek/pld-source.conf util-vserver-0.30.214.pld/distrib/pld-ac/poldek/pld-source.conf |
164 | --- util-vserver-0.30.214.orig/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 | |
165 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/poldek/pld-source.conf 2007-11-15 13:42:58.000000000 +0100 | |
7eb65750 | 166 | @@ -0,0 +1,44 @@ |
4fadbbef JR |
167 | +# $Id$ |
168 | +# PLD <http://www.pld-linux.org/> | |
169 | + | |
170 | +_pld_arch = %ARCH% | |
171 | +_pld_prefix = ftp://ftp.ac.pld-linux.org/dists/ac | |
172 | +## Some mirrors | |
173 | +## You can use them if you have better connection there | |
174 | +# CI TASK: | |
175 | +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/ac | |
176 | + | |
177 | + | |
178 | +_ac_idxtype = pndir | |
179 | + | |
180 | +# PLD 2.0 (Ac) | |
181 | +[source] | |
182 | +type = %{_ac_idxtype} | |
183 | +name = ac | |
184 | +path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/ | |
7eb65750 | 185 | +#signed = yes |
4fadbbef JR |
186 | + |
187 | +[source] | |
188 | +type = %{_ac_idxtype} | |
7eb65750 ER |
189 | +name = ac-updates |
190 | +path = %{_pld_prefix}/updates/%{_pld_arch}/ | |
191 | +#signed = yes | |
4fadbbef JR |
192 | + |
193 | +[source] | |
194 | +type = %{_ac_idxtype} | |
195 | +name = ac-supported | |
196 | +path = %{_pld_prefix}/supported/%{_pld_arch}/ | |
197 | +noauto = yes | |
7eb65750 | 198 | +#signed = yes |
4fadbbef JR |
199 | + |
200 | +[source] | |
201 | +type = %{_ac_idxtype} | |
202 | +name = ac-ready | |
203 | +path = %{_pld_prefix}/ready/%{_pld_arch}/ | |
204 | +noauto = yes | |
205 | + | |
206 | +[source] | |
207 | +type = %{_ac_idxtype} | |
208 | +name = ac-test | |
209 | +path = %{_pld_prefix}/test/%{_pld_arch}/ | |
210 | +noauto = yes | |
21e9a651 | 211 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/poldek/poldek.conf util-vserver-0.30.214.pld/distrib/pld-ac/poldek/poldek.conf |
212 | --- util-vserver-0.30.214.orig/distrib/pld-ac/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 | |
213 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/poldek/poldek.conf 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
214 | @@ -0,0 +1,182 @@ |
215 | +# poldek main configuration file. | |
216 | + | |
217 | +# Some macros. Macros are local, they are not visible in included files | |
218 | +# and macros declared in them are not visible to includer. | |
219 | +# Macros names starts with underscore '_'. | |
220 | +# | |
221 | +_distro = pld | |
222 | + | |
223 | +# Both local and remote files may be included. Included files may not contain | |
224 | +# [global] section, it will be ignored anyway. | |
225 | +%include %{_distro}-source.conf | |
226 | + | |
227 | +# local sources | |
228 | +%include source.conf | |
229 | + | |
230 | +# External downloaders configuration, not necessary in most cases, cause | |
231 | +# to internal HTTP and FTP client. | |
232 | +#%include fetch.conf | |
233 | + | |
234 | +[global] | |
235 | + | |
236 | + | |
237 | +# This parameter allows to configure the default repository index type. | |
238 | +#default index type = pndir | |
239 | + | |
240 | +# Cache directory for downloaded files. NOTE: that parent directory of cachedir | |
241 | +# must exists. | |
242 | +#cachedir = $HOME/.poldek-cache | |
243 | + | |
244 | +# Switch to ordinary user at startup when executed by root | |
245 | +#runas = poldek | |
246 | + | |
247 | +# Permits using root privileges for installation only. Automatically turned | |
248 | +# on when poldek executed as ordinary user. | |
249 | +#use sudo = no | |
250 | + | |
251 | +# Load /etc/apt/sources.list. | |
252 | +#load apt sources list = no | |
253 | + | |
254 | +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2). | |
255 | +# This option is a workaround for broken zlib linked into librpm; with enabled | |
256 | +# 'auto zlib in rpm' poldek tries to detect such case and then enables external | |
257 | +# *.gz handling automatically. | |
258 | +#vfile external compress = no | |
259 | + | |
260 | +# Auto detection of zlib linked into librpm. See 'vfile external compress' | |
261 | +# description. | |
262 | +#auto zlib in rpm = yes | |
263 | + | |
264 | +# Automatically download whole index if incremental update fails. | |
265 | +#autoupa = yes | |
266 | + | |
267 | +# Do not save given paths into created indexes. This option may significantly | |
268 | +# reduce index size. Example (notice missing starting '/'): | |
269 | +# exclude path = usr/share/doc:usr/share/man:usr/src | |
270 | +#exclude path = | |
271 | + | |
272 | +# Full path name to a PM (rpm for now) binary. | |
273 | +#pm command = /bin/rpm | |
274 | + | |
275 | +# Full path name to sudo binary. | |
276 | +#sudo command = /usr/bin/sudo | |
277 | + | |
278 | + | |
279 | +### File downloaders configuration | |
280 | + | |
281 | +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default | |
282 | +# 'poldek@znienacka.net' is sent) | |
283 | +#vfile ftp sysuser as anon passwd = no | |
284 | + | |
285 | +# File getters configuration parameter. By this option URL handlers may be configured. | |
286 | +# To get file from HTTP and FTP servers poldek uses its internal client (what is | |
287 | +# recommended), although it can be changedby this option. Others protocols handled | |
288 | +# by external utilities can be configured also. The syntax is: | |
289 | +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME | |
290 | + | |
291 | +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch] | |
292 | +# sections (placed in fetch.conf in default configuration). | |
293 | +# Examples: | |
294 | +# default fetcher = ftp,http:internal | |
295 | +# default fetcher = https:wget | |
296 | +# default fetcher = cdrom:vfjuggle | |
297 | +# vfjuggle is a cdrom getter supplied with poldek. | |
298 | +#default fetcher = http,ftp: internal | |
299 | + | |
300 | +# Proxies for internal FTP and HTTP client may be configured in usual | |
301 | +# way, by environment variables ftp_proxy and http_proxy, or by this option. | |
302 | +# Its syntax is similar to "default fetcher" one: | |
303 | +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL | |
304 | +# Example: | |
305 | +# proxy = http: http://w3cache.foo.org:8080 | |
306 | +#proxy = | |
307 | + | |
308 | +# Comma separated list of hosts or domains which will not be accessed via proxy. | |
309 | +# Option overrides no_proxy environment variable. | |
310 | +# Example: | |
311 | +# noproxy = localhost, .pl, ftp.foo.bar.org | |
312 | +#noproxy = | |
313 | + | |
314 | +# Internal HTTP and FTP client is stubborn, it retries to retrive | |
315 | +# file if connection breaks. This option tells it how many times | |
316 | +# it should try. | |
317 | +#vfile retries = 128 | |
318 | + | |
319 | + | |
320 | +### Installation options | |
321 | + | |
322 | +# Install packages in small groups instead of doing all-or-nothing | |
323 | +# installations. | |
324 | +particle install = no | |
325 | + | |
326 | +# Do not remove downloaded packages after its successful installation. | |
327 | +#keep downloads = no | |
328 | + | |
329 | +# Controls visibility of multiple package instances with different EVR. | |
330 | +# If on, only one, highest version will be visible. | |
331 | +#unique package names = no | |
332 | + | |
333 | +# Epoch autopromotion during dependency comparision. RPM specific. | |
334 | +# Set it up if you are using system with rpm prior to 4.2.1 version. | |
335 | +#promoteepoch = no | |
336 | + | |
337 | +# Confirm packages installation. | |
338 | +#confirm installation = no | |
339 | + | |
340 | +# Confirm packages removal. | |
341 | +#confirm removal = yes | |
342 | + | |
343 | +# Let the user select package among equivalents. | |
344 | +choose equivalents manually = yes | |
345 | + | |
346 | +# Prevent package listed from being upgraded if they are already installed. | |
347 | +# hold = kernel* dev | |
348 | +#hold = | |
349 | + | |
350 | +# Ignore package list - packages fits given mask will be invisible. | |
351 | +# ignore = *-smp-* foo* | |
352 | +ignore = kernel* udev devfs | |
353 | + | |
354 | +# Conflicts with already installed packages are treated as resolved | |
355 | +# if at least one of multiple-installed package satisfies conflict. | |
356 | +# rpm doesn't support such cases, so --pm-nodeps is needed (use with | |
357 | +# care). | |
358 | +#allow duplicates = yes | |
359 | + | |
360 | + | |
361 | +### RPM specific options | |
362 | + | |
363 | +# rpm macros can be set by this option. Examples: | |
364 | +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT | |
365 | +# Do not install any documentation: | |
366 | +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man | |
367 | +# rpmdef = _excludedocs 1 | |
368 | +#rpmdef = | |
369 | + | |
370 | + | |
371 | +### Dependency processing settings | |
372 | +# Subtle dependency processing options, they should not be changed | |
373 | +# unless you know what you are doing | |
374 | + | |
375 | +# Automatically install packages required by installed ones. | |
376 | +#follow = yes | |
377 | + | |
378 | +# Greedy upgrades, i.e. upgrade packages which dependencies are broken | |
379 | +# by being uninstalled ones. | |
380 | +#greedy = yes | |
381 | + | |
382 | +# Be yet more greedy; if successor of orphaned package found, and this | |
383 | +# successor drags no packages then upgrade the package instead of process | |
384 | +# its dependencies. Option value is implied by 'greedy' one by defalut. | |
385 | +#aggressive greedy = yes | |
386 | + | |
387 | +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g. | |
388 | +# package A requires capability foo >= 1.0 while package B provides "foo" | |
389 | +# without any version. Use with care, it may cause weird dependency errors. | |
390 | +#mercy = no | |
391 | + | |
392 | +# Taking into account package Obsoletes. | |
393 | +#obsoletes = yes | |
394 | + | |
395 | +# Taking into account package Conflicts. | |
396 | +#conflicts = yes | |
21e9a651 | 397 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/poldek/source.conf util-vserver-0.30.214.pld/distrib/pld-ac/poldek/source.conf |
398 | --- util-vserver-0.30.214.orig/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 | |
399 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/poldek/source.conf 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
400 | @@ -0,0 +1,85 @@ |
401 | +# Sample poldek sources configuration | |
402 | +# Every source is configured in his own [source] section. | |
403 | +# Possible parameters are: | |
404 | +# | |
405 | +#[source] | |
406 | +# Unique name of the repository. | |
407 | +#name = foo | |
408 | + | |
409 | +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' | |
410 | +# and 'dir' as listed by --stl switch. | |
411 | +#type = pndir | |
412 | + | |
413 | +# This parameter sets index original type i.e type of repository | |
414 | +# from what this repository is created. Default is 'dir' - means | |
415 | +# that directory of packages is scanned. | |
416 | +#original type = dir | |
417 | + | |
418 | +# Unique name of the repository. May be either path or URL. | |
419 | +#path = /some/url/or/dir | |
420 | + | |
421 | +# If package index and packages are stored in different locations then | |
422 | +# prefix stands for packages path. | |
423 | +#prefix = /some/url/or/dir | |
424 | + | |
425 | +# Controls visibility of multiple package instances with different EVR. | |
426 | +# If on, only one, highest version will be visible. | |
427 | +#douniq = no | |
428 | + | |
429 | +# Repository priority. If the same packages (equal names and EVR) | |
430 | +# are available in more than one source then package from highest | |
431 | +# prioritized source are taken. Priority is numeric value. Lower number | |
432 | +# means higher priority, and negative priorities are allowed. | |
433 | +# Priority is numeric value. | |
434 | +#pri = 0 | |
435 | + | |
436 | +# Controling if repository index will be implicit loaded. Set it off if | |
437 | +# the index should be loaded on demand only, i.e. if specified directly | |
438 | +# by --sn option. | |
439 | +#auto = yes | |
440 | + | |
441 | +# Controls if repository index will be implicit updated. Set it off if | |
442 | +# the index should be updated on demand only, i.e. if specified directly | |
443 | +# by --sn option. | |
444 | +#autoup = yes | |
445 | + | |
446 | +# Packages PGP/GPG signatures (if any) will be verified before their | |
447 | +# installation. | |
448 | +#signed = no | |
449 | + | |
450 | +# Have the same meaning as [global] parameter. Example: | |
451 | +# hold = kernel* dev | |
452 | +#hold = | |
453 | + | |
454 | +# Have the same meaning as [global] parameter. Example: | |
455 | +# ignore = kernel*smp* dev | |
456 | +#ignore = | |
457 | + | |
458 | +# Parameter have the same meaning as [global] parameter. | |
459 | +# exclude path = usr/share/doc:usr/share/man:usr/src | |
460 | +#exclude path = | |
461 | + | |
462 | +# Preferred language of package descriptions. If not set, taken from locale | |
463 | +# settings. Example: | |
464 | +# lang = pl_PL:lt_LT | |
465 | +#lang = | |
466 | + | |
467 | +[source] | |
468 | +name = home | |
469 | +type = dir | |
470 | +path = $HOME/rpm/RPMS | |
471 | +auto = no | |
472 | +autoup = no | |
473 | + | |
474 | +#[source] | |
475 | +#type = pndir | |
476 | +#name = foo | |
477 | +#path = ftp://ftp.foo.bar.org/RPMS/ | |
478 | +#pri = -10 | |
479 | +#auto = no | |
480 | +#autoup = no | |
481 | +#signed = yes | |
482 | +#hold = kernel* | |
483 | +#ignore = kernel*-smp-* | |
484 | +#dscr = pl_PL | |
485 | + | |
21e9a651 | 486 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/rpm/macros util-vserver-0.30.214.pld/distrib/pld-ac/rpm/macros |
487 | --- util-vserver-0.30.214.orig/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100 | |
488 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/rpm/macros 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
489 | @@ -0,0 +1,4 @@ |
490 | +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 | |
491 | +# you have to use at least one language beside 'C' | |
492 | +%_install_langs C:en:pl | |
493 | +%_netsharedpath /dev | |
21e9a651 | 494 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ac/rpmlist.d/00.lst util-vserver-0.30.214.pld/distrib/pld-ac/rpmlist.d/00.lst |
495 | --- util-vserver-0.30.214.orig/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 | |
496 | +++ util-vserver-0.30.214.pld/distrib/pld-ac/rpmlist.d/00.lst 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
497 | @@ -0,0 +1,10 @@ |
498 | +basesystem-*.rpm | |
499 | +dev-*.rpm | |
500 | +FHS-*.rpm | |
501 | +glibc-misc-*.rpm | |
502 | +glibc-[0-9]*.rpm | |
503 | +libgcc-[0-9]*.rpm | |
504 | +setup-*.rpm | |
505 | +issue-[0-9]*.rpm | |
506 | +rpm-base-*.rpm | |
507 | +vserver-packages-*.rpm | |
21e9a651 | 508 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/pkgs/01 util-vserver-0.30.214.pld/distrib/pld-th/pkgs/01 |
509 | --- util-vserver-0.30.214.orig/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100 | |
510 | +++ util-vserver-0.30.214.pld/distrib/pld-th/pkgs/01 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
511 | @@ -0,0 +1,5 @@ |
512 | +basesystem | |
513 | +glibc | |
514 | +issue | |
515 | +rpm-base | |
516 | +vserver-packages | |
21e9a651 | 517 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/poldek/aliases.conf util-vserver-0.30.214.pld/distrib/pld-th/poldek/aliases.conf |
518 | --- util-vserver-0.30.214.orig/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 | |
519 | +++ util-vserver-0.30.214.pld/distrib/pld-th/poldek/aliases.conf 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
520 | @@ -0,0 +1,30 @@ |
521 | +# System wide aliases | |
522 | +# ls | |
523 | +ll = ls -l | |
524 | +llu = ls -lu | |
525 | +llU = ls -lU | |
526 | +lli = ls -lI | |
527 | + | |
528 | +# install | |
529 | +freshen = install -FN | |
530 | +upgrade = install -F | |
531 | + | |
532 | +# for backward compatybility, greedy is on by default now | |
533 | +greedy-upgrade = install -FG | |
534 | + | |
535 | +just-install = install -IN | |
536 | + | |
537 | +# search | |
538 | +what-requires = search -r | |
539 | +what-provides = search -p | |
540 | +rsearch = search --perlre | |
541 | + | |
542 | +exit = quit | |
543 | + | |
544 | +# for fun | |
545 | +#ls = uninstall kernel | |
546 | + | |
547 | +less = !less | |
548 | +grep = !grep | |
549 | +awk = !awk | |
550 | + | |
21e9a651 | 551 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/poldek/fetch.conf util-vserver-0.30.214.pld/distrib/pld-th/poldek/fetch.conf |
552 | --- util-vserver-0.30.214.orig/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 | |
553 | +++ util-vserver-0.30.214.pld/distrib/pld-th/poldek/fetch.conf 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
554 | @@ -0,0 +1,62 @@ |
555 | +# Configuration of poldek external file getters. Each [fetcher] section | |
556 | +# declares one external downloader. The syntax is: | |
557 | +# [fetcher] | |
558 | +# name = NAME | |
559 | +# proto = PROTOCOL[ ,PROTOCOL... ] | |
560 | +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO | |
561 | +# Possible parameters are: | |
562 | +# | |
563 | +#[fetcher] | |
564 | +# Unique name of the fetcher. This is an optional parameter, if not set then | |
565 | +# name is taken from the "cmd" parameter value as "$(basename $cmd)". | |
566 | +#name = foo | |
567 | + | |
568 | +# Protocol or protocols supported by fetcher. Name of the protocol can be | |
569 | +# completely arbitrary, i.e. if you can handle protocol "foo" by writing | |
570 | +# a script which takes URLs in form 'foo://'. | |
571 | +#proto = foo,bar | |
572 | + | |
573 | +# Parameter specifies an external command and its invoking syntax. | |
574 | +# The syntax of "cmd" is: | |
575 | +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] | |
576 | +# Where COMMAND is the name or full path of command, OPTION is command specific | |
577 | +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with | |
578 | +# 'cache directory/file basename', and '%p' with file basename, %P with file full | |
579 | +# path (URL). Optional suffix 'n' with %p and %P means that command can be | |
580 | +# invoked with multiple files at once. | |
581 | +#cmd = foogetter.sh -N %D %Pn | |
582 | + | |
583 | +##Configured fetchers | |
584 | +[fetcher] | |
585 | +proto = cdrom | |
586 | +cmd = vfjuggle %d %Pn | |
587 | + | |
588 | +[fetcher] | |
589 | +proto = http,ftp,https | |
590 | +cmd = wget -N --dot-style=binary -P %d %Pn | |
591 | + | |
592 | +[fetcher] | |
593 | +proto = http,ftp | |
594 | +cmd = snarf %P %D | |
595 | + | |
596 | +[fetcher] | |
597 | +proto = https | |
598 | +cmd = curl %P -o %D | |
599 | + | |
600 | +[fetcher] | |
601 | +proto = rsync | |
602 | +cmd = rsync -v %P %d | |
603 | + | |
604 | +[fetcher] | |
605 | +proto = smb | |
606 | +cmd = vfsmb -v %P %d | |
607 | + | |
608 | +#[fetcher] | |
609 | +#proto = ssh | |
610 | +#cmd = vfssh.sh %d %Pn | |
611 | + | |
612 | +#[fetcher] | |
613 | +#proto = foo | |
614 | +#cmd = foo.sh %d %Pn | |
615 | + | |
616 | + | |
21e9a651 | 617 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/poldek/pld-source.conf util-vserver-0.30.214.pld/distrib/pld-th/poldek/pld-source.conf |
618 | --- util-vserver-0.30.214.orig/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 | |
619 | +++ util-vserver-0.30.214.pld/distrib/pld-th/poldek/pld-source.conf 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 AM |
620 | @@ -0,0 +1,51 @@ |
621 | +# PLD <http://www.pld-linux.org/> | |
622 | + | |
623 | +_pld_arch = %ARCH% | |
624 | +_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th | |
625 | +## Some mirrors | |
626 | +## You can use them if you have better connection there | |
627 | +# CI TASK: | |
628 | +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th | |
629 | + | |
630 | + | |
631 | +_th_idxtype = pndir | |
632 | + | |
633 | +# PLD 3.0 (Th) | |
634 | +[source] | |
635 | +type = %{_th_idxtype} | |
636 | +name = th | |
637 | +path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/ | |
638 | + | |
639 | +[source] | |
640 | +type = %{_th_idxtype} | |
641 | +name = th | |
642 | +path = %{_pld_prefix}/PLD/noarch/RPMS/ | |
643 | + | |
644 | +[source] | |
645 | +type = %{_th_idxtype} | |
646 | +name = th-updates-security | |
647 | +path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/ | |
648 | + | |
649 | +[source] | |
650 | +type = %{_th_idxtype} | |
651 | +name = th-updates-general | |
652 | +path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/ | |
653 | +noauto = yes | |
654 | + | |
655 | +#[source] | |
656 | +#type = %{_th_idxtype} | |
657 | +#name = th-supported | |
658 | +#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/ | |
659 | +#noauto = yes | |
660 | + | |
661 | +[source] | |
662 | +type = %{_th_idxtype} | |
663 | +name = th-ready | |
664 | +path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/ | |
665 | +noauto = yes | |
666 | + | |
667 | +[source] | |
668 | +type = %{_th_idxtype} | |
669 | +name = th-test | |
670 | +path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/ | |
671 | +noauto = yes | |
21e9a651 | 672 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/poldek/poldek.conf util-vserver-0.30.214.pld/distrib/pld-th/poldek/poldek.conf |
673 | --- util-vserver-0.30.214.orig/distrib/pld-th/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 | |
674 | +++ util-vserver-0.30.214.pld/distrib/pld-th/poldek/poldek.conf 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
675 | @@ -0,0 +1,182 @@ |
676 | +# poldek main configuration file. | |
677 | + | |
678 | +# Some macros. Macros are local, they are not visible in included files | |
679 | +# and macros declared in them are not visible to includer. | |
680 | +# Macros names starts with underscore '_'. | |
681 | +# | |
682 | +_distro = pld | |
683 | + | |
684 | +# Both local and remote files may be included. Included files may not contain | |
685 | +# [global] section, it will be ignored anyway. | |
686 | +%include %{_distro}-source.conf | |
687 | + | |
688 | +# local sources | |
689 | +%include source.conf | |
690 | + | |
691 | +# External downloaders configuration, not necessary in most cases, cause | |
692 | +# to internal HTTP and FTP client. | |
693 | +#%include fetch.conf | |
694 | + | |
695 | +[global] | |
696 | + | |
697 | + | |
698 | +# This parameter allows to configure the default repository index type. | |
699 | +#default index type = pndir | |
700 | + | |
701 | +# Cache directory for downloaded files. NOTE: that parent directory of cachedir | |
702 | +# must exists. | |
703 | +#cachedir = $HOME/.poldek-cache | |
704 | + | |
705 | +# Switch to ordinary user at startup when executed by root | |
706 | +#runas = poldek | |
707 | + | |
708 | +# Permits using root privileges for installation only. Automatically turned | |
709 | +# on when poldek executed as ordinary user. | |
710 | +#use sudo = no | |
711 | + | |
712 | +# Load /etc/apt/sources.list. | |
713 | +#load apt sources list = no | |
714 | + | |
715 | +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2). | |
716 | +# This option is a workaround for broken zlib linked into librpm; with enabled | |
717 | +# 'auto zlib in rpm' poldek tries to detect such case and then enables external | |
718 | +# *.gz handling automatically. | |
719 | +#vfile external compress = no | |
720 | + | |
721 | +# Auto detection of zlib linked into librpm. See 'vfile external compress' | |
722 | +# description. | |
723 | +#auto zlib in rpm = yes | |
724 | + | |
725 | +# Automatically download whole index if incremental update fails. | |
726 | +#autoupa = yes | |
727 | + | |
728 | +# Do not save given paths into created indexes. This option may significantly | |
729 | +# reduce index size. Example (notice missing starting '/'): | |
730 | +# exclude path = usr/share/doc:usr/share/man:usr/src | |
731 | +#exclude path = | |
732 | + | |
733 | +# Full path name to a PM (rpm for now) binary. | |
734 | +#pm command = /bin/rpm | |
735 | + | |
736 | +# Full path name to sudo binary. | |
737 | +#sudo command = /usr/bin/sudo | |
738 | + | |
739 | + | |
740 | +### File downloaders configuration | |
741 | + | |
742 | +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default | |
743 | +# 'poldek@znienacka.net' is sent) | |
744 | +#vfile ftp sysuser as anon passwd = no | |
745 | + | |
746 | +# File getters configuration parameter. By this option URL handlers may be configured. | |
747 | +# To get file from HTTP and FTP servers poldek uses its internal client (what is | |
748 | +# recommended), although it can be changedby this option. Others protocols handled | |
749 | +# by external utilities can be configured also. The syntax is: | |
750 | +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME | |
751 | + | |
752 | +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch] | |
753 | +# sections (placed in fetch.conf in default configuration). | |
754 | +# Examples: | |
755 | +# default fetcher = ftp,http:internal | |
756 | +# default fetcher = https:wget | |
757 | +# default fetcher = cdrom:vfjuggle | |
758 | +# vfjuggle is a cdrom getter supplied with poldek. | |
759 | +#default fetcher = http,ftp: internal | |
760 | + | |
761 | +# Proxies for internal FTP and HTTP client may be configured in usual | |
762 | +# way, by environment variables ftp_proxy and http_proxy, or by this option. | |
763 | +# Its syntax is similar to "default fetcher" one: | |
764 | +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL | |
765 | +# Example: | |
766 | +# proxy = http: http://w3cache.foo.org:8080 | |
767 | +#proxy = | |
768 | + | |
769 | +# Comma separated list of hosts or domains which will not be accessed via proxy. | |
770 | +# Option overrides no_proxy environment variable. | |
771 | +# Example: | |
772 | +# noproxy = localhost, .pl, ftp.foo.bar.org | |
773 | +#noproxy = | |
774 | + | |
775 | +# Internal HTTP and FTP client is stubborn, it retries to retrive | |
776 | +# file if connection breaks. This option tells it how many times | |
777 | +# it should try. | |
778 | +#vfile retries = 128 | |
779 | + | |
780 | + | |
781 | +### Installation options | |
782 | + | |
783 | +# Install packages in small groups instead of doing all-or-nothing | |
784 | +# installations. | |
785 | +particle install = no | |
786 | + | |
787 | +# Do not remove downloaded packages after its successful installation. | |
788 | +#keep downloads = no | |
789 | + | |
790 | +# Controls visibility of multiple package instances with different EVR. | |
791 | +# If on, only one, highest version will be visible. | |
792 | +#unique package names = no | |
793 | + | |
794 | +# Epoch autopromotion during dependency comparision. RPM specific. | |
795 | +# Set it up if you are using system with rpm prior to 4.2.1 version. | |
796 | +#promoteepoch = no | |
797 | + | |
798 | +# Confirm packages installation. | |
799 | +#confirm installation = no | |
800 | + | |
801 | +# Confirm packages removal. | |
802 | +#confirm removal = yes | |
803 | + | |
804 | +# Let the user select package among equivalents. | |
cc65018c | 805 | +choose equivalents manually = yes |
4fadbbef JR |
806 | + |
807 | +# Prevent package listed from being upgraded if they are already installed. | |
808 | +# hold = kernel* dev | |
809 | +#hold = | |
810 | + | |
811 | +# Ignore package list - packages fits given mask will be invisible. | |
812 | +# ignore = *-smp-* foo* | |
813 | +ignore = kernel* udev devfs | |
814 | + | |
815 | +# Conflicts with already installed packages are treated as resolved | |
816 | +# if at least one of multiple-installed package satisfies conflict. | |
817 | +# rpm doesn't support such cases, so --pm-nodeps is needed (use with | |
818 | +# care). | |
819 | +#allow duplicates = yes | |
820 | + | |
821 | + | |
822 | +### RPM specific options | |
823 | + | |
824 | +# rpm macros can be set by this option. Examples: | |
825 | +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT | |
826 | +# Do not install any documentation: | |
827 | +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man | |
828 | +# rpmdef = _excludedocs 1 | |
829 | +#rpmdef = | |
830 | + | |
831 | + | |
832 | +### Dependency processing settings | |
833 | +# Subtle dependency processing options, they should not be changed | |
834 | +# unless you know what you are doing | |
835 | + | |
836 | +# Automatically install packages required by installed ones. | |
837 | +#follow = yes | |
838 | + | |
839 | +# Greedy upgrades, i.e. upgrade packages which dependencies are broken | |
840 | +# by being uninstalled ones. | |
841 | +#greedy = yes | |
842 | + | |
843 | +# Be yet more greedy; if successor of orphaned package found, and this | |
844 | +# successor drags no packages then upgrade the package instead of process | |
845 | +# its dependencies. Option value is implied by 'greedy' one by defalut. | |
846 | +#aggressive greedy = yes | |
847 | + | |
848 | +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g. | |
849 | +# package A requires capability foo >= 1.0 while package B provides "foo" | |
850 | +# without any version. Use with care, it may cause weird dependency errors. | |
851 | +#mercy = no | |
852 | + | |
853 | +# Taking into account package Obsoletes. | |
854 | +#obsoletes = yes | |
855 | + | |
856 | +# Taking into account package Conflicts. | |
857 | +#conflicts = yes | |
21e9a651 | 858 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/poldek/source.conf util-vserver-0.30.214.pld/distrib/pld-th/poldek/source.conf |
859 | --- util-vserver-0.30.214.orig/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 | |
860 | +++ util-vserver-0.30.214.pld/distrib/pld-th/poldek/source.conf 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
861 | @@ -0,0 +1,85 @@ |
862 | +# Sample poldek sources configuration | |
863 | +# Every source is configured in his own [source] section. | |
864 | +# Possible parameters are: | |
865 | +# | |
866 | +#[source] | |
867 | +# Unique name of the repository. | |
868 | +#name = foo | |
869 | + | |
870 | +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' | |
871 | +# and 'dir' as listed by --stl switch. | |
872 | +#type = pndir | |
873 | + | |
874 | +# This parameter sets index original type i.e type of repository | |
875 | +# from what this repository is created. Default is 'dir' - means | |
876 | +# that directory of packages is scanned. | |
877 | +#original type = dir | |
878 | + | |
879 | +# Unique name of the repository. May be either path or URL. | |
880 | +#path = /some/url/or/dir | |
881 | + | |
882 | +# If package index and packages are stored in different locations then | |
883 | +# prefix stands for packages path. | |
884 | +#prefix = /some/url/or/dir | |
885 | + | |
886 | +# Controls visibility of multiple package instances with different EVR. | |
887 | +# If on, only one, highest version will be visible. | |
888 | +#douniq = no | |
889 | + | |
890 | +# Repository priority. If the same packages (equal names and EVR) | |
891 | +# are available in more than one source then package from highest | |
892 | +# prioritized source are taken. Priority is numeric value. Lower number | |
893 | +# means higher priority, and negative priorities are allowed. | |
894 | +# Priority is numeric value. | |
895 | +#pri = 0 | |
896 | + | |
897 | +# Controling if repository index will be implicit loaded. Set it off if | |
898 | +# the index should be loaded on demand only, i.e. if specified directly | |
899 | +# by --sn option. | |
900 | +#auto = yes | |
901 | + | |
902 | +# Controls if repository index will be implicit updated. Set it off if | |
903 | +# the index should be updated on demand only, i.e. if specified directly | |
904 | +# by --sn option. | |
905 | +#autoup = yes | |
906 | + | |
907 | +# Packages PGP/GPG signatures (if any) will be verified before their | |
908 | +# installation. | |
909 | +#signed = no | |
910 | + | |
911 | +# Have the same meaning as [global] parameter. Example: | |
912 | +# hold = kernel* dev | |
913 | +#hold = | |
914 | + | |
915 | +# Have the same meaning as [global] parameter. Example: | |
916 | +# ignore = kernel*smp* dev | |
917 | +#ignore = | |
918 | + | |
919 | +# Parameter have the same meaning as [global] parameter. | |
920 | +# exclude path = usr/share/doc:usr/share/man:usr/src | |
921 | +#exclude path = | |
922 | + | |
923 | +# Preferred language of package descriptions. If not set, taken from locale | |
924 | +# settings. Example: | |
925 | +# lang = pl_PL:lt_LT | |
926 | +#lang = | |
927 | + | |
928 | +[source] | |
929 | +name = home | |
930 | +type = dir | |
931 | +path = $HOME/rpm/RPMS | |
932 | +auto = no | |
933 | +autoup = no | |
934 | + | |
935 | +#[source] | |
936 | +#type = pndir | |
937 | +#name = foo | |
938 | +#path = ftp://ftp.foo.bar.org/RPMS/ | |
939 | +#pri = -10 | |
940 | +#auto = no | |
941 | +#autoup = no | |
942 | +#signed = yes | |
943 | +#hold = kernel* | |
944 | +#ignore = kernel*-smp-* | |
945 | +#dscr = pl_PL | |
946 | + | |
21e9a651 | 947 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/rpm/macros util-vserver-0.30.214.pld/distrib/pld-th/rpm/macros |
948 | --- util-vserver-0.30.214.orig/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100 | |
949 | +++ util-vserver-0.30.214.pld/distrib/pld-th/rpm/macros 2007-11-15 13:42:58.000000000 +0100 | |
d7090917 | 950 | @@ -0,0 +1,4 @@ |
e7229914 JR |
951 | +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 |
952 | +# you have to use at least one language beside 'C' | |
953 | +%_install_langs C:en:pl | |
d7090917 | 954 | +%_netsharedpath /dev |
21e9a651 | 955 | diff -urN util-vserver-0.30.214.orig/distrib/pld-th/rpmlist.d/00.lst util-vserver-0.30.214.pld/distrib/pld-th/rpmlist.d/00.lst |
956 | --- util-vserver-0.30.214.orig/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 | |
957 | +++ util-vserver-0.30.214.pld/distrib/pld-th/rpmlist.d/00.lst 2007-11-15 13:42:58.000000000 +0100 | |
34158836 | 958 | @@ -0,0 +1,10 @@ |
452506e7 JR |
959 | +basesystem-*.rpm |
960 | +dev-*.rpm | |
e7229914 JR |
961 | +FHS-*.rpm |
962 | +glibc-misc-*.rpm | |
963 | +glibc-[0-9]*.rpm | |
964 | +libgcc-[0-9]*.rpm | |
965 | +setup-*.rpm | |
4e5a2018 | 966 | +issue-[0-9]*.rpm |
f5f1d176 | 967 | +rpm-base-*.rpm |
34158836 | 968 | +vserver-packages-*.rpm |
21e9a651 | 969 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/pkgs/01 util-vserver-0.30.214.pld/distrib/pld-ti/pkgs/01 |
970 | --- util-vserver-0.30.214.orig/distrib/pld-ti/pkgs/01 1970-01-01 01:00:00.000000000 +0100 | |
971 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/pkgs/01 2007-11-15 13:42:58.000000000 +0100 | |
972 | @@ -0,0 +1,5 @@ | |
973 | +basesystem | |
974 | +glibc | |
975 | +issue | |
976 | +rpm-base | |
977 | +vserver-packages | |
978 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/poldek/aliases.conf util-vserver-0.30.214.pld/distrib/pld-ti/poldek/aliases.conf | |
979 | --- util-vserver-0.30.214.orig/distrib/pld-ti/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 | |
980 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/poldek/aliases.conf 2007-11-15 13:42:58.000000000 +0100 | |
981 | @@ -0,0 +1,30 @@ | |
982 | +# System wide aliases | |
983 | +# ls | |
984 | +ll = ls -l | |
985 | +llu = ls -lu | |
986 | +llU = ls -lU | |
987 | +lli = ls -lI | |
988 | + | |
989 | +# install | |
990 | +freshen = install -FN | |
991 | +upgrade = install -F | |
992 | + | |
993 | +# for backward compatybility, greedy is on by default now | |
994 | +greedy-upgrade = install -FG | |
995 | + | |
996 | +just-install = install -IN | |
997 | + | |
998 | +# search | |
999 | +what-requires = search -r | |
1000 | +what-provides = search -p | |
1001 | +rsearch = search --perlre | |
1002 | + | |
1003 | +exit = quit | |
1004 | + | |
1005 | +# for fun | |
1006 | +#ls = uninstall kernel | |
1007 | + | |
1008 | +less = !less | |
1009 | +grep = !grep | |
1010 | +awk = !awk | |
1011 | + | |
1012 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/poldek/fetch.conf util-vserver-0.30.214.pld/distrib/pld-ti/poldek/fetch.conf | |
1013 | --- util-vserver-0.30.214.orig/distrib/pld-ti/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 | |
1014 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/poldek/fetch.conf 2007-11-15 13:42:58.000000000 +0100 | |
1015 | @@ -0,0 +1,62 @@ | |
1016 | +# Configuration of poldek external file getters. Each [fetcher] section | |
1017 | +# declares one external downloader. The syntax is: | |
1018 | +# [fetcher] | |
1019 | +# name = NAME | |
1020 | +# proto = PROTOCOL[ ,PROTOCOL... ] | |
1021 | +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO | |
1022 | +# Possible parameters are: | |
1023 | +# | |
1024 | +#[fetcher] | |
1025 | +# Unique name of the fetcher. This is an optional parameter, if not set then | |
1026 | +# name is taken from the "cmd" parameter value as "$(basename $cmd)". | |
1027 | +#name = foo | |
1028 | + | |
1029 | +# Protocol or protocols supported by fetcher. Name of the protocol can be | |
1030 | +# completely arbitrary, i.e. if you can handle protocol "foo" by writing | |
1031 | +# a script which takes URLs in form 'foo://'. | |
1032 | +#proto = foo,bar | |
1033 | + | |
1034 | +# Parameter specifies an external command and its invoking syntax. | |
1035 | +# The syntax of "cmd" is: | |
1036 | +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] | |
1037 | +# Where COMMAND is the name or full path of command, OPTION is command specific | |
1038 | +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with | |
1039 | +# 'cache directory/file basename', and '%p' with file basename, %P with file full | |
1040 | +# path (URL). Optional suffix 'n' with %p and %P means that command can be | |
1041 | +# invoked with multiple files at once. | |
1042 | +#cmd = foogetter.sh -N %D %Pn | |
1043 | + | |
1044 | +##Configured fetchers | |
1045 | +[fetcher] | |
1046 | +proto = cdrom | |
1047 | +cmd = vfjuggle %d %Pn | |
1048 | + | |
1049 | +[fetcher] | |
1050 | +proto = http,ftp,https | |
1051 | +cmd = wget -N --dot-style=binary -P %d %Pn | |
1052 | + | |
1053 | +[fetcher] | |
1054 | +proto = http,ftp | |
1055 | +cmd = snarf %P %D | |
1056 | + | |
1057 | +[fetcher] | |
1058 | +proto = https | |
1059 | +cmd = curl %P -o %D | |
1060 | + | |
1061 | +[fetcher] | |
1062 | +proto = rsync | |
1063 | +cmd = rsync -v %P %d | |
1064 | + | |
1065 | +[fetcher] | |
1066 | +proto = smb | |
1067 | +cmd = vfsmb -v %P %d | |
1068 | + | |
1069 | +#[fetcher] | |
1070 | +#proto = ssh | |
1071 | +#cmd = vfssh.sh %d %Pn | |
1072 | + | |
1073 | +#[fetcher] | |
1074 | +#proto = foo | |
1075 | +#cmd = foo.sh %d %Pn | |
1076 | + | |
1077 | + | |
1078 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/poldek/pld-source.conf util-vserver-0.30.214.pld/distrib/pld-ti/poldek/pld-source.conf | |
1079 | --- util-vserver-0.30.214.orig/distrib/pld-ti/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 | |
1080 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/poldek/pld-source.conf 2007-11-15 13:52:31.000000000 +0100 | |
1081 | @@ -0,0 +1,46 @@ | |
1082 | +# PLD Titanium | |
1083 | +# Unofficial version of PLD Linux Distribution | |
1084 | +# http://www.pld-linux.org/Titanium | |
1085 | + | |
1086 | +_arch = %ARCH% | |
1087 | +_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium | |
1088 | + | |
1089 | +_type = pndir | |
1090 | + | |
1091 | +[source] | |
1092 | +type = %{_type} | |
1093 | +name = titanium | |
1094 | +path = %{_prefix}/PLD/%{_arch}/RPMS/ | |
1095 | + | |
1096 | +[source] | |
1097 | +type = %{_type} | |
1098 | +name = titanium | |
1099 | +path = %{_prefix}/PLD/noarch/RPMS/ | |
1100 | + | |
1101 | +[source] | |
1102 | +type = %{_type} | |
1103 | +name = titanium-ready | |
1104 | +path = %{_prefix}/ready/%{_arch}/RPMS/ | |
1105 | +auto = no | |
1106 | +autoup = no | |
1107 | + | |
1108 | +[source] | |
1109 | +type = %{_type} | |
1110 | +name = titanium-ready | |
1111 | +path = %{_prefix}/ready/noarch/RPMS/ | |
1112 | +auto = no | |
1113 | +autoup = no | |
1114 | + | |
1115 | +[source] | |
1116 | +type = %{_type} | |
1117 | +name = titanium-test | |
1118 | +path = %{_prefix}/test/%{_arch}/RPMS/ | |
1119 | +auto = no | |
1120 | +autoup = no | |
1121 | + | |
1122 | +[source] | |
1123 | +type = %{_type} | |
1124 | +name = titanium-test | |
1125 | +path = %{_prefix}/test/noarch/RPMS/ | |
1126 | +auto = no | |
1127 | +autoup = no | |
1128 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/poldek/poldek.conf util-vserver-0.30.214.pld/distrib/pld-ti/poldek/poldek.conf | |
1129 | --- util-vserver-0.30.214.orig/distrib/pld-ti/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 | |
1130 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/poldek/poldek.conf 2007-11-15 13:42:58.000000000 +0100 | |
1131 | @@ -0,0 +1,182 @@ | |
1132 | +# poldek main configuration file. | |
1133 | + | |
1134 | +# Some macros. Macros are local, they are not visible in included files | |
1135 | +# and macros declared in them are not visible to includer. | |
1136 | +# Macros names starts with underscore '_'. | |
1137 | +# | |
1138 | +_distro = pld | |
1139 | + | |
1140 | +# Both local and remote files may be included. Included files may not contain | |
1141 | +# [global] section, it will be ignored anyway. | |
1142 | +%include %{_distro}-source.conf | |
1143 | + | |
1144 | +# local sources | |
1145 | +%include source.conf | |
1146 | + | |
1147 | +# External downloaders configuration, not necessary in most cases, cause | |
1148 | +# to internal HTTP and FTP client. | |
1149 | +#%include fetch.conf | |
1150 | + | |
1151 | +[global] | |
1152 | + | |
1153 | + | |
1154 | +# This parameter allows to configure the default repository index type. | |
1155 | +#default index type = pndir | |
1156 | + | |
1157 | +# Cache directory for downloaded files. NOTE: that parent directory of cachedir | |
1158 | +# must exists. | |
1159 | +#cachedir = $HOME/.poldek-cache | |
1160 | + | |
1161 | +# Switch to ordinary user at startup when executed by root | |
1162 | +#runas = poldek | |
1163 | + | |
1164 | +# Permits using root privileges for installation only. Automatically turned | |
1165 | +# on when poldek executed as ordinary user. | |
1166 | +#use sudo = no | |
1167 | + | |
1168 | +# Load /etc/apt/sources.list. | |
1169 | +#load apt sources list = no | |
1170 | + | |
1171 | +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2). | |
1172 | +# This option is a workaround for broken zlib linked into librpm; with enabled | |
1173 | +# 'auto zlib in rpm' poldek tries to detect such case and then enables external | |
1174 | +# *.gz handling automatically. | |
1175 | +#vfile external compress = no | |
1176 | + | |
1177 | +# Auto detection of zlib linked into librpm. See 'vfile external compress' | |
1178 | +# description. | |
1179 | +#auto zlib in rpm = yes | |
1180 | + | |
1181 | +# Automatically download whole index if incremental update fails. | |
1182 | +#autoupa = yes | |
1183 | + | |
1184 | +# Do not save given paths into created indexes. This option may significantly | |
1185 | +# reduce index size. Example (notice missing starting '/'): | |
1186 | +# exclude path = usr/share/doc:usr/share/man:usr/src | |
1187 | +#exclude path = | |
1188 | + | |
1189 | +# Full path name to a PM (rpm for now) binary. | |
1190 | +#pm command = /bin/rpm | |
1191 | + | |
1192 | +# Full path name to sudo binary. | |
1193 | +#sudo command = /usr/bin/sudo | |
1194 | + | |
1195 | + | |
1196 | +### File downloaders configuration | |
1197 | + | |
1198 | +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default | |
1199 | +# 'poldek@znienacka.net' is sent) | |
1200 | +#vfile ftp sysuser as anon passwd = no | |
1201 | + | |
1202 | +# File getters configuration parameter. By this option URL handlers may be configured. | |
1203 | +# To get file from HTTP and FTP servers poldek uses its internal client (what is | |
1204 | +# recommended), although it can be changedby this option. Others protocols handled | |
1205 | +# by external utilities can be configured also. The syntax is: | |
1206 | +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME | |
1207 | + | |
1208 | +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch] | |
1209 | +# sections (placed in fetch.conf in default configuration). | |
1210 | +# Examples: | |
1211 | +# default fetcher = ftp,http:internal | |
1212 | +# default fetcher = https:wget | |
1213 | +# default fetcher = cdrom:vfjuggle | |
1214 | +# vfjuggle is a cdrom getter supplied with poldek. | |
1215 | +#default fetcher = http,ftp: internal | |
1216 | + | |
1217 | +# Proxies for internal FTP and HTTP client may be configured in usual | |
1218 | +# way, by environment variables ftp_proxy and http_proxy, or by this option. | |
1219 | +# Its syntax is similar to "default fetcher" one: | |
1220 | +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL | |
1221 | +# Example: | |
1222 | +# proxy = http: http://w3cache.foo.org:8080 | |
1223 | +#proxy = | |
1224 | + | |
1225 | +# Comma separated list of hosts or domains which will not be accessed via proxy. | |
1226 | +# Option overrides no_proxy environment variable. | |
1227 | +# Example: | |
1228 | +# noproxy = localhost, .pl, ftp.foo.bar.org | |
1229 | +#noproxy = | |
1230 | + | |
1231 | +# Internal HTTP and FTP client is stubborn, it retries to retrive | |
1232 | +# file if connection breaks. This option tells it how many times | |
1233 | +# it should try. | |
1234 | +#vfile retries = 128 | |
1235 | + | |
1236 | + | |
1237 | +### Installation options | |
1238 | + | |
1239 | +# Install packages in small groups instead of doing all-or-nothing | |
1240 | +# installations. | |
1241 | +particle install = no | |
1242 | + | |
1243 | +# Do not remove downloaded packages after its successful installation. | |
1244 | +#keep downloads = no | |
1245 | + | |
1246 | +# Controls visibility of multiple package instances with different EVR. | |
1247 | +# If on, only one, highest version will be visible. | |
1248 | +#unique package names = no | |
1249 | + | |
1250 | +# Epoch autopromotion during dependency comparision. RPM specific. | |
1251 | +# Set it up if you are using system with rpm prior to 4.2.1 version. | |
1252 | +#promoteepoch = no | |
1253 | + | |
1254 | +# Confirm packages installation. | |
1255 | +#confirm installation = no | |
1256 | + | |
1257 | +# Confirm packages removal. | |
1258 | +#confirm removal = yes | |
1259 | + | |
1260 | +# Let the user select package among equivalents. | |
1261 | +choose equivalents manually = yes | |
1262 | + | |
1263 | +# Prevent package listed from being upgraded if they are already installed. | |
1264 | +# hold = kernel* dev | |
1265 | +#hold = | |
1266 | + | |
1267 | +# Ignore package list - packages fits given mask will be invisible. | |
1268 | +# ignore = *-smp-* foo* | |
1269 | +ignore = kernel* udev devfs | |
1270 | + | |
1271 | +# Conflicts with already installed packages are treated as resolved | |
1272 | +# if at least one of multiple-installed package satisfies conflict. | |
1273 | +# rpm doesn't support such cases, so --pm-nodeps is needed (use with | |
1274 | +# care). | |
1275 | +#allow duplicates = yes | |
1276 | + | |
1277 | + | |
1278 | +### RPM specific options | |
1279 | + | |
1280 | +# rpm macros can be set by this option. Examples: | |
1281 | +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT | |
1282 | +# Do not install any documentation: | |
1283 | +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man | |
1284 | +# rpmdef = _excludedocs 1 | |
1285 | +#rpmdef = | |
1286 | + | |
1287 | + | |
1288 | +### Dependency processing settings | |
1289 | +# Subtle dependency processing options, they should not be changed | |
1290 | +# unless you know what you are doing | |
1291 | + | |
1292 | +# Automatically install packages required by installed ones. | |
1293 | +#follow = yes | |
1294 | + | |
1295 | +# Greedy upgrades, i.e. upgrade packages which dependencies are broken | |
1296 | +# by being uninstalled ones. | |
1297 | +#greedy = yes | |
1298 | + | |
1299 | +# Be yet more greedy; if successor of orphaned package found, and this | |
1300 | +# successor drags no packages then upgrade the package instead of process | |
1301 | +# its dependencies. Option value is implied by 'greedy' one by defalut. | |
1302 | +#aggressive greedy = yes | |
1303 | + | |
1304 | +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g. | |
1305 | +# package A requires capability foo >= 1.0 while package B provides "foo" | |
1306 | +# without any version. Use with care, it may cause weird dependency errors. | |
1307 | +#mercy = no | |
1308 | + | |
1309 | +# Taking into account package Obsoletes. | |
1310 | +#obsoletes = yes | |
1311 | + | |
1312 | +# Taking into account package Conflicts. | |
1313 | +#conflicts = yes | |
1314 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/poldek/source.conf util-vserver-0.30.214.pld/distrib/pld-ti/poldek/source.conf | |
1315 | --- util-vserver-0.30.214.orig/distrib/pld-ti/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 | |
1316 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/poldek/source.conf 2007-11-15 13:42:58.000000000 +0100 | |
1317 | @@ -0,0 +1,85 @@ | |
1318 | +# Sample poldek sources configuration | |
1319 | +# Every source is configured in his own [source] section. | |
1320 | +# Possible parameters are: | |
1321 | +# | |
1322 | +#[source] | |
1323 | +# Unique name of the repository. | |
1324 | +#name = foo | |
1325 | + | |
1326 | +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' | |
1327 | +# and 'dir' as listed by --stl switch. | |
1328 | +#type = pndir | |
1329 | + | |
1330 | +# This parameter sets index original type i.e type of repository | |
1331 | +# from what this repository is created. Default is 'dir' - means | |
1332 | +# that directory of packages is scanned. | |
1333 | +#original type = dir | |
1334 | + | |
1335 | +# Unique name of the repository. May be either path or URL. | |
1336 | +#path = /some/url/or/dir | |
1337 | + | |
1338 | +# If package index and packages are stored in different locations then | |
1339 | +# prefix stands for packages path. | |
1340 | +#prefix = /some/url/or/dir | |
1341 | + | |
1342 | +# Controls visibility of multiple package instances with different EVR. | |
1343 | +# If on, only one, highest version will be visible. | |
1344 | +#douniq = no | |
1345 | + | |
1346 | +# Repository priority. If the same packages (equal names and EVR) | |
1347 | +# are available in more than one source then package from highest | |
1348 | +# prioritized source are taken. Priority is numeric value. Lower number | |
1349 | +# means higher priority, and negative priorities are allowed. | |
1350 | +# Priority is numeric value. | |
1351 | +#pri = 0 | |
1352 | + | |
1353 | +# Controling if repository index will be implicit loaded. Set it off if | |
1354 | +# the index should be loaded on demand only, i.e. if specified directly | |
1355 | +# by --sn option. | |
1356 | +#auto = yes | |
1357 | + | |
1358 | +# Controls if repository index will be implicit updated. Set it off if | |
1359 | +# the index should be updated on demand only, i.e. if specified directly | |
1360 | +# by --sn option. | |
1361 | +#autoup = yes | |
1362 | + | |
1363 | +# Packages PGP/GPG signatures (if any) will be verified before their | |
1364 | +# installation. | |
1365 | +#signed = no | |
1366 | + | |
1367 | +# Have the same meaning as [global] parameter. Example: | |
1368 | +# hold = kernel* dev | |
1369 | +#hold = | |
1370 | + | |
1371 | +# Have the same meaning as [global] parameter. Example: | |
1372 | +# ignore = kernel*smp* dev | |
1373 | +#ignore = | |
1374 | + | |
1375 | +# Parameter have the same meaning as [global] parameter. | |
1376 | +# exclude path = usr/share/doc:usr/share/man:usr/src | |
1377 | +#exclude path = | |
1378 | + | |
1379 | +# Preferred language of package descriptions. If not set, taken from locale | |
1380 | +# settings. Example: | |
1381 | +# lang = pl_PL:lt_LT | |
1382 | +#lang = | |
1383 | + | |
1384 | +[source] | |
1385 | +name = home | |
1386 | +type = dir | |
1387 | +path = $HOME/rpm/RPMS | |
1388 | +auto = no | |
1389 | +autoup = no | |
1390 | + | |
1391 | +#[source] | |
1392 | +#type = pndir | |
1393 | +#name = foo | |
1394 | +#path = ftp://ftp.foo.bar.org/RPMS/ | |
1395 | +#pri = -10 | |
1396 | +#auto = no | |
1397 | +#autoup = no | |
1398 | +#signed = yes | |
1399 | +#hold = kernel* | |
1400 | +#ignore = kernel*-smp-* | |
1401 | +#dscr = pl_PL | |
1402 | + | |
1403 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/rpm/macros util-vserver-0.30.214.pld/distrib/pld-ti/rpm/macros | |
1404 | --- util-vserver-0.30.214.orig/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100 | |
1405 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/rpm/macros 2007-11-15 13:42:58.000000000 +0100 | |
1406 | @@ -0,0 +1,4 @@ | |
1407 | +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 | |
1408 | +# you have to use at least one language beside 'C' | |
1409 | +%_install_langs C:en:pl | |
1410 | +%_netsharedpath /dev | |
1411 | diff -urN util-vserver-0.30.214.orig/distrib/pld-ti/rpmlist.d/00.lst util-vserver-0.30.214.pld/distrib/pld-ti/rpmlist.d/00.lst | |
1412 | --- util-vserver-0.30.214.orig/distrib/pld-ti/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 | |
1413 | +++ util-vserver-0.30.214.pld/distrib/pld-ti/rpmlist.d/00.lst 2007-11-15 13:42:58.000000000 +0100 | |
1414 | @@ -0,0 +1,10 @@ | |
1415 | +basesystem-*.rpm | |
1416 | +dev-*.rpm | |
1417 | +FHS-*.rpm | |
1418 | +glibc-misc-*.rpm | |
1419 | +glibc-[0-9]*.rpm | |
1420 | +libgcc-[0-9]*.rpm | |
1421 | +setup-*.rpm | |
1422 | +issue-[0-9]*.rpm | |
1423 | +rpm-base-*.rpm | |
1424 | +vserver-packages-*.rpm | |
1425 | diff -urN util-vserver-0.30.214.orig/scripts/functions util-vserver-0.30.214.pld/scripts/functions | |
1426 | --- util-vserver-0.30.214.orig/scripts/functions 2007-09-02 22:06:41.000000000 +0200 | |
1427 | +++ util-vserver-0.30.214.pld/scripts/functions 2007-11-15 13:42:58.000000000 +0100 | |
1428 | @@ -403,6 +403,20 @@ | |
4fadbbef JR |
1429 | fi |
1430 | } | |
1431 | ||
1432 | +function _pkgSetVarsPoldek | |
1433 | +{ | |
1434 | + if test -n "$PKGDIR"; then | |
1435 | + findDir POLDEKETCDIR $PKGDIR/poldeketc $PKGDIR/base/poldek/etc /etc/poldek | |
1436 | + findDir POLDEKCACHEDIR $PKGDIR/poldek-cache $PKGDIR/base/poldek/cache | |
1437 | + else | |
1438 | + findDir POLDEKETCDIR "$VDIR"/etc/poldek /etc/poldek | |
1439 | + findDir POLDEKCACHEDIR "$VDIR"/var/tmp/poldek-cache | |
1440 | + fi | |
1441 | + | |
1442 | + findFile POLDEK_CONFIG "$POLDEKETCDIR"/poldek.conf "" | |
1443 | + test -z "$POLDEK_CONFIG" || export POLDEK_CONFIG | |
1444 | +} | |
1445 | + | |
1446 | ||
1447 | function _pkgMountBase | |
1448 | { | |
21e9a651 | 1449 | @@ -476,6 +490,7 @@ |
4fadbbef JR |
1450 | rpm) _pkgSetVarsRPM;; |
1451 | apt) _pkgSetVarsApt;; | |
1452 | yum) _pkgSetVarsYum;; | |
1453 | + poldek) _pkgSetVarsPoldek;; | |
1454 | *) echo "Unknown packaging flavor" >&2; exit 1;; | |
1455 | esac | |
1456 | done | |
21e9a651 | 1457 | @@ -764,6 +779,8 @@ |
4e5a2018 JR |
1458 | style=redhat |
1459 | elif test -e "$_pgs_vdir"/etc/mandrake-release; then | |
1460 | style=mandrake | |
1461 | + elif test -e "$_pgs_vdir"/etc/pld-release; then | |
1462 | + style=pld | |
1463 | elif test -e "$_pgs_vdir"/etc/debian_version; then | |
1464 | style=debian | |
1465 | elif test -e "$_pgs_vdir"/etc/SuSE-release; then | |
21e9a651 | 1466 | @@ -831,6 +848,27 @@ |
4fadbbef JR |
1467 | test -n "$have_yum" && return 0 || return 1 |
1468 | } | |
1469 | ||
1470 | +## Usage: pkgmgmt.isPoldekAvailable <cfgdir> <vdir> [<is-internal>] | |
1471 | +function pkgmgmt.isPoldekAvailable | |
1472 | +{ | |
1473 | + local cfgdir="$1" | |
1474 | + local vdir="$2" | |
1475 | + local is_internal="$3" | |
1476 | + | |
1477 | + local have_poldek i | |
1478 | + if test -n "$is_internal"; then | |
1479 | + have_poldek=1 | |
1480 | + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek= | |
1481 | + else | |
1482 | + have_poldek= | |
1483 | + for i in /bin /usr/bin /usr/local/bin; do | |
1484 | + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; } | |
1485 | + done | |
1486 | + fi | |
1487 | + | |
1488 | + test -n "$have_poldek" && return 0 || return 1 | |
1489 | +} | |
1490 | + | |
1491 | ||
1492 | function vshelper.doSanityCheck | |
1493 | { | |
21e9a651 | 1494 | diff -urN util-vserver-0.30.214.orig/scripts/Makefile-files util-vserver-0.30.214.pld/scripts/Makefile-files |
1495 | --- util-vserver-0.30.214.orig/scripts/Makefile-files 2007-09-02 22:06:41.000000000 +0200 | |
1496 | +++ util-vserver-0.30.214.pld/scripts/Makefile-files 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 | 1497 | @@ -21,6 +21,7 @@ |
fe9ea50c | 1498 | scripts/vapt-get-worker \ |
1499 | scripts/vrpm-worker \ | |
1500 | scripts/vyum-worker \ | |
1501 | + scripts/vpoldek-worker \ | |
1502 | scripts/vrpm-preload \ | |
1503 | scripts/save_s_context \ | |
1504 | scripts/vservers.grabinfo.sh \ | |
909684f7 | 1505 | @@ -47,11 +48,13 @@ |
fe9ea50c | 1506 | scripts/vserver-build.template \ |
1507 | scripts/vserver-build.rsync \ | |
893c90d5 | 1508 | scripts/vserver-build.clone \ |
fe9ea50c | 1509 | + scripts/vserver-build.poldek \ |
1510 | scripts/vserver-build.functions \ | |
1511 | scripts/vserver-build.functions.apt \ | |
1512 | scripts/vserver-build.functions.rpm \ | |
1513 | scripts/vserver-build.functions.pkgmgmt \ | |
1514 | scripts/vserver-build.functions.yum \ | |
1515 | + scripts/vserver-build.functions.poldek \ | |
1516 | scripts/vserver-setup.functions \ | |
1517 | scripts/vserver.functions \ | |
1518 | scripts/vserver.start \ | |
21e9a651 | 1519 | @@ -65,6 +68,7 @@ |
fe9ea50c | 1520 | scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \ |
1521 | scripts/vapt-get-worker \ | |
1522 | scripts/vpkg \ | |
1523 | + scripts/vpoldek-worker \ | |
1524 | scripts/vrpm-worker \ | |
1525 | scripts/vrpm-preload \ | |
1526 | scripts/start-vservers \ | |
21e9a651 | 1527 | @@ -88,6 +92,7 @@ |
fe9ea50c | 1528 | scripts_sbin_src_PRGS = scripts/chbind \ |
1529 | scripts/chcontext \ | |
1530 | scripts/vapt-get \ | |
1531 | + scripts/vpoldek \ | |
1532 | scripts/vdispatch-conf \ | |
1533 | scripts/vemerge \ | |
1534 | scripts/vesync \ | |
21e9a651 | 1535 | diff -urN util-vserver-0.30.214.orig/scripts/pkgmgmt util-vserver-0.30.214.pld/scripts/pkgmgmt |
1536 | --- util-vserver-0.30.214.orig/scripts/pkgmgmt 2007-09-02 22:06:41.000000000 +0200 | |
1537 | +++ util-vserver-0.30.214.pld/scripts/pkgmgmt 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 | 1538 | @@ -195,7 +195,7 @@ |
4fadbbef JR |
1539 | " |
1540 | ||
1541 | case $2 in | |
1542 | - (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}") | |
1543 | + (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}") | |
1544 | hasSubstring "$pkgs" ---rpm--- || { | |
1545 | warning "$ERR | |
1546 | * The vserver does not seem to have the 'rpm' package which is required | |
909684f7 | 1547 | @@ -205,9 +205,9 @@ |
4fadbbef JR |
1548 | ERR= |
1549 | } | |
1550 | ||
1551 | - hasSubstring "$pkgs" ---apt--- ---yum--- || { | |
1552 | + hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || { | |
1553 | warning "$ERR | |
1554 | -* The vserver does not seem to have a depsolver like 'apt' or 'yum' | |
1555 | +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek' | |
1556 | installed. It is suggested to install such a program before setting | |
1557 | up internal package management." | |
1558 | res=1 | |
909684f7 | 1559 | @@ -368,6 +368,131 @@ |
4fadbbef JR |
1560 | fi |
1561 | } | |
1562 | ||
1563 | +function processVserver_PLD() | |
1564 | +{ | |
1565 | + local vserver=$1 | |
1566 | + local is_internalize=$2 | |
1567 | + local cfgdir | |
1568 | + local i | |
1569 | + | |
1570 | + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || \ | |
1571 | + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt | |
1572 | + | |
1573 | + ## Figure out the environment.... | |
1574 | + pkgmgmt.isPoldekAvailable "$cfgdir" "$vdir" "$is_internalize" || have_poldek= | |
1575 | + | |
1576 | + local POLDEKETCDIR= | |
1577 | + local POLDEKCACHEDIR= | |
1578 | + local RPMETCDIR= | |
1579 | + local RPMSTATEDIR= | |
1580 | + | |
1581 | + ## Create directories and assign variables where configuration | |
1582 | + ## can/will be found on the host | |
1583 | + if test -n "$is_internalize"; then | |
1584 | + verifyInternalPackages "$vserver" RH || test -n "$IS_FORCE" || | |
1585 | + panic " | |
1586 | +Can not continue; use '--force' to override this check" | |
1587 | + | |
1588 | + pushd "$vdir" >/dev/null | |
1589 | + | |
1590 | + test ! -L var/lib/rpm || { | |
1591 | + $_EXEC_CD /var/lib $_RM rpm && | |
1592 | + $_EXEC_CD /var/lib $_MKDIR -m755 rpm && | |
1593 | + $_EXEC_CD /var/lib $_CHOWN rpm:rpm rpm || | |
1594 | + : | |
1595 | + } </dev/null 2>/dev/null | |
1596 | + | |
1597 | + for i in var/tmp/poldek-cache etc/rpm etc/poldek; do | |
1598 | + test -d "$i" || | |
1599 | + $_EXEC_CD /$(dirname "$i") $_MKDIR -m755 $(basename "$i") || : | |
1600 | + done #2>/dev/null | |
1601 | + | |
1602 | + popd >/dev/null | |
1603 | + | |
1604 | + if test -n "$have_poldek"; then | |
1605 | + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /etc/poldek | |
1606 | + fi | |
1607 | + | |
1608 | + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /etc/rpm / | |
1609 | + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state | |
1610 | + else | |
1611 | + mkdir -m755 -p "$cfgdir" | |
1612 | + local need_base= | |
1613 | + | |
1614 | + if test -n "$have_poldek"; then | |
1615 | + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc / | |
1616 | + findDir POLDEKCACHEDIR "$cfgdir"/poldek-cache "$cfgdir"/base/poldek/cache / | |
1617 | + | |
1618 | + test "$POLDEKETCDIR" != / || POLDEKETCDIR=$cfgdir/base/poldek/etc | |
1619 | + test "$POLDEKCACHEDIR" != / || POLDEKCACHEDIR=$cfgdir/base/poldek/cache | |
1620 | + | |
1621 | + test -d "$cfgdir"/poldeketc -a -d "$cfgdir"/poldek-cache || need_base=1 | |
1622 | + fi | |
1623 | + | |
1624 | + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc / | |
1625 | + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state / | |
1626 | + | |
1627 | + test "$RPMETCDIR" != / || RPMETCDIR=$cfgdir/base/rpm/etc | |
1628 | + test "$RPMSTATEDIR" != / || RPMSTATEDIR=$cfgdir/base/rpm/state | |
1629 | + | |
1630 | + test -d "$cfgdir"/rpmetc -a -d "$cfgdir"/rpmstate || need_base=1 | |
1631 | + test ! -e "$cfgdir"/base || need_base= | |
1632 | + | |
1633 | + test -z "$need_base" || ln -s "$PKGCFGDIR" "$cfgdir"/base | |
1634 | + | |
1635 | + mkdir -m755 -p "$PKGCFGDIR" | |
1636 | + _createDirs "$POLDEKETCDIR" "$POLDEKCACHEDIR" \ | |
1637 | + "$RPMETCDIR" "$RPMSTATEDIR" | |
1638 | + fi | |
1639 | + | |
1640 | + ## Copy the files... | |
1641 | + if test -n "$is_internalize"; then | |
1642 | + if test -n "$have_poldek"; then | |
1643 | + _copySecure "$vdir" "$POLDEKETCDIR" /etc/poldek | |
1644 | + pushd "$vdir" >/dev/null | |
1645 | + _hashAuto /etc/poldek.conf '/' | |
1646 | + popd >/dev/null | |
1647 | + fi | |
1648 | + | |
1649 | + _copySecure "$vdir" "$RPMETCDIR" /etc/rpm | |
1650 | + _copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm | |
1651 | + | |
1652 | + pushd "$vdir" >/dev/null | |
1653 | + ## remove %_dbpath settings | |
1654 | + _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D' | |
1655 | + popd >/dev/null | |
1656 | + else | |
1657 | + if test -n "$have_poldek"; then | |
1658 | + _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR" | |
1659 | + _unhashAuto "$POLDEKETCDIR"/poldek.conf '/' | |
1660 | + fi | |
1661 | + | |
1662 | + _copySecureRev "$vdir" /etc/rpm "$RPMETCDIR" | |
1663 | + _copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR" | |
1664 | + | |
1665 | + echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros | |
1666 | + fi | |
1667 | + | |
1668 | + ## Cleanups... | |
1669 | + if test -n "$is_internalize"; then | |
1670 | + : | |
1671 | + else | |
8d5b8ef9 | 1672 | + tmpdir=$($_MKTEMPDIR -p /var/tmp pgmgmt.XXXXXX) |
4fadbbef JR |
1673 | + trap "$_RM -rf $tmpdir" EXIT |
1674 | + pushd "$vdir" >/dev/null | |
1675 | + $_EXEC_CD /var/lib $_MV rpm $tmpdir/ | |
1676 | + $_EXEC_CD /var/lib $_LN_S "$rpmdb_mntpoint" rpm | |
1677 | + $_RM -rf $tmpdir | |
1678 | + fi | |
1679 | + | |
1680 | + ## Finish it... | |
1681 | + if test -n "$is_internalize"; then | |
1682 | + $_TOUCH "$cfgdir"/internal | |
1683 | + else | |
1684 | + $_RM -f "$cfgdir"/internal | |
1685 | + fi | |
1686 | +} | |
1687 | + | |
1688 | function processVserver_Debian() | |
1689 | { | |
1690 | local vserver=$1 | |
21e9a651 | 1691 | @@ -422,6 +547,7 @@ |
4fadbbef JR |
1692 | |
1693 | case "$style" in | |
1694 | (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";; | |
1695 | + (pld) processVserver_PLD "$vserver" "$IS_INTERNALIZE";; | |
1696 | (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";; | |
1697 | (*) | |
1698 | echo $"Vserver style '$style' is not supported for packagemanagment" >&2 | |
21e9a651 | 1699 | diff -urN util-vserver-0.30.214.orig/scripts/util-vserver-vars.pathsubst util-vserver-0.30.214.pld/scripts/util-vserver-vars.pathsubst |
1700 | --- util-vserver-0.30.214.orig/scripts/util-vserver-vars.pathsubst 2007-09-02 22:06:41.000000000 +0200 | |
1701 | +++ util-vserver-0.30.214.pld/scripts/util-vserver-vars.pathsubst 2007-11-15 13:42:58.000000000 +0100 | |
1702 | @@ -53,6 +53,7 @@ | |
4fadbbef JR |
1703 | _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm" |
1704 | _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum" | |
1705 | _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt" | |
1706 | +_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek" | |
1707 | _LISTDEVIP="$__LEGACYDIR/listdevip" | |
1708 | _LOCKFILE="$__PKGLIBDIR/lockfile" | |
1709 | _MASK2PREFIX="$__PKGLIBDIR/mask2prefix" | |
21e9a651 | 1710 | @@ -105,6 +106,8 @@ |
4fadbbef JR |
1711 | _VUNIFY="$__PKGLIBDIR/vunify" |
1712 | _VYUM="$__SBINDIR/vyum" | |
1713 | _VYUM_WORKER="$__PKGLIBDIR/vyum-worker" | |
1714 | +_VPOLDEK="$__SBINDIR/vpoldek" | |
1715 | +_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker" | |
1716 | ||
1717 | _AWK="@AWK@" | |
fe9ea50c | 1718 | _BZIP2="@BZIP2@" |
21e9a651 | 1719 | diff -urN util-vserver-0.30.214.orig/scripts/vpkg util-vserver-0.30.214.pld/scripts/vpkg |
1720 | --- util-vserver-0.30.214.orig/scripts/vpkg 2007-09-02 22:06:41.000000000 +0200 | |
1721 | +++ util-vserver-0.30.214.pld/scripts/vpkg 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 | 1722 | @@ -115,6 +115,44 @@ |
4e5a2018 JR |
1723 | fi |
1724 | fi | |
1725 | ;; | |
1726 | + (pld) | |
1727 | + rpm_param= | |
1728 | + poldek_param= | |
1729 | + case "$tag" in | |
1730 | + ## rpm outputs sometimes '(contains no files)', so return | |
1731 | + ## only the valid output | |
1732 | + (get-conffiles) | |
1733 | + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );; | |
1734 | + (install) | |
1735 | + rpm_param=( -Uvh "$@" ) | |
1736 | + poldek_param=( --install -v "$@" ) | |
1737 | + ;; | |
1738 | + esac | |
1739 | + | |
1740 | + if test -n "$is_external"; then | |
1741 | + have_poldek=1 | |
1742 | + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek= | |
1743 | + else | |
1744 | + have_poldek= | |
1745 | + for i in /bin /usr/bin /usr/local/bin; do | |
1746 | + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; } | |
1747 | + done | |
1748 | + fi | |
1749 | + | |
1750 | + if test -n "$is_external"; then | |
1751 | + if test "$have_poldek" -a "$poldek_param"; then | |
1752 | + cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" ) | |
1753 | + else | |
1754 | + cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" ) | |
1755 | + fi | |
1756 | + else | |
1757 | + if test "$have_poldek" -a "$poldek_param"; then | |
1758 | + cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" ) | |
1759 | + else | |
1760 | + cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" ) | |
1761 | + fi | |
1762 | + fi | |
1763 | + ;; | |
1764 | (debian) | |
1765 | case "$tag" in | |
1766 | (get-conffiles) | |
21e9a651 | 1767 | diff -urN util-vserver-0.30.214.orig/scripts/vpoldek util-vserver-0.30.214.pld/scripts/vpoldek |
1768 | --- util-vserver-0.30.214.orig/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100 | |
1769 | +++ util-vserver-0.30.214.pld/scripts/vpoldek 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
1770 | @@ -0,0 +1,96 @@ |
1771 | +#! /bin/bash | |
1772 | +# $Id$ | |
1773 | + | |
1774 | +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> | |
1775 | +# | |
1776 | +# This program is free software; you can redistribute it and/or modify | |
1777 | +# it under the terms of the GNU General Public License as published by | |
1778 | +# the Free Software Foundation; version 2 of the License. | |
1779 | +# | |
1780 | +# This program is distributed in the hope that it will be useful, | |
1781 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | |
1782 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
1783 | +# GNU General Public License for more details. | |
1784 | +# | |
1785 | +# You should have received a copy of the GNU General Public License | |
1786 | +# along with this program; if not, write to the Free Software | |
1787 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
1788 | + | |
1789 | +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} | |
1790 | +test -e "$UTIL_VSERVER_VARS" || { | |
1791 | + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 | |
1792 | + exit 1 | |
1793 | +} | |
1794 | +. "$UTIL_VSERVER_VARS" | |
1795 | +. "$_LIB_FUNCTIONS" | |
1796 | + | |
1797 | + | |
1798 | +function showHelp() | |
1799 | +{ | |
1800 | + echo \ | |
1801 | +$"Usage: $0 <vserver-name>* [--all] -- <params>+ | |
1802 | + | |
1803 | +Report bugs to <$PACKAGE_BUGREPORT>." | |
1804 | + exit 0 | |
1805 | +} | |
1806 | + | |
1807 | +function showVersion() | |
1808 | +{ | |
1809 | + echo \ | |
1810 | +$"vpoldek $PACKAGE_VERSION -- poldek for vservers | |
1811 | +This program is part of $PACKAGE_STRING | |
1812 | + | |
1813 | +Copyright (C) 2003 Enrico Scholz | |
1814 | +This program is free software; you may redistribute it under the terms of | |
1815 | +the GNU General Public License. This program has absolutely no warranty." | |
1816 | + exit 0 | |
1817 | +} | |
1818 | + | |
1819 | +is_quiet= | |
1820 | +declare -a vservers=() | |
1821 | + | |
1822 | +while test "$#" -ge 1; do | |
1823 | + case "$1" in | |
1824 | + --) shift; break;; | |
1825 | + --help) showHelp $0;; | |
1826 | + --quiet|-q) is_quiet=1 ;; | |
1827 | + --all) | |
1828 | + getAllVservers tmp | |
1829 | + vservers=( "${vservers[@]}" "${tmp[@]}" ) | |
1830 | + ;; | |
1831 | + --version) | |
1832 | + showVersion ;; | |
1833 | + *) vservers=( "${vservers[@]}" "$1" ) | |
1834 | + esac | |
1835 | + shift | |
1836 | +done | |
1837 | + | |
1838 | +cnt=0 | |
1839 | +res=255 | |
1840 | +for i in "${vservers[@]}"; do | |
1841 | + cnt=$[ cnt + 1 ] | |
1842 | + | |
1843 | + test -n "$is_quiet" || { | |
1844 | + colorize bold echo -n "vpoldek: operating on vserver " | |
1845 | + colorize bold colorize emph echo "$i" | |
1846 | + xtermTitle "vpoldek: operating on vserver '$i' [$cnt/${#vservers[@]}]" | |
1847 | + } | |
1848 | + | |
1849 | + if pkgmgmt.isInternal "$i"; then | |
1850 | + $_VSERVER "$i" exec poldek "$@" | |
1851 | + else | |
1852 | + callInNamespace "$i" \ | |
1853 | + "$_VNAMESPACE" --new -- "$_VPOLDEK_WORKER" "$i" "$@" | |
1854 | + fi | |
1855 | + res=$? | |
1856 | + | |
1857 | + test $res -eq 0 -o -n "$is_quiet" || { | |
1858 | + colorize error echo -n $"vpoldek failed on vserver '$i' with errorcode $res" | |
1859 | + echo | |
1860 | + } | |
1861 | + | |
1862 | + test -n "$is_quiet" || echo | |
1863 | +done | |
1864 | + | |
1865 | +test "$cnt" -ge 0 || echo "No vservers specified" >&2 | |
1866 | +exit $res | |
21e9a651 | 1867 | diff -urN util-vserver-0.30.214.orig/scripts/vpoldek-worker util-vserver-0.30.214.pld/scripts/vpoldek-worker |
1868 | --- util-vserver-0.30.214.orig/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100 | |
1869 | +++ util-vserver-0.30.214.pld/scripts/vpoldek-worker 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
1870 | @@ -0,0 +1,45 @@ |
1871 | +#! /bin/bash | |
1872 | +# $Id$ | |
1873 | + | |
1874 | +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> | |
1875 | +# | |
1876 | +# This program is free software; you can redistribute it and/or modify | |
1877 | +# it under the terms of the GNU General Public License as published by | |
1878 | +# the Free Software Foundation; version 2 of the License. | |
1879 | +# | |
1880 | +# This program is distributed in the hope that it will be useful, | |
1881 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | |
1882 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
1883 | +# GNU General Public License for more details. | |
1884 | +# | |
1885 | +# You should have received a copy of the GNU General Public License | |
1886 | +# along with this program; if not, write to the Free Software | |
1887 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
1888 | + | |
1889 | +set -e | |
1890 | + | |
1891 | +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} | |
1892 | +test -e "$UTIL_VSERVER_VARS" || { | |
1893 | + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 | |
1894 | + exit 1 | |
1895 | +} | |
1896 | +. "$UTIL_VSERVER_VARS" | |
1897 | +. "$_LIB_FUNCTIONS" | |
1898 | + | |
1899 | + | |
1900 | +vserver="$1" | |
1901 | +shift | |
1902 | + | |
1903 | +pkgInit "$vserver" rpm poldek | |
1904 | + | |
1905 | +test -z "$_POLDEK" || { | |
1906 | + warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of" | |
1907 | + ${POLDEK:=$_POLDEK} | |
1908 | +} | |
1909 | + | |
1910 | +exec ${_POLDEK:-poldek} \ | |
1911 | + -v --root=$VDIR \ | |
1912 | + --cachedir=$POLDEKCACHEDIR \ | |
1913 | + --conf=$POLDEK_CONFIG \ | |
1914 | + --pmcmd=$RPM_BINARY \ | |
1915 | + "$@" | |
21e9a651 | 1916 | diff -urN util-vserver-0.30.214.orig/scripts/vserver-build util-vserver-0.30.214.pld/scripts/vserver-build |
1917 | --- util-vserver-0.30.214.orig/scripts/vserver-build 2007-09-02 22:06:41.000000000 +0200 | |
1918 | +++ util-vserver-0.30.214.pld/scripts/vserver-build 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 | 1919 | @@ -57,6 +57,9 @@ |
fe9ea50c | 1920 | yum ... -- -d <distribution> |
4fadbbef JR |
1921 | ... installs the base-packages of the given distribution with |
1922 | help of 'vyum' | |
fe9ea50c | 1923 | + poldek ... -- -d <distribution> |
4fadbbef JR |
1924 | + ... installs the base-packages of the given distribution with |
1925 | + help of 'vpoldek' | |
fe9ea50c | 1926 | rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+ |
4fadbbef | 1927 | ... installs lists of rpm-packages |
fe9ea50c | 1928 | skeleton ... -- [<cmd> <args>*] |
21e9a651 | 1929 | @@ -136,7 +139,7 @@ |
4fadbbef JR |
1930 | |
1931 | case x"$method" in | |
1932 | (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; | |
893c90d5 | 1933 | - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone) |
1934 | + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek) | |
4fadbbef JR |
1935 | . $__PKGLIBDIR/vserver-build.$method |
1936 | ;; | |
1937 | (x) panic $"No build-method specified";; | |
21e9a651 | 1938 | diff -urN util-vserver-0.30.214.orig/scripts/vserver-build.functions util-vserver-0.30.214.pld/scripts/vserver-build.functions |
1939 | --- util-vserver-0.30.214.orig/scripts/vserver-build.functions 2007-09-02 22:06:41.000000000 +0200 | |
1940 | +++ util-vserver-0.30.214.pld/scripts/vserver-build.functions 2007-11-15 13:42:58.000000000 +0100 | |
909684f7 | 1941 | @@ -167,6 +167,12 @@ |
fe9ea50c | 1942 | elif test -e /etc/slackware-version; then |
1943 | set -- $(cat /etc/slackware-version) | |
4fadbbef JR |
1944 | DISTRIBUTION=slackware$2 |
1945 | + elif test -e /etc/pld-release; then | |
1946 | + old_IFS=$IFS | |
1947 | + IFS='()' | |
1948 | + set -- $(cat /etc/pld-release) | |
1949 | + DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z) | |
1950 | + IFS=$old_IFS | |
1951 | elif test -n "$1"; then | |
1952 | DISTRIBUTION=$1 | |
1953 | else | |
21e9a651 | 1954 | diff -urN util-vserver-0.30.214.orig/scripts/vserver-build.functions.poldek util-vserver-0.30.214.pld/scripts/vserver-build.functions.poldek |
1955 | --- util-vserver-0.30.214.orig/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100 | |
1956 | +++ util-vserver-0.30.214.pld/scripts/vserver-build.functions.poldek 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
1957 | @@ -0,0 +1,67 @@ |
1958 | +# $Id$ --*- sh -*-- | |
1959 | + | |
1960 | +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> | |
1961 | +# | |
1962 | +# This program is free software; you can redistribute it and/or modify | |
1963 | +# it under the terms of the GNU General Public License as published by | |
1964 | +# the Free Software Foundation; version 2 of the License. | |
1965 | +# | |
1966 | +# This program is distributed in the hope that it will be useful, | |
1967 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | |
1968 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
1969 | +# GNU General Public License for more details. | |
1970 | +# | |
1971 | +# You should have received a copy of the GNU General Public License | |
1972 | +# along with this program; if not, write to the Free Software | |
1973 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
1974 | + | |
1975 | +function poldek.installBasePackages | |
1976 | +{ | |
1977 | + local name="$1" | |
1978 | + local dir="$2" | |
1979 | + | |
1980 | + test "$dir" != / || return 0 | |
1981 | + for filelist in "$dir"/*; do | |
1982 | + isRegularFile "$filelist" || continue | |
1983 | + local idx=0 | |
1984 | + local can_fail=false | |
1985 | + local flags='--install' | |
1986 | + | |
1987 | + set -- $(<$filelist) | |
1988 | + while test "$#" -gt 0; do | |
1989 | + case "$1" in | |
1990 | + --reinstall) flags='--reinstall';; | |
1991 | + --can-fail) can_fail=true;; | |
1992 | + *) break;; | |
1993 | + esac | |
1994 | + shift | |
1995 | + done | |
1996 | + "$_VPOLDEK" "$name" -- $flags $* || $can_fail | |
1997 | + done | |
1998 | +} | |
1999 | + | |
2000 | +function poldek.initVariables | |
2001 | +{ | |
2002 | + findFile POLDEKCONFDEFAULT \ | |
2003 | + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \ | |
2004 | + "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \ | |
2005 | + "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \ | |
2006 | + "$__DISTRIBDIR/defaults/poldek/poldek.conf" \ | |
2007 | + '' | |
2008 | +} | |
2009 | + | |
2010 | +function poldek.initFilesystem | |
2011 | +{ | |
2012 | + mkdir -p "$PKGCFGDIR"/poldek/etc | |
2013 | + mkdir -p "$PKGCFGBASE"/poldek-cache | |
2014 | + | |
2015 | + $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache | |
2016 | + | |
2017 | + populateDirectory "$PKGCFGDIR/poldek/etc" \ | |
2018 | + "$__DISTRIBDIR/defaults/poldek" \ | |
2019 | + "$__DISTRIBDIR/$DISTRIBUTION/poldek" \ | |
2020 | + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek" | |
2021 | + | |
78219c44 JR |
2022 | +# test -z "$POLDEKCONFDEFAULT" || \ |
2023 | +# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/ | |
4fadbbef | 2024 | +} |
21e9a651 | 2025 | diff -urN util-vserver-0.30.214.orig/scripts/vserver-build.poldek util-vserver-0.30.214.pld/scripts/vserver-build.poldek |
2026 | --- util-vserver-0.30.214.orig/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100 | |
2027 | +++ util-vserver-0.30.214.pld/scripts/vserver-build.poldek 2007-11-15 13:42:58.000000000 +0100 | |
4fadbbef JR |
2028 | @@ -0,0 +1,64 @@ |
2029 | +# $Id$ --*- sh -*-- | |
2030 | + | |
2031 | +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> | |
2032 | +# | |
2033 | +# This program is free software; you can redistribute it and/or modify | |
2034 | +# it under the terms of the GNU General Public License as published by | |
2035 | +# the Free Software Foundation; version 2 of the License. | |
2036 | +# | |
2037 | +# This program is distributed in the hope that it will be useful, | |
2038 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | |
2039 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
2040 | +# GNU General Public License for more details. | |
2041 | +# | |
2042 | +# You should have received a copy of the GNU General Public License | |
2043 | +# along with this program; if not, write to the Free Software | |
2044 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
2045 | + | |
2046 | +tmp=$(getopt -o +d: --long debug -n "$0" -- "$@") || exit 1 | |
2047 | +eval set -- "$tmp" | |
2048 | + | |
2049 | +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM" | |
2050 | +. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK" | |
2051 | +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" | |
2052 | + | |
2053 | +while true; do | |
2054 | + case "$1" in | |
2055 | + (-d) DISTRIBUTION=$2; shift;; | |
2056 | + (--debug) set -x;; | |
2057 | + (--) shift; break ;; | |
2058 | + (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2 | |
2059 | + exit 1 | |
2060 | + ;; | |
2061 | + esac | |
2062 | + shift | |
2063 | +done | |
2064 | + | |
2065 | +getDistribution | |
2066 | + | |
2067 | +base.init | |
2068 | + | |
2069 | +pkgmgmt.initVariables | |
2070 | +rpm.initVariables | |
2071 | +poldek.initVariables | |
2072 | + | |
2073 | +base.initFilesystem "$OPTION_FORCE" | |
2074 | +pkgmgmt.initFilesystem "$OPTION_FORCE" | |
2075 | +rpm.initFilesystem | |
2076 | +poldek.initFilesystem | |
2077 | + | |
2078 | +setup_writeOption "$VSERVER_NAME" | |
2079 | +setup_writeInitialFstab | |
2080 | + | |
2081 | +test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" | |
2082 | +rpm.initDB "$SETUP_CONFDIR" | |
2083 | +rpm.importGPGPubKeys "$SETUP_CONFDIR" \ | |
2084 | + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \ | |
2085 | + "$__CONFDIR/.distributions/.common/pubkeys" \ | |
2086 | + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys" | |
2087 | + | |
2088 | +$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole | |
2089 | +poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR" | |
2090 | +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" | |
2091 | + | |
2092 | +base.setSuccess |