---- 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
+--- util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 22:59:35.515771366 +0200
++++ util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 23:22:53.714374272 +0200
@@ -42,6 +42,7 @@
defaults/apt.conf \
defaults/rpm/macros \
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 \
+@@ -85,7 +85,10 @@
+ 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-ti/pkgs/01 pld-ti/rpm/macros
nobase_confdistrib_DATA = rh9/apt/sources.list \
fc1/apt/sources.list \
-@@ -83,7 +87,11 @@
+@@ -83,7 +87,10 @@
fc5/apt/sources.list \
fc6/apt/sources.list \
f7/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-ti/poldek/repos.d/pld.conf
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
= $(nobase_distrib_SCRIPTS)
+# PLD Linux Distribution <http://www.pld-linux.org/>.
+
+# 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}
++_prefix = %{_pld_main_prefix}
+
-+_ac_idxtype = pndir
++_type = pndir
+
+# PLD 2.0 (Ac)
+[source]
-+type = %{_ac_idxtype}
++type = %{_type}
+name = ac
-+path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
++path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/
+signed = yes
+# buggy deps -- use one from updates instead
+ignore = msmtp-sendmail*
+pri = 1
+
+[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}/
+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}/
+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 @@
+--- util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100
++++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2008-04-29 23:36:23.674175489 +0300
+@@ -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
++%_tmppath /tmp
++%_host_os %_os
--- 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
@@ -0,0 +1,6 @@
+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.214/distrib/pld-th/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
++++ util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2008-03-26 00:27:05.335185240 +0200
+@@ -0,0 +1,65 @@
++# PLD Linux Distribution <http://www.pld-linux.org/>.
+
-+_pld_arch = %ARCH%
-+_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
++_arch = %ARCH%
++_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
-+
++#_prefix = ftp://ftp.task.pld-linux.org/dists/th
+
-+_th_idxtype = pndir
++_type = pndir
+
+# PLD 3.0 (Th)
+[source]
-+type = %{_th_idxtype}
-+name = th
-+path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
++type = %{_type}
++name = th
++path = %{_prefix}/PLD/%{_arch}/RPMS/
+
+[source]
-+type = %{_th_idxtype}
-+name = th
-+path = %{_pld_prefix}/PLD/noarch/RPMS/
++type = %{_type}
++name = th
++path = %{_prefix}/PLD/noarch/RPMS/
+
-+[source]
-+type = %{_th_idxtype}
-+name = th-updates-security
-+path = %{_pld_prefix}/updates-security/%{_pld_arch}/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 = %{_th_idxtype}
-+name = th-updates-general
-+path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
-+noauto = yes
++type = %{_type}
++name = th-ready
++path = %{_prefix}/ready/%{_arch}/RPMS/
++auto = no
++autoup = no
+
-+#[source]
-+#type = %{_th_idxtype}
-+#name = th-supported
-+#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/
-+#noauto = yes
++[source]
++type = %{_type}
++name = th-ready
++path = %{_prefix}/ready/noarch/RPMS/
++auto = no
++autoup = no
+
+[source]
-+type = %{_th_idxtype}
-+name = th-ready
-+path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
-+noauto = yes
++type = %{_type}
++name = th-test
++path = %{_prefix}/test/%{_arch}/RPMS/
++auto = no
++autoup = no
+
+[source]
-+type = %{_th_idxtype}
-+name = th-test
-+path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
-+noauto = yes
++type = %{_type}
++name = th-test
++path = %{_prefix}/test/noarch/RPMS/
++auto = no
++autoup = no
--- 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 @@
+@@ -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
++%_tmppath /tmp
++%_host_os %_os
--- 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 @@
+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 @@
+@@ -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
++%_tmppath /tmp
++%_host_os %_os
--- 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
@@ -403,6 +403,20 @@
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
+++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,81 @@
+# $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" || \
projects / packages / util-vserver.git / blobdiff