1 |
rbu 08/09/01 00:41:08 |
2 |
|
3 |
Modified: xendomains.initd xendomains.confd |
4 |
Added: xen-tools-3.3.0--as-needed.patch |
5 |
xen-tools-3.3.0-nostrip.patch |
6 |
xen-tools-3.3.0-xen-detect-nopie-fix.patch |
7 |
Log: |
8 |
Version bump to Xen 3.3 (bug #201792). Fixes bugs: |
9 |
* Add USE flags for ACM and FLASK Xen Security Modules |
10 |
* Properly compile and uninstall python bytecode |
11 |
* RDEPEND on pyxml (bug #201255) |
12 |
* Remove libvncserver dependency |
13 |
* Shutdown xendomains in reverse start order (bug #210445) |
14 |
* Allow for parallel shutdown of xendomains (bug #162833) |
15 |
* Check that python is built with threading (bug #236092) |
16 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc4-git1 x86_64) |
17 |
|
18 |
Revision Changes Path |
19 |
1.3 app-emulation/xen-tools/files/xendomains.initd |
20 |
|
21 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd?rev=1.3&view=markup |
22 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd?rev=1.3&content-type=text/plain |
23 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd?r1=1.2&r2=1.3 |
24 |
|
25 |
Index: xendomains.initd |
26 |
=================================================================== |
27 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd,v |
28 |
retrieving revision 1.2 |
29 |
retrieving revision 1.3 |
30 |
diff -u -r1.2 -r1.3 |
31 |
--- xendomains.initd 2 May 2007 04:10:04 -0000 1.2 |
32 |
+++ xendomains.initd 1 Sep 2008 00:41:08 -0000 1.3 |
33 |
@@ -1,7 +1,7 @@ |
34 |
#!/sbin/runscript |
35 |
# Copyright 1999-2006 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd,v 1.2 2007/05/02 04:10:04 marineam Exp $ |
38 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd,v 1.3 2008/09/01 00:41:08 rbu Exp $ |
39 |
|
40 |
opts="start stop status restart" |
41 |
|
42 |
@@ -53,7 +53,7 @@ |
43 |
fi |
44 |
fi |
45 |
# Create all domains with config files in AUTODIR. |
46 |
- for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do |
47 |
+ for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do |
48 |
name=$(get_domname ${dom}) |
49 |
if ! is_running ${name} ; then |
50 |
ebegin " Starting domain ${name}" |
51 |
@@ -74,10 +74,22 @@ |
52 |
|
53 |
einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}" |
54 |
# Stop all domains with config files in AUTODIR. |
55 |
- for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do |
56 |
+ DOMAINS="$(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort -r)" |
57 |
+ |
58 |
+ if [[ "$PARALLEL_SHUTDOWN" = "yes" ]] ; then |
59 |
+ for dom in $DOMAINS ; do |
60 |
+ name=$(get_domname ${dom}) |
61 |
+ if is_running ${name} ; then |
62 |
+ ebegin " Asking domain ${name} to shutdown..." |
63 |
+ xm shutdown ${name} >/dev/null |
64 |
+ eend $? |
65 |
+ fi |
66 |
+ done |
67 |
+ fi |
68 |
+ for dom in $DOMAINS ; do |
69 |
name=$(get_domname ${dom}) |
70 |
if is_running ${name} ; then |
71 |
- ebegin " Stopping domain ${name}" |
72 |
+ ebegin " Waiting for domain ${name} to shutdown" |
73 |
xm shutdown --wait ${name} >/dev/null |
74 |
eend $? |
75 |
else |
76 |
|
77 |
|
78 |
|
79 |
1.2 app-emulation/xen-tools/files/xendomains.confd |
80 |
|
81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xendomains.confd?rev=1.2&view=markup |
82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xendomains.confd?rev=1.2&content-type=text/plain |
83 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xendomains.confd?r1=1.1&r2=1.2 |
84 |
|
85 |
Index: xendomains.confd |
86 |
=================================================================== |
87 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.confd,v |
88 |
retrieving revision 1.1 |
89 |
retrieving revision 1.2 |
90 |
diff -u -r1.1 -r1.2 |
91 |
--- xendomains.confd 14 Aug 2006 07:11:47 -0000 1.1 |
92 |
+++ xendomains.confd 1 Sep 2008 00:41:08 -0000 1.2 |
93 |
@@ -2,6 +2,8 @@ |
94 |
|
95 |
# Directory of domains to boot. AUTODIR should contain one or more symlinks |
96 |
# to domain config files in /etc/xen |
97 |
- |
98 |
AUTODIR=/etc/xen/auto |
99 |
|
100 |
+# Send shutdown commands to all domains in parallel instead of waiting for |
101 |
+# each to shutdown individually |
102 |
+PARALLEL_SHUTDOWN=yes |
103 |
|
104 |
|
105 |
|
106 |
1.1 app-emulation/xen-tools/files/xen-tools-3.3.0--as-needed.patch |
107 |
|
108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xen-tools-3.3.0--as-needed.patch?rev=1.1&view=markup |
109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xen-tools-3.3.0--as-needed.patch?rev=1.1&content-type=text/plain |
110 |
|
111 |
Index: xen-tools-3.3.0--as-needed.patch |
112 |
=================================================================== |
113 |
# HG changeset patch |
114 |
# User Keir Fraser <keir.fraser@××××××.com> |
115 |
# Date 1219920254 -3600 |
116 |
# Node ID e92dedc72471c02c8d6b05b74afed0d32ae86171 |
117 |
# Parent 18a18a7dec2b6ad8eabb3281a1535e8bec05d8d5 |
118 |
tools/xenmon/Makefile: Move LDFLAGS after $< |
119 |
|
120 |
gcc expects libraries needed for object files to be specified after |
121 |
the object. Linking usually does not fail, unless it is optimized (for |
122 |
instance, using -Wl,-as-needed). |
123 |
|
124 |
The related Gentoo bug is 135145 [ https://bugs.gentoo.org/135145 ]. |
125 |
|
126 |
From: Robert Buchholz <rbu@g.o> |
127 |
Signed-off-by: Keir Fraser <keir.fraser@××××××.com> |
128 |
xen-unstable changeset: 18386:ab8212bd5604f58635e2b8bc6ffec6eddd211cf9 |
129 |
xen-unstable date: Wed Aug 27 15:02:38 2008 +0100 |
130 |
|
131 |
--- a/tools/xenmon/Makefile Thu Aug 28 11:43:40 2008 +0100 |
132 |
+++ b/tools/xenmon/Makefile Thu Aug 28 11:44:14 2008 +0100 |
133 |
@@ -42,6 +42,6 @@ clean: |
134 |
|
135 |
|
136 |
%: %.c Makefile |
137 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
138 |
+ $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@ |
139 |
xentrace_%: %.c Makefile |
140 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
141 |
+ $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@ |
142 |
|
143 |
|
144 |
|
145 |
|
146 |
1.1 app-emulation/xen-tools/files/xen-tools-3.3.0-nostrip.patch |
147 |
|
148 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xen-tools-3.3.0-nostrip.patch?rev=1.1&view=markup |
149 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xen-tools-3.3.0-nostrip.patch?rev=1.1&content-type=text/plain |
150 |
|
151 |
Index: xen-tools-3.3.0-nostrip.patch |
152 |
=================================================================== |
153 |
Index: xen-3.3.0/tools/ioemu-qemu-xen/Makefile |
154 |
=================================================================== |
155 |
--- xen-3.3.0.orig/tools/ioemu-qemu-xen/Makefile |
156 |
+++ xen-3.3.0/tools/ioemu-qemu-xen/Makefile |
157 |
@@ -205,7 +205,7 @@ endif |
158 |
install: all $(if $(BUILD_DOCS),install-doc) |
159 |
mkdir -p "$(DESTDIR)$(bindir)" |
160 |
ifneq ($(TOOLS),) |
161 |
- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" |
162 |
+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" |
163 |
endif |
164 |
mkdir -p "$(DESTDIR)$(datadir)" |
165 |
set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ |
166 |
Index: xen-3.3.0/tools/ioemu-qemu-xen/Makefile.target |
167 |
=================================================================== |
168 |
--- xen-3.3.0.orig/tools/ioemu-qemu-xen/Makefile.target |
169 |
+++ xen-3.3.0/tools/ioemu-qemu-xen/Makefile.target |
170 |
@@ -707,7 +707,7 @@ clean: |
171 |
|
172 |
install: all install-hook |
173 |
ifneq ($(PROGS),) |
174 |
- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" |
175 |
+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" |
176 |
endif |
177 |
|
178 |
# Include automatically generated dependency files |
179 |
|
180 |
|
181 |
|
182 |
1.1 app-emulation/xen-tools/files/xen-tools-3.3.0-xen-detect-nopie-fix.patch |
183 |
|
184 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xen-tools-3.3.0-xen-detect-nopie-fix.patch?rev=1.1&view=markup |
185 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/xen-tools/files/xen-tools-3.3.0-xen-detect-nopie-fix.patch?rev=1.1&content-type=text/plain |
186 |
|
187 |
Index: xen-tools-3.3.0-xen-detect-nopie-fix.patch |
188 |
=================================================================== |
189 |
Index: xen-3.3.0/tools/misc/Makefile |
190 |
=================================================================== |
191 |
--- xen-3.3.0.orig/tools/misc/Makefile |
192 |
+++ xen-3.3.0/tools/misc/Makefile |
193 |
@@ -51,3 +51,7 @@ clean: |
194 |
|
195 |
xenperf: %: %.o Makefile |
196 |
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDFLAGS_libxenctrl) |
197 |
+ |
198 |
+xen-detect: %: %.c Makefile |
199 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(call cc-option,$(CC),-nopie,) -o $@ $< |
200 |
+ |