]>
Commit | Line | Data |
---|---|---|
e7229914 JR |
1 | diff -urN util-vserver-0.30.207/distrib/Makefile.am util-vserver-0.30.207-pld/distrib/Makefile.am |
2 | --- util-vserver-0.30.207/distrib/Makefile.am 2005-04-08 21:12:09.000000000 +0200 | |
3 | +++ util-vserver-0.30.207-pld/distrib/Makefile.am 2005-05-17 15:27:16.884625000 +0200 | |
4 | @@ -43,7 +43,8 @@ | |
5 | fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/fedora*.repo) \ | |
6 | $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \ | |
7 | suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ | |
8 | - suse91/rpm/macros | |
9 | + suse91/rpm/macros \ | |
10 | + pld2.0/pkgs/01 pld2.0/rpm/macros pld2.0/rpmlist.d/00.lst | |
11 | ||
12 | nobase_confdistrib_DATA = rh9/apt/sources.list \ | |
13 | fc1/apt/sources.list \ | |
14 | @@ -67,6 +68,7 @@ | |
15 | ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \ | |
16 | ln -sf ../redhat/initpre $(DESTDIR)$(distribdir)/$$i/; \ | |
17 | done | |
18 | + ln -sf pld2.0 $(DESTDIR)$(distribdir)/pld1.99 | |
19 | $(mkinstalldirs) $(DESTDIR)$(confdir) \ | |
20 | $(DESTDIR)$(confdistribdir)/.common/pubkeys \ | |
21 | $(DESTDIR)$(confdefaultsdir) \ | |
22 | diff -urN util-vserver-0.30.207/distrib/pld2.0/pkgs/01 util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01 | |
23 | --- util-vserver-0.30.207/distrib/pld2.0/pkgs/01 1970-01-01 01:00:00.000000000 +0100 | |
24 | +++ util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01 2005-05-16 19:09:20.000000000 +0200 | |
4e5a2018 | 25 | @@ -0,0 +1,3 @@ |
e7229914 JR |
26 | +vserver-basesystem |
27 | +glibc | |
4e5a2018 | 28 | +issue |
e7229914 JR |
29 | diff -urN util-vserver-0.30.207/distrib/pld2.0/rpm/macros util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros |
30 | --- util-vserver-0.30.207/distrib/pld2.0/rpm/macros 1970-01-01 01:00:00.000000000 +0100 | |
31 | +++ util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros 2005-05-17 15:23:04.279026888 +0200 | |
d7090917 | 32 | @@ -0,0 +1,4 @@ |
e7229914 JR |
33 | +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 |
34 | +# you have to use at least one language beside 'C' | |
35 | +%_install_langs C:en:pl | |
d7090917 | 36 | +%_netsharedpath /dev |
e7229914 JR |
37 | diff -urN util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst |
38 | --- util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 | |
39 | +++ util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst 2005-05-17 15:15:56.643037440 +0200 | |
4e5a2018 | 40 | @@ -0,0 +1,8 @@ |
e7229914 JR |
41 | +vserver-basesystem-*.rpm |
42 | +vserver-dev-*.rpm | |
43 | +FHS-*.rpm | |
44 | +glibc-misc-*.rpm | |
45 | +glibc-[0-9]*.rpm | |
46 | +libgcc-[0-9]*.rpm | |
47 | +setup-*.rpm | |
4e5a2018 JR |
48 | +issue-[0-9]*.rpm |
49 | diff -ur -x '*~' -x .libs -x .deps util-vserver-0.30.207/scripts/functions util-vserver-0.30.207-poldek/scripts/functions | |
50 | --- util-vserver-0.30.207/scripts/functions 2005-05-20 18:33:27.361745984 +0200 | |
51 | +++ util-vserver-0.30.207-poldek/scripts/functions 2005-05-20 18:33:06.191964280 +0200 | |
52 | @@ -674,6 +674,8 @@ | |
53 | style=redhat | |
54 | elif test -e "$_pgs_vdir"/etc/mandrake-release; then | |
55 | style=mandrake | |
56 | + elif test -e "$_pgs_vdir"/etc/pld-release; then | |
57 | + style=pld | |
58 | elif test -e "$_pgs_vdir"/etc/debian_version; then | |
59 | style=debian | |
60 | elif test -e "$_pgs_vdir"/etc/SuSE-release; then | |
e7229914 JR |
61 | diff -urN util-vserver-0.30.207/scripts/vserver-build.functions util-vserver-0.30.207-pld/scripts/vserver-build.functions |
62 | --- util-vserver-0.30.207/scripts/vserver-build.functions 2005-04-16 23:20:45.000000000 +0200 | |
63 | +++ util-vserver-0.30.207-pld/scripts/vserver-build.functions 2005-05-17 15:13:49.646343872 +0200 | |
64 | @@ -133,6 +133,9 @@ | |
65 | elif test -e /etc/slackware-release; then | |
66 | set -- $(cat /etc/slackware-release) | |
67 | DISTRIBUTION=slackware$2 | |
68 | + elif test -e /etc/pld-release; then | |
69 | + set -- $(cat /etc/pld-release) | |
70 | + DISTRIBUTION=pld$1 | |
71 | elif test -n "$1"; then | |
72 | DISTRIBUTION=$1 | |
73 | else | |
4e5a2018 JR |
74 | diff -ur -x '*~' -x .libs -x .deps util-vserver-0.30.207/scripts/vpkg util-vserver-0.30.207-poldek/scripts/vpkg |
75 | --- util-vserver-0.30.207/scripts/vpkg 2005-03-21 21:03:30.000000000 +0100 | |
76 | +++ util-vserver-0.30.207-poldek/scripts/vpkg 2005-05-20 18:22:18.745391120 +0200 | |
77 | @@ -115,6 +115,44 @@ | |
78 | fi | |
79 | fi | |
80 | ;; | |
81 | + (pld) | |
82 | + rpm_param= | |
83 | + poldek_param= | |
84 | + case "$tag" in | |
85 | + ## rpm outputs sometimes '(contains no files)', so return | |
86 | + ## only the valid output | |
87 | + (get-conffiles) | |
88 | + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );; | |
89 | + (install) | |
90 | + rpm_param=( -Uvh "$@" ) | |
91 | + poldek_param=( --install -v "$@" ) | |
92 | + ;; | |
93 | + esac | |
94 | + | |
95 | + if test -n "$is_external"; then | |
96 | + have_poldek=1 | |
97 | + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek= | |
98 | + else | |
99 | + have_poldek= | |
100 | + for i in /bin /usr/bin /usr/local/bin; do | |
101 | + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; } | |
102 | + done | |
103 | + fi | |
104 | + | |
105 | + if test -n "$is_external"; then | |
106 | + if test "$have_poldek" -a "$poldek_param"; then | |
107 | + cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" ) | |
108 | + else | |
109 | + cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" ) | |
110 | + fi | |
111 | + else | |
112 | + if test "$have_poldek" -a "$poldek_param"; then | |
113 | + cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" ) | |
114 | + else | |
115 | + cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" ) | |
116 | + fi | |
117 | + fi | |
118 | + ;; | |
119 | (debian) | |
120 | case "$tag" in | |
121 | (get-conffiles) |