- up to pre2841; ubuntu templates dropped upstream

[packages/util-vserver.git] / util-vserver-pld.patch

diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index a66b7d32b367c932c368a3c77d18aa1bfb8b9eca..5cb51b14adc860dab2ecb91a46c87b635acc7ea2 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -8,12 +8,12 @@
                           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
@@ -114,13 +114,15 @@
 +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 @@
@@ -200,11 +202,13 @@
 +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 @@
@@ -265,11 +269,13 @@
 +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 @@
@@ -768,9 +774,9 @@
        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>
@@ -826,9 +832,8 @@
 +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" \