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