---- util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 22:57:41.202725402 +0200
-+++ util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 22:59:35.515771366 +0200
-@@ -42,6 +42,7 @@
+--- util-vserver-0.30.216-r2837.orig/distrib/defaults/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/defaults/poldek/poldek.conf 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,11 @@
++# poldek configuration file.
++
++%includedir repos.d
++
++[global]
++particle install = no
++choose equivalents manually = yes
++unique package names = yes
++
++#hold =
++ignore = kernel* udev devfs
+--- util-vserver-0.30.216-r2837.orig/distrib/Makefile.am 2009-06-22 17:36:52.000000000 +0200
++++ util-vserver-0.30.216-r2837/distrib/Makefile.am 2009-06-22 17:49:36.000000000 +0200
+@@ -45,6 +45,7 @@
defaults/apt.conf \
defaults/rpm/macros \
defaults/apt/apt.conf \
template/initpost template/initpre \
rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \
fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \
-@@ -73,7 +74,10 @@
- breezy/debootstrap.script dapper/debootstrap.script \
- edgy/debootstrap.script feisty/debootstrap.script \
- gutsy/debootstrap.script hoary/debootstrap.script \
-- warty/debootstrap.script
-+ warty/debootstrap.script \
-+ pld-ac/pkgs/01 pld-ac/rpm/macros \
-+ pld-th/pkgs/01 pld-th/rpm/macros \
-+ pld-ti/pkgs/01 pld-ti/rpm/macros \
+@@ -85,7 +86,9 @@
+ suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
+ suse91/rpm/macros \
+ gentoo/init-vserver.sh gentoo/net.vserver \
+- gentoo/reboot.sh gentoo/shutdown.sh
++ gentoo/reboot.sh gentoo/shutdown.sh\
++ pld-ac/pkgs/01 pld-ac/rpm/macros pld-ac/rpm/macros.lang \
++ pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpm/macros.lang
nobase_confdistrib_DATA = rh9/apt/sources.list \
fc1/apt/sources.list \
-@@ -83,7 +87,11 @@
+@@ -95,7 +99,9 @@
fc5/apt/sources.list \
fc6/apt/sources.list \
f7/apt/sources.list \
- suse91/apt/sources.list
+ suse91/apt/sources.list \
+ pld-ac/poldek/repos.d/pld.conf \
-+ pld-th/poldek/repos.d/pld.conf \
-+ pld-ti/poldek/repos.d/pld.conf \
-+
++ pld-th/poldek/repos.d/pld.conf
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
= $(nobase_distrib_SCRIPTS)
---- /dev/null 2007-11-07 17:05:30.000000000 +0200
-+++ util-vserver-0.30.214/distrib/defaults/poldek/poldek.conf 2008-03-25 19:36:58.721331962 +0200
-@@ -0,0 +1,11 @@
-+# poldek configuration file.
-+
-+%includedir repos.d
-+
-+[global]
-+particle install = no
-+choose equivalents manually = yes
-+unique package names = yes
-+
-+#hold =
-+ignore = kernel* udev devfs
---- util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2008-03-25 23:05:18.538916218 +0200
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/pkgs/01 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+basesystem
+filesystem
+issue
+rpm-base
+vserver-packages
---- util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2008-03-25 20:34:12.000000000 +0200
-@@ -0,0 +1,56 @@
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,64 @@
+# $Id$
+# PLD Linux Distribution <http://www.pld-linux.org/>.
++#
++# Main sources for PLD Linux 2.0 (Ac)
+
+# specify our packages architecture
-+_pld_arch = %ARCH%
++_arch = %ARCH%
+
+# main PLD-site for often changed things:
+_pld_main_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
+## Some mirrors
+## You can use them if you have better connection there
+# CI TASK:
-+#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/ac
-+#_pld_prefix = %{_pld_main_prefix}
-+_pld_prefix = %{_pld_main_prefix}
++#_prefix = ftp://ftp.task.pld-linux.org/dists/ac
++_prefix = %{_pld_main_prefix}
+
-+_ac_idxtype = pndir
++_type = pndir
+
-+# PLD 2.0 (Ac)
++# PLD Linux 2.0 (Ac)
+[source]
-+type = %{_ac_idxtype}
-+name = ac
-+path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
++type = %{_type}
++name = ac-main
++path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/
+signed = yes
-+# buggy deps -- use one from updates instead
-+ignore = msmtp-sendmail*
+pri = 1
++# msmtp-sendmail is broken, yum noarch is older than in updates
++ignore = msmtp-sendmail* yum*
+
+[source]
-+type = %{_ac_idxtype}
++type = %{_type}
+name = ac-updates
-+path = %{_pld_prefix}/updates/%{_pld_arch}/
++path = %{_prefix}/updates/%{_arch}/
+signed = yes
+pri = 1
+
+[source]
-+type = %{_ac_idxtype}
++type = %{_type}
+name = ac-supported
-+path = %{_pld_prefix}/supported/%{_pld_arch}/
++path = %{_prefix}/supported/%{_arch}/
++signed = yes
+auto = no
+autoup = no
-+signed = yes
+
+[source]
-+type = %{_ac_idxtype}
++type = %{_type}
+name = ac-ready
-+path = %{_pld_main_prefix}/ready/%{_pld_arch}/
++path = %{_pld_main_prefix}/ready/%{_arch}/
++#signed = yes
+auto = no
+autoup = no
+
+[source]
-+type = %{_ac_idxtype}
++type = %{_type}
+name = ac-test
-+path = %{_pld_main_prefix}/test/%{_pld_arch}/
++path = %{_pld_main_prefix}/test/%{_arch}/
+auto = no
+autoup = no
---- util-vserver-0.30.214.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100
-@@ -0,0 +1,4 @@
++
++# ac-main + ac-updates
++[source]
++type = group
++name = ac
++sources = ac-main ac-updates
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,3 @@
++%_netsharedpath /dev:/proc
++%_tmppath /tmp
++%_host_os %_os
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros.lang 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,3 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
+%_install_langs C:en:pl
-+%_netsharedpath /dev
---- util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2008-03-25 23:05:18.538916218 +0200
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/pkgs/01 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,6 @@
+basesystem
+filesystem
-+glibc-misc
++glibc
+issue
+rpm-base
+vserver-packages
---- util-vserver-0.30.214.org/distrib/pld-th/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
-@@ -0,0 +1,51 @@
-+# PLD <http://www.pld-linux.org/>
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,71 @@
++# PLD Linux Distribution <http://www.pld-linux.org/>.
++#
++# Main sources for PLD Linux 3.0 (Th)
++
++# specify our packages architecture
++_arch = %ARCH%
++
++# main PLD-site for often changed things (test, ready):
++_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th
+
-+_pld_arch = %ARCH%
-+_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
+## Some mirrors
+## You can use them if you have better connection there
+# CI TASK:
-+#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th
-+
-+
-+_th_idxtype = pndir
-+
-+# PLD 3.0 (Th)
-+[source]
-+type = %{_th_idxtype}
-+name = th
-+path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
-+
-+[source]
-+type = %{_th_idxtype}
-+name = th
-+path = %{_pld_prefix}/PLD/noarch/RPMS/
-+
-+[source]
-+type = %{_th_idxtype}
-+name = th-updates-security
-+path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/
-+
-+[source]
-+type = %{_th_idxtype}
-+name = th-updates-general
-+path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
-+noauto = yes
-+
-+#[source]
-+#type = %{_th_idxtype}
-+#name = th-supported
-+#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/
-+#noauto = yes
++#_prefix = ftp://ftp.task.pld-linux.org/dists/th
++_prefix = %{_pld_main_prefix}
+
++# PLD Linux 3.0 (Th): main sources
+[source]
-+type = %{_th_idxtype}
-+name = th-ready
-+path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
-+noauto = yes
++type = pndir
++name = th
++path = %{_prefix}/PLD/%{_arch}/RPMS/
+
+[source]
-+type = %{_th_idxtype}
-+name = th-test
-+path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
-+noauto = yes
---- util-vserver-0.30.214.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-th/rpm/macros 2007-11-15 23:20:48.184505622 +0100
-@@ -0,0 +1,4 @@
-+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
-+# you have to use at least one language beside 'C'
-+%_install_langs C:en:pl
-+%_netsharedpath /dev
---- util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.181172125 +0100
-+++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2008-03-25 23:05:18.538916218 +0200
-@@ -0,0 +1,6 @@
-+basesystem
-+filesystem
-+glibc-misc
-+issue
-+rpm-base
-+vserver-packages
---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-ti/poldek/repos.d/pld.conf 2007-11-15 23:20:48.217840583 +0100
-@@ -0,0 +1,46 @@
-+# PLD Titanium
-+# Unofficial version of PLD Linux Distribution
-+# http://www.pld-linux.org/Titanium
-+
-+_arch = %ARCH%
-+_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium
-+
-+_type = pndir
++type = pndir
++name = th
++path = %{_prefix}/PLD/noarch/RPMS/
+
++# PLD Linux 3.0 (Th): obsolete sources (kde3, ...)
+[source]
-+type = %{_type}
-+name = titanium
-+path = %{_prefix}/PLD/%{_arch}/RPMS/
++type = pndir
++name = th-obsolete
++path = %{_prefix}/obsolete/%{_arch}/RPMS/
++auto = no
++autoup = no
+
+[source]
-+type = %{_type}
-+name = titanium
-+path = %{_prefix}/PLD/noarch/RPMS/
++type = pndir
++name = th-obsolete
++path = %{_prefix}/obsolete/noarch/RPMS/
++auto = no
++autoup = no
+
++# PLD Linux 3.0 (Th): ready sources (testing stage before moved to main)
+[source]
-+type = %{_type}
-+name = titanium-ready
-+path = %{_prefix}/ready/%{_arch}/RPMS/
++type = pndir
++name = th-ready
++path = %{_pld_main_prefix}/ready/%{_arch}/RPMS/
+auto = no
+autoup = no
+
+[source]
-+type = %{_type}
-+name = titanium-ready
-+path = %{_prefix}/ready/noarch/RPMS/
++type = pndir
++name = th-ready
++path = %{_pld_main_prefix}/ready/noarch/RPMS/
+auto = no
+autoup = no
+
++# PLD Linux 3.0 (Th): test sources (built packages to be moved to ready)
+[source]
-+type = %{_type}
-+name = titanium-test
-+path = %{_prefix}/test/%{_arch}/RPMS/
++type = pndir
++name = th-test
++path = %{_pld_main_prefix}/test/%{_arch}/RPMS/
+auto = no
+autoup = no
+
+[source]
-+type = %{_type}
-+name = titanium-test
-+path = %{_prefix}/test/noarch/RPMS/
++type = pndir
++name = th-test
++path = %{_pld_main_prefix}/test/noarch/RPMS/
+auto = no
+autoup = no
---- util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/distrib/pld-ti/rpm/macros 2007-11-15 23:20:48.221174080 +0100
-@@ -0,0 +1,4 @@
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,3 @@
++%_netsharedpath /dev:/proc
++%_tmppath /tmp
++%_host_os %_os
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros.lang 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,3 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
+%_install_langs C:en:pl
-+%_netsharedpath /dev
---- util-vserver-0.30.214.org/scripts/functions 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/functions 2007-11-15 23:20:48.221174080 +0100
+--- util-vserver-0.30.216-r2837.orig/scripts/functions 2009-06-22 17:36:35.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/functions 2009-06-22 17:48:26.000000000 +0200
@@ -403,6 +403,20 @@
fi
}
function _pkgMountBase
{
@@ -476,6 +490,7 @@
- rpm) _pkgSetVarsRPM;;
apt) _pkgSetVarsApt;;
yum) _pkgSetVarsYum;;
+ urpmi) _pkgSetVarsUrpmi;;
+ poldek) _pkgSetVarsPoldek;;
*) echo "Unknown packaging flavor" >&2; exit 1;;
esac
done
-@@ -764,6 +779,8 @@
+@@ -770,6 +785,8 @@
style=redhat
elif test -e "$_pgs_vdir"/etc/mandrake-release; then
style=mandrake
elif test -e "$_pgs_vdir"/etc/debian_version; then
style=debian
elif test -e "$_pgs_vdir"/etc/SuSE-release; then
-@@ -831,6 +848,27 @@
+@@ -837,6 +854,27 @@
test -n "$have_yum" && return 0 || return 1
}
function vshelper.doSanityCheck
{
---- util-vserver-0.30.214.org/scripts/Makefile-files 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/Makefile-files 2007-11-15 23:20:48.221174080 +0100
+--- util-vserver-0.30.216-r2837.orig/scripts/Makefile-files 2009-06-22 17:36:35.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/Makefile-files 2009-06-22 17:48:26.000000000 +0200
@@ -21,6 +21,7 @@
scripts/vapt-get-worker \
scripts/vrpm-worker \
scripts/vrpm-preload \
scripts/save_s_context \
scripts/vservers.grabinfo.sh \
-@@ -47,11 +48,13 @@
+@@ -48,12 +49,14 @@
scripts/vserver-build.template \
scripts/vserver-build.rsync \
scripts/vserver-build.clone \
+ scripts/vserver-build.poldek \
scripts/vserver-build.functions \
scripts/vserver-build.functions.apt \
- scripts/vserver-build.functions.rpm \
scripts/vserver-build.functions.pkgmgmt \
+ scripts/vserver-build.functions.rpm \
+ scripts/vserver-build.functions.urpmi \
scripts/vserver-build.functions.yum \
+ scripts/vserver-build.functions.poldek \
scripts/vserver-setup.functions \
scripts/vserver.functions \
scripts/vserver.start \
-@@ -65,6 +68,7 @@
+@@ -66,6 +69,7 @@
scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
scripts/vapt-get-worker \
scripts/vpkg \
scripts/vrpm-worker \
scripts/vrpm-preload \
scripts/start-vservers \
-@@ -88,6 +92,7 @@
+@@ -89,6 +93,7 @@
scripts_sbin_src_PRGS = scripts/chbind \
scripts/chcontext \
scripts/vapt-get \
scripts/vdispatch-conf \
scripts/vemerge \
scripts/vesync \
---- util-vserver-0.30.214.org/scripts/pkgmgmt 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/pkgmgmt 2007-11-15 23:20:48.221174080 +0100
+--- util-vserver-0.30.216-r2837.orig/scripts/pkgmgmt 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/pkgmgmt 2009-06-22 17:48:26.000000000 +0200
@@ -195,7 +195,7 @@
"
case $2 in
-- (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
-+ (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
+- (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi "${YUM_RELEASEPKGS[@]}")
++ (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi poldek "${YUM_RELEASEPKGS[@]}")
hasSubstring "$pkgs" ---rpm--- || {
warning "$ERR
* The vserver does not seem to have the 'rpm' package which is required
ERR=
}
-- hasSubstring "$pkgs" ---apt--- ---yum--- || {
-+ hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || {
+- hasSubstring "$pkgs" ---apt--- ---yum--- ---urpmi--- || {
++ hasSubstring "$pkgs" ---apt--- ---yum--- ---urpmi--- ---poldek--- || {
warning "$ERR
-* The vserver does not seem to have a depsolver like 'apt' or 'yum'
+* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
(debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
(*)
echo $"Vserver style '$style' is not supported for packagemanagment" >&2
---- util-vserver-0.30.214.org/scripts/util-vserver-vars.pathsubst 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/util-vserver-vars.pathsubst 2007-11-15 23:20:48.221174080 +0100
-@@ -53,6 +53,7 @@
+--- util-vserver-0.30.216-r2837.orig/scripts/util-vserver-vars.pathsubst 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/util-vserver-vars.pathsubst 2009-06-22 17:48:26.000000000 +0200
+@@ -54,6 +54,7 @@
_LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
_LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
_LISTDEVIP="$__LEGACYDIR/listdevip"
_LOCKFILE="$__PKGLIBDIR/lockfile"
_MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
-@@ -105,6 +106,8 @@
+@@ -109,6 +110,8 @@
_VUNIFY="$__PKGLIBDIR/vunify"
_VYUM="$__SBINDIR/vyum"
_VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
_AWK="@AWK@"
_BZIP2="@BZIP2@"
---- util-vserver-0.30.214.org/scripts/vpkg 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vpkg 2007-11-15 23:20:48.221174080 +0100
+--- util-vserver-0.30.216-r2837.orig/scripts/vpkg 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/vpkg 2009-06-22 17:48:26.000000000 +0200
@@ -115,6 +115,44 @@
fi
fi
(debian)
case "$tag" in
(get-conffiles)
---- util-vserver-0.30.214.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/scripts/vpoldek 2007-11-15 22:00:24.000000000 +0100
+--- util-vserver-0.30.216-r2837.orig/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vpoldek 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,74 @@
+#! /bin/bash
+# $Id$
+
+test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- )
+exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@"
---- util-vserver-0.30.214.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.214/scripts/vpoldek-worker 2007-11-15 22:58:23.000000000 +0100
+--- util-vserver-0.30.216-r2837.orig/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vpoldek-worker 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,45 @@
+#! /bin/bash
+# $Id$
+ --conf=$POLDEK_CONFIG \
+ --pmcmd=$RPM_BINARY \
+ "$@"
---- util-vserver-0.30.214.org/scripts/vserver-build 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver-build 2007-11-15 23:20:48.224507577 +0100
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build 2009-06-22 17:36:34.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/vserver-build 2009-06-22 17:48:26.000000000 +0200
@@ -57,6 +57,9 @@
- yum ... -- -d <distribution>
... installs the base-packages of the given distribution with
help of 'vyum'
+ urpmi ... -- -d <distribution> -m <mirror>
+ poldek ... -- -d <distribution>
+ ... installs the base-packages of the given distribution with
+ help of 'vpoldek'
case x"$method" in
(xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
-- (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
-+ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
+- (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi)
++ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi|xpoldek)
. $__PKGLIBDIR/vserver-build.$method
;;
(x) panic $"No build-method specified";;
---- util-vserver-0.30.214.org/scripts/vserver-build.functions 2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver-build.functions 2007-11-15 23:20:48.224507577 +0100
-@@ -167,6 +167,12 @@
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions 2009-06-22 17:36:35.000000000 +0200
++++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions 2009-06-22 17:48:26.000000000 +0200
+@@ -170,6 +170,12 @@
elif test -e /etc/slackware-version; then
set -- $(cat /etc/slackware-version)
DISTRIBUTION=slackware$2
elif test -n "$1"; then
DISTRIBUTION=$1
else
---- util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 19:20:07.685144000 +0200
-+++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200
-@@ -0,0 +1,82 @@
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions.poldek 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,83 @@
+# $Id$ --*- sh -*--
+
+# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+function poldek.initFilesystem
+{
+ mkdir -p "$PKGCFGDIR"/poldek/etc/repos.d
-+ mkdir -p "$PKGCFGBASE"/poldek-cache
+
-+ $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache
++ $_LN_S "$__CONFDIR"/.defaults/cachebase/poldek "$PKGCFGDIR"/poldek/cache
+
+ populateDirectory "$PKGCFGDIR/poldek/etc" \
+ "$__DISTRIBDIR/defaults/poldek" \
+
+ if [ -n "$SETUP_MACHINE" ]; then
+ say "Using $SETUP_MACHINE as machine"
-+ sed -i -e "s#^\(_pld_arch\s*\)=.*#\1= $SETUP_MACHINE#" "$PKGCFGDIR"/poldek/etc/repos.d/pld.conf
++ sed -i -e "s#^\(_arch\s*\)=.*#\1= $SETUP_MACHINE#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf
+ fi
+
+ if [ -n "$MIRROR" ]; then
+ say "Using $MIRROR as mirror URL"
-+ sed -i -e "s#^\(_pld_prefix\s*\)=.*#\1= $MIRROR#" "$PKGCFGDIR"/poldek/etc/repos.d/pld.conf
++ sed -i -e "s#^\(_prefix\s*\)=.*#\1= $MIRROR#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf
+ fi
+
-+# test -z "$POLDEKCONFDEFAULT" || \
-+# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
++ if [ "$DISTRIBUTION" = "pld-ac" ]; then
++ echo 'auto directory dependencies = no' >> "$PKGCFGDIR"/poldek/etc/poldek.conf
++ echo '%_check_dirname_deps 0' >> "$PKGCFGDIR"/rpm/etc/macros
++ fi
+}
---- util-vserver-0.30.214/scripts/vserver-build.poldek 2007-11-15 23:20:48.224507577 +0100
-+++ util-vserver-0.30.214/scripts/vserver-build.poldek 2008-03-25 20:25:23.000000000 +0200
+--- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/scripts/vserver-build.poldek 2009-06-22 17:48:26.000000000 +0200
@@ -0,0 +1,65 @@
+# $Id$ --*- sh -*--
+
projects / packages / util-vserver.git / blobdiff