template/initpost template/initpre \
rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \
fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \
-@@ -85,7 +86,10 @@
+@@ -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-th/pkgs/01 pld-th/rpm/macros \
-+ pld-ti/pkgs/01 pld-ti/rpm/macros
++ pld-th/pkgs/01 pld-th/rpm/macros
nobase_confdistrib_DATA = rh9/apt/sources.list \
fc1/apt/sources.list \
-@@ -95,7 +99,10 @@
+@@ -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)
+vserver-packages
--- 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,65 @@
+@@ -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%
-+_prefix = ftp://ftp.th.pld-linux.org/dists/th
++
++# main PLD-site for often changed things (test, ready):
++_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th
++
+## Some mirrors
+## You can use them if you have better connection there
+# CI TASK:
+#_prefix = ftp://ftp.task.pld-linux.org/dists/th
++_prefix = %{_pld_main_prefix}
+
-+_type = pndir
-+
-+# PLD 3.0 (Th)
++# PLD Linux 3.0 (Th): main sources
+[source]
-+type = %{_type}
++type = pndir
+name = th
+path = %{_prefix}/PLD/%{_arch}/RPMS/
+
+[source]
-+type = %{_type}
++type = pndir
+name = th
+path = %{_prefix}/PLD/noarch/RPMS/
+
-+#[source]
-+#type = %{_type}
-+#name = th-updates
-+#path = %{_prefix}/updates/%{_arch}/RPMS/
-+#
-+#[source]
-+#type = %{_type}
-+#name = th-updates
-+#path = %{_prefix}/updates/noarch/RPMS/
-+
-+#[source]
-+#type = %{_type}
-+#name = th-supported
-+#path = %{_prefix}/supported/%{_arch}/
-+#auto = no
-+
-+[source]
-+type = %{_type}
-+name = th-ready
-+path = %{_prefix}/ready/%{_arch}/RPMS/
-+auto = no
-+autoup = no
-+
++# PLD Linux 3.0 (Th): obsolete sources (kde3, ...)
+[source]
-+type = %{_type}
-+name = th-ready
-+path = %{_prefix}/ready/noarch/RPMS/
++type = pndir
++name = th-obsolete
++path = %{_prefix}/obsolete/%{_arch}/RPMS/
+auto = no
+autoup = no
+
+[source]
-+type = %{_type}
-+name = th-test
-+path = %{_prefix}/test/%{_arch}/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 = th-test
-+path = %{_prefix}/test/noarch/RPMS/
-+auto = no
-+autoup = no
---- 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,6 @@
-+# 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:/proc
-+%_tmppath /tmp
-+%_host_os %_os
---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/pkgs/01 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.216-r2837/distrib/pld-ti/pkgs/01 2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,6 @@
-+basesystem
-+filesystem
-+glibc-misc
-+issue
-+rpm-base
-+vserver-packages
---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.216-r2837/distrib/pld-ti/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
-@@ -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
-+
-+[source]
-+type = %{_type}
-+name = titanium
-+path = %{_prefix}/PLD/%{_arch}/RPMS/
-+
-+[source]
-+type = %{_type}
-+name = titanium
-+path = %{_prefix}/PLD/noarch/RPMS/
-+
-+[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.216-r2837.orig/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.216-r2837/distrib/pld-ti/rpm/macros 2009-06-22 17:48:26.000000000 +0200
+--- 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,6 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
function _pkgMountBase
{
@@ -476,6 +490,7 @@
- rpm) _pkgSetVarsRPM;;
apt) _pkgSetVarsApt;;
yum) _pkgSetVarsYum;;
+ urpmi) _pkgSetVarsUrpmi;;
+ poldek) _pkgSetVarsPoldek;;
*) echo "Unknown packaging flavor" >&2; exit 1;;
esac
"
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'
--- 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";;
projects / packages / util-vserver.git / blobdiff