1 |
commit: cf1ab5a43c3406e3c2ff86177d652f3e089c2747 |
2 |
Author: Wim Muskee <wimmuskee <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 29 18:15:29 2011 +0000 |
4 |
Commit: Wim Muskee <wimmuskee <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Mar 29 18:15:29 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=cf1ab5a4 |
7 |
|
8 |
ltsp-server: Fixed bootstrap and getstage plugins. |
9 |
|
10 |
--- |
11 |
net-misc/ltsp-server/ChangeLog | 5 ++++ |
12 |
net-misc/ltsp-server/Manifest | 6 +++- |
13 |
.../files/ltsp-server-5.2.6-bootstrap.patch | 22 ++++++++++++++++++++ |
14 |
.../files/ltsp-server-5.2.6-setstage.patch | 17 +++++++++++++++ |
15 |
...er-5.2.6.ebuild => ltsp-server-5.2.6-r1.ebuild} | 3 ++ |
16 |
5 files changed, 51 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/ltsp-server/ChangeLog b/net-misc/ltsp-server/ChangeLog |
19 |
index bb71285..5e03c8a 100644 |
20 |
--- a/net-misc/ltsp-server/ChangeLog |
21 |
+++ b/net-misc/ltsp-server/ChangeLog |
22 |
@@ -2,6 +2,11 @@ |
23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+*ltsp-server-5.2.6-r1 (29 03 2011) |
27 |
+ |
28 |
+ 29 03 2011; Wim Muskee wimmuskee@×××××.com ltsp-server-5.2.6-r1: |
29 |
+ Fixed bootstrap and getstage plugins. |
30 |
+ |
31 |
24 03 2011; Wim Muskee wimmuskee@×××××.com ltsp-server-9999: |
32 |
Added localapps man page and examples. |
33 |
|
34 |
|
35 |
diff --git a/net-misc/ltsp-server/Manifest b/net-misc/ltsp-server/Manifest |
36 |
index 190811e..5ddc7b6 100644 |
37 |
--- a/net-misc/ltsp-server/Manifest |
38 |
+++ b/net-misc/ltsp-server/Manifest |
39 |
@@ -1,5 +1,7 @@ |
40 |
+AUX ltsp-server-5.2.6-bootstrap.patch 1320 RMD160 7fdbaf07f07736eca03ba7770f011eda21075e90 SHA1 05a69c800faf58e2bee817766859d19f1e7c22d5 SHA256 b1c1fd802f5a3c25a6559adf6ffe3098323f0a5664438ef3e43ae950421feaf7 |
41 |
+AUX ltsp-server-5.2.6-setstage.patch 828 RMD160 8f0e50e80abebef35dfa3faab36522b05467144f SHA1 fb8fe8a10b5bd9606328fc902bfca0de4ea43fd5 SHA256 d600fe8d9b36f089dfed109521b858734a177c57686bfdc20e1bbc1863590db0 |
42 |
EBUILD ltsp-server-5.2.5.ebuild 2257 RMD160 89ca6ff7c14d7b2c7d61a9e7f2594c4527240a70 SHA1 928e0bba4d7ba795413d671e4d8af92f6974a41e SHA256 144225dae00da1c7f9a9b396b1f613d42910f769afb164bd2b9de1a6c322562a |
43 |
-EBUILD ltsp-server-5.2.6.ebuild 2309 RMD160 ce89f0aa7f0ba7fb0eb099ef182be0e0ac4a978a SHA1 a8ba0394c7d00e63d78f076c16183b55cec081c6 SHA256 d830455506d49dd8333fe15f935eddd226c2c85c1db20506af37edc20aef7398 |
44 |
+EBUILD ltsp-server-5.2.6-r1.ebuild 2401 RMD160 76f4cabc2ace640924ff30c18548a7c4b478918b SHA1 6cf207d4a9db56cf7f14a371203cdbe6aeaa0f27 SHA256 2333582b83990f6f9395c9a33773cc5ece2586583db7536072f452c65d52ec56 |
45 |
EBUILD ltsp-server-9999.ebuild 2306 RMD160 8a9e987918761f52050dac41fd85a69a1d1ce234 SHA1 5630b29e5a21a443cd0b231e894598d954703fe5 SHA256 6a529607e9f51323f5a839fa4054eb2557cf6c6f8833b719e55849d64a62ad32 |
46 |
-MISC ChangeLog 2538 RMD160 d13082d7efb13d0f291b47c71b76393f8f041627 SHA1 932e3c15c1a95575798dd8c9cbb580e1798fa51a SHA256 77a727e27781c4ac514165d8906cc5f998372a3b14bd7a1756c0a17e40834334 |
47 |
+MISC ChangeLog 2682 RMD160 94a8f4c86acc33bc7065c6b0aa2e2e779037e150 SHA1 49af6ba03cf57f48a90af87417e2a5e423228510 SHA256 6556050af0d44c932452c31fd94fc3682fa40a8f30d7cee3c0b122b8de7363fc |
48 |
MISC metadata.xml 418 RMD160 d07ff50aee16b42f0c514f082c19ab3b0cfc8430 SHA1 571c6b7d459fe60fe64ffa557e3f5556a5b6c698 SHA256 0e33cdaaa303808a7c0a0fd7f2e49bb818996007c99cbd1e0f0240db439810d3 |
49 |
|
50 |
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.6-bootstrap.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.6-bootstrap.patch |
51 |
new file mode 100644 |
52 |
index 0000000..b596691 |
53 |
--- /dev/null |
54 |
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.6-bootstrap.patch |
55 |
@@ -0,0 +1,22 @@ |
56 |
+--- server/plugins/ltsp-build-client/Gentoo/010-bootstrap.orig 2011-03-28 21:06:00.700447978 +0200 |
57 |
++++ server/plugins/ltsp-build-client/Gentoo/010-bootstrap 2011-03-28 21:09:09.358697514 +0200 |
58 |
+@@ -6,7 +6,7 @@ |
59 |
+ add_option "quickstart-host" "`eval_gettext "Get profile from a Quickstart server"`" "advanced" "true" |
60 |
+ ;; |
61 |
+ configure) |
62 |
+- if [ -n "$option_quickstart_profile_value" ] || [ -n ${QUICKSTART_PROFILE} ]; then |
63 |
++ if [ -n "$option_quickstart_profile_value" ] || [ -n "$QUICKSTART_PROFILE" ]; then |
64 |
+ QUICKSTART_PROFILE=${option_quickstart_profile_value:-$QUICKSTART_PROFILE} |
65 |
+ printf "`eval_gettext "Manual Quickstart: %s"`\n" $QUICKSTART_PROFILE |
66 |
+ else |
67 |
+@@ -26,8 +26,8 @@ |
68 |
+ if [ -n "$option_quickstart_verbose_value" ] || [ "${QUICKSTART_VERBOSE}" = true ]; then |
69 |
+ QUICKSTART_ARGS="$QUICKSTART_ARGS --verbose" |
70 |
+ fi |
71 |
+- if [ -n "$option_quickstart_host_value" ] || [ -n ${QUICKSTART_HOST} ]; then |
72 |
+- QUICKSTART_ARGS="$QUICKSTART_ARGS --client=${option_quickstart_host_value:-$QUICKSTART_HOST}" |
73 |
++ if [ -n "$option_quickstart_host_value" ] || [ -n "$QUICKSTART_HOST" ]; then |
74 |
++ QUICKSTART_ARGS="$QUICKSTART_ARGS --client ${option_quickstart_host_value:-$QUICKSTART_HOST}" |
75 |
+ fi |
76 |
+ ;; |
77 |
+ install) |
78 |
|
79 |
diff --git a/net-misc/ltsp-server/files/ltsp-server-5.2.6-setstage.patch b/net-misc/ltsp-server/files/ltsp-server-5.2.6-setstage.patch |
80 |
new file mode 100644 |
81 |
index 0000000..0750309 |
82 |
--- /dev/null |
83 |
+++ b/net-misc/ltsp-server/files/ltsp-server-5.2.6-setstage.patch |
84 |
@@ -0,0 +1,17 @@ |
85 |
+--- server/plugins/ltsp-build-client/Gentoo/002-set-stage-file.orig 2011-03-28 21:05:48.460448127 +0200 |
86 |
++++ server/plugins/ltsp-build-client/Gentoo/002-set-stage-file 2011-03-29 18:44:14.002448307 +0200 |
87 |
+@@ -3,8 +3,13 @@ |
88 |
+ add_option "stage-uri" "`eval_gettext "Stage 3 URI"`" "advanced" "true" |
89 |
+ ;; |
90 |
+ configure) |
91 |
+- if [ -n "$option_stage_uri_value" ] || [ -n $STAGE_URI ]; then |
92 |
++ if [ -n "$option_stage_uri_value" ] || [ -n "$STAGE_URI" ]; then |
93 |
+ STAGE_URI="${option_stage_uri_value:-$STAGE_URI}" |
94 |
++ PROTOCOL=$(echo ${STAGE_URI} | sed -e 's|://.\+$||') |
95 |
++ fi |
96 |
++ |
97 |
++ # only download if stage not local |
98 |
++ if [[ "$PROTOCOL" != "file" ]]; then |
99 |
+ STAGE_ARCH=${ARCH} |
100 |
+ DISTFILES_BASE="http://distfiles.gentoo.org/releases/${ARCH}/autobuilds" |
101 |
+ |
102 |
|
103 |
diff --git a/net-misc/ltsp-server/ltsp-server-5.2.6.ebuild b/net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild |
104 |
similarity index 96% |
105 |
rename from net-misc/ltsp-server/ltsp-server-5.2.6.ebuild |
106 |
rename to net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild |
107 |
index 31d4b42..f4b0bde 100644 |
108 |
--- a/net-misc/ltsp-server/ltsp-server-5.2.6.ebuild |
109 |
+++ b/net-misc/ltsp-server/ltsp-server-5.2.6-r1.ebuild |
110 |
@@ -46,6 +46,9 @@ RDEPEND="!net-misc/ltsp-client |
111 |
|
112 |
src_unpack() { |
113 |
bzr_src_unpack |
114 |
+ cd $S |
115 |
+ epatch "${FILESDIR}/${P}-bootstrap.patch" |
116 |
+ epatch "${FILESDIR}/${P}-setstage.patch" |
117 |
} |
118 |
|
119 |
src_install() { |