aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2013-09-08 14:04:20 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2013-09-08 14:04:20 +0000
commitb2cf43380050ec9e28ea29124200fefe082f5dc5 (patch)
tree404ac91dd96d8d618435ddde59d5e24e82a5a71d
parent63f0f5c06dc114841043d8bb140fb7281d073085 (diff)
downloadalpine_aports-b2cf43380050ec9e28ea29124200fefe082f5dc5.tar.bz2
alpine_aports-b2cf43380050ec9e28ea29124200fefe082f5dc5.tar.xz
alpine_aports-b2cf43380050ec9e28ea29124200fefe082f5dc5.zip
main/xen: qemu-coroutine-gthread.patch rebase
-rw-r--r--main/xen/APKBUILD6
-rw-r--r--main/xen/qemu-coroutine-gthread.patch4
2 files changed, 5 insertions, 5 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 6b7a2b0492..4c649d35be 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -190,7 +190,7 @@ b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch
1904c5455d1adc09752a835e241097fbc39 fix-pod2man-choking.patch 1904c5455d1adc09752a835e241097fbc39 fix-pod2man-choking.patch
191a4097e06a7e000ed00f4607db014d277 qemu-xen-websocket.patch 191a4097e06a7e000ed00f4607db014d277 qemu-xen-websocket.patch
19235bdea1d4e3ae2565edc7e40906efdd5 qemu-xen-tls-websockets.patch 19235bdea1d4e3ae2565edc7e40906efdd5 qemu-xen-tls-websockets.patch
193a62a8828eb0e9e9c1579808d7271fd59 qemu-coroutine-gthread.patch 1939cf9b155dfa6cd473554aa0f25181c1c qemu-coroutine-gthread.patch
194a90c36642f0701a8aaa4ebe4dde430f5 xenstored.initd 194a90c36642f0701a8aaa4ebe4dde430f5 xenstored.initd
195b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd 195b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd
196ed262f15fb880badb53575539468646c xenconsoled.initd 196ed262f15fb880badb53575539468646c xenconsoled.initd
@@ -213,7 +213,7 @@ dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patc
213fcb5b9ff0bc4b4d39fed9b88891491b91628aa449914cfea321abe5da24c1da2 fix-pod2man-choking.patch 213fcb5b9ff0bc4b4d39fed9b88891491b91628aa449914cfea321abe5da24c1da2 fix-pod2man-choking.patch
214e9f6c482fc449e0b540657a8988ad31f2e680b8933e50e6486687a52f6a9ed04 qemu-xen-websocket.patch 214e9f6c482fc449e0b540657a8988ad31f2e680b8933e50e6486687a52f6a9ed04 qemu-xen-websocket.patch
215435dd428d83acdfde58888532a1cece1e9075b2a2460fe3f6cd33c7d400f2715 qemu-xen-tls-websockets.patch 215435dd428d83acdfde58888532a1cece1e9075b2a2460fe3f6cd33c7d400f2715 qemu-xen-tls-websockets.patch
216509a2333d4b8b996345b6edf3508568e25e012b140c4d5416b077a952b250bbf qemu-coroutine-gthread.patch 2167477c5acfc756f6498858e4a3eb250b3db84ee491a9d4ae38dddbc27275a370c qemu-coroutine-gthread.patch
217868c77d689ae54b7041da169bfaa01868503337d4105a071eb771f4ec5a0543d xenstored.initd 217868c77d689ae54b7041da169bfaa01868503337d4105a071eb771f4ec5a0543d xenstored.initd
218ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd 218ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd
21993bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd 21993bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd
@@ -236,7 +236,7 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2
2362e95ad43bb66f928fe1e8caf474a3211571f75f79ea32aaa3eddb3aed9963444bd131006b67e682395af0d79118b2634bf808404693b813a94662d2a9d665ac2 fix-pod2man-choking.patch 2362e95ad43bb66f928fe1e8caf474a3211571f75f79ea32aaa3eddb3aed9963444bd131006b67e682395af0d79118b2634bf808404693b813a94662d2a9d665ac2 fix-pod2man-choking.patch
23745f1da45f3ff937d0a626e37c130d76f5b97f49a57ddeb11ef2a8e850c04c32c819a3dfcef501eb3784db5fe7b39c88230063e56aa6e5197fd9c7b7d424fff77 qemu-xen-websocket.patch 23745f1da45f3ff937d0a626e37c130d76f5b97f49a57ddeb11ef2a8e850c04c32c819a3dfcef501eb3784db5fe7b39c88230063e56aa6e5197fd9c7b7d424fff77 qemu-xen-websocket.patch
23811eaccc346440ff285552f204d491e3b31bda1665c3219ecae3061b5d55db9dec885af0c031fa19c67e87bbe238002b1911bbd5bfea2f2ba0d61e6b3d0c952c9 qemu-xen-tls-websockets.patch 23811eaccc346440ff285552f204d491e3b31bda1665c3219ecae3061b5d55db9dec885af0c031fa19c67e87bbe238002b1911bbd5bfea2f2ba0d61e6b3d0c952c9 qemu-xen-tls-websockets.patch
239ef3b29749a93166ae3032b692f051caf622c409695dcb368a6e9698f7cc8753d50ea21a9fb3ec40466d8253aed8a7a7e63690ea01a6df8f0b456aee6b64110d5 qemu-coroutine-gthread.patch 2398b8df4f57ab725f54cfe44fb6b8d271ee22e94873f168e452293dd53955854b171b8311209133e5d825f9ce985219818803182b3451708a3452bc699b7b1dda1 qemu-coroutine-gthread.patch
240880584e0866b1efcf3b7a934f07072ec84c13c782e3e7a15848d38ba8af50259d46db037dca1e037b15274989f2c22acd1134954dd60c59f4ee693b417d03e0d xenstored.initd 240880584e0866b1efcf3b7a934f07072ec84c13c782e3e7a15848d38ba8af50259d46db037dca1e037b15274989f2c22acd1134954dd60c59f4ee693b417d03e0d xenstored.initd
241100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd 241100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd
24212f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd 24212f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd
diff --git a/main/xen/qemu-coroutine-gthread.patch b/main/xen/qemu-coroutine-gthread.patch
index 6074d7aef9..8c8a71bbfb 100644
--- a/main/xen/qemu-coroutine-gthread.patch
+++ b/main/xen/qemu-coroutine-gthread.patch
@@ -1,10 +1,10 @@
1--- xen-4.3.0.orig/tools/Makefile 1--- xen-4.3.0.orig/tools/Makefile
2+++ xen-4.3.0/tools/Makefile 2+++ xen-4.3.0/tools/Makefile
3@@ -204,7 +204,6 @@ 3@@ -204,6 +204,7 @@
4 --sysconfdir=/etc/qemu \ 4 --sysconfdir=/etc/qemu \
5 --disable-kvm \ 5 --disable-kvm \
6 --enable-vnc-ws \ 6 --enable-vnc-ws \
7- --with-coroutine=gthread \ 7+ --with-coroutine=gthread \
8 --disable-docs \ 8 --disable-docs \
9 --python=$(PYTHON) \ 9 --python=$(PYTHON) \
10 $(IOEMU_CONFIGURE_CROSS); \ 10 $(IOEMU_CONFIGURE_CROSS); \