aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2013-06-01 17:44:10 -0500
committerNatanael Copa <ncopa@alpinelinux.org>2013-06-04 09:57:10 +0000
commita8cbfcb9ec38f46d9d6ddc4dfb6dd01a9d4394af (patch)
tree071a5ccc7bae18f8fd01f46cdb454088f11f0811
parent7df050b2c9df6bd7de4a596277f3ff1d3f383834 (diff)
downloadalpine_aports-a8cbfcb9ec38f46d9d6ddc4dfb6dd01a9d4394af.tar.bz2
alpine_aports-a8cbfcb9ec38f46d9d6ddc4dfb6dd01a9d4394af.tar.xz
alpine_aports-a8cbfcb9ec38f46d9d6ddc4dfb6dd01a9d4394af.zip
main/xen: more pod2man fixes
(cherry picked from commit 6e8d8f7559a5bcde7f49af5c9944fa642ad77fa2)
-rw-r--r--main/xen/APKBUILD6
-rw-r--r--main/xen/fix-pod2man-choking.patch61
2 files changed, 64 insertions, 3 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index b0b106127e..9407f67227 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -150,7 +150,7 @@ ed7d0399c6ca6aeee479da5d8f807fe0 xsa41b.patch
1502f3dd7bdc59d104370066d6582725575 xsa41c.patch 1502f3dd7bdc59d104370066d6582725575 xsa41c.patch
151b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch 151b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch
152e70b9128ffc2175cea314a533a7d8457 xsa56.patch 152e70b9128ffc2175cea314a533a7d8457 xsa56.patch
1530cdbb5830c4c00ad200e265b088f47f8 fix-pod2man-choking.patch 153dc1c1d28cbf5469e6edebf343ce21cb1 fix-pod2man-choking.patch
15495d8af17bf844d41a015ff32aae51ba1 xenstored.initd 15495d8af17bf844d41a015ff32aae51ba1 xenstored.initd
155b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd 155b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd
156ed262f15fb880badb53575539468646c xenconsoled.initd 156ed262f15fb880badb53575539468646c xenconsoled.initd
@@ -172,7 +172,7 @@ a0c225d716d343fe041b63e3940900c5b3573ed3bcfc5b7c2d52ea2861c3fc28 docs-Fix-gener
172683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch 172683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch
173dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch 173dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch
174a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch 174a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch
1758597702a590c84d2ac23dad6517e32d0978e2c32cf0a65ef9661bb55cba5afbd fix-pod2man-choking.patch 17548b47a3aed56fa04913379fcf2a2d833bfc061cf3505ef1eb3559635c8c8722e fix-pod2man-choking.patch
17681d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd 17681d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd
177ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd 177ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd
17893bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd 17893bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd
@@ -194,7 +194,7 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2
19436b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch 19436b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch
19531dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch 19531dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch
19626a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d xsa56.patch 19626a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d xsa56.patch
1971a2c9fd8478642eeba87abb981d69a8d29e30d5f7b0ea1967cab8c421db60534ccb3e94a6803d4a2c310a5b0b5f97ee83dd2606f985c24bbcede5c57616edaec fix-pod2man-choking.patch 197133af8806470abb1687ad6f2a3e6104ec2742894de7f1dfa0e58c2fd192e1ff41737792d5d01562cdeefc35b3cb5f291f2da6c7b93cf6764682919d71b0b284d fix-pod2man-choking.patch
198792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd 198792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd
199100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd 199100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd
20012f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd 20012f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd
diff --git a/main/xen/fix-pod2man-choking.patch b/main/xen/fix-pod2man-choking.patch
index bda8a588fa..1c030a69f0 100644
--- a/main/xen/fix-pod2man-choking.patch
+++ b/main/xen/fix-pod2man-choking.patch
@@ -20,3 +20,64 @@
20 =back 20 =back
21 21
22 =item B<sched-credit2> [I<OPTIONS>] 22 =item B<sched-credit2> [I<OPTIONS>]
23--- xen-4.2.2.orig/docs/man/xl.cfg.pod.5
24+++ xen-4.2.2/docs/man/xl.cfg.pod.5
25@@ -402,10 +402,10 @@
26
27 =back
28
29-=item B<ioports=[ "IOPORT_RANGE", "IOPORT_RANGE", ... ]>
30-
31 =over 4
32
33+=item B<ioports=[ "IOPORT_RANGE", "IOPORT_RANGE", ... ]>
34+
35 Allow guest to access specific legacy I/O ports. Each B<IOPORT_RANGE>
36 is given in hexadecimal and may either a span e.g. C<2f8-2ff>
37 (inclusive) or a single I/O port C<2f8>.
38@@ -415,10 +415,10 @@
39
40 =back
41
42-=item B<irqs=[ NUMBER, NUMBER, ... ]>
43-
44 =over 4
45
46+=item B<irqs=[ NUMBER, NUMBER, ... ]>
47+
48 Allow a guest to access specific physical IRQs.
49
50 It is recommended to use this option only for trusted VMs under
51@@ -680,9 +680,11 @@
52
53 =back
54
55+Please see F<docs/misc/tscmode.txt> for more information on this option.
56+
57 =back
58
59-Please see F<docs/misc/tscmode.txt> for more information on this option.
60+=over 4
61
62 =item B<localtime=BOOLEAN>
63
64@@ -691,6 +693,8 @@
65 =item B<rtc_timeoffset=SECONDS>
66
67 Set the real time clock offset in seconds. 0 by default.
68+
69+=back
70
71 =head3 Support for Paravirtualisation of HVM Guests
72
73--- xen-4.2.2.orig/docs/man/xl.pod.1
74+++ xen-4.2.2/docs/man/xl.pod.1
75@@ -851,8 +851,6 @@
76
77 =item B<-p [pool] -d>... : Illegal
78
79-=item
80-
81 =back
82
83 =item B<sched-credit2> [I<OPTIONS>]