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