diff options
author | William Pitcock <nenolod@dereferenced.org> | 2013-06-01 17:15:53 -0500 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-04 09:57:01 +0000 |
commit | 7df050b2c9df6bd7de4a596277f3ff1d3f383834 (patch) | |
tree | 357386ca1921deaae77438c4191d3f9e76db7a02 | |
parent | 70a7c317209820b96639a9f99f7d2395c56944ae (diff) | |
download | alpine_aports-7df050b2c9df6bd7de4a596277f3ff1d3f383834.tar.bz2 alpine_aports-7df050b2c9df6bd7de4a596277f3ff1d3f383834.tar.xz alpine_aports-7df050b2c9df6bd7de4a596277f3ff1d3f383834.zip |
main/xen: fix more pod2man breakage
(cherry picked from commit 36bfee190e2e5cafe5bf04546f291831d72073a7)
-rw-r--r-- | main/xen/APKBUILD | 6 | ||||
-rw-r--r-- | main/xen/fix-pod2man-choking.patch | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index 7bfcc6bc3e..b0b106127e 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD | |||
@@ -150,7 +150,7 @@ ed7d0399c6ca6aeee479da5d8f807fe0 xsa41b.patch | |||
150 | 2f3dd7bdc59d104370066d6582725575 xsa41c.patch | 150 | 2f3dd7bdc59d104370066d6582725575 xsa41c.patch |
151 | b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch | 151 | b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch |
152 | e70b9128ffc2175cea314a533a7d8457 xsa56.patch | 152 | e70b9128ffc2175cea314a533a7d8457 xsa56.patch |
153 | eabbf2ea11a8c95e911f6138dbbf7220 fix-pod2man-choking.patch | 153 | 0cdbb5830c4c00ad200e265b088f47f8 fix-pod2man-choking.patch |
154 | 95d8af17bf844d41a015ff32aae51ba1 xenstored.initd | 154 | 95d8af17bf844d41a015ff32aae51ba1 xenstored.initd |
155 | b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd | 155 | b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd |
156 | ed262f15fb880badb53575539468646c xenconsoled.initd | 156 | ed262f15fb880badb53575539468646c xenconsoled.initd |
@@ -172,7 +172,7 @@ a0c225d716d343fe041b63e3940900c5b3573ed3bcfc5b7c2d52ea2861c3fc28 docs-Fix-gener | |||
172 | 683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch | 172 | 683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch |
173 | dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch | 173 | dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch |
174 | a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch | 174 | a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch |
175 | 656eca6937502602f0ea5fb805ed332e196d8d3d9d466ea1e18d9214ecb89456 fix-pod2man-choking.patch | 175 | 8597702a590c84d2ac23dad6517e32d0978e2c32cf0a65ef9661bb55cba5afbd fix-pod2man-choking.patch |
176 | 81d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd | 176 | 81d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd |
177 | ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd | 177 | ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd |
178 | 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd | 178 | 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd |
@@ -194,7 +194,7 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2 | |||
194 | 36b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch | 194 | 36b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch |
195 | 31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch | 195 | 31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch |
196 | 26a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d xsa56.patch | 196 | 26a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d xsa56.patch |
197 | cae84fb00604285f4f7e3489c17c01248bbc640f310dbcdf2fd734e660f0f3c2c363e47f775fd28fe832bf6ab80c8760d37f2f0a42c84b6107630db2d50def6c fix-pod2man-choking.patch | 197 | 1a2c9fd8478642eeba87abb981d69a8d29e30d5f7b0ea1967cab8c421db60534ccb3e94a6803d4a2c310a5b0b5f97ee83dd2606f985c24bbcede5c57616edaec fix-pod2man-choking.patch |
198 | 792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd | 198 | 792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd |
199 | 100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd | 199 | 100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd |
200 | 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd | 200 | 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd |
diff --git a/main/xen/fix-pod2man-choking.patch b/main/xen/fix-pod2man-choking.patch index ca28483c20..bda8a588fa 100644 --- a/main/xen/fix-pod2man-choking.patch +++ b/main/xen/fix-pod2man-choking.patch | |||
@@ -9,3 +9,14 @@ | |||
9 | 9 | ||
10 | Note that, by default, GUS shares IRQ(7) with parallel ports and so | 10 | Note that, by default, GUS shares IRQ(7) with parallel ports and so |
11 | qemu must be told to not have parallel ports to have working GUS | 11 | qemu must be told to not have parallel ports to have working GUS |
12 | --- xen-4.2.2.orig/docs/man/xl.pod.1 | ||
13 | +++ xen-4.2.2/docs/man/xl.pod.1 | ||
14 | @@ -851,8 +851,6 @@ | ||
15 | |||
16 | =item B<-p [pool] -d>... : Illegal | ||
17 | |||
18 | -=item | ||
19 | - | ||
20 | =back | ||
21 | |||
22 | =item B<sched-credit2> [I<OPTIONS>] | ||