root
12 years ago
parent
12dab7c8d9
commit
9ef33aae6f
@ -1,43 +1,29 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX festival-1.96_beta-gcc43.patch 547 SHA256 2bb1b1355e60636efb5e66dc5c00330343f01cc9702ac920f87b062185f03216 SHA512 1b6c80fac465a1268985bda328054899efeae3e993c8c1a0455aeb4328c2530b491fa19fbc03818556e5301740b421b76e1169775ede76b6da4d87cab6da876b WHIRLPOOL 466b567d5c36f56d939692f54721abb8e1c8c791a48ac73e9aa9bb6ec07848aa5a08df11a0da9eec1b6113e7e4943add59b784512526b297d528fb3769507344
|
||||
AUX festival-1.96_beta-hts-voices.patch 5315 SHA256 dab29e024d70674bb7736f9b4f8202bdc2f25b1953ec842c2a2ea6df3ea07ebb SHA512 98c3d4f10c0edd8b0eede9b34b85b647adb59953ce9239415269582da9a100d4e4fb3dcb6f9a19612f8f1439e701aba7dbc9c9f8ce404c75dd2987b47c80b8a4 WHIRLPOOL 26cd81f1afb7c2316859b326fc402d5835e78cb7141d0aaf2321606f133818394079643d0827613e8e0b5945e8c99fc9cb88bd9343d85be57be6fd6893157b3c
|
||||
AUX festival-1.96_beta-init-scm.patch 856 SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40 SHA512 bf86a21659affa4e7ec2eefedb0bfb3650473a90c72fe30e5ad8aabb9a20a344a792c6f612af466fc50359b4dec7e6f9afb358f1e509428513781b93e7c3c874 WHIRLPOOL 1dcf0fe1c256aa87b88f1173604be58a66cb1dec9841a082d4f77e4ca4e661639ff1a7fe8bd5c4579a9244ce7143bf48f9fe2d5f09fde7d52ceb02502c3e2a49
|
||||
AUX festival-2.1-gcc4.7.patch 924 SHA256 7aef97c6784c268ab7e7ab0007673c5d54914409d7246ae1be0f63ca83e882de SHA512 d5d41c1dd60339fd219c51da7f1d6f9348832b2ffe4181787dacdca024d218dc7dbca168b9fbcb75795d681d534d77089aa8bf6fcbfbb47e2946f17c16a12071 WHIRLPOOL 2ad145f28cd1690e5f7e9dd94cc642c6ba4596c9326424e49804b74e97a7bd0da4f3b6c10a584db6f1dac1e8d053557ee4a68cba64a86376bf6bff3358e04bea
|
||||
AUX festival-2.1-gentoo-system.patch 7736 SHA256 bf595e5bda12ac753265a7630b8ba3042951191f180e08ed375955d76cab2d4b SHA512 bd15a7668e8702b1171b8a5b0ad615f6dd22ca2f2940f91abd1617fcf29aab70d97f6bf940ff5b8887bd0799af1545f781d17e23000c1f339bd9808afac4860a WHIRLPOOL 7db3db87eaa686755625b87e524d8fe52db56c2c22d0424783375bd7640a9bb11b01220b22335d6a0ea3a4eb4a8ccc6462fb0b486ec3d7a69e134a6e3dc4277a
|
||||
AUX festival-2.1-init-scm.patch 856 SHA256 71bc918dffd72adb21b8cd7394358929e23aa1e32849a4c7f0aa85aa6d4cba40 SHA512 bf86a21659affa4e7ec2eefedb0bfb3650473a90c72fe30e5ad8aabb9a20a344a792c6f612af466fc50359b4dec7e6f9afb358f1e509428513781b93e7c3c874 WHIRLPOOL 1dcf0fe1c256aa87b88f1173604be58a66cb1dec9841a082d4f77e4ca4e661639ff1a7fe8bd5c4579a9244ce7143bf48f9fe2d5f09fde7d52ceb02502c3e2a49
|
||||
AUX festival-2.1-ldflags.patch 438 SHA256 4242057ced3647a0f0c9ba3047b290ae498d30d26a0436a95237fc9a653941b2 SHA512 5c7eb23673aef0ddcc0d13bec73caa90c807fdd884f73cda33c28bc80d701ef80fbf417987f078f692d418cb3a67a6243652017bb34537a75fd32b29819b9726 WHIRLPOOL 6f16a00a4a8cd1557984c65e6e14e1096b2e817d92d236176f75293c2f815a5a6a6eafa3719c2aafac161682fa179cbe35400d93dc62fa182aba49217d3241e9
|
||||
AUX festival.rc 633 SHA256 78ae79b864964c5f850def024d24fee467384c7f5989fb3d0b3beb9a426d40aa SHA512 26bb17a654467403462f226a3303b2f7a4565de021b2c16658f61830171a780c94191097798c2b37c4752fa4c54eef5cad982fbd5d8eb5e6bc93dfbcdc615015 WHIRLPOOL a64a8c2cffdb9c57354fff1164aad33a076a52e2ea35316a89752ef136f4b04fca4d5978b66afa29cb9ef516e059d88b52cbd426bf8992e6032e104ac63aa0af
|
||||
AUX server.scm 466 SHA256 47fdb50da65813547cef61d44040373e8c0d8f83adddc0e82e10502a1a9b6c3d SHA512 f37bae0d498140c1c023858ee71fa94da59fff4c62a734a4b8a338a9df1adf447ebc88da07a00b55a6cbd0bb67e4a60d5d41d8a17ee8c049111b1b5fcccc49f0 WHIRLPOOL 78d606510f23eb8675820f6ab6f366bf1d10f609f795b2f33cbabbf86bbf865919b099428a7cc418749b9ab49988710799f33cec9f287d98e1effd41f2ecf83f
|
||||
AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 SHA256 dd050d6556b484ecd494dd080c8b917fcc08c264260c4850d5392986f492febe SHA512 b88068c42735ad3279c4d95d091bba13a536597dd0d09f8c6ccfab448011fdd974f09d5ba1b6e9e1d31c8e59a4d8dc678c2891b9efb28dcc364684f5d902004c WHIRLPOOL b2f59826c75b71057a47b1f1195629ceea79c397826ad65bce0d319220cd27c7f4d4db9c13b7a12a449f4760c97cb5f942b2c768ac7235f4c7f859e690b6f09f
|
||||
DIST festival-1.96-beta.tar.gz 731682 SHA256 4fa48d3525957762c83f289fba361063b8855f57ff50b7db22754d844aeadbee SHA512 3ab2d0f41d66f1ed20e549f3c4a4fd7e2a9a33ad7fc6cfb6b246ff8feabc0d46e4b6eaa2c4e876b02f220080a0f04a634b3288b2b87603abf64c05015fe5bf68 WHIRLPOOL 354223c334b5b31b172fc37e30e3d3bc05836cfc4d0887931984eb2f834195393357b69832cefc0804e3f29d7c29530c32879274022c893d953a73cfdfe5adbc
|
||||
DIST festival-2.1-release.tar.gz 787313 SHA256 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080 SHA512 1f9f28af7106c98e313d3c4d4bb26a7f927c1214fa5a0e2b4972fc85e1011e328331b73852abb57f26fa5062263d1dbccaf65e3be59c6ec762ccf340fc93797a WHIRLPOOL 0e90a9b3e673ea7ca63a4fdb7f60868db3a74347281267aad20a94548f385b8c1a66472145f0b7c7e4c02a30a695ca012e25443ffdb9ecbafd4cd3bac2f72568
|
||||
DIST festlex_CMU.tar.gz 1925748 SHA256 c19430919bca45d5368cd4c82af6153fbcc96a487ebd30b78b5f3c08718b7c07 SHA512 c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b WHIRLPOOL 040094e7dcbfb280a18b5862927855cdde62a49f8eac8d63045c1f92f720cc0041f2991ebacb05d457cd77c4c471e935a808a6e185df28e7f87d0e1d08f21905
|
||||
DIST festlex_OALD.tar.gz 1472516 SHA256 61afc02c4b9dee6322412958ea8be477ee451c3cdab789b88c4907e3e377ccd5 SHA512 0221c3d78140c6cb4e74f98edbdf0dbe5987a8efa3e7205844a5c01c31a98aaced3b20e4a42b09aaa4a3c93c9225d9f24d96df3fb5d963092e955d4cb4674aac WHIRLPOOL 12f96f04d0b7257a032e9e720136bb79e1377fa63f83cd5f3b35dbed5687da838dc4c11de183df89794a389d139c83ea1ea4df3ab6e7c87018c408ed9dbdf290
|
||||
DIST festlex_POSLEX.tar.gz 242914 SHA256 5ef8cc5d35e9f2141b5a0a4774df82dc9731fe7e9800eb09ecf264f2f8503e7b SHA512 5c3857a195f5f5ebc4c366f37685437af41eb7e86a1a13b41b08cab91e536114ae4ddfa8b124acb40ec32c13b53d0dbf2c857d4c756b0720c9a363866ecb8c47 WHIRLPOOL 8c5b1ed51b89377bb56cfdb12cc0affb9646cdf57b8c908deb547c3bb08c66881c59bef5f04ed1973b6f00c8ce45e0f85b9339afddb2bc460599f5ca11b8f05e
|
||||
DIST festvox_cmu_us_awb_arctic_hts.tar.gz 878090 SHA256 56b930028a14efdaa01b8b34add087bcde75b774b97b205d2f478413203d9a4d SHA512 78e923fb6b8f21361b19fb2f38b3c71f06bde14233c88ea10abad593e384641f0a6a8952a90badbffd5671a8be58eaca7b1cda1c3bfe313157316e09d5804891 WHIRLPOOL a97724c564ba47e5f1784d0ccce44b653728646dcac41b2db0c1eaac8f23887ba604d01c9c03e0793c6941e9fadde3bd1c3b2d41c4c1ccd2a70eae37be0c3556
|
||||
DIST festvox_cmu_us_awb_cg.tar.gz 4452760 SHA256 f6010538b3e2f32152cc75741a62b8c7eecfaa3e51153c9db735723002807264 SHA512 b77174d2e9ab914ee3c4d6e0d83e29b64034bb45d3fe021acf3a6da13304acc819c4ac5b1046a6f022312e90aa23c73b585aaf11f927e80aee4533584b60356b WHIRLPOOL fe2aa698dfa917f8e72c49bb1399c3c430d65da2b3b072d53cb6810e6cde49b19de8c5b44e0ee23647a93ded1fc6a39c80eab059c25e3eb28805a7d9977f3539
|
||||
DIST festvox_cmu_us_bdl_arctic_hts.tar.gz 1060641 SHA256 caa679c728c8804f4a1dae6ab08e7b31f10b292e572598fb6432d0e18f40bd2b SHA512 c8ca253a15365b2f269c28cb82412581d63eef5ac21480c17871f6513bbddab7c4245a47b353c5e611272cebd5a5a050dd9d2fe72034f076d431bba1eaba9997 WHIRLPOOL eb0f5bea4cc85ceb53695baf1052d9642839079fd4e5b1d16dc9ddc877373d6f7bb08636183860f0b501afaca0bbb1e4d930c7f058ae667f149bc5ae8b04b75b
|
||||
DIST festvox_cmu_us_jmk_arctic_hts.tar.gz 909045 SHA256 e4f623d1114922c8844ec266d46d558e1521e0ab3bc6e958cdf8f69c28bcc038 SHA512 66e2ea23af2c1efb19a0a039481c439c1b179fa5ad4205f5b4855682927cf772d36238cfe5c2fb681553a79635e4b902fce2ea521b4754efe3e13167a56ca634 WHIRLPOOL 8e396b1f9a9bafe7d6fdbc539741c34c33300ab4a5a1b03e3105d9494f070c0f77d8892fbe1da0c3d91d8ac78ff3800c22310a9bf7a606e52e51a0203c32d7c1
|
||||
DIST festvox_cmu_us_rms_cg.tar.gz 5222226 SHA256 5f0ffc3181df76b63f3c13db3cdc6e67e02639a3982c6b6fa55bbbd2fe1cbc30 SHA512 a251fa27f6cabecb29cf4199cb040cb2ce512a6a447840d31b0d2055d26e6a86f4730bbe3e0f1612e413858f41fdbdd184f04575f9f64658d3f34171612ee172 WHIRLPOOL c9a5f712952c2c88d901e49cf33f03328d44fd6befaca16bcf5041a82beeb092bd6fd47751b7da9da6393c752a3b4b9ae52119a99a6ad1aca6b335cc78a8c2ae
|
||||
DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 SHA256 adcc187fc7db39e17c119811936be57f0b788908f06c3d9b330856ad8357b128 SHA512 58908094c7e538118471ebd80d86d91f681d0958587f0c5ee6c3a00e1ad5f41519e7bb2a96353f9a68946aba343e11c2949fe2b1efafc53f0d8a6b20d7e3e1f8 WHIRLPOOL 2e87cedb571b4ece257e8c27ab9570fe183691ebc17ddb8fc4323201bd4fc2a449f30a5879a3ce8cc8f8673283c3162761235bf253c96a089d86796b898607a0
|
||||
DIST festvox_kallpc16k.tar.gz 4104056 SHA256 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c WHIRLPOOL c0242c9abb733c30cbba75178de8aa825a0be17bc24a2851eff64147a080c2cbd0d374de1e6e4a8bce562f727474d1e80d26535efe12e8ed640d7eb7bce75832
|
||||
DIST festvox_kedlpc16k.tar.gz 4221528 SHA256 6b8f11424bda5c81ae8a58f7838e2a9d12fdb39cdfff6ed89f611305391b1a36 SHA512 9fc3665bb03484ba20bd1ad80f2acba6c3fa23cef8e23b2d3e3723415aa0ed57c5c184e5393783b3636af735188eff9f106d0993f46c89a2571b9fe8c48c86be WHIRLPOOL 3e252c3f283238d79a615a7f27a1d1781ad795ef4e5615466a079d1034aefea209d286d02839600624ad01c994f0be65b0e436606a5d57546df592935781d25b
|
||||
DIST festvox_rablpc16k.tar.gz 5369001 SHA256 54835837ca734e62c0210c0f9dd27380d2ad89819ae91ec6e8cfab4e515b7bdc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11 WHIRLPOOL 08266d82182ebc939965f52ef591043de664ed8380105e42eb39b4a96f50bda5d8958d9b7850e963fe1e8324fd6a5d05a5d1d7ab41f4c88940e61fe783dbf557
|
||||
DIST festvox_us1.tar.gz 11040 SHA256 23b332513867d6e9c340dc888a7ce67843e5a3c03db328cd36975985057c8b8e SHA512 7ac318f700c8fade65da80f33b86b124cd8f71bb687aa7a7c355dc1087a3bd01a3b28fdef3a2eff6458836bbf8e90dd7802b58177f4c73eba3a737e6646a1f9d WHIRLPOOL d26dd836725ba14f2d21f8f8cbb19fab1df0dfd282fe6b14f3a768660c32f32c2472ef5dc066f952392c6fa53077c4d81c67f3794242288fef65180a61cbc69e
|
||||
DIST festvox_us2.tar.gz 11037 SHA256 d27ad26213144d956815e804c06e5473191ac12afb44f6a1029b3842e3a3007c SHA512 73fcc610cc2eab225deebf6648895c2be3d4a604f88b171c75991136dac65a0d65f36d3e588188e96e7c70a341cdb3756c82573e6150a587099da54c8ce511a6 WHIRLPOOL 3bc8ee82f275a617335502bf90552aabdcb067fe948dc479276f773499dedb116964327a46e977229991fab282afb0b88d99c6cc7c00bdf5a9eeb28e596c845e
|
||||
DIST festvox_us3.tar.gz 11220 SHA256 af9ca4d1832e1971aa6e52f6a3ff8f729bf970c7bee1de7e8ac0611ca01871b8 SHA512 e9e62e977fe462db0d2d7c5bbe6e871dddeec4bd7d240ecd1e5e5fddddecf177d21263fdb4ebb42a0aac36dea72c64f5cf42d38d838457c26821be46b7202aa7 WHIRLPOOL 503e16c239262526d4542e303149aa842559b1aba44d19fae0f8524d0a9dfe8fe4c676f571944afc92437a18c683b7d5b426df1c269b3e030778e4900cb0be40
|
||||
DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
|
||||
EBUILD festival-1.96_beta.ebuild 5069 SHA256 d208fe76edec24bace6ad20310208b6b75822a61c4411fa941e203516ba9f6f6 SHA512 95ef1e043ec2b2f476cb6a89dc0443c5a423468ec5567248a9892b72427c687553965cab087b2952c5d4525569f8dc491159ec8250af00d7b6b9fe162a376151 WHIRLPOOL 0851257fd886596a85f97add07a30497f30c8505bd4d4fbb01553810cb9884d09b86fdf5e330620dfb61241cd645bbc0a1af5dd7d0d74783c73dee8b5bf82a07
|
||||
EBUILD festival-2.1-r1.ebuild 3745 SHA256 c00bf928fdefb503f8c3ae79a7b02d9e6ab037ac1803f6fde835ed2c19e10f62 SHA512 8663e519b82ba85570f53e44d570da7c38f3eb94e5829c584754e3c351c70c3dd2b409adbedec60c3b1aec6ce7febeb9f83deffa06e8fe5b474dcce8bd88e706 WHIRLPOOL 2ac20c923a36154195d1072a917c765d6bba4d64ffea04636d1d111b44b3ad1de7f96641eda75455a6c6fcc9d75e72d37abb1dd9cd4a74130a0fa60ac9e4e8bc
|
||||
EBUILD festival-2.1.ebuild 3692 SHA256 c766cfc5c2762d65bde375da2ef16e7ed040c63f6d2d82a4d78681ee5e15be91 SHA512 0593c5286bd2f40023350f5b52f0f9e6b0cde16c6ad24c4f2d99660b7536deb4ed0d3f9a91df6440f611d2b716ddc05a6fc9c1812f036af711e49089e1a5a741 WHIRLPOOL d60db6810eeb5c1cf3cab8dfef475509cae0285204f3a8a0133004c35e6cca032b5b6f4537de131ac6c18b7223ed00cbd68e15d8d7ad5d9df1f04f2b9e82ebc4
|
||||
MISC ChangeLog 19988 SHA256 96d12708d4b41700f1e60b6e7593d22f0e149728cb7ccd113975324492c32d85 SHA512 a49fa10aa0b18e86c47daea43fb5bd12078918a3c2120d972b8a1ed18aa4eeda501d971a98bc1219cf844eef651e895db2468689061884825b9b04406153ab24 WHIRLPOOL 4ae5dcba74deb58639e7bd8528b7fa07cbb6b899cecf3c61ef96fe7012ef64a944fdcd0b7fd88edeb877acc8805cd834874d96987ee704ceacc12fc18fbb8b8d
|
||||
MISC metadata.xml 321 SHA256 54fb73517995daec7601b063031a9021800c7d8fdcc73d969060b7447f0ce6d7 SHA512 73ed4c95aa474860fc27c7fa758bc15a5ea5260d39981c72d09ef575f90879159d0740418c7898a08eb723e6a7158dad42eadac6aa7a3731c16aa0787cf40ab3 WHIRLPOOL 85dfa75da59f47878f729cb88ee2886377629771ae00d3b82e090ad9c7dcbb399f1a440e4094dc0290eb5a856c99c55bd8989b2421028b7f6439128d6fcc80e2
|
||||
MISC ChangeLog 20340 SHA256 8c1430ba667eb485830a3ac738db468e5da7b0c8a0ae8b6b3a96a6b6fdcb1a27 SHA512 0c68701e575242de09c70c243d2f96e560bebfa70cefe97ed77ecbdaa0d22881c6ca0fe11135023b9bf9368fe234d16f3977f905b93e284163308f3e0c22fa2f WHIRLPOOL 5a2a9b0d4dd7167156c03943d2847b1319fbb3e37a3dca707b408bda64383e919ddb57c2e0a0f648b74abb3cc26d8650dad8465cf9ae4b921bac5ed9d5bbc692
|
||||
MISC metadata.xml 276 SHA256 e155e128983e303f69cc7f179118c895267e62f9815e1333ec37b8e221f5ed84 SHA512 5b1c1ae4f078d6656d776ee1d520157de0a10d577766ff3624d1b5dcfe9fc95fe197cb5a9701e7691b1945b7c9405f8d0e834d0415ee7dce1d5d42d2347fd2d7 WHIRLPOOL 3de4d81049e937166690cf304fd3af09ef8359c533413ef83e0bf96f2de823f8ddd7b02d6704b9d7cfd72f592cfc0f064d7a4a6567e821ac2f4c46640c6af10e
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.17 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlC9OtUACgkQdIssYB9vBoMdggCeJrW1YVjm1f2dn49fNFi1zCDR
|
||||
YW8AnR1v96IBO9FAXZwyNsbobkElP2x9
|
||||
=SVCR
|
||||
iEYEAREIAAYFAlC9PasACgkQdIssYB9vBoOFIQCfeswWd7rJnMEC+MMC76/r3wfK
|
||||
C8UAn0VUO7IALaXB7ONOnG+DX0EYoPc7
|
||||
=0LcL
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,9 +1,29 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX durep-0.9-color-output.patch 7587 SHA256 760cdb5eb3dd94e5476c4b3f6a4ff43d2530babcd78b667e268649bbb1e0c649 SHA512 1ab4120a106e6a9f2d93a3b4d22395754b868d88e8d33dc20e5227cc56c84c0320d0f7572b2835946dd5ac0de40b567b2d21134b1dd6e3f2a1e2f21bec36dbad WHIRLPOOL 84d169e210d40862a269c01e0f7565180aea74289abdd51018aa549cafe8be1833b12bb4d8a7c14a4a0ad19a59da4ff5e215d14421366e562a8fca5809357ba3
|
||||
AUX durep-0.9-dirhandle.patch 848 SHA256 4fbdd5659421f39e689f070278e619327beeb4b4ad286ebcf195c8e498c7d3b5 SHA512 8e887393bab2c011cdf9ae096fc4f8b077c02c471203768c9f51b59df0a36f94aad797ffc017cf03ab0ddd2eed5e290d3ec65c90774bebacb5c35673ac3f176d WHIRLPOOL 7c2083a22ac52563735f1d616c96207d5e92abb1ad56fae8d127188568db8a3b27b54d4d168d7bcc822bbc72074628ef0ffff563c80a300080599aa371a61c10
|
||||
AUX durep-0.9-gigabyte.patch 327 SHA256 2d953915390811eb1e9cf3470760a5c03012956dafa07b32effb1a3e524a64ad SHA512 2bb28c5956cc6f8b301890f82eb86255f84ed6f93d1dc61e96bacb840ae0181feed76e992bca86249e9003701666784fdf7a40331c6c1731c55b3e3d2a4897b8 WHIRLPOOL f3922aea532fd14c9cd164ffe6245b6d64667c16d22795c85950ab6e8ff75e6989ba1dcbc85bf91545ca8aab17222041b3ec205a16d874211399cf33d0e1b385
|
||||
AUX durep-0.9-r4-color-output.patch 3477 SHA256 5d8eda3ced6776725b6843861db9fcb73158b98858ae2a33ecda7585f39c5dca SHA512 18bd766f706bf2036b1da35c0daf1add0adb6603a6cd0c68277efff8e1f2f8224cc2d79ca6c4afc70db9a01b5eec8a4ca7899c7c92b0bd38f709e7736731937a WHIRLPOOL 05170473d8b0700e10e66030e7741fe7fbaf497a642cf496c275c8c649143837d70f65c16c7d98b8c81bf6d773ab5f8b0805664b5691d34ba36cb8cbb5ad202e
|
||||
DIST durep-0.9.tar.gz 13713 SHA256 71605ebc4d25f6452e2aaa0119e9a6b7e753fe46ec2999e17311389a03016825 SHA512 a8a58cf4a77fa43e06eb22ce70e566fe9c5dd6921677dbe4691a6dd95e2fad3735778a9858e3b80957ba6efd20293fcd2ba4ddc9cfe29f5813997de0f9c96b6d WHIRLPOOL a64f822cae74934e45eb9c5acf87f708feb84854f6912a6c9342ffb79cee9569d4685fbe09f78144404695995dc454e25603cd2720e1618cfdf98376e907c18f
|
||||
EBUILD durep-0.9-r3.ebuild 822 SHA256 5212708dc3b81ee26ffcd2e9a14b09042f130c25ff24c2cdaa8ebdad432526c8 SHA512 c408dfc9bb4a90ec5ffe8bc9308ed483321a4392758a5957241fb1ec89180e8a7762eb25d77d31b83ce1e3217c562e34156f714372c5e5ef0ae63a9a437e27cf WHIRLPOOL 3027e22131e0220a9ad0904ac1e0102ef7bb7204d41989434c33abfbca827abc126a129ba812b3c09bf5f0b7a860f403919fbd1337f7b314861b5b7009f76595
|
||||
EBUILD durep-0.9-r4.ebuild 855 SHA256 d7fc1aab668755ff59d3a89f45473fddffc00d5ecfa1c90f2f5f435e8e540722 SHA512 d5733f63ce4060ee8e8e5b7207d6d723b0c42e95daf6170a3df6e3dbbdc45b4d96a0ea94153e8fbdacbbe1e03d13eafa6fa822b83b2fd9018249b7a6688ae53e WHIRLPOOL 7205e946d006321400e69fbb763dab8665b700c17be5def1b98759efab75cfbcc1d24805d38bced58eefb6ada987fa79e781ab4a905ebcbea0c1a7164d1b7db9
|
||||
MISC ChangeLog 2410 SHA256 a5e634fdf117f7ca778b447f1bf1fa8c3e9f1ad36706c42c4f9afc300f8d4df7 SHA512 0e78a9878223b3c3651c2d4579436d2c6b0b91b2b9cc687d3b5ed2cb652824369d04d354b5b83372ccc66c6e61de13815f1352eaac9f52cd6c23701c5955cac5 WHIRLPOOL a19323b51fb9f7fd379d6417c060f108dea98d178ca25d5ee1dda77c384c3c58a7bb8c2721655d6f35838c321d2cabd9576f66f00a4e1d5a669db53bf1a969c8
|
||||
EBUILD durep-0.9-r4.ebuild 859 SHA256 03ec7c6ccd0702afaf6a0017976dd657a17d75334249441492838f91346a2ff7 SHA512 4961f5b133716729467b802c68dac8e03b0d49bc728d9933a1cd02d0d05038fa4db84faf2d402814f122fc615e5817d8b3edf1ebc8ad8a4c46c06dae92da7282 WHIRLPOOL 31a78d4f858573981277f41883a813176ba31879c0c18a483eb4b4b0dc1db5be8101de1845481159adc36cbd87c56f1b9bff73b72a9f2c7e669db1e320b9d839
|
||||
MISC ChangeLog 2518 SHA256 fe33f0f9ed565fa405cec382d20008bf64e5d7e7d0aea813d8851eaae241a906 SHA512 35d79e0044bdf1a6eca1eaf2ca81383befa192bcb6ee7d79603624c358b1965ee145a3b8156e28ec83840f337e6162e0b5527511043d1c1359d85be1bf94feb6 WHIRLPOOL d550df7b6e5ce67690ae80fe65b55bcaf757ada53c2144c28d0bcc596a3b7166bfb139426b70ecd9f26a27657c4b6ed81ef13328636fb608dc18773fc3810933
|
||||
MISC metadata.xml 305 SHA256 f64ba385231db5cd8b7cb08785900c64d35ea8a024b89b3f73ce6807c8b1a80e SHA512 a3c7b35fc05f9ccba31dec47b371eefe3f3fc89f0ae12d7102b61c73a37f86537c6dbebf90d363abbcf4b1bcef4fd09f75266df315d6af83df8f12c306e504ec WHIRLPOOL 4014455c0d1f39cda9b687eb72217a36c0cdb0b22066d5bc8751ac1a93c03f2142b98562a2045c24109f66189c740ad13bc17185e863497698448afa86ae455c
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCAAGBQJQvdP0AAoJEJOE+m71LUu6qV0P/0OkeMZt5LojByzXNF/1oJn5
|
||||
CaxNqi7WIIusB2u0HeHAZT8nO6ddDyekPSsQDZG02qKnAOYTt5pBWtvEkN2Mj4wR
|
||||
8vbWqKJD2SwqDyLEiFk15hoigGwBqG/UVXFcrHwhRh3dzRSNljf9SSU4osz+o55u
|
||||
xNf69IVwteXgaYOF/5Kx3/FxpNknQAC9lyJxHGc4uccgqhDDb1U/g+ERuJTePsj9
|
||||
pB4BJGAz1kwrs69P3/11W9vx9rba7yr+227Mxjz+0o0NJPNDPyldbozsBr8SRaja
|
||||
oHDyn2pVerGWytiM5LoYfr8JhovAIvLzVzs7L8dZf7BS2lVV73/CU5eknNbtZFqr
|
||||
NWK03rrVCXBhOR3YyzawAAy0Wx4qtvRJ6Ex0HT06HttgF5KHeBdHDVICURHDRHXg
|
||||
ixA2t3CrXJyk3LOBarX27S6V1aYJQfRH1Bp1+aptTKu3v9cv74zERT5iygP+eGkO
|
||||
oQbwLet4ZjhkW1DNyffIbfZee0II5eZkJyvw3otQ+1WtMAqE9IBlBMbDuuFFVtBY
|
||||
sK6LC4uUkHmLb28YL2G26sMKtTrt8wHbLp6I/FbMX0wkISC4eXyqAT9O+kBQoVMc
|
||||
jTe5fAr+W7ErDeEckUUngTWtjxzY0h2SM7YZqf+tJbvcbCueLfIbJlMsWO8zIctZ
|
||||
2d5usYnvcb+MOm3zwCAD
|
||||
=cREB
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
--- localepurge.orig 2012-12-04 23:15:29.422756767 +0100
|
||||
+++ localepurge 2012-12-04 23:16:13.313756491 +0100
|
||||
@@ -198,7 +198,7 @@
|
||||
|
||||
if [ "$SHOWFREEDSPACE" = "enabled" ]; then
|
||||
if test $SPACETMP -gt 0 ; then
|
||||
- LOCALETOTAL=$SPACETMP
|
||||
+ LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
|
||||
einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
|
||||
fi
|
||||
SPACETMP=0
|
||||
@@ -230,7 +230,7 @@
|
||||
|
||||
if [ "$SHOWFREEDSPACE" = "enabled" ]; then
|
||||
if test $SPACETMP -gt 0 ; then
|
||||
- MANTOTAL=$SPACETMP
|
||||
+ MANTOTAL=$(($MANTOTAL + $SPACETMP))
|
||||
einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
|
||||
fi
|
||||
SPACETMP=0
|
||||
@ -0,0 +1,18 @@
|
||||
--- localepurge.orig 2012-12-04 23:08:17.754765708 +0100
|
||||
+++ localepurge 2012-12-04 23:09:02.397765264 +0100
|
||||
@@ -165,7 +165,14 @@
|
||||
${ACTION} `find ${REMOVEPATH} -type f -o -type l`
|
||||
|
||||
if [ "$SHOWFREEDSPACE" = "enabled" ]; then
|
||||
- SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
|
||||
+ # if symlink, REMOVEPATH could be removed
|
||||
+ # check from parentdir then
|
||||
+ if [ -d ${REMOVEPATH} ]; then
|
||||
+ SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
|
||||
+ else
|
||||
+ SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
|
||||
+ fi
|
||||
+
|
||||
SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
|
||||
|
||||
if test $SPACESUM -gt 0 ; then
|
||||
@ -1,6 +1,16 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST ssh-multiadd-1.3.1.tar.gz 13975 SHA256 e604d41025adc8b3781aa60b2fc520b9b84f721b5edf06e75433ccd8716b0b93 SHA512 e99ce579b874166610cc6f64ab6ee227bd5dafd3777d32f96db16d986d49ee755f380965d617d7a99d682a1891436f6fa315e74acb94ddc54d2228f2ee48902f WHIRLPOOL 233e97eb9031d0b59b9c1a9f55a0d5eb39bb3b1446247c9a5823ef3081a30f78d55512f1bff5bf943e68ed57ca8a266f6a54d486d9b168b348ce48e369ef53eb
|
||||
DIST ssh-multiadd-1.3.2.tar.gz 14035 SHA256 5526a9682b5d5e5051f91cd64a3e472bc6311939ee412725bf94eabb8f2f94c8 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3 WHIRLPOOL 871af4cb49282fbf22c547b99a9c14d035fd8766ba29899add5e2522d1a648df3e9705837b99a5cbfbe87ad0f363fab262905fe104353123171bfcccbb5be52f
|
||||
EBUILD ssh-multiadd-1.3.1-r1.ebuild 828 SHA256 3d6c893f607efefb8eaaa8a6760854d14fa95d6a8897dbf40d84665f7b742287 SHA512 950d638365344b9532c30a35d1e44bfad939d3d393ea2a5ae407fbff699dc00dcc61d5288e1b0be0b81df4a613745e693338bc367fbd6291b00a87dd58f08dce WHIRLPOOL 5b7adc7c2ceea95bb67db71b5cf90c0c7c6fbea1fac631066fb258571a4e5266327cc8e970ddedf8f1c988a94994ba27164b7b0ae496d737d232a152e7ad3b3f
|
||||
EBUILD ssh-multiadd-1.3.2.ebuild 808 SHA256 2e0a3a56adfb10ee146b19f63f7d6f84c58eb0a703472a1b87262a4852efe26d SHA512 2a403ee8f2b207ce3f0b653b4f4af9eab3928655362d4fe107544e3bd8af6bcf4769727adba7715600a6a56916b368d2b2c501cbadcb9cd96fde62805c7aaf42 WHIRLPOOL ca1439fbce0b2a468e2835acde24e8b2ce0e0787d78ece9468234c163b62daa52a706493595a51683e3a7937a5af64033352b0383ab21baa900c1bbd538055fe
|
||||
MISC ChangeLog 2117 SHA256 a5aa8d65c6c87432758f2cdaa555fd0218cbf3eda7d3c04a38419e08e86abd40 SHA512 d722dda5a0cb78e1a6de8393ed7f6110f9a798f189c7685e493699124e1d458c79c1b79ff877270a6c25479fd5e36d2c49fdbe1c01fcbe5ba6d889a6edfab749 WHIRLPOOL 136ac013386642cbfcc0ab6a89c18af2d1b89488fb4eb5f3a02ffbf7504d24c595c9aae3968a57f3442299ad0f390a9874420a4125a08877e19e219fd7fbdf93
|
||||
MISC metadata.xml 279 SHA256 0e85e33b007bcbaf8ffeaa81271e082efd848de91c4712bd30266b3104554092 SHA512 81b24f087cbb5b69400c1f56551535a7e15be02f4f36c481402f4cd61cc0e6d4de679fb66a6ad7527a29f709c3ef681823f0f5a06f3399e36757a9d2811aa1b2 WHIRLPOOL 87be2fb1548073eb2260514760f419736a1c681b9e3ae60756d72e99317e650c97fbb273a882f47b4a0fff2173a5ca0a8c8c1e91f7e7b030a2f9f4766eb88bba
|
||||
MISC ChangeLog 2213 SHA256 088130a26d51dbb1b0641325dd26b500a49fc46aa1a70c0e0a1969d2840d7126 SHA512 1a21bafb1fac158f213bc8b04eb2e613cf055d2c09ab14c172d712d5ca2d1825c1b5a64e769159e4c3d572eaaf9905dea20e418c20f10674b9dec151fe6951a5 WHIRLPOOL 51890a971828baa9a61189210e209499e9de062ec9c2af1f272b22529591056da8bc41bee27eb9e1a08d3091a91bb88a230fc33c5eeb8a7542ab6c20b13ce0b8
|
||||
MISC metadata.xml 278 SHA256 5f8a6b77b33a2d09858e7ff5e32262bcbf87a626473a5f01b8eda40ed8d5c02b SHA512 e9b1a16a8ff14b0d651e25631228eb6742ba0ac1192564d3eb232ca3ca91bbfa281b212e781db41892b92a5d231280fbd4007cf7ffef5d4e8782f3d027de278e WHIRLPOOL e780f5fe6da33808a5dc6f8d16e4f1fdeb755b491df9c2c6b3ef9a54cf7dbf177c70fc0cc09d6524bda2f7624f2ff4a2f41d72cff9632617156075eeaffa5d91
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlC+o+MACgkQVWmRsqeSphM41ACfRpYZ4hC+pdlDVgzUDUCKX6SB
|
||||
YNgAn3/1d9JAvhEX2JixuehYU80Cvewx
|
||||
=/dGM
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
DIST virt-manager-0.9.1.tar.gz 1942398 SHA256 15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a SHA512 d21f06e5f99a66318c58d78b8d61b6c590c5defc5eccb2d2f6b4182d1883e02a095ad7b44bef0c6c0cd32919b6670b5c41ee3c5b5d44cc592bcdd56e73f19801 WHIRLPOOL 191fda27f3e99cf38ecbc673b26be3d0aa38b0e88777f73798f6444a6463b66fba1345304af3ee2344eb31de2a34f57e48108d6191d94eb251ea0b006cf79cab
|
||||
DIST virt-manager-0.9.4.tar.gz 1709809 SHA256 dc8c553beeb15bb30cd5517b2105bcc47cf482b03523e522733c52b0e5df0fc0 SHA512 f70f4c4f0d5b282d8126e495a2da8bcb6afe0bcbbae493d4abb46c3a1802f5ce36f477125421cb577ab2f64bae522db4d7c03558fa7997d74f5060b29b98c53a WHIRLPOOL 00a213515f23858278f47069102cf82eb053255b81a9e128fd666dbb17f6d9e7ce2365b4370fa3b733406c07599fe5c0dfa076a6555c48dd62d1178b679acedb
|
||||
EBUILD virt-manager-0.9.1.ebuild 2519 SHA256 9c308ebb05d3feafdcd494531308770a1290b4bce6a643ff2d9bb20b0fb29fe0 SHA512 331aa845cc74d45cb28659d99e6783bb076b1ecdb54767cd1c91ba2745dd4fa27c46ee73cc6597cfa90d40075a1e8203b4a66b95ed7bb4192727e4633feebd42 WHIRLPOOL 1f2f9eb8178293eae0a6a667427acbfb77894fda177fed53dc131ac96bbecf2bac9dc2c4398637cafd5479c4f7e17a0ac8db7979ddbcedfb33fd9da3f18b383c
|
||||
EBUILD virt-manager-0.9.4.ebuild 2516 SHA256 cf6c675ebfc576482807518055a7b2d0163565f2b45016204f4b090c53f7246b SHA512 2fb7d2efed11cbcd2f5bc0cb0b1cac43ed550011d78ec1b59484c4dda8169ad2d747d5115c277bd2a20a31c6d6372656db7ae5caa465094e1ae55cda4092bf47 WHIRLPOOL 29907785304130f1745a25ba15f667e0b206159cac80f98d8fa855ee105b586c638c7fa45fc2d2e05935fb3bf3c01444f6da836de596c349a76af369ba1a72e2
|
||||
EBUILD virt-manager-0.9.4.ebuild 2637 SHA256 19ed20461bb287a5b8151f38dbbe2872886530de9f39ba4161f16b5d14d84c45 SHA512 1928a1dbf62c9305869240ab2fe68a587df1da8090ac45dcc37dafd873ded38ff120a2efee09cd0bb11ce065f5d9685a58159360c24469dea2b3fa5bef72e72e WHIRLPOOL d5ef815c13bf084218e9e66da6b949c38ac4f24e219b6b80f6bf7ac4b9dfdf43048cc9db033e671a624ab4f3b748b63079b95baef9ddb9a2845b9c358af2cb47
|
||||
EBUILD virt-manager-9999.ebuild 2459 SHA256 dc91b22f727b2ed436b68a8d8dc93b5f23396ce556629d5782b0b91be39a19db SHA512 0644c28e29afdaf27447237e469221f10b64b4ccd18821fb9e02a555172720ad987a14b74e160a7564f81a96a4bcd5038f7bbe4aa3929e91468732b46aebd82f WHIRLPOOL fa59a342212cdbacc2e6dae4cd0e04e6a0c6501c29ab679945e16042e7f3080fd323e9187c994f2f36fdcc2edcf4293273bf6a04c101144e3cfbc3e7d6eb1c25
|
||||
MISC ChangeLog 14237 SHA256 d5b95446a987ae75d76da8b0bfc20afc8e1801d2c37c97526697e48045c4d0e1 SHA512 7cc3ffb8a4e748ed34a087dc37157d68409b0d8a1a41b4554693e5531a4182b706d7bb6866c93de7ca8a68e118d7c0b916f45ca4e1bf4e9bbd31507411c99a3f WHIRLPOOL 7b0c7241830198cc82e200a813261ac6dd1c49daee7492007b991b60b4d0b9dba295a688146f9c101c8bae8d30ccdf2b0c66cf4c0942fba8df34a7795dfb798a
|
||||
MISC metadata.xml 641 SHA256 3d4ac13637c95e0524006f0cbaf690d4dc8d3f7faf2e36581be8730aba6cc672 SHA512 29a2b310305f9ca3abb4d103c04c84b605006cdcbdf461ea0ee4a9da08bc1a3495632ce212835bc64e5b0da86e3eb78f25125e5d462548be8b032b5a7300902a WHIRLPOOL e34c2b3a5bcafae7ee45d457b9e574b09e1d683c013e29610ba0810657377c3a7c6382a04be3adb1c4edaffdd8c33fbce773113eda47070f10671576ea2ce568
|
||||
MISC ChangeLog 14491 SHA256 6dec32ea530a91dd7cdefad36a4965700d578355d44b4a17863fddfc74b23cb2 SHA512 6e96b38ac3f0522cfbbaade73369b8efe28b20c958b24195da08343fedd2cd7e3fd60c038a3dab0a37f42c96fba31039ab03cfe8d5edc8a3e881c59f991425c4 WHIRLPOOL 0ed84dafee6dfdb1053d6ab5ffcb9fbafe96fb7967bb7635e9e5cfe3dc13dae947e6b84eb353c352db5ae20d42cfbf7f24ec835e8569cda0fa2868597c075d54
|
||||
MISC metadata.xml 722 SHA256 70795a507d431d9f6682777a65b480eeb0d762368f3150552b7d17bf98f96bed SHA512 1a6cb74025b5f750c82f7c373638a764f19057bbb076e96688f73690362ef197d8a38333873f8ec5baaa9cdf11a0848c83c1d86403f17b70347d7f6ca8fcbe3f WHIRLPOOL 5a3b8cbfbdbada615803ac5e6cf3a21ebc6f5d15ee1d440be6de3efcd129557c6651aac91192b8b94ed7171e856cc564e9f49c7c5b6d425d2b778621f644c7ef
|
||||
|
||||
@ -0,0 +1,107 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild,v 1.1 2012/12/04 23:10:18 cardoe Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils gnome2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Graphical console client for connecting to virtual machines"
|
||||
HOMEPAGE="http://virt-manager.org/"
|
||||
SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gtk3 nsplugin sasl +spice +vnc"
|
||||
|
||||
RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
|
||||
>=dev-libs/libxml2-2.6
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
!gtk3? ( >=x11-libs/gtk+-2.18:2 )
|
||||
nsplugin? (
|
||||
>=dev-libs/nspr-4
|
||||
>=x11-libs/gtk+-2.18:2
|
||||
)
|
||||
spice? ( >=net-misc/spice-gtk-0.12.101[sasl?,gtk3=] )
|
||||
vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3=] )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/intltool-0.35.0
|
||||
virtual/pkgconfig
|
||||
nsplugin? ( =net-misc/npapi-sdk-0.27 )
|
||||
spice? ( >=app-emulation/spice-protocol-0.10.1 )"
|
||||
|
||||
REQUIRED_USE="|| ( spice vnc )"
|
||||
|
||||
GTK2_BUILDDIR="${WORKDIR}/${P}_nsplugin"
|
||||
GTK3_BUILDDIR="${WORKDIR}/${P}_gtk"
|
||||
|
||||
pkg_setup() {
|
||||
G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
|
||||
|
||||
GTK2_G2CONF="${G2CONF} $(use_enable nsplugin plugin)"
|
||||
GTK2_G2CONF="${G2CONF} --with-gtk=2.0"
|
||||
|
||||
GTK3_G2CONF="${G2CONF} --with-gtk=3.0"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
mkdir ${GTK2_BUILDDIR} || die
|
||||
mkdir ${GTK3_BUILDDIR} || die
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use nsplugin; then
|
||||
export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)"
|
||||
export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)"
|
||||
fi
|
||||
|
||||
export ECONF_SOURCE="${S}"
|
||||
|
||||
cd ${GTK2_BUILDDIR}
|
||||
echo "Running configure in ${GTK2_BUILDDIR}"
|
||||
G2CONF="${GTK2_G2CONF}" gnome2_src_configure
|
||||
|
||||
if use gtk3; then
|
||||
cd ${GTK3_BUILDDIR}
|
||||
echo "Running configure in ${GTK3_BUILDDIR}"
|
||||
G2CONF="${GTK3_G2CONF}" gnome2_src_configure
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd ${GTK2_BUILDDIR}
|
||||
echo "Running make in ${GTK2_BUILDDIR}"
|
||||
default
|
||||
|
||||
if use gtk3; then
|
||||
cd ${GTK3_BUILDDIR}
|
||||
echo "Running make in ${GTK3_BUILDDIR}"
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd ${GTK2_BUILDDIR}
|
||||
echo "Running make check in ${GTK2_BUILDDIR}"
|
||||
default
|
||||
|
||||
if use gtk3; then
|
||||
cd ${GTK3_BUILDDIR}
|
||||
echo "Running make check in ${GTK3_BUILDDIR}"
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd ${GTK2_BUILDDIR}
|
||||
echo "Running make install in ${GTK2_BUILDDIR}"
|
||||
default
|
||||
|
||||
if use gtk3; then
|
||||
cd ${GTK3_BUILDDIR}
|
||||
echo "Running make install in ${GTK3_BUILDDIR}"
|
||||
default
|
||||
fi
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
# create second tree of USB devices according to
|
||||
# http://www.virtualbox.org/ticket/7759#comment:5
|
||||
|
||||
SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
|
||||
SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
|
||||
SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
|
||||
SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
|
||||
SUBSYSTEM=="usb_device", ACTION!="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
|
||||
SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
|
||||
SUBSYSTEM=="usb_device", ACTION=="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
|
||||
SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
|
||||
|
||||
@ -0,0 +1,149 @@
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c
|
||||
--- newlib/libc/stdlib/wcstoull.c 2007-07-07 04:03:28.000000000 +0800
|
||||
+++ newlib/libc/stdlib/wcstoull.c 2012-12-02 14:19:40.905136553 +0800
|
||||
@@ -124,7 +124,7 @@
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <reent.h>
|
||||
-
|
||||
+#include <wchar.h>
|
||||
#ifndef _REENT_ONLY
|
||||
|
||||
unsigned long long
|
||||
diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c
|
||||
newlib-1.16.0/newlib/doc/makedoc.c
|
||||
--- newlib/doc/makedoc.c 2007-01-03 01:59:59.000000000 +0900
|
||||
+++ newlib/doc/makedoc.c 2012-12-02 16:53:42.700289294 +0800
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
-
|
||||
+#include <string.h>
|
||||
#define DEF_SIZE 5000
|
||||
#define STACK 50
|
||||
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c
|
||||
--- newlib/libc/reent/lseek64r.c 2003-06-04 03:48:07.000000000 +0800
|
||||
+++ newlib/libc/reent/lseek64r.c 2012-12-02 18:29:45.435760985 +0800
|
||||
@@ -1,8 +1,8 @@
|
||||
/* Reentrant versions of lseek system call. */
|
||||
|
||||
-#include <reent.h>
|
||||
+#include "../include/reent.h"
|
||||
#include <unistd.h>
|
||||
-#include <_syslist.h>
|
||||
+#include "../include/_syslist.h"
|
||||
|
||||
/* Some targets provides their own versions of this functions. Those
|
||||
targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c
|
||||
--- newlib/libc/stdio64/fseeko64.c 2007-07-14 04:37:53.000000000 +0800
|
||||
+++ newlib/libc/stdio64/fseeko64.c 2012-12-02 18:26:29.955778906 +0800
|
||||
@@ -119,7 +119,7 @@
|
||||
ptr->_errno = EOVERFLOW;
|
||||
return EOF;
|
||||
}
|
||||
- return (_off64_t) _fseeko_r (ptr, fp, offset, whence);
|
||||
+ return (_off64_t) _fseeko64_r (ptr, fp, offset, whence);
|
||||
}
|
||||
|
||||
/* Make sure stdio is set up. */
|
||||
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c
|
||||
--- newlib/libc/reent/fstat64r.c 2012-12-03 13:17:26.569703981 +0800
|
||||
+++ newlib/libc/reent/fstat64r.c 2003-06-04 03:48:07.000000000 +0800
|
||||
@@ -1,10 +1,10 @@
|
||||
/* Reentrant versions of fstat system call. This implementation just
|
||||
calls the fstat system call. */
|
||||
|
||||
-#include <reent.h>
|
||||
+#include "../include/reent.h">
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <_syslist.h>
|
||||
+#include "../include/_syslist.h"
|
||||
|
||||
#ifdef __LARGE64_FILES
|
||||
|
||||
diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c
|
||||
--- libgloss/i386/cygmon-gmon.c 2002-10-26 03:18:46.000000000 +0800
|
||||
+++ libgloss/i386/cygmon-gmon.c 2012-12-03 14:38:41.454257066 +0800
|
||||
@@ -68,6 +68,9 @@
|
||||
|
||||
#include "cygmon-gmon.h"
|
||||
|
||||
+#include <unistd.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <strings.h>
|
||||
/*
|
||||
* froms is actually a bunch of unsigned shorts indexing tos
|
||||
*/
|
||||
@@ -78,6 +78,8 @@
|
||||
static char *s_lowpc = 0;
|
||||
static char *s_highpc = 0;
|
||||
static unsigned long s_textsize = 0;
|
||||
+extern void profil_write(int, char*, int);
|
||||
+extern int moncontrol (int);
|
||||
|
||||
static int ssiz;
|
||||
static char *sbuf;
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h
|
||||
newlib-1.16.0/newlib/libc/include/_syslist.h
|
||||
--- newlib/libc/include/_syslist.h 2005-08-23 05:13:35.000000000 +0800
|
||||
+++ newlib/libc/include/_syslist.h 2012-12-03 17:20:03.092369483 +0800
|
||||
@@ -2,6 +2,7 @@
|
||||
and only provide C names, so that we end up in violation of ANSI */
|
||||
#ifndef __SYSLIST_H
|
||||
#define __SYSLIST_H
|
||||
+#include <sys/types.h>
|
||||
|
||||
#ifdef MISSING_SYSCALL_NAMES
|
||||
#define _close close
|
||||
|
||||
#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in
|
||||
#--- newlib/libc/Makefile.in 2007-05-25 01:33:30.000000000 +0800
|
||||
#+++ newlib/libc/Makefile.in 2012-12-03 21:52:05.621873084 +0800
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c
|
||||
--- newlib/libc/stdio64/ftello64.c 2007-07-14 04:37:53.000000000 +0800
|
||||
+++ newlib/libc/stdio64/ftello64.c 2012-12-04 18:34:46.491509484 +0800
|
||||
@@ -93,7 +93,7 @@
|
||||
|
||||
/* Only do 64-bit tell on large file. */
|
||||
if (!(fp->_flags & __SL64))
|
||||
- return (_off64_t) _ftello_r (ptr, fp);
|
||||
+ return (_off64_t) _ftello64_r (ptr, fp);
|
||||
|
||||
/* Ensure stdio is set up. */
|
||||
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c
|
||||
--- newlib/libc/reent/open64r.c 2002-08-27 02:56:06.000000000 +0800
|
||||
+++ newlib/libc/reent/open64r.c 2012-12-04 20:06:10.044006769 +0800
|
||||
@@ -1,8 +1,8 @@
|
||||
/* Reentrant versions of open system call. */
|
||||
|
||||
-#include <reent.h>
|
||||
+#include "../include/reent.h">
|
||||
#include <unistd.h>
|
||||
-#include <fcntl.h>
|
||||
+#include <sys/_default_fcntl.h>
|
||||
#include <_syslist.h>
|
||||
|
||||
#ifdef __LARGE64_FILES
|
||||
diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c
|
||||
--- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800
|
||||
+++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800
|
||||
@@ -1,10 +1,10 @@
|
||||
/* Reentrant versions of syscalls need to support signal/raise.
|
||||
These implementations just call the usual system calls. */
|
||||
|
||||
-#include <reent.h>
|
||||
+#include "../include/reent.h"
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
-#include <_syslist.h>
|
||||
+#include "../include/_syslist.h"
|
||||
|
||||
/* Some targets provides their own versions of these functions. Those
|
||||
targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# Fix gcc-4.6
|
||||
diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
|
||||
--- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800
|
||||
+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
# Define some default flags.
|
||||
# NB. '-Wcast-qual' is nasty, so I omitted it.
|
||||
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
|
||||
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
|
||||
diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
|
||||
--- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800
|
||||
+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
-include $(XEN_TARGET_ARCH)/Makefile
|
||||
|
||||
-CFLAGS += -Werror -Wmissing-prototypes
|
||||
+CFLAGS += -Wmissing-prototypes
|
||||
CFLAGS += -I. $(CFLAGS_xeninclude)
|
||||
|
||||
# Needed for posix_fadvise64() in xc_linux.c
|
||||
# Drop .config
|
||||
diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
|
||||
--- Config.mk 2012-09-17 18:23:12.000000000 +0800
|
||||
+++ Config.mk 2012-12-05 14:01:10.641260261 +0800
|
||||
@@ -7,7 +7,6 @@
|
||||
# fallback for older make
|
||||
realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
|
||||
|
||||
--include $(XEN_ROOT)/.config
|
||||
|
||||
# A debug build of Xen and tools?
|
||||
debug ?= n
|
||||
@ -0,0 +1,112 @@
|
||||
# Patch Makefile to patch insource newlib,
|
||||
# Prevent internal downloading of external packages
|
||||
diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
|
||||
--- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800
|
||||
+++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800
|
||||
@@ -8,30 +8,30 @@
|
||||
include $(XEN_ROOT)/Config.mk
|
||||
|
||||
#ZLIB_URL?=http://www.zlib.net
|
||||
-ZLIB_URL=$(XEN_EXTFILES_URL)
|
||||
+ZLIB_URL=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
|
||||
ZLIB_VERSION=1.2.3
|
||||
|
||||
#LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils
|
||||
-LIBPCI_URL?=$(XEN_EXTFILES_URL)
|
||||
+LIBPCI_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
|
||||
LIBPCI_VERSION=2.2.9
|
||||
|
||||
#NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib
|
||||
-NEWLIB_URL?=$(XEN_EXTFILES_URL)
|
||||
+NEWLIB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
|
||||
NEWLIB_VERSION=1.16.0
|
||||
|
||||
#LWIP_URL?=http://download.savannah.gnu.org/releases/lwip
|
||||
-LWIP_URL?=$(XEN_EXTFILES_URL)
|
||||
+LWIP_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
|
||||
LWIP_VERSION=1.3.0
|
||||
|
||||
#GRUB_URL?=http://alpha.gnu.org/gnu/grub
|
||||
-GRUB_URL?=$(XEN_EXTFILES_URL)
|
||||
+GRUB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
|
||||
GRUB_VERSION=0.97
|
||||
|
||||
-#OCAML_URL?=$(XEN_EXTFILES_URL)
|
||||
+#OCAML_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
|
||||
OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11
|
||||
OCAML_VERSION=3.11.0
|
||||
|
||||
-WGET=wget -c
|
||||
+WGET=cp -t .
|
||||
|
||||
GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH)
|
||||
ifeq ($(XEN_TARGET_ARCH),x86_32)
|
||||
@@ -95,12 +95,13 @@
|
||||
##############
|
||||
|
||||
newlib-$(NEWLIB_VERSION).tar.gz:
|
||||
- $(WGET) $(NEWLIB_URL)/$@
|
||||
+# $(WGET) $(NEWLIB_URL)/$@
|
||||
|
||||
newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
|
||||
tar xzf $<
|
||||
patch -d $@ -p0 < newlib.patch
|
||||
patch -d $@ -p0 < newlib-chk.patch
|
||||
+ patch -d $@ -p0 < newlib-implicits.patch
|
||||
patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
|
||||
find $@ -type f | xargs perl -i.bak \
|
||||
-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
|
||||
@@ -112,7 +113,7 @@
|
||||
$(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
|
||||
mkdir -p newlib-$(XEN_TARGET_ARCH)
|
||||
( cd newlib-$(XEN_TARGET_ARCH) && \
|
||||
- CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
|
||||
+ CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
|
||||
$(CROSS_MAKE) && \
|
||||
$(CROSS_MAKE) install )
|
||||
|
||||
@@ -121,7 +122,7 @@
|
||||
############
|
||||
|
||||
zlib-$(ZLIB_VERSION).tar.gz:
|
||||
- $(WGET) $(ZLIB_URL)/$@
|
||||
+# $(WGET) $(ZLIB_URL)/$@
|
||||
|
||||
zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz
|
||||
tar xzf $<
|
||||
@@ -141,7 +142,7 @@
|
||||
##############
|
||||
|
||||
pciutils-$(LIBPCI_VERSION).tar.bz2:
|
||||
- $(WGET) $(LIBPCI_URL)/$@
|
||||
+# $(WGET) $(LIBPCI_URL)/$@
|
||||
|
||||
pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
|
||||
tar xjf $<
|
||||
@@ -169,7 +170,7 @@
|
||||
######
|
||||
|
||||
lwip-$(LWIP_VERSION).tar.gz:
|
||||
- $(WGET) $(LWIP_URL)/$@
|
||||
+# $(WGET) $(LWIP_URL)/$@
|
||||
|
||||
lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
|
||||
tar xzf $<
|
||||
@@ -325,7 +326,7 @@
|
||||
######
|
||||
|
||||
grub-$(GRUB_VERSION).tar.gz:
|
||||
- $(WGET) $(GRUB_URL)/$@
|
||||
+#$(WGET) $(GRUB_URL)/$@
|
||||
|
||||
grub-upstream: grub-$(GRUB_VERSION).tar.gz
|
||||
tar xzf $<
|
||||
@@ -392,7 +393,7 @@
|
||||
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
|
||||
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
|
||||
|
||||
-install-grub: pv-grub
|
||||
+install-grub:
|
||||
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
|
||||
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
|
||||
--- stubdom/Makefile 2012-12-05 08:01:01.480241322 +0800
|
||||
+++ stubdom/Makefile 2012-12-05 08:01:37.432238026 +0800
|
||||
@@ -101,6 +101,7 @@
|
||||
tar xzf $<
|
||||
patch -d $@ -p0 < newlib.patch
|
||||
patch -d $@ -p0 < newlib-chk.patch
|
||||
+ patch -d $@ -p0 < newlib-implicits.patch
|
||||
patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
|
||||
find $@ -type f | xargs perl -i.bak \
|
||||
-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
|
||||
|
||||
@ -0,0 +1,110 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild,v 1.1 2012/12/04 16:31:20 idella4 Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit flag-o-matic eutils multilib toolchain-funcs
|
||||
|
||||
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
|
||||
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
|
||||
GRUB_URL=mirror://gnu-alpha/grub
|
||||
SRC_URI="
|
||||
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
$GRUB_URL/grub-0.97.tar.gz
|
||||
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
|
||||
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
|
||||
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
|
||||
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz"
|
||||
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
|
||||
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="custom-cflags"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
sys-devel/gcc"
|
||||
|
||||
RDEPEND="=app-emulation/xen-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \;
|
||||
fi
|
||||
|
||||
#Substitute for internal downloading
|
||||
cp $DISTDIR/zlib-1.2.3.tar.gz \
|
||||
$DISTDIR/pciutils-2.2.9.tar.bz2 \
|
||||
$DISTDIR/lwip-1.3.0.tar.gz \
|
||||
$DISTDIR/newlib-1.16.0.tar.gz \
|
||||
$DISTDIR/grub-0.97.tar.gz \
|
||||
./stubdom/ || die "files not coped to stubdom"
|
||||
# Note: tip to patch grub gentoo style, for review soon. This is around 1/3.
|
||||
# cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \
|
||||
# "${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \
|
||||
# stubdom/grub.patches/ || die
|
||||
einfo "files copied to stubdom"
|
||||
|
||||
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
|
||||
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
|
||||
|
||||
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
|
||||
epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch
|
||||
|
||||
# Drop .config and Fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include
|
||||
|
||||
# TODO; fix those -j1
|
||||
if use x86; then
|
||||
emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
|
||||
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
elif use amd64; then
|
||||
emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
|
||||
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
|
||||
if use multilib; then
|
||||
multilib_toolchain_setup x86
|
||||
emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use x86; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
if use amd64; then
|
||||
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
|
||||
if use multilib; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile
|
||||
--- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800
|
||||
+++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800
|
||||
@@ -28,13 +28,6 @@
|
||||
$(MAKE) -C $D/src bin/$(*F).rom
|
||||
|
||||
$T:
|
||||
- if ! wget -O _$T $(IPXE_TARBALL_URL); then \
|
||||
- $(GIT) clone $(IPXE_GIT_URL) $D.git; \
|
||||
- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
|
||||
- $(IPXE_GIT_TAG) | gzip >../_$T); \
|
||||
- rm -rf $D.git; \
|
||||
- fi
|
||||
- mv _$T $T
|
||||
|
||||
$D/src/arch/i386/Makefile: $T Config
|
||||
rm -rf $D
|
||||
diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile
|
||||
--- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800
|
||||
+++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800
|
||||
@@ -18,7 +18,6 @@
|
||||
cp ovmf-makefile ovmf/Makefile;
|
||||
|
||||
seabios-dir:
|
||||
- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
|
||||
cp seabios-config seabios-dir/.config;
|
||||
|
||||
.PHONY: all
|
||||
@ -0,0 +1,20 @@
|
||||
diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile
|
||||
--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800
|
||||
+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800
|
||||
@@ -14,13 +14,13 @@
|
||||
.PHONY: blowfish.h
|
||||
blowfish.h:
|
||||
rm -f blowfish.bin
|
||||
- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all
|
||||
+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all
|
||||
(echo "static unsigned int blowfish32_code[] = {"; \
|
||||
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
|
||||
echo "};") >$@
|
||||
rm -f blowfish.bin
|
||||
ifeq ($(XEN_COMPILE_ARCH),x86_64)
|
||||
- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all
|
||||
+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all
|
||||
(echo "static unsigned int blowfish64_code[] = {"; \
|
||||
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
|
||||
echo "};") >>$@
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile
|
||||
--- tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800
|
||||
+++ tools/qemu-xen-traditional/Makefile 2012-11-22 06:12:29.433599695 +0800
|
||||
@@ -243,7 +243,7 @@
|
||||
install: all $(if $(BUILD_DOCS),install-doc)
|
||||
mkdir -p "$(DESTDIR)$(bindir)"
|
||||
ifneq ($(TOOLS),)
|
||||
- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
|
||||
+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
|
||||
endif
|
||||
ifneq ($(BLOBS),)
|
||||
mkdir -p "$(DESTDIR)$(datadir)"
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target
|
||||
--- tools/qemu-xen-traditional/Makefile.target 2012-09-07 00:05:30.000000000 +0800
|
||||
+++ tools/qemu-xen-traditional/Makefile.target 2012-11-22 06:26:45.302521231 +0800
|
||||
@@ -755,7 +755,7 @@
|
||||
|
||||
install: all install-hook
|
||||
ifneq ($(PROGS),)
|
||||
- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
endif
|
||||
|
||||
# Include automatically generated dependency files
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target
|
||||
--- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800
|
||||
+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800
|
||||
@@ -437,9 +437,6 @@
|
||||
install: all
|
||||
ifneq ($(PROGS),)
|
||||
$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
-ifneq ($(STRIP),)
|
||||
- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
|
||||
-endif
|
||||
endif
|
||||
ifdef CONFIG_TRACE_SYSTEMTAP
|
||||
ifdef CONFIG_TRACE_SYSTEMTAP
|
||||
@ -1,21 +0,0 @@
|
||||
diff -urN xen-3.3.1/tools/ioemu-qemu-xen/xen-setup xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup
|
||||
--- xen-3.3.1/tools/ioemu-qemu-xen/xen-setup 2009-01-05 04:36:22.000000000 -0700
|
||||
+++ xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup 2009-04-25 17:55:03.000000000 -0600
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
# git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
|
||||
|
||||
+target=i386-dm
|
||||
+
|
||||
rm -f $target/Makefile
|
||||
rm -f $target/config.mak
|
||||
rm -f config-host.mak
|
||||
@@ -11,8 +13,6 @@
|
||||
|
||||
./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
|
||||
|
||||
-target=i386-dm
|
||||
-
|
||||
if [ "x$XEN_ROOT" != x ]; then
|
||||
echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
|
||||
fi
|
||||
@ -1,16 +0,0 @@
|
||||
--- tools/blktap/lib/blktaplib.h.orig 2011-09-21 19:29:30.240868534 +0800
|
||||
+++ tools/blktap/lib/blktaplib.h 2011-09-21 19:34:21.184868372 +0800
|
||||
@@ -195,8 +195,13 @@
|
||||
pid_t pid;
|
||||
} msg_pid_t;
|
||||
|
||||
+#ifndef READ
|
||||
#define READ 0
|
||||
+#endif
|
||||
+
|
||||
+#ifndef WRITE
|
||||
#define WRITE 1
|
||||
+#endif
|
||||
|
||||
/*Control Messages between manager and tapdev*/
|
||||
#define CTLMSG_PARAMS 1
|
||||
@ -1,28 +0,0 @@
|
||||
--- ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:27:01.846896986 +0800
|
||||
+++ ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:29:09.910897067 +0800
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include <signal.h>
|
||||
#include <fcntl.h>
|
||||
--- ./tools/blktap/drivers/block-qcow2.c 2011-09-22 04:15:49.339854677 +0800
|
||||
+++ ./tools/blktap/drivers/block-qcow2.c 2009-11-10 23:12:55.000000000 +0800
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "aes.h"
|
||||
#include <assert.h>
|
||||
#include <stdint.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
--- ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:43:40.005898352 +0800
|
||||
+++ ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:26:53.979898723 +0800
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <zlib.h>
|
||||
#include "aes.h"
|
||||
#include <assert.h>
|
||||
+#include <sys/stat.h>
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
--- ./tools/fs-back/Makefile 2011-09-26 23:14:30.454759297 +0800
|
||||
+++ ./tools/fs-back/Makefile 2011-09-27 16:37:57.445748680 +0800
|
||||
@@ -23,7 +23,7 @@
|
||||
all: $(IBIN)
|
||||
|
||||
fs-backend: $(OBJS) fs-backend.c
|
||||
- $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
|
||||
|
||||
install: all
|
||||
$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
|
||||
--- ./tools/libfsimage/common/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ ./tools/libfsimage/common/Makefile 2011-09-27 16:41:16.516748626 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
|
||||
LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
|
||||
-LDFLAGS = $(LDFLAGS-y)
|
||||
+#LDFLAGS = $(LDFLAGS-y)
|
||||
|
||||
LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c
|
||||
|
||||
--- ./tools/misc/lomount/Makefile 2011-09-27 14:23:26.596752233 +0800
|
||||
+++ ./tools/misc/lomount/Makefile 2011-09-27 16:37:57.445748680 +0800
|
||||
@@ -23,5 +23,5 @@
|
||||
$(RM) *.a *.so *.o *.rpm $(BIN)
|
||||
|
||||
%: %.c $(HDRS) Makefile
|
||||
- $(CC) $(CFLAGS) -o $@ $<
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
||||
|
||||
@ -1,257 +0,0 @@
|
||||
Only in xen-3.4.2/: cflags.sh
|
||||
diff -ur xen-3.4.2.orig//config/StdGNU.mk xen-3.4.2//config/StdGNU.mk
|
||||
--- xen-3.4.2.orig//config/StdGNU.mk 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//config/StdGNU.mk 2011-09-26 02:18:14.630771549 +0800
|
||||
@@ -48,7 +48,7 @@
|
||||
SHLIB_CFLAGS = -shared
|
||||
|
||||
ifneq ($(debug),y)
|
||||
-CFLAGS += -O2 -fomit-frame-pointer
|
||||
+CFLAGS += -fomit-frame-pointer
|
||||
else
|
||||
# Less than -O1 produces bad code and large stack frames
|
||||
CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls
|
||||
diff -ur xen-3.4.2.orig//config/SunOS.mk xen-3.4.2//config/SunOS.mk
|
||||
--- xen-3.4.2.orig//config/SunOS.mk 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//config/SunOS.mk 2011-09-26 02:18:14.640771549 +0800
|
||||
@@ -45,7 +45,7 @@
|
||||
SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
|
||||
|
||||
ifneq ($(debug),y)
|
||||
-CFLAGS += -O2 -fno-omit-frame-pointer
|
||||
+CFLAGS += -fno-omit-frame-pointer
|
||||
else
|
||||
# Less than -O1 produces bad code and large stack frames
|
||||
CFLAGS += -O1 -fno-omit-frame-pointer
|
||||
diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
|
||||
--- xen-3.4.2.orig//Config.mk 2011-09-26 02:17:29.221771569 +0800
|
||||
+++ xen-3.4.2//Config.mk 2011-09-26 02:18:14.686771549 +0800
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
# Tools to run on system hosting the build
|
||||
HOSTCC = gcc
|
||||
-HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
+HOSTCFLAGS = -Wall -Wstrict-prototypes -fomit-frame-pointer
|
||||
HOSTCFLAGS += -fno-strict-aliasing
|
||||
|
||||
DISTDIR ?= $(XEN_ROOT)/dist
|
||||
diff -ur xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk xen-3.4.2//extras/mini-os/arch/ia64/arch.mk
|
||||
--- xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//extras/mini-os/arch/ia64/arch.mk 2011-09-26 02:18:14.689771549 +0800
|
||||
@@ -1,8 +1,8 @@
|
||||
|
||||
ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
|
||||
-ARCH_CFLAGS += -O2
|
||||
+#ARCH_CFLAGS += -O2
|
||||
ARCH_ASFLAGS := -x assembler-with-cpp
|
||||
-ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer
|
||||
+ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127
|
||||
ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp
|
||||
|
||||
ARCH_LDFLAGS = -warn-common
|
||||
diff -ur xen-3.4.2.orig//stubdom/grub.patches/00cvs xen-3.4.2//stubdom/grub.patches/00cvs
|
||||
--- xen-3.4.2.orig//stubdom/grub.patches/00cvs 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//stubdom/grub.patches/00cvs 2011-09-26 02:18:14.549771549 +0800
|
||||
@@ -223,8 +223,8 @@
|
||||
+++ grub/configure.ac 2008-04-10 23:26:50.000000000 +0100
|
||||
@@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then
|
||||
fi
|
||||
- STAGE1_CFLAGS="-O2"
|
||||
- GRUB_CFLAGS="-O2"
|
||||
+ STAGE1_CFLAGS=""
|
||||
+ GRUB_CFLAGSS=""
|
||||
- AC_CACHE_CHECK([whether optimization for size works], size_flag, [
|
||||
+ AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [
|
||||
saved_CFLAGS=$CFLAGS
|
||||
@@ -237,7 +237,7 @@
|
||||
+ if test "x$grub_cv_cc_Os" = xyes; then
|
||||
STAGE2_CFLAGS="-Os"
|
||||
else
|
||||
- STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops"
|
||||
+ STAGE2_CFLAGS=" -fno-strength-reduce -fno-unroll-loops"
|
||||
@@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then
|
||||
# OpenBSD has a GCC extension for protecting applications from
|
||||
# stack smashing attacks, but GRUB doesn't want this feature.
|
||||
diff -ur xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
|
||||
--- xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2011-09-26 02:24:37.261771380 +0800
|
||||
@@ -1849,7 +1849,7 @@
|
||||
GCC=`test $ac_compiler_gnu = yes && echo yes`
|
||||
ac_test_CFLAGS=${CFLAGS+set}
|
||||
ac_save_CFLAGS=$CFLAGS
|
||||
-CFLAGS="-g"
|
||||
+CFLAGS=""
|
||||
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||||
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_cc_g+set}" = set; then
|
||||
@@ -1898,15 +1898,15 @@
|
||||
CFLAGS=$ac_save_CFLAGS
|
||||
elif test $ac_cv_prog_cc_g = yes; then
|
||||
if test "$GCC" = yes; then
|
||||
- CFLAGS="-g -O2"
|
||||
+ CFLAGS=""
|
||||
else
|
||||
- CFLAGS="-g"
|
||||
+ CFLAGS=""
|
||||
fi
|
||||
else
|
||||
if test "$GCC" = yes; then
|
||||
- CFLAGS="-O2"
|
||||
+# CFLAGS="-O2"
|
||||
else
|
||||
- CFLAGS=
|
||||
+ CFLAGS=""
|
||||
fi
|
||||
fi
|
||||
echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
|
||||
Only in xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver: configure~
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2011-09-26 02:17:29.223771569 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-26 02:22:14.583771444 +0800
|
||||
@@ -464,7 +464,7 @@
|
||||
|
||||
|
||||
# default flags for all hosts
|
||||
-CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing"
|
||||
+CFLAGS="$CFLAGS -g -fno-strict-aliasing"
|
||||
CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
|
||||
LDFLAGS="$LDFLAGS -g"
|
||||
if test "$werror" = "yes" ; then
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile 2009-11-05 19:44:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile 2011-09-26 02:18:14.264771549 +0800
|
||||
@@ -12,7 +12,7 @@
|
||||
OBJCOPY = $(CROSS)objcopy
|
||||
|
||||
# we rely on GCC inline:ing the stuff we tell it to in many places here.
|
||||
-CFLAGS = -Winline -Wall -g -O2 -static
|
||||
+CFLAGS = -Winline -Wall -g -static
|
||||
NOSTDFLAGS = -nostartfiles -nostdlib
|
||||
ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/cris/
|
||||
LDLIBS =
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c 2009-11-05 19:44:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c 2011-09-26 02:18:14.669771549 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
* http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml
|
||||
*
|
||||
* mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \
|
||||
-* -O2 -static -o hello-mips hello-mips.c
|
||||
+* -static -o hello-mips hello-mips.c
|
||||
*
|
||||
*/
|
||||
#define __NR_SYSCALL_BASE 4000
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile 2009-11-05 19:44:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile 2011-09-26 02:18:14.262771549 +0800
|
||||
@@ -2,7 +2,7 @@
|
||||
-include ../config-host.mak
|
||||
VPATH=$(SRC_PATH)/tests
|
||||
|
||||
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
|
||||
+CFLAGS=-Wall -g -fno-strict-aliasing
|
||||
#CFLAGS+=-msse2
|
||||
LDFLAGS=
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
.PHONY: test-mmap
|
||||
test-mmap: test-mmap.c
|
||||
- $(CC) $(CFLAGS) -Wall -static -O2 $(LDFLAGS) -o $@ $<
|
||||
+ $(CC) $(CFLAGS) -Wall -static $(LDFLAGS) -o $@ $<
|
||||
-./test-mmap
|
||||
-$(QEMU) ./test-mmap
|
||||
-$(QEMU) -p 8192 ./test-mmap 8192
|
||||
@@ -88,17 +88,17 @@
|
||||
arm-linux-ld -o $@ $<
|
||||
|
||||
hello-arm.o: hello-arm.c
|
||||
- arm-linux-gcc -Wall -g -O2 -c -o $@ $<
|
||||
+ arm-linux-gcc -Wall -g -c -o $@ $<
|
||||
|
||||
test-arm-iwmmxt: test-arm-iwmmxt.s
|
||||
cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@
|
||||
|
||||
# MIPS test
|
||||
hello-mips: hello-mips.c
|
||||
- mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
|
||||
+ mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $<
|
||||
|
||||
hello-mipsel: hello-mips.c
|
||||
- mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
|
||||
+ mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $<
|
||||
|
||||
# testsuite for the CRIS port.
|
||||
test-cris:
|
||||
diff -ur xen-3.4.2.orig//tools/libaio/src/Makefile xen-3.4.2//tools/libaio/src/Makefile
|
||||
--- xen-3.4.2.orig//tools/libaio/src/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/libaio/src/Makefile 2011-09-26 02:18:14.288771549 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
libdir=$(prefix)/lib
|
||||
|
||||
ARCH := $(shell uname -m | sed -e s/i.86/i386/)
|
||||
-CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
|
||||
+CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -fPIC
|
||||
SO_CFLAGS=-shared $(CFLAGS)
|
||||
L_CFLAGS=$(CFLAGS)
|
||||
LINK_FLAGS=
|
||||
diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
|
||||
--- xen-3.4.2.orig//tools/libxen/Makefile.dist 2011-09-26 02:17:29.223771569 +0800
|
||||
+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-26 02:18:14.553771549 +0800
|
||||
@@ -22,7 +22,7 @@
|
||||
CFLAGS = -Iinclude \
|
||||
$(shell xml2-config --cflags) \
|
||||
$(shell curl-config --cflags) \
|
||||
- -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
|
||||
+ -W -Wall -Wmissing-prototypes -std=c99 -fPIC
|
||||
|
||||
LDFLAGS = $(shell xml2-config --libs) \
|
||||
$(shell curl-config --libs)
|
||||
diff -ur xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4
|
||||
--- xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 2011-09-26 02:18:14.659771549 +0800
|
||||
@@ -62,7 +62,7 @@
|
||||
CFLAGS += -Wno-unused-parameter
|
||||
|
||||
CFLAGS += -g
|
||||
-CFLAGS += -O2
|
||||
+#CFLAGS += -O2
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += -fno-common
|
||||
#CFLAGS += -fomit-frame-pointer
|
||||
diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
|
||||
--- xen-3.4.2.orig//extras/mini-os/minios.mk 2011-09-26 02:29:41.869771248 +0800
|
||||
+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-26 02:33:55.708771108 +0800
|
||||
@@ -23,7 +23,7 @@
|
||||
DEF_CFLAGS += -DGNT_DEBUG
|
||||
DEF_CFLAGS += -DGNTMAP_DEBUG
|
||||
else
|
||||
-DEF_CFLAGS += -O3
|
||||
+#DEF_CFLAGS += -O3
|
||||
endif
|
||||
|
||||
# Make the headers define our internal stuff
|
||||
diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
|
||||
--- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2011-09-26 02:29:41.872771248 +0800
|
||||
+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-26 02:37:59.835771029 +0800
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
$(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
-CFLAGS += -O3
|
||||
+#CFLAGS += -O3
|
||||
#CFLAGS += -g
|
||||
|
||||
MAJOR := 3.0
|
||||
diff -ur xen-3.4.2.orig//tools/vnet/vnetd/Makefile xen-3.4.2//tools/vnet/vnetd/Makefile
|
||||
--- xen-3.4.2.orig//tools/vnet/vnetd/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vnet/vnetd/Makefile 2011-09-26 02:37:59.834771029 +0800
|
||||
@@ -44,7 +44,7 @@
|
||||
CPPFLAGS += -D __ARCH_I386_ATOMIC__
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
-CFLAGS += -O3
|
||||
+#CFLAGS += -O3
|
||||
CFLAGS += $(INCLUDES) $(LIBS)
|
||||
|
||||
LDFLAGS += $(LIBS)
|
||||
@ -1,429 +0,0 @@
|
||||
diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
|
||||
--- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800
|
||||
+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
# Tools to run on system hosting the build
|
||||
HOSTCC = gcc
|
||||
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
HOSTCFLAGS += -fno-strict-aliasing
|
||||
|
||||
DISTDIR ?= $(XEN_ROOT)/dist
|
||||
diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
|
||||
--- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
# Define some default flags.
|
||||
# NB. '-Wcast-qual' is nasty, so I omitted it.
|
||||
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
|
||||
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
|
||||
diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile
|
||||
--- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800
|
||||
@@ -5,7 +5,7 @@
|
||||
QCOW_UTIL = img2qcow qcow2raw qcow-create
|
||||
LIBAIO_DIR = ../../libaio/src
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -I../lib
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile
|
||||
--- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800
|
||||
@@ -13,7 +13,7 @@
|
||||
SRCS :=
|
||||
SRCS += xenbus.c blkif.c xs_api.c
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -fPIC
|
||||
# get asprintf():
|
||||
diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile
|
||||
--- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800
|
||||
@@ -2,7 +2,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile
|
||||
--- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-#CFLAGS += -Werror -g -O0
|
||||
+#CFLAGS += -g -O0
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800
|
||||
@@ -10,7 +10,7 @@
|
||||
CFLAGS += -DNDEBUG
|
||||
endif
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
# Disable PIE/SSP if GCC supports them. They can break us.
|
||||
$(call cc-option-add,CFLAGS,CC,-nopie)
|
||||
diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile
|
||||
--- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
SRCS :=
|
||||
SRCS += flask_op.c
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile
|
||||
--- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
|
||||
|
||||
PROFILE=#-pg
|
||||
-BASECFLAGS=-Wall -g -Werror
|
||||
+BASECFLAGS=-Wall -g
|
||||
BASECFLAGS+= $(PROFILE)
|
||||
#BASECFLAGS+= -I$(XEN_ROOT)/tools
|
||||
BASECFLAGS+= $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile
|
||||
--- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
IBIN = fs-backend
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800
|
||||
@@ -468,7 +468,7 @@
|
||||
CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
|
||||
LDFLAGS="$LDFLAGS -g"
|
||||
if test "$werror" = "yes" ; then
|
||||
-CFLAGS="$CFLAGS -Werror"
|
||||
+CFLAGS="$CFLAGS"
|
||||
fi
|
||||
|
||||
if test "$solaris" = "no" ; then
|
||||
@@ -1150,7 +1150,7 @@
|
||||
echo "sparse enabled $sparse"
|
||||
echo "profiler $profiler"
|
||||
echo "static build $static"
|
||||
-echo "-Werror enabled $werror"
|
||||
+
|
||||
if test "$darwin" = "yes" ; then
|
||||
echo "Cocoa support $cocoa"
|
||||
fi
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800
|
||||
@@ -26,7 +26,7 @@
|
||||
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
|
||||
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
|
||||
CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
|
||||
-#CFLAGS+=-Werror
|
||||
+#CFLAGS+=
|
||||
LIBS=
|
||||
# user emulator name
|
||||
ifndef TARGET_ARCH2
|
||||
diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile
|
||||
--- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
HARNESS_SRCS:=main.c
|
||||
# io_queue.c
|
||||
|
||||
-CFLAGS=-Wall -Werror -g -O -laio
|
||||
+CFLAGS=-Wall -g -O -laio
|
||||
#-lpthread -lrt
|
||||
|
||||
all: $(PROGS)
|
||||
diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800
|
||||
@@ -1,6 +1,6 @@
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror
|
||||
+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/
|
||||
LDFLAGS += -L../common/
|
||||
|
||||
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
|
||||
diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile
|
||||
--- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800
|
||||
+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
-include $(XEN_TARGET_ARCH)/Makefile
|
||||
|
||||
-CFLAGS += -Werror -Wmissing-prototypes
|
||||
+CFLAGS += -Wmissing-prototypes
|
||||
CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include
|
||||
|
||||
# Needed for posix_fadvise64() in xc_linux.c
|
||||
diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
|
||||
--- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800
|
||||
@@ -22,7 +22,7 @@
|
||||
CFLAGS = -Iinclude \
|
||||
$(shell xml2-config --cflags) \
|
||||
$(shell curl-config --cflags) \
|
||||
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
|
||||
+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
|
||||
|
||||
LDFLAGS = $(shell xml2-config --libs) \
|
||||
$(shell curl-config --libs)
|
||||
diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile
|
||||
--- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
HDRS = $(wildcard *.h)
|
||||
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
|
||||
diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile
|
||||
--- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
INCLUDES += -I $(XEN_XC)
|
||||
INCLUDES += -I $(XEN_LIBXC)
|
||||
diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py
|
||||
--- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800
|
||||
@@ -3,7 +3,7 @@
|
||||
import os
|
||||
import sys
|
||||
|
||||
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
|
||||
+extra_compile_args = [ "-fno-strict-aliasing" ]
|
||||
|
||||
XEN_ROOT = "../.."
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py
|
||||
--- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
XEN_ROOT = "../.."
|
||||
|
||||
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
|
||||
+extra_compile_args = [ "-fno-strict-aliasing" ]
|
||||
|
||||
include_dirs = [ XEN_ROOT + "/tools/libxc",
|
||||
XEN_ROOT + "/tools/xenstore",
|
||||
diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile
|
||||
--- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT = ../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += -I. $(CFLAGS_libxenctrl)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
|
||||
--- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800
|
||||
@@ -25,7 +25,7 @@
|
||||
PIC_OBJS := $(LIB_SRCS:.c=.opic)
|
||||
|
||||
$(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
|
||||
-CFLAGS += -Werror -fno-strict-aliasing
|
||||
+CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += -O3
|
||||
#CFLAGS += -g
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
|
||||
|
||||
# General compiler flags
|
||||
-CFLAGS = -Werror -g3 -I.
|
||||
+CFLAGS = -g3 -I.
|
||||
|
||||
# Generic project files
|
||||
HDRS = $(wildcard *.h)
|
||||
diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
|
||||
|
||||
# General compiler flags
|
||||
-CFLAGS = -Werror -g3 -I.
|
||||
+CFLAGS = -g3 -I.
|
||||
|
||||
# Generic project files
|
||||
HDRS = $(wildcard *.h)
|
||||
diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile
|
||||
--- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800
|
||||
@@ -11,7 +11,7 @@
|
||||
XEN_ROOT = ../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
|
||||
|
||||
PROGRAMS = xc_restore xc_save readnotes lsevtchn
|
||||
diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800
|
||||
@@ -13,7 +13,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -I $(XEN_XC)
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
LDFLAGS += $(LDFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
LDFLAGS += $(LDFLAGS_libxenstore)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800
|
||||
@@ -34,7 +34,7 @@
|
||||
OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
|
||||
SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
|
||||
|
||||
-WARN_FLAGS=-Wall -Werror
|
||||
+WARN_FLAGS=-Wall
|
||||
|
||||
CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE)
|
||||
LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
|
||||
diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800
|
||||
@@ -18,7 +18,7 @@
|
||||
all install xentop:
|
||||
else
|
||||
|
||||
-CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
|
||||
+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
|
||||
LDFLAGS += -L$(XEN_LIBXENSTAT)
|
||||
LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
|
||||
CFLAGS += -DHOST_$(XEN_OS)
|
||||
diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
MAJOR = 3.0
|
||||
MINOR = 0
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -I.
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c
|
||||
--- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800
|
||||
@@ -865,7 +865,7 @@
|
||||
{
|
||||
unsigned int offset, datalen;
|
||||
struct node *node;
|
||||
- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
|
||||
+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */
|
||||
char *name;
|
||||
|
||||
/* Extra "strings" can be created by binary data. */
|
||||
diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile
|
||||
--- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
LDFLAGS += $(LDFLAGS_libxenctrl)
|
||||
Only in xen-3.4.2/: Werror.sh
|
||||
diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk
|
||||
--- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800
|
||||
@@ -68,7 +68,7 @@
|
||||
CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK
|
||||
endif
|
||||
ifeq ($(no_warns),y)
|
||||
-CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized
|
||||
+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized
|
||||
endif
|
||||
ifneq ($(vhpt_disable),y)
|
||||
CFLAGS += -DVHPT_ENABLED=1
|
||||
diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk
|
||||
--- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800
|
||||
@@ -8,7 +8,7 @@
|
||||
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector)
|
||||
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all)
|
||||
|
||||
-CFLAGS += -Werror -fno-builtin -msoft-float
|
||||
+CFLAGS += -fno-builtin -msoft-float
|
||||
|
||||
# NB. awk invocation is a portable alternative to 'head -n -1'
|
||||
%.S: %.bin
|
||||
diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk
|
||||
--- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800
|
||||
@@ -17,7 +17,7 @@
|
||||
endif
|
||||
|
||||
CFLAGS += -fno-builtin -fno-common
|
||||
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
|
||||
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
|
||||
CFLAGS += -I$(BASEDIR)/include
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
|
||||
@ -1,731 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Keir Fraser <keir@xen.org>
|
||||
# Date 1311171934 -3600
|
||||
# Node ID 1976adbf2b807e505fdf0356c29ec0c0499ed533
|
||||
# Parent 411b38f8f90bc042a9e6839b6840dd57cbee4a8c
|
||||
hvmloader: Switch to absolute addressing for calling hypercall stubs.
|
||||
|
||||
This is clearer and less fragile than trying to make relative calls
|
||||
work. In particular, the old approach failed if _start was not
|
||||
== HVMLOADER_PHYSICAL_ADDRESS. This was the case for some modern
|
||||
toolchains which reorder functions.
|
||||
|
||||
Signed-off-by: Keir Fraser <keir@xen.org>
|
||||
xen-unstable changeset: 23730:dd5eecf739d1
|
||||
xen-unstable date: Wed Jul 20 15:02:16 2011 +0100
|
||||
|
||||
|
||||
hvmloader: Remove hard tabs from source files.
|
||||
|
||||
Signed-off-by: Keir Fraser <keir@xen.org>
|
||||
xen-unstable changeset: 23729:4f1109af9c63
|
||||
xen-unstable date: Wed Jul 20 14:52:16 2011 +0100
|
||||
|
||||
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/hypercall.h
|
||||
--- a/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:24:09 2011 +0100
|
||||
+++ b/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:25:34 2011 +0100
|
||||
@@ -35,147 +35,148 @@
|
||||
#include <xen/xen.h>
|
||||
#include "config.h"
|
||||
|
||||
-/*
|
||||
- * NB. Hypercall address needs to be relative to a linkage symbol for
|
||||
- * some version of ld to relocate the relative calls properly.
|
||||
- */
|
||||
-#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \
|
||||
- " + " STR(HYPERCALL_PHYSICAL_ADDRESS)
|
||||
+#define hcall_addr(name) \
|
||||
+ ((unsigned long)HYPERCALL_PHYSICAL_ADDRESS + __HYPERVISOR_##name * 32)
|
||||
|
||||
-#define _hypercall0(type, name) \
|
||||
-({ \
|
||||
- long __res; \
|
||||
- asm volatile ( \
|
||||
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
|
||||
- : "=a" (__res) \
|
||||
- : \
|
||||
- : "memory" ); \
|
||||
- (type)__res; \
|
||||
+#define _hypercall0(type, name) \
|
||||
+({ \
|
||||
+ long __res; \
|
||||
+ asm volatile ( \
|
||||
+ "call *%%eax" \
|
||||
+ : "=a" (__res) \
|
||||
+ : "0" (hcall_addr(name)) \
|
||||
+ : "memory" ); \
|
||||
+ (type)__res; \
|
||||
})
|
||||
|
||||
-#define _hypercall1(type, name, a1) \
|
||||
-({ \
|
||||
- long __res, __ign1; \
|
||||
- asm volatile ( \
|
||||
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
|
||||
- : "=a" (__res), "=b" (__ign1) \
|
||||
- : "1" ((long)(a1)) \
|
||||
- : "memory" ); \
|
||||
- (type)__res; \
|
||||
+#define _hypercall1(type, name, a1) \
|
||||
+({ \
|
||||
+ long __res, __ign1; \
|
||||
+ asm volatile ( \
|
||||
+ "call *%%eax" \
|
||||
+ : "=a" (__res), "=b" (__ign1) \
|
||||
+ : "0" (hcall_addr(name)), \
|
||||
+ "1" ((long)(a1)) \
|
||||
+ : "memory" ); \
|
||||
+ (type)__res; \
|
||||
})
|
||||
|
||||
-#define _hypercall2(type, name, a1, a2) \
|
||||
-({ \
|
||||
- long __res, __ign1, __ign2; \
|
||||
- asm volatile ( \
|
||||
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
|
||||
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \
|
||||
- : "1" ((long)(a1)), "2" ((long)(a2)) \
|
||||
- : "memory" ); \
|
||||
- (type)__res; \
|
||||
+#define _hypercall2(type, name, a1, a2) \
|
||||
+({ \
|
||||
+ long __res, __ign1, __ign2; \
|
||||
+ asm volatile ( \
|
||||
+ "call *%%eax" \
|
||||
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \
|
||||
+ : "0" (hcall_addr(name)), \
|
||||
+ "1" ((long)(a1)), "2" ((long)(a2)) \
|
||||
+ : "memory" ); \
|
||||
+ (type)__res; \
|
||||
})
|
||||
|
||||
-#define _hypercall3(type, name, a1, a2, a3) \
|
||||
-({ \
|
||||
- long __res, __ign1, __ign2, __ign3; \
|
||||
- asm volatile ( \
|
||||
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
|
||||
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
|
||||
- "=d" (__ign3) \
|
||||
- : "1" ((long)(a1)), "2" ((long)(a2)), \
|
||||
- "3" ((long)(a3)) \
|
||||
- : "memory" ); \
|
||||
- (type)__res; \
|
||||
+#define _hypercall3(type, name, a1, a2, a3) \
|
||||
+({ \
|
||||
+ long __res, __ign1, __ign2, __ign3; \
|
||||
+ asm volatile ( \
|
||||
+ "call *%%eax" \
|
||||
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
|
||||
+ "=d" (__ign3) \
|
||||
+ : "0" (hcall_addr(name)), \
|
||||
+ "1" ((long)(a1)), "2" ((long)(a2)), \
|
||||
+ "3" ((long)(a3)) \
|
||||
+ : "memory" ); \
|
||||
+ (type)__res; \
|
||||
})
|
||||
|
||||
-#define _hypercall4(type, name, a1, a2, a3, a4) \
|
||||
-({ \
|
||||
- long __res, __ign1, __ign2, __ign3, __ign4; \
|
||||
- asm volatile ( \
|
||||
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
|
||||
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
|
||||
- "=d" (__ign3), "=S" (__ign4) \
|
||||
- : "1" ((long)(a1)), "2" ((long)(a2)), \
|
||||
- "3" ((long)(a3)), "4" ((long)(a4)) \
|
||||
- : "memory" ); \
|
||||
- (type)__res; \
|
||||
+#define _hypercall4(type, name, a1, a2, a3, a4) \
|
||||
+({ \
|
||||
+ long __res, __ign1, __ign2, __ign3, __ign4; \
|
||||
+ asm volatile ( \
|
||||
+ "call *%%eax" \
|
||||
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
|
||||
+ "=d" (__ign3), "=S" (__ign4) \
|
||||
+ : "0" (hcall_addr(name)), \
|
||||
+ "1" ((long)(a1)), "2" ((long)(a2)), \
|
||||
+ "3" ((long)(a3)), "4" ((long)(a4)) \
|
||||
+ : "memory" ); \
|
||||
+ (type)__res; \
|
||||
})
|
||||
|
||||
-#define _hypercall5(type, name, a1, a2, a3, a4, a5) \
|
||||
-({ \
|
||||
- long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \
|
||||
- asm volatile ( \
|
||||
- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
|
||||
- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
|
||||
- "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \
|
||||
- : "1" ((long)(a1)), "2" ((long)(a2)), \
|
||||
- "3" ((long)(a3)), "4" ((long)(a4)), \
|
||||
- "5" ((long)(a5)) \
|
||||
- : "memory" ); \
|
||||
- (type)__res; \
|
||||
+#define _hypercall5(type, name, a1, a2, a3, a4, a5) \
|
||||
+({ \
|
||||
+ long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \
|
||||
+ asm volatile ( \
|
||||
+ "call *%%eax" \
|
||||
+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
|
||||
+ "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \
|
||||
+ : "0" (hcall_addr(name)), \
|
||||
+ "1" ((long)(a1)), "2" ((long)(a2)), \
|
||||
+ "3" ((long)(a3)), "4" ((long)(a4)), \
|
||||
+ "5" ((long)(a5)) \
|
||||
+ : "memory" ); \
|
||||
+ (type)__res; \
|
||||
})
|
||||
|
||||
static inline int
|
||||
hypercall_sched_op(
|
||||
- int cmd, void *arg)
|
||||
+ int cmd, void *arg)
|
||||
{
|
||||
- return _hypercall2(int, sched_op, cmd, arg);
|
||||
+ return _hypercall2(int, sched_op, cmd, arg);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_memory_op(
|
||||
- unsigned int cmd, void *arg)
|
||||
+ unsigned int cmd, void *arg)
|
||||
{
|
||||
- return _hypercall2(int, memory_op, cmd, arg);
|
||||
+ return _hypercall2(int, memory_op, cmd, arg);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_multicall(
|
||||
- void *call_list, int nr_calls)
|
||||
+ void *call_list, int nr_calls)
|
||||
{
|
||||
- return _hypercall2(int, multicall, call_list, nr_calls);
|
||||
+ return _hypercall2(int, multicall, call_list, nr_calls);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_event_channel_op(
|
||||
- int cmd, void *arg)
|
||||
+ int cmd, void *arg)
|
||||
{
|
||||
- return _hypercall2(int, event_channel_op, cmd, arg);
|
||||
+ return _hypercall2(int, event_channel_op, cmd, arg);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_xen_version(
|
||||
- int cmd, void *arg)
|
||||
+ int cmd, void *arg)
|
||||
{
|
||||
- return _hypercall2(int, xen_version, cmd, arg);
|
||||
+ return _hypercall2(int, xen_version, cmd, arg);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_console_io(
|
||||
- int cmd, int count, char *str)
|
||||
+ int cmd, int count, char *str)
|
||||
{
|
||||
- return _hypercall3(int, console_io, cmd, count, str);
|
||||
+ return _hypercall3(int, console_io, cmd, count, str);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_vm_assist(
|
||||
- unsigned int cmd, unsigned int type)
|
||||
+ unsigned int cmd, unsigned int type)
|
||||
{
|
||||
- return _hypercall2(int, vm_assist, cmd, type);
|
||||
+ return _hypercall2(int, vm_assist, cmd, type);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_vcpu_op(
|
||||
- int cmd, int vcpuid, void *extra_args)
|
||||
+ int cmd, int vcpuid, void *extra_args)
|
||||
{
|
||||
- return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
|
||||
+ return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
|
||||
}
|
||||
|
||||
static inline int
|
||||
hypercall_hvm_op(
|
||||
- int cmd, void *arg)
|
||||
+ int cmd, void *arg)
|
||||
{
|
||||
- return _hypercall2(int, hvm_op, cmd, arg);
|
||||
+ return _hypercall2(int, hvm_op, cmd, arg);
|
||||
}
|
||||
|
||||
#endif /* __HVMLOADER_HYPERCALL_H__ */
|
||||
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/pci_regs.h
|
||||
--- a/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:24:09 2011 +0100
|
||||
+++ b/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:25:34 2011 +0100
|
||||
@@ -1,69 +1,69 @@
|
||||
/*
|
||||
- * pci_regs.h
|
||||
+ * pci_regs.h
|
||||
*
|
||||
- * PCI standard defines
|
||||
- * Copyright 1994, Drew Eckhardt
|
||||
- * Copyright 1997--1999 Martin Mares <mj@ucw.cz>
|
||||
+ * PCI standard defines
|
||||
+ * Copyright 1994, Drew Eckhardt
|
||||
+ * Copyright 1997--1999 Martin Mares <mj@ucw.cz>
|
||||
*
|
||||
- * For more information, please consult the following manuals (look at
|
||||
- * http://www.pcisig.com/ for how to get them):
|
||||
+ * For more information, please consult the following manuals (look at
|
||||
+ * http://www.pcisig.com/ for how to get them):
|
||||
*
|
||||
- * PCI BIOS Specification
|
||||
- * PCI Local Bus Specification
|
||||
- * PCI to PCI Bridge Specification
|
||||
- * PCI System Design Guide
|
||||
+ * PCI BIOS Specification
|
||||
+ * PCI Local Bus Specification
|
||||
+ * PCI to PCI Bridge Specification
|
||||
+ * PCI System Design Guide
|
||||
*/
|
||||
|
||||
#ifndef __HVMLOADER_PCI_REGS_H__
|
||||
#define __HVMLOADER_PCI_REGS_H__
|
||||
|
||||
-#define PCI_VENDOR_ID 0x00 /* 16 bits */
|
||||
-#define PCI_DEVICE_ID 0x02 /* 16 bits */
|
||||
-#define PCI_COMMAND 0x04 /* 16 bits */
|
||||
-#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */
|
||||
-#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */
|
||||
-#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */
|
||||
-#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */
|
||||
-#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */
|
||||
-#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */
|
||||
-#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */
|
||||
-#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */
|
||||
-#define PCI_COMMAND_SERR 0x100 /* Enable SERR */
|
||||
-#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */
|
||||
+#define PCI_VENDOR_ID 0x00 /* 16 bits */
|
||||
+#define PCI_DEVICE_ID 0x02 /* 16 bits */
|
||||
+#define PCI_COMMAND 0x04 /* 16 bits */
|
||||
+#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */
|
||||
+#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */
|
||||
+#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */
|
||||
+#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */
|
||||
+#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */
|
||||
+#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */
|
||||
+#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */
|
||||
+#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */
|
||||
+#define PCI_COMMAND_SERR 0x100 /* Enable SERR */
|
||||
+#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */
|
||||
#define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
|
||||
|
||||
-#define PCI_STATUS 0x06 /* 16 bits */
|
||||
-#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */
|
||||
-#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */
|
||||
-#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */
|
||||
-#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */
|
||||
-#define PCI_STATUS_PARITY 0x100 /* Detected parity error */
|
||||
-#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */
|
||||
-#define PCI_STATUS_DEVSEL_FAST 0x000
|
||||
-#define PCI_STATUS_DEVSEL_MEDIUM 0x200
|
||||
-#define PCI_STATUS_DEVSEL_SLOW 0x400
|
||||
-#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
|
||||
-#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
|
||||
-#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
|
||||
-#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
|
||||
-#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
|
||||
+#define PCI_STATUS 0x06 /* 16 bits */
|
||||
+#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */
|
||||
+#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */
|
||||
+#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */
|
||||
+#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */
|
||||
+#define PCI_STATUS_PARITY 0x100 /* Detected parity error */
|
||||
+#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */
|
||||
+#define PCI_STATUS_DEVSEL_FAST 0x000
|
||||
+#define PCI_STATUS_DEVSEL_MEDIUM 0x200
|
||||
+#define PCI_STATUS_DEVSEL_SLOW 0x400
|
||||
+#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
|
||||
+#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
|
||||
+#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
|
||||
+#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
|
||||
+#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
|
||||
|
||||
-#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
|
||||
-#define PCI_REVISION_ID 0x08 /* Revision ID */
|
||||
-#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */
|
||||
-#define PCI_CLASS_DEVICE 0x0a /* Device class */
|
||||
+#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
|
||||
+#define PCI_REVISION_ID 0x08 /* Revision ID */
|
||||
+#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */
|
||||
+#define PCI_CLASS_DEVICE 0x0a /* Device class */
|
||||
|
||||
-#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
|
||||
-#define PCI_LATENCY_TIMER 0x0d /* 8 bits */
|
||||
-#define PCI_HEADER_TYPE 0x0e /* 8 bits */
|
||||
-#define PCI_HEADER_TYPE_NORMAL 0
|
||||
-#define PCI_HEADER_TYPE_BRIDGE 1
|
||||
-#define PCI_HEADER_TYPE_CARDBUS 2
|
||||
+#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
|
||||
+#define PCI_LATENCY_TIMER 0x0d /* 8 bits */
|
||||
+#define PCI_HEADER_TYPE 0x0e /* 8 bits */
|
||||
+#define PCI_HEADER_TYPE_NORMAL 0
|
||||
+#define PCI_HEADER_TYPE_BRIDGE 1
|
||||
+#define PCI_HEADER_TYPE_CARDBUS 2
|
||||
|
||||
-#define PCI_BIST 0x0f /* 8 bits */
|
||||
-#define PCI_BIST_CODE_MASK 0x0f /* Return result */
|
||||
-#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */
|
||||
-#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */
|
||||
+#define PCI_BIST 0x0f /* 8 bits */
|
||||
+#define PCI_BIST_CODE_MASK 0x0f /* Return result */
|
||||
+#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */
|
||||
+#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */
|
||||
|
||||
/*
|
||||
* Base addresses specify locations in memory or I/O space.
|
||||
@@ -71,38 +71,38 @@
|
||||
* 0xffffffff to the register, and reading it back. Only
|
||||
* 1 bits are decoded.
|
||||
*/
|
||||
-#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
|
||||
-#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */
|
||||
-#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */
|
||||
-#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */
|
||||
-#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */
|
||||
-#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */
|
||||
-#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */
|
||||
-#define PCI_BASE_ADDRESS_SPACE_IO 0x01
|
||||
-#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
|
||||
-#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
|
||||
-#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */
|
||||
-#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */
|
||||
-#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */
|
||||
-#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */
|
||||
-#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
|
||||
-#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
|
||||
+#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
|
||||
+#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */
|
||||
+#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */
|
||||
+#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */
|
||||
+#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */
|
||||
+#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */
|
||||
+#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */
|
||||
+#define PCI_BASE_ADDRESS_SPACE_IO 0x01
|
||||
+#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
|
||||
+#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
|
||||
+#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */
|
||||
+#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */
|
||||
+#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */
|
||||
+#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */
|
||||
+#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
|
||||
+#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
|
||||
/* bit 1 is reserved if address_space = 1 */
|
||||
|
||||
/* Header type 0 (normal devices) */
|
||||
-#define PCI_CARDBUS_CIS 0x28
|
||||
-#define PCI_SUBSYSTEM_VENDOR_ID 0x2c
|
||||
-#define PCI_SUBSYSTEM_ID 0x2e
|
||||
-#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
|
||||
-#define PCI_ROM_ADDRESS_ENABLE 0x01
|
||||
-#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
|
||||
+#define PCI_CARDBUS_CIS 0x28
|
||||
+#define PCI_SUBSYSTEM_VENDOR_ID 0x2c
|
||||
+#define PCI_SUBSYSTEM_ID 0x2e
|
||||
+#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
|
||||
+#define PCI_ROM_ADDRESS_ENABLE 0x01
|
||||
+#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
|
||||
|
||||
-#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
|
||||
+#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
|
||||
|
||||
/* 0x35-0x3b are reserved */
|
||||
-#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */
|
||||
-#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */
|
||||
-#define PCI_MIN_GNT 0x3e /* 8 bits */
|
||||
-#define PCI_MAX_LAT 0x3f /* 8 bits */
|
||||
+#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */
|
||||
+#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */
|
||||
+#define PCI_MIN_GNT 0x3e /* 8 bits */
|
||||
+#define PCI_MAX_LAT 0x3f /* 8 bits */
|
||||
|
||||
#endif /* __HVMLOADER_PCI_REGS_H__ */
|
||||
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/smbios_types.h
|
||||
--- a/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:24:09 2011 +0100
|
||||
+++ b/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:25:34 2011 +0100
|
||||
@@ -32,157 +32,157 @@
|
||||
between 0xf0000 and 0xfffff.
|
||||
*/
|
||||
struct smbios_entry_point {
|
||||
- char anchor_string[4];
|
||||
- uint8_t checksum;
|
||||
- uint8_t length;
|
||||
- uint8_t smbios_major_version;
|
||||
- uint8_t smbios_minor_version;
|
||||
- uint16_t max_structure_size;
|
||||
- uint8_t entry_point_revision;
|
||||
- uint8_t formatted_area[5];
|
||||
- char intermediate_anchor_string[5];
|
||||
- uint8_t intermediate_checksum;
|
||||
- uint16_t structure_table_length;
|
||||
- uint32_t structure_table_address;
|
||||
- uint16_t number_of_structures;
|
||||
- uint8_t smbios_bcd_revision;
|
||||
+ char anchor_string[4];
|
||||
+ uint8_t checksum;
|
||||
+ uint8_t length;
|
||||
+ uint8_t smbios_major_version;
|
||||
+ uint8_t smbios_minor_version;
|
||||
+ uint16_t max_structure_size;
|
||||
+ uint8_t entry_point_revision;
|
||||
+ uint8_t formatted_area[5];
|
||||
+ char intermediate_anchor_string[5];
|
||||
+ uint8_t intermediate_checksum;
|
||||
+ uint16_t structure_table_length;
|
||||
+ uint32_t structure_table_address;
|
||||
+ uint16_t number_of_structures;
|
||||
+ uint8_t smbios_bcd_revision;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* This goes at the beginning of every SMBIOS structure. */
|
||||
struct smbios_structure_header {
|
||||
- uint8_t type;
|
||||
- uint8_t length;
|
||||
- uint16_t handle;
|
||||
+ uint8_t type;
|
||||
+ uint8_t length;
|
||||
+ uint16_t handle;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 0 - BIOS Information */
|
||||
struct smbios_type_0 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint8_t vendor_str;
|
||||
- uint8_t version_str;
|
||||
- uint16_t starting_address_segment;
|
||||
- uint8_t release_date_str;
|
||||
- uint8_t rom_size;
|
||||
- uint8_t characteristics[8];
|
||||
- uint8_t characteristics_extension_bytes[2];
|
||||
- uint8_t major_release;
|
||||
- uint8_t minor_release;
|
||||
- uint8_t embedded_controller_major;
|
||||
- uint8_t embedded_controller_minor;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint8_t vendor_str;
|
||||
+ uint8_t version_str;
|
||||
+ uint16_t starting_address_segment;
|
||||
+ uint8_t release_date_str;
|
||||
+ uint8_t rom_size;
|
||||
+ uint8_t characteristics[8];
|
||||
+ uint8_t characteristics_extension_bytes[2];
|
||||
+ uint8_t major_release;
|
||||
+ uint8_t minor_release;
|
||||
+ uint8_t embedded_controller_major;
|
||||
+ uint8_t embedded_controller_minor;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 1 - System Information */
|
||||
struct smbios_type_1 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint8_t manufacturer_str;
|
||||
- uint8_t product_name_str;
|
||||
- uint8_t version_str;
|
||||
- uint8_t serial_number_str;
|
||||
- uint8_t uuid[16];
|
||||
- uint8_t wake_up_type;
|
||||
- uint8_t sku_str;
|
||||
- uint8_t family_str;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint8_t manufacturer_str;
|
||||
+ uint8_t product_name_str;
|
||||
+ uint8_t version_str;
|
||||
+ uint8_t serial_number_str;
|
||||
+ uint8_t uuid[16];
|
||||
+ uint8_t wake_up_type;
|
||||
+ uint8_t sku_str;
|
||||
+ uint8_t family_str;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 3 - System Enclosure */
|
||||
struct smbios_type_3 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint8_t manufacturer_str;
|
||||
- uint8_t type;
|
||||
- uint8_t version_str;
|
||||
- uint8_t serial_number_str;
|
||||
- uint8_t asset_tag_str;
|
||||
- uint8_t boot_up_state;
|
||||
- uint8_t power_supply_state;
|
||||
- uint8_t thermal_state;
|
||||
- uint8_t security_status;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint8_t manufacturer_str;
|
||||
+ uint8_t type;
|
||||
+ uint8_t version_str;
|
||||
+ uint8_t serial_number_str;
|
||||
+ uint8_t asset_tag_str;
|
||||
+ uint8_t boot_up_state;
|
||||
+ uint8_t power_supply_state;
|
||||
+ uint8_t thermal_state;
|
||||
+ uint8_t security_status;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 4 - Processor Information */
|
||||
struct smbios_type_4 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint8_t socket_designation_str;
|
||||
- uint8_t processor_type;
|
||||
- uint8_t processor_family;
|
||||
- uint8_t manufacturer_str;
|
||||
- uint32_t cpuid[2];
|
||||
- uint8_t version_str;
|
||||
- uint8_t voltage;
|
||||
- uint16_t external_clock;
|
||||
- uint16_t max_speed;
|
||||
- uint16_t current_speed;
|
||||
- uint8_t status;
|
||||
- uint8_t upgrade;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint8_t socket_designation_str;
|
||||
+ uint8_t processor_type;
|
||||
+ uint8_t processor_family;
|
||||
+ uint8_t manufacturer_str;
|
||||
+ uint32_t cpuid[2];
|
||||
+ uint8_t version_str;
|
||||
+ uint8_t voltage;
|
||||
+ uint16_t external_clock;
|
||||
+ uint16_t max_speed;
|
||||
+ uint16_t current_speed;
|
||||
+ uint8_t status;
|
||||
+ uint8_t upgrade;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 11 - OEM Strings */
|
||||
struct smbios_type_11 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint8_t count;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint8_t count;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 16 - Physical Memory Array
|
||||
* Associated with one type 17 (Memory Device).
|
||||
*/
|
||||
struct smbios_type_16 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint8_t location;
|
||||
- uint8_t use;
|
||||
- uint8_t error_correction;
|
||||
- uint32_t maximum_capacity;
|
||||
- uint16_t memory_error_information_handle;
|
||||
- uint16_t number_of_memory_devices;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint8_t location;
|
||||
+ uint8_t use;
|
||||
+ uint8_t error_correction;
|
||||
+ uint32_t maximum_capacity;
|
||||
+ uint16_t memory_error_information_handle;
|
||||
+ uint16_t number_of_memory_devices;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 17 - Memory Device
|
||||
* Associated with one type 19
|
||||
*/
|
||||
struct smbios_type_17 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint16_t physical_memory_array_handle;
|
||||
- uint16_t memory_error_information_handle;
|
||||
- uint16_t total_width;
|
||||
- uint16_t data_width;
|
||||
- uint16_t size;
|
||||
- uint8_t form_factor;
|
||||
- uint8_t device_set;
|
||||
- uint8_t device_locator_str;
|
||||
- uint8_t bank_locator_str;
|
||||
- uint8_t memory_type;
|
||||
- uint16_t type_detail;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint16_t physical_memory_array_handle;
|
||||
+ uint16_t memory_error_information_handle;
|
||||
+ uint16_t total_width;
|
||||
+ uint16_t data_width;
|
||||
+ uint16_t size;
|
||||
+ uint8_t form_factor;
|
||||
+ uint8_t device_set;
|
||||
+ uint8_t device_locator_str;
|
||||
+ uint8_t bank_locator_str;
|
||||
+ uint8_t memory_type;
|
||||
+ uint16_t type_detail;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 19 - Memory Array Mapped Address */
|
||||
struct smbios_type_19 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint32_t starting_address;
|
||||
- uint32_t ending_address;
|
||||
- uint16_t memory_array_handle;
|
||||
- uint8_t partition_width;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint32_t starting_address;
|
||||
+ uint32_t ending_address;
|
||||
+ uint16_t memory_array_handle;
|
||||
+ uint8_t partition_width;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 20 - Memory Device Mapped Address */
|
||||
struct smbios_type_20 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint32_t starting_address;
|
||||
- uint32_t ending_address;
|
||||
- uint16_t memory_device_handle;
|
||||
- uint16_t memory_array_mapped_address_handle;
|
||||
- uint8_t partition_row_position;
|
||||
- uint8_t interleave_position;
|
||||
- uint8_t interleaved_data_depth;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint32_t starting_address;
|
||||
+ uint32_t ending_address;
|
||||
+ uint16_t memory_device_handle;
|
||||
+ uint16_t memory_array_mapped_address_handle;
|
||||
+ uint8_t partition_row_position;
|
||||
+ uint8_t interleave_position;
|
||||
+ uint8_t interleaved_data_depth;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 32 - System Boot Information */
|
||||
struct smbios_type_32 {
|
||||
- struct smbios_structure_header header;
|
||||
- uint8_t reserved[6];
|
||||
- uint8_t boot_status;
|
||||
+ struct smbios_structure_header header;
|
||||
+ uint8_t reserved[6];
|
||||
+ uint8_t boot_status;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* SMBIOS type 127 -- End-of-table */
|
||||
struct smbios_type_127 {
|
||||
- struct smbios_structure_header header;
|
||||
+ struct smbios_structure_header header;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#endif /* SMBIOS_TYPES_H */
|
||||
diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/util.c
|
||||
--- a/tools/firmware/hvmloader/util.c Wed Jul 20 15:24:09 2011 +0100
|
||||
+++ b/tools/firmware/hvmloader/util.c Wed Jul 20 15:25:34 2011 +0100
|
||||
@@ -125,11 +125,11 @@
|
||||
|
||||
int strncmp(const char *s1, const char *s2, uint32_t n)
|
||||
{
|
||||
- uint32_t ctr;
|
||||
- for (ctr = 0; ctr < n; ctr++)
|
||||
- if (s1[ctr] != s2[ctr])
|
||||
- return (int)(s1[ctr] - s2[ctr]);
|
||||
- return 0;
|
||||
+ uint32_t ctr;
|
||||
+ for (ctr = 0; ctr < n; ctr++)
|
||||
+ if (s1[ctr] != s2[ctr])
|
||||
+ return (int)(s1[ctr] - s2[ctr]);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
void *memcpy(void *dest, const void *src, unsigned n)
|
||||
@ -1,241 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit base flag-o-matic eutils multilib python
|
||||
|
||||
# TPMEMUFILE=tpm_emulator-0.4.tar.gz
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
|
||||
# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
|
||||
|
||||
CDEPEND="dev-lang/python[ncurses,threads]
|
||||
sys-libs/zlib
|
||||
hvm? ( media-libs/libsdl )
|
||||
acm? ( dev-libs/libxml2 )
|
||||
api? ( dev-libs/libxml2 net-misc/curl )"
|
||||
# vtpm? ( dev-libs/gmp dev-libs/openssl )
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
sys-devel/gettext
|
||||
sys-devel/gcc
|
||||
dev-lang/perl
|
||||
dev-lang/python[ssl]
|
||||
app-misc/pax-utils
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
dev-texlive/texlive-latexextra
|
||||
media-gfx/transfig
|
||||
media-gfx/graphviz
|
||||
)
|
||||
hvm? (
|
||||
x11-proto/xproto
|
||||
sys-devel/dev86
|
||||
)"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
dev-python/pyxml
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
|| ( virtual/udev sys-apps/hotplug )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
|
||||
"${FILESDIR}/${PN}-3.3.0-nostrip.patch"
|
||||
"${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
|
||||
"${FILESDIR}/${P}-as-needed.patch"
|
||||
"${FILESDIR}/${P}-fix-definitions.patch"
|
||||
"${FILESDIR}/${P}-fix-include.patch"
|
||||
"${FILESDIR}/${P}-werror-idiocy-v2.patch"
|
||||
)
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
|
||||
usr/share/xen/qemu/openbios-sparc64"
|
||||
|
||||
pkg_setup() {
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
|
||||
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
|
||||
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
|
||||
eerror "to build xen-tools on your current profile."
|
||||
die "USE=hvm is unsupported on this system."
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
# use vtpm && export "VTPM_TOOLS=y"
|
||||
use api && export "LIBXENAPI_BINDINGS=y"
|
||||
use acm && export "ACM_SECURITY=y"
|
||||
use flask && export "FLASK_ENABLE=y"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
base_src_prepare
|
||||
|
||||
# use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \;
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
chmod 644 tools/check/check_x11_devel
|
||||
sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
|
||||
sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
|
||||
fi
|
||||
|
||||
sed -e '/texi2html/ s/-number/&-sections/' \
|
||||
-i tools/ioemu-qemu-xen/Makefile || die #409333
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake -C tools ${myopt} || die "compile failed"
|
||||
|
||||
if use doc; then
|
||||
sh ./docs/check_pkgs || die "package check failed"
|
||||
emake docs || die "compiling docs failed"
|
||||
emake dev-docs || die "make dev-docs failed"
|
||||
fi
|
||||
|
||||
emake -C docs man-pages || die "make man-pages failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \
|
||||
|| die "install failed"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"/etc/sysconfig
|
||||
|
||||
dodoc README docs/README.xen-bugtool docs/ChangeLog
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
|
||||
|| die "install docs failed"
|
||||
|
||||
dohtml -r docs/api/
|
||||
docinto pdf
|
||||
dodoc docs/api/tools/python/latex/refman.pdf
|
||||
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
|
||||
doman docs/man?/*
|
||||
|
||||
newinitd "${FILESDIR}"/xend.initd-r1 xend \
|
||||
|| die "Couldn't install xen.initd"
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains \
|
||||
|| die "Couldn't install xendomains.confd"
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \
|
||||
|| die "Couldn't install xendomains.initd"
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
|
||||
echo
|
||||
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
|
||||
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
|
||||
ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
|
||||
fi
|
||||
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 multilib system is required to build HVM support."
|
||||
echo
|
||||
elog "The ioemu use flag has been removed and replaced with hvm."
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
|
||||
python_mod_optimize $(use pygrub && echo grub) xen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup $(use pygrub && echo grub) xen
|
||||
}
|
||||
@ -1,253 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.6 2012/12/02 22:48:42 ssuominen Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit base flag-o-matic eutils multilib python toolchain-funcs
|
||||
|
||||
# TPMEMUFILE=tpm_emulator-0.4.tar.gz
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
|
||||
# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
QA_PRESTRIPPED="/usr/share/xen/qemu/openbios-ppc \
|
||||
/usr/share/xen/qemu/openbios-sparc64 \
|
||||
/usr/share/xen/qemu/openbios-sparc32"
|
||||
QA_WX_LOAD="${QA_PRESTRIPPED}"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
|
||||
|
||||
CDEPEND="dev-lang/python[ncurses,threads]
|
||||
sys-libs/zlib
|
||||
hvm? ( media-libs/libsdl )
|
||||
acm? ( dev-libs/libxml2 )
|
||||
api? ( dev-libs/libxml2 net-misc/curl )"
|
||||
# vtpm? ( dev-libs/gmp dev-libs/openssl )
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
sys-devel/gettext
|
||||
sys-devel/gcc
|
||||
dev-lang/perl
|
||||
dev-lang/python[ssl]
|
||||
app-misc/pax-utils
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/transfig
|
||||
media-gfx/graphviz
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexextra
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? (
|
||||
x11-proto/xproto
|
||||
sys-devel/dev86
|
||||
)"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
dev-python/pyxml
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
|| ( virtual/udev sys-apps/hotplug )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
|
||||
"${FILESDIR}/${PN}-3.3.0-nostrip.patch"
|
||||
"${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
|
||||
"${FILESDIR}/${P}-as-needed.patch"
|
||||
"${FILESDIR}/${P}-fix-definitions.patch"
|
||||
"${FILESDIR}/${P}-fix-include.patch"
|
||||
"${FILESDIR}/${P}-werror-idiocy-v2.patch"
|
||||
"${FILESDIR}/${P}-ldflags-respect.patch"
|
||||
)
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
|
||||
usr/share/xen/qemu/openbios-sparc64"
|
||||
|
||||
pkg_setup() {
|
||||
if [ -x /.config/ ]; then
|
||||
die "the system has a dir /.config; this needs to be removed to allow the package to emerge"
|
||||
fi
|
||||
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
|
||||
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
|
||||
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
|
||||
eerror "to build xen-tools on your current profile."
|
||||
die "USE=hvm is unsupported on this system."
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
# use vtpm && export "VTPM_TOOLS=y"
|
||||
use api && export "LIBXENAPI_BINDINGS=y"
|
||||
use acm && export "ACM_SECURITY=y"
|
||||
use flask && export "FLASK_ENABLE=y"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
base_src_prepare
|
||||
|
||||
# use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
# Try and remove all the default custom-cflags
|
||||
if use custom-cflags; then
|
||||
epatch "${FILESDIR}/${P}-remove-default-cflags.patch"
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
chmod 644 tools/check/check_x11_devel
|
||||
sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
|
||||
sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
|
||||
fi
|
||||
|
||||
sed -e '/texi2html/ s/-number/&-sections/' \
|
||||
-i tools/ioemu-qemu-xen/Makefile || die #409333
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed"
|
||||
|
||||
if use doc; then
|
||||
sh ./docs/check_pkgs || die "package check failed"
|
||||
emake docs || die "compiling docs failed"
|
||||
emake dev-docs || die "make dev-docs failed"
|
||||
fi
|
||||
|
||||
emake -C docs man-pages || die "make man-pages failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \
|
||||
|| die "install failed"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"/etc/sysconfig
|
||||
|
||||
# Remove unneeded static-libs
|
||||
rm "${D}"/usr/lib64/libxenctrl.a "${D}"/usr/lib64/libxenguest.a \
|
||||
"${D}"/usr/lib64/libflask.a "${D}"/usr/lib64/libxenstore.a \
|
||||
"${D}"/usr/lib64/libblktap.a "${D}"/usr/lib64/libxenapi.a
|
||||
|
||||
dodoc README docs/README.xen-bugtool docs/ChangeLog
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
|
||||
|| die "install docs failed"
|
||||
|
||||
dohtml -r docs/api/
|
||||
docinto pdf
|
||||
dodoc docs/api/tools/python/latex/refman.pdf
|
||||
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
|
||||
doman docs/man?/*
|
||||
|
||||
newinitd "${FILESDIR}"/xend.initd-r1 xend \
|
||||
|| die "Couldn't install xen.initd"
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains \
|
||||
|| die "Couldn't install xendomains.confd"
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \
|
||||
|| die "Couldn't install xendomains.initd"
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
|
||||
echo
|
||||
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
|
||||
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
|
||||
ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
|
||||
fi
|
||||
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 multilib system is required to build HVM support."
|
||||
echo
|
||||
elog "The ioemu use flag has been removed and replaced with hvm."
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
|
||||
python_mod_optimize $(use pygrub && echo grub) xen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup $(use pygrub && echo grub) xen
|
||||
}
|
||||
@ -1,13 +1,19 @@
|
||||
AUX xen-3.3.0-unexported-target-fix.patch 788 SHA256 e46f5fbe4c579b84f895f0ac6e05589553a11305ca30e69405082d58abd9ee07 SHA512 f5e889cf04ad026fea2a3ab77379b8c947e38db22e7d3e0aeaf273b407a1768887d9ee3a40d8b715da2238a9032e91e2efdf97b8bba564d3781d4b8dabcc6f8c WHIRLPOOL 323f579283c2ef3bcd8f776e682312934c13a360fc320c9d37a83ef1d8a70e2c6857573f2970dc0950f0a6d04bcf20225f58ca1b91ff1fad65f4dca8613e09ff
|
||||
AUX xen-3.4.2-CVE-2011-1583.patch 2893 SHA256 809c1744aee7569db31e9959c1e2c433ef6f4067134b26f70a689e056a024df9 SHA512 2ff60a97463edbd70ef51d0e4d35b8de66ee046f90c5bae956d14f8b6d736370aef9ab760ea7a6eaaf8f55a0102f2122c6af903219008097a477f8dde494765b WHIRLPOOL ac661bb9ca1f42a74787be72232c9aa3d83d3920c1bd6817cc699b1838465cf32c72659247bf1dec248ea2b60f1dbfa7a82169908a2062cab29b4e06d0bc8b40
|
||||
AUX xen-3.4.2-dump_registers-watchdog-fix.patch 533 SHA256 17d18f268efd302085bdfa0673e2d9478e84206b6d060d0a63854441233a81c6 SHA512 83f758ac8139a0cfaf9f1a0bfeba3d59627eafc0213161f16389ebe4cb06d0d7a72dc80b392a46139158013ec8ce4f519b16caf640328b744e23fe835a064e88 WHIRLPOOL d5d0a2640029c24acf78a31e90227fc4ba88b3c68e2e450c9e5e89ccb64d30db7dcf073de949a25baa0e8ddc20e975481ddfea4e1429208a87b9574a60523534
|
||||
AUX xen-3.4.2-fix-__addr_ok-limit.patch 3380 SHA256 dab6954da3cbf7592a36a6234561174d0d117711b87c0868d17f9d21af75a835 SHA512 ccec8a9e3433dd1514c7509111a8a8b7786123c30312ff7ab2257f4029dbd8c01e732d6d2b85cff60d9d5d6adc358d4a62e10678abdb3ea88c47540a21ebf809 WHIRLPOOL 57769017afe888c0466b635dfa8882aa37aea6c324d5261a5b0a90c0f1011fe5a2c69c6154cc114ca3e2f78a129692c4dd78e0e83d3f9cfde665c17ecfebeac0
|
||||
AUX xen-3.4.2-no-DMA.patch 2708 SHA256 87a3fe134b8d3c762d4d229986ccb77898a603a18974f453cfdf6ba9d68fe982 SHA512 19b0476b30827482f89e6b62f6f0199ae70e80cea1bd121ed9fe0d3e3e9ae47f248c87de057ca6a38223c0650029d10697ddaf18428efac51255e5cbeb7daaa7 WHIRLPOOL eac1839d3d74d29f68bdae599b456c991b5a8bf7ef2fb750dcbb4c2c1d575d085e97e523563d9685dc9006542668048fd7d2b0b1d343b8c4f9c2b4e65177c38d
|
||||
AUX xen-3.4.2-werror-idiocy.patch 16826 SHA256 261ef6541736f1df757476590bb8581cac376c9408e5041e8356336e13025c67 SHA512 1a0fb1e6a3b325626c06887c1cd8ea2c8eac44f1b1dfa07860d3ddb1bf7172cddf573d492a68cae08aef1c2cfcdd9ab257aa9e5da255ba1fbc3ce0d9c3a8c91c WHIRLPOOL 4a3ef1f648cdb36c580029329077a3ff5bd25012a83354f06ee98508aef6736a3f4d4652afb6d42dcfa61674aa5a0392152137ab7207ac6657787277805f22f2
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX xen-4.1.1-iommu_sec_fix.patch 2851 SHA256 3a0ab3cb5c18db91f4be457cbba36189a558da7b794e1a35795f4fed3d48a7c8 SHA512 832ecee2dedeb13c3cc61298fa9dacd131623c84c06fa9d4ecbcc6be97d660c3fa025ae61654e0f31396b50d917de3c2ca77262ed18e006ec281a707a6cf662d WHIRLPOOL f787685f52f4bd27fa11e80f8025c4ea90cf831610d9ae69d34bb0eaee7a34017d7aa7868935e1936bc868503892ae923d8fdfc8eafea5fab8f33765452ea371
|
||||
DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
|
||||
DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
|
||||
EBUILD xen-4.1.1-r2.ebuild 3323 SHA256 e6d2a3c6bc4751e718b027bfe556bbb6a14d3a93a95312d79b18992009c688e2 SHA512 69539569655baea11b8dc1fcd1329855ec61a699439f05bd4cf98416d8406c08101819c04508af1d58397e288fdbe6b440f78445490e1c9425c712097219adfb WHIRLPOOL 012ec3f1e95a2f5e11741bc9d5ba379a18c1d931a0f1da6578d6e6e6dd5dc7fcd4aa035a026535895683f94f265067d3f841b1665eb31b14f7e4a34cfb507728
|
||||
DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
|
||||
EBUILD xen-4.1.1-r2.ebuild 3326 SHA256 938ca3d3f2ae8c775fe30fbaa4444c0fd7a86016080362d4e0636e0a7977ee74 SHA512 af1fe8ecc1adc5b353b219c150871ebbffe78c7abc57c34df197bfd5a7c7ba790f743adc7c3d2e2f0194c56e8539d2009c9907be95cf69a96779de950a777067 WHIRLPOOL e3fca98777fe12e99418be2e09cb290b858202d44542306914d00d6f424950b85eee6b81b0e994b30f3432b3759ea5a26a97850ed94ad8b32abbe1b1dd13004e
|
||||
EBUILD xen-4.1.2.ebuild 3217 SHA256 374e77ab7aadd7bca98e6d668d0a9e26842c1582987b24bc5015424f2c194ad7 SHA512 94dca833fb2439e175d0c4868c648fd0cf5cb54960f7a45664dcb449a3473d342d04f5235ee22abfaa13296e2a1d0e8935e23e01d7949ff99409e3034e5b0ebe WHIRLPOOL b85040d9da4af45a1bd383310546056ad186113f56b96ca756957b711cd9f51f42a8aff60b634efbec1756fa296dc54be152d3f2ba72bb7ec99d9e5110b99db3
|
||||
MISC ChangeLog 15606 SHA256 0640c101743598fc3efd7d7b873ca8a8ef3d38cb0295cb5b9f031c711307eb0d SHA512 38a586293f5bbb08c00173e5dccca6492ee734f24c937ff227cb0c07c1a50ce300afebb983f808ffda3186e53055f9c4bc72f5b98ff239d3208592c8f5b1b143 WHIRLPOOL 36621bcc5c0054f6a607dbd12017aaadd08f71a292d6099ce88392abd1a61740ab460b91ec1c9d2b8d351365106d56d86a30be077fc28aeea8783a9dd9795339
|
||||
MISC metadata.xml 541 SHA256 97d4306daf81d0ab22b866e60e41edccee3d7e0fd076cc2a1a7a4bf621978fed SHA512 e23e38cf9295c268ecdc657acefe485f02f7969f742febe395d3d0453670a76ec27f3a87b3aacb0dd28df3becb86a6f7ea44bb698b32f87c3d40ab13432668cf WHIRLPOOL afb9468473b857c3e7217105077ce9e8507509163c45b6fbafb0051856bc1893e3bd39ae52b8663938f43fb3ce8388d46b1ed5c5640c2ae25677f3547ae49df3
|
||||
EBUILD xen-4.2.0.ebuild 3218 SHA256 ff3b187eed6d61e5c0526c9ac048ee73776dd5ee3324b80471b9ea7493134982 SHA512 b18f7fd057f45757ce22fed4f2b0346d80bda87ef6f181cef58c358802e48cb1cdf813c9da1880baf0c8b9b38ab8ff2fae5c04a659b741081e90450a39566828 WHIRLPOOL 45ab5ef5ca2d1b0092b1820ad8f5b4d0469f039295846094c575342aabd797c0596ea23c5542bd0cae810cebbaac213eb895d235650ef1bf7b76339baf027043
|
||||
MISC ChangeLog 16299 SHA256 2a7311ae37c3b824f47ab2f07d14eadd17317b57990444e4c622222c3457f3a8 SHA512 0bc18d47f50d8cc907fdb0ab26df07d1b164086f3bbd41378ea55b8fc38e449050b99659a8ffacf6f246bfd24bd7f0356cbb2dfba16a99f5f77a370abf4a4f99 WHIRLPOOL bf1610aff8efc3d2dc510e92a8555c8d5ffb0c59177c2f0ab44d9799c153585ca5cb17eb9ad1ef8ec5c9fe7455b28e347ceed93b3465c02ba51897d028cdfc63
|
||||
MISC metadata.xml 484 SHA256 04c4175e3ad068efdc7c047e41347a84c796fbf22ff23c40ad86860f0662fe65 SHA512 acff2c2bbcba61be17a8036edeea6dae0a8d6f7cb6a47597ec6948935b1cbc2c2f9be43dd4cdb9da347fa725d30416ce78ffbde5381c33781dcc184a1f930541 WHIRLPOOL 1bc4a8f1375bb020d410077ba46e62776e71df06ca02accf1819580e87ef4e655722cc6f831a2f8b33614ae66a40bbf7e7268e84ffdd4c04cc1f599134580d68
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlC+pHQACgkQVWmRsqeSphOHVACfYoFO2pw3GVVewepvJC24VDnf
|
||||
WQQAn1B5zw4724CnXpQYx4woks9GS0vp
|
||||
=vacs
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
diff -Nru a/tools/ioemu-qemu-xen/xen-setup b/tools/ioemu-qemu-xen/xen-setup
|
||||
--- a/tools/ioemu-qemu-xen/xen-setup 2008-08-22 17:56:41.000000000 +0800
|
||||
+++ b/tools/ioemu-qemu-xen/xen-setup 2009-02-20 10:55:37.000000000 +0800
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
# git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
|
||||
|
||||
+target=i386-dm
|
||||
+
|
||||
rm -f $target/Makefile
|
||||
rm -f $target/config.mak
|
||||
rm -f config-host.mak
|
||||
@@ -11,8 +13,6 @@
|
||||
|
||||
./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
|
||||
|
||||
-target=i386-dm
|
||||
-
|
||||
if [ "x$XEN_ROOT" != x ]; then
|
||||
echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
|
||||
fi
|
||||
@ -1,87 +0,0 @@
|
||||
--- tools/libxc/xc_dom_bzimageloader.c 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ tools/libxc/xc_dom_bzimageloader.c 2011-10-09 20:10:08.972815311 +0800
|
||||
@@ -308,19 +308,19 @@
|
||||
|
||||
extern struct xc_dom_loader elf_loader;
|
||||
|
||||
-static unsigned int payload_offset(struct setup_header *hdr)
|
||||
+static int check_magic(struct xc_dom_image *dom, const void *magic, size_t len)
|
||||
{
|
||||
- unsigned int off;
|
||||
+ if (len > dom->kernel_size)
|
||||
+ return 0;
|
||||
+
|
||||
+ return (memcmp(dom->kernel_blob, magic, len) == 0);
|
||||
+ }
|
||||
|
||||
- off = (hdr->setup_sects + 1) * 512;
|
||||
- off += hdr->payload_offset;
|
||||
- return off;
|
||||
-}
|
||||
-
|
||||
-static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
|
||||
+static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
|
||||
{
|
||||
struct setup_header *hdr;
|
||||
- int ret;
|
||||
+ uint64_t payload_offset, payload_length;
|
||||
+ /* int ret; */
|
||||
|
||||
if ( dom->kernel_blob == NULL )
|
||||
{
|
||||
@@ -352,20 +352,47 @@
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- dom->kernel_blob = dom->kernel_blob + payload_offset(hdr);
|
||||
- dom->kernel_size = hdr->payload_length;
|
||||
+ /* upcast to 64 bits to avoid overflow */
|
||||
+ /* setup_sects is u8 and so cannot overflow */
|
||||
+ payload_offset = (hdr->setup_sects + 1) * 512;
|
||||
+ payload_offset += hdr->payload_offset;
|
||||
+ payload_length = hdr->payload_length;
|
||||
|
||||
- if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
|
||||
- {
|
||||
+/* if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
|
||||
+ {
|
||||
ret = xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
|
||||
- if ( ret == -1 )
|
||||
+ if ( ret == -1 ) */
|
||||
+ if ( payload_offset >= dom->kernel_size )
|
||||
+ {
|
||||
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload offset overflow",
|
||||
+ __FUNCTION__);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ if ( (payload_offset + payload_length) > dom->kernel_size )
|
||||
+ {
|
||||
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload length overflow",
|
||||
+ __FUNCTION__);
|
||||
+ }
|
||||
+
|
||||
+ dom->kernel_blob = dom->kernel_blob + payload_offset;
|
||||
+ dom->kernel_size = payload_length;
|
||||
+
|
||||
+ if ( check_magic(dom, "\037\213", 2) )
|
||||
+ {
|
||||
+ if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 )
|
||||
{
|
||||
- xc_dom_panic(XC_INVALID_KERNEL,
|
||||
- "%s: unable to gzip decompress kernel\n",
|
||||
- __FUNCTION__);
|
||||
+ if ( verbose )
|
||||
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\$n",
|
||||
+ __FUNCTION__);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
+ else
|
||||
+ {
|
||||
+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unknown compression format\n",
|
||||
+ __FUNCTION__);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
else if ( memcmp(dom->kernel_blob, "\102\132\150", 3) == 0 )
|
||||
{
|
||||
ret = xc_try_bzip2_decode(dom, &dom->kernel_blob, &dom->kernel_size);
|
||||
@ -1,19 +0,0 @@
|
||||
diff -r 784caad93325 xen/common/keyhandler.c
|
||||
--- a/xen/common/keyhandler.c Tue Nov 10 15:03:52 2009 +0000
|
||||
+++ b/xen/common/keyhandler.c Tue Jan 05 10:47:49 2010 +0000
|
||||
@@ -106,6 +106,7 @@
|
||||
unsigned int cpu;
|
||||
|
||||
/* We want to get everything out that we possibly can. */
|
||||
+ watchdog_disable();
|
||||
console_start_sync();
|
||||
|
||||
printk("'%c' pressed -> dumping registers\n", key);
|
||||
@@ -125,6 +126,7 @@
|
||||
printk("\n");
|
||||
|
||||
console_end_sync();
|
||||
+ watchdog_enable();
|
||||
}
|
||||
|
||||
static void dump_dom0_registers(unsigned char key)
|
||||
@ -1,101 +0,0 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA1
|
||||
|
||||
Xen Security Advisory CVE-2011-2901 / XSA-4
|
||||
revision no.2
|
||||
Xen <= 3.3 DoS due to incorrect virtual address validation
|
||||
|
||||
ISSUE DESCRIPTION
|
||||
=================
|
||||
|
||||
The x86_64 __addr_ok() macro intends to ensure that the checked
|
||||
address is either in the positive half of the 48-bit virtual address
|
||||
space, or above the Xen-reserved area. However, the current shift
|
||||
count is off-by-one, allowing full access to the "negative half" too,
|
||||
via certain hypercalls which ignore virtual-address bits [63:48].
|
||||
Vulnerable hypercalls exist only in very old versions of the
|
||||
hypervisor.
|
||||
|
||||
VULNERABLE SYSTEMS
|
||||
==================
|
||||
|
||||
All systems running a Xen 3.3 or earlier hypervisor with 64-bit PV
|
||||
guests with untrusted administrators are vulnerable.
|
||||
|
||||
IMPACT
|
||||
======
|
||||
|
||||
A malicious guest administrator on a vulnerable system is able to
|
||||
crash the host.
|
||||
|
||||
There are no known further exploits but these have not been ruled out.
|
||||
|
||||
RESOLUTION
|
||||
==========
|
||||
|
||||
The attached patch resolves the issue.
|
||||
|
||||
Alternatively, users may choose to upgrade to a more recent hypervisor
|
||||
|
||||
PATCHES
|
||||
=======
|
||||
|
||||
The following patch resolves this issue.
|
||||
|
||||
Filename: fix-__addr_ok-limit.patch
|
||||
SHA1: f18bde8d276110451c608a16f577865aa1226b4f
|
||||
SHA256: 2da5aac72e1ac4849c34d38374ae456795905fd9512eef94b48fc31383c21636
|
||||
|
||||
This patch should apply cleanly, and fix the problem, for all affected
|
||||
versions of Xen.
|
||||
|
||||
It is harmless when applied to later hypervisors and will be included
|
||||
in the Xen unstable branch in due course.
|
||||
|
||||
VERSION HISTORY
|
||||
===============
|
||||
|
||||
Analysis following version 1 of this advisory (sent out to the
|
||||
predisclosure list during the embargo period) indicates that the
|
||||
actual DoS vulnerability only exists in very old hypervisors, Xen 3.3
|
||||
and earlier, contrary to previous reports.
|
||||
|
||||
This advisory is no longer embargoed.
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.9 (GNU/Linux)
|
||||
|
||||
iQEcBAEBAgAGBQJOYLq2AAoJEIP+FMlX6CvZLegH/26/oJBkd/WM/yYhXkzlbnIP
|
||||
MxF6Fgy96Omu8poQTanD7g1vEcM0TOLY+Kk3GGsfj4aDdEJ5Nq4ZOW8ooI0VnVcD
|
||||
7VXQqFsXPxre+eZ6g+G0AsmzdsG45C3qujUTRfGKqzYwXqjWjt9nNsdIy1Mrz8/4
|
||||
zG1uLDkN0LXnBG2Te4q8ZckYwMq8gFXHHnH35RfQ5Besu6pvJmtK3rFXETdlP12A
|
||||
JjBh7t5jsCfzvYWFQehVp8mJupuftiOBPClmVh4vrvN9gYd5rzEgB4Q9Ioiqz2qT
|
||||
2bE1zegR8NeOKBOi9xriTU8F530OdFzeWAbo7D5gyEbYdc60eNwbadcgNGLbzMg=
|
||||
=09T8
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Subject: XSA-4: xen: correct limit checking in x86_64 version of __addr_ok
|
||||
|
||||
The x86_64 __addr_ok() macro intends to ensure that the checked
|
||||
address is either in the positive half of the 48-bit virtual address
|
||||
space, or above the Xen-reserved area. However, the current shift
|
||||
count is off-by-one, allowing full access to the "negative half"
|
||||
too. Guests may exploit this to gain access to off-limits ranges.
|
||||
|
||||
This issue has been assigned CVE-2011-2901.
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@...hat.com>
|
||||
Signed-off-by: Ian Campbell <ian.campbell@...rix.com>
|
||||
|
||||
diff --git a/xen/include/asm-x86/x86_64/uaccess.h
|
||||
b/xen/include/asm-x86/x86_64/uaccess.h
|
||||
--- a/xen/include/asm-x86/x86_64/uaccess.h
|
||||
+++ b/xen/include/asm-x86/x86_64/uaccess.h
|
||||
@@ -34,7 +34,7 @@
|
||||
* non-canonical address (and thus fault) before ever reaching VIRT_START.
|
||||
*/
|
||||
#define __addr_ok(addr) \
|
||||
- (((unsigned long)(addr) < (1UL<<48)) || \
|
||||
+ (((unsigned long)(addr) < (1UL<<47)) || \
|
||||
((unsigned long)(addr) >= HYPERVISOR_VIRT_END))
|
||||
|
||||
#define access_ok(addr, size) \
|
||||
@ -1,71 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Tim Deegan <Tim.Deegan@citrix.com>
|
||||
# Date 1313145221 -3600
|
||||
# Node ID 84e3706df07a1963e23cd3875d8603917657d462
|
||||
# Parent cb22fa57ff252893b6adb1481e09b1287eacd990
|
||||
Passthrough: disable bus-mastering on any card that causes an IOMMU fault.
|
||||
|
||||
This stops the card from raising back-to-back faults and live-locking
|
||||
the CPU that handles them.
|
||||
|
||||
Signed-off-by: Tim Deegan <tim@xen.org>
|
||||
Acked-by: Wei Wang2 <wei.wang2@amd.com>
|
||||
Acked-by: Allen M Kay <allen.m.kay@intel.com>
|
||||
|
||||
--- a/xen/drivers/passthrough/vtd/iommu.c.orig Mon Jul 25 16:48:39 2011 +0100
|
||||
+++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 12 11:33:41 2011 +0100
|
||||
@@ -733,7 +733,7 @@
|
||||
while (1)
|
||||
{
|
||||
u8 fault_reason;
|
||||
- u16 source_id;
|
||||
+ u16 source_id, cword;
|
||||
u32 data;
|
||||
u64 guest_addr;
|
||||
int type;
|
||||
@@ -766,6 +766,14 @@
|
||||
iommu_page_fault_do_one(iommu, type, fault_reason,
|
||||
source_id, guest_addr);
|
||||
|
||||
+ /* Tell the device to stop DMAing; we can't rely on the guest to
|
||||
+ * control it for us. */
|
||||
+ cword = pci_conf_read16(PCI_BUS(source_id), PCI_SLOT(source_id),
|
||||
+ PCI_FUNC(source_id), PCI_COMMAND);
|
||||
+ pci_conf_write16(PCI_BUS(source_id), PCI_SLOT(source_id),
|
||||
+ PCI_FUNC(source_id), PCI_COMMAND,
|
||||
+ cword & ~PCI_COMMAND_MASTER);
|
||||
+
|
||||
fault_index++;
|
||||
if ( fault_index > cap_num_fault_regs(iommu->cap) )
|
||||
fault_index = 0;
|
||||
|
||||
--- a/xen/drivers/passthrough/amd/iommu_init.c.orig Mon Jul 25 16:48:39 2011 +0100
|
||||
+++ b/xen/drivers/passthrough/amd/iommu_init.c Fri Aug 12 11:33:41 2011 +0100
|
||||
@@ -415,7 +415,7 @@
|
||||
|
||||
static void parse_event_log_entry(u32 entry[])
|
||||
{
|
||||
- u16 domain_id, device_id;
|
||||
+ u16 domain_id, device_id, bdf, cword;
|
||||
u32 code;
|
||||
u64 *addr;
|
||||
char * event_str[] = {"ILLEGAL_DEV_TABLE_ENTRY",
|
||||
@@ -449,6 +449,18 @@
|
||||
printk(XENLOG_ERR "AMD-Vi: "
|
||||
"%s: domain = %d, device id = 0x%04x, fault address = 0x%"PRIx64"\n",
|
||||
event_str[code-1], domain_id, device_id, *addr);
|
||||
+
|
||||
+ /* Tell the device to stop DMAing; we can't rely on the guest to
|
||||
+ * control it for us. */
|
||||
+ for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ )
|
||||
+ if ( get_dma_requestor_id(bdf) == device_id )
|
||||
+ {
|
||||
+ cword = pci_conf_read16(PCI_BUS(bdf), PCI_SLOT(bdf),
|
||||
+ PCI_FUNC(bdf), PCI_COMMAND);
|
||||
+ pci_conf_write16(PCI_BUS(bdf), PCI_SLOT(bdf),
|
||||
+ PCI_FUNC(bdf), PCI_COMMAND,
|
||||
+ cword & ~PCI_COMMAND_MASTER);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,429 +0,0 @@
|
||||
diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
|
||||
--- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800
|
||||
+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
# Tools to run on system hosting the build
|
||||
HOSTCC = gcc
|
||||
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
HOSTCFLAGS += -fno-strict-aliasing
|
||||
|
||||
DISTDIR ?= $(XEN_ROOT)/dist
|
||||
diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
|
||||
--- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
# Define some default flags.
|
||||
# NB. '-Wcast-qual' is nasty, so I omitted it.
|
||||
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
|
||||
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
|
||||
diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile
|
||||
--- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800
|
||||
@@ -5,7 +5,7 @@
|
||||
QCOW_UTIL = img2qcow qcow2raw qcow-create
|
||||
LIBAIO_DIR = ../../libaio/src
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -I../lib
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile
|
||||
--- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800
|
||||
@@ -13,7 +13,7 @@
|
||||
SRCS :=
|
||||
SRCS += xenbus.c blkif.c xs_api.c
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -fPIC
|
||||
# get asprintf():
|
||||
diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile
|
||||
--- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800
|
||||
@@ -2,7 +2,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile
|
||||
--- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-#CFLAGS += -Werror -g -O0
|
||||
+#CFLAGS += -g -O0
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800
|
||||
+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800
|
||||
@@ -10,7 +10,7 @@
|
||||
CFLAGS += -DNDEBUG
|
||||
endif
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
# Disable PIE/SSP if GCC supports them. They can break us.
|
||||
$(call cc-option-add,CFLAGS,CC,-nopie)
|
||||
diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile
|
||||
--- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
SRCS :=
|
||||
SRCS += flask_op.c
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile
|
||||
--- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
|
||||
|
||||
PROFILE=#-pg
|
||||
-BASECFLAGS=-Wall -g -Werror
|
||||
+BASECFLAGS=-Wall -g
|
||||
BASECFLAGS+= $(PROFILE)
|
||||
#BASECFLAGS+= -I$(XEN_ROOT)/tools
|
||||
BASECFLAGS+= $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile
|
||||
--- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
IBIN = fs-backend
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800
|
||||
@@ -468,7 +468,7 @@
|
||||
CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
|
||||
LDFLAGS="$LDFLAGS -g"
|
||||
if test "$werror" = "yes" ; then
|
||||
-CFLAGS="$CFLAGS -Werror"
|
||||
+CFLAGS="$CFLAGS"
|
||||
fi
|
||||
|
||||
if test "$solaris" = "no" ; then
|
||||
@@ -1150,7 +1150,7 @@
|
||||
echo "sparse enabled $sparse"
|
||||
echo "profiler $profiler"
|
||||
echo "static build $static"
|
||||
-echo "-Werror enabled $werror"
|
||||
+
|
||||
if test "$darwin" = "yes" ; then
|
||||
echo "Cocoa support $cocoa"
|
||||
fi
|
||||
diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target
|
||||
--- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800
|
||||
+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800
|
||||
@@ -26,7 +26,7 @@
|
||||
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
|
||||
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
|
||||
CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
|
||||
-#CFLAGS+=-Werror
|
||||
+#CFLAGS+=
|
||||
LIBS=
|
||||
# user emulator name
|
||||
ifndef TARGET_ARCH2
|
||||
diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile
|
||||
--- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
HARNESS_SRCS:=main.c
|
||||
# io_queue.c
|
||||
|
||||
-CFLAGS=-Wall -Werror -g -O -laio
|
||||
+CFLAGS=-Wall -g -O -laio
|
||||
#-lpthread -lrt
|
||||
|
||||
all: $(PROGS)
|
||||
diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800
|
||||
@@ -1,6 +1,6 @@
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror
|
||||
+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/
|
||||
LDFLAGS += -L../common/
|
||||
|
||||
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
|
||||
diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile
|
||||
--- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800
|
||||
+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
-include $(XEN_TARGET_ARCH)/Makefile
|
||||
|
||||
-CFLAGS += -Werror -Wmissing-prototypes
|
||||
+CFLAGS += -Wmissing-prototypes
|
||||
CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include
|
||||
|
||||
# Needed for posix_fadvise64() in xc_linux.c
|
||||
diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
|
||||
--- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800
|
||||
@@ -22,7 +22,7 @@
|
||||
CFLAGS = -Iinclude \
|
||||
$(shell xml2-config --cflags) \
|
||||
$(shell curl-config --cflags) \
|
||||
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
|
||||
+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
|
||||
|
||||
LDFLAGS = $(shell xml2-config --libs) \
|
||||
$(shell curl-config --libs)
|
||||
diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile
|
||||
--- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
HDRS = $(wildcard *.h)
|
||||
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
|
||||
diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile
|
||||
--- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
INCLUDES += -I $(XEN_XC)
|
||||
INCLUDES += -I $(XEN_LIBXC)
|
||||
diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py
|
||||
--- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800
|
||||
@@ -3,7 +3,7 @@
|
||||
import os
|
||||
import sys
|
||||
|
||||
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
|
||||
+extra_compile_args = [ "-fno-strict-aliasing" ]
|
||||
|
||||
XEN_ROOT = "../.."
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py
|
||||
--- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
XEN_ROOT = "../.."
|
||||
|
||||
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
|
||||
+extra_compile_args = [ "-fno-strict-aliasing" ]
|
||||
|
||||
include_dirs = [ XEN_ROOT + "/tools/libxc",
|
||||
XEN_ROOT + "/tools/xenstore",
|
||||
diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile
|
||||
--- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800
|
||||
+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT = ../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += -I. $(CFLAGS_libxenctrl)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
|
||||
--- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800
|
||||
@@ -25,7 +25,7 @@
|
||||
PIC_OBJS := $(LIB_SRCS:.c=.opic)
|
||||
|
||||
$(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
|
||||
-CFLAGS += -Werror -fno-strict-aliasing
|
||||
+CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += -O3
|
||||
#CFLAGS += -g
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
|
||||
|
||||
# General compiler flags
|
||||
-CFLAGS = -Werror -g3 -I.
|
||||
+CFLAGS = -g3 -I.
|
||||
|
||||
# Generic project files
|
||||
HDRS = $(wildcard *.h)
|
||||
diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk
|
||||
--- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
|
||||
|
||||
# General compiler flags
|
||||
-CFLAGS = -Werror -g3 -I.
|
||||
+CFLAGS = -g3 -I.
|
||||
|
||||
# Generic project files
|
||||
HDRS = $(wildcard *.h)
|
||||
diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile
|
||||
--- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800
|
||||
@@ -11,7 +11,7 @@
|
||||
XEN_ROOT = ../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
|
||||
|
||||
PROGRAMS = xc_restore xc_save readnotes lsevtchn
|
||||
diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800
|
||||
@@ -13,7 +13,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -I $(XEN_XC)
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
LDFLAGS += $(LDFLAGS_libxenctrl)
|
||||
diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
LDFLAGS += $(LDFLAGS_libxenstore)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800
|
||||
@@ -34,7 +34,7 @@
|
||||
OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
|
||||
SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
|
||||
|
||||
-WARN_FLAGS=-Wall -Werror
|
||||
+WARN_FLAGS=-Wall
|
||||
|
||||
CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE)
|
||||
LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
|
||||
diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800
|
||||
@@ -18,7 +18,7 @@
|
||||
all install xentop:
|
||||
else
|
||||
|
||||
-CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
|
||||
+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
|
||||
LDFLAGS += -L$(XEN_LIBXENSTAT)
|
||||
LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
|
||||
CFLAGS += -DHOST_$(XEN_OS)
|
||||
diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile
|
||||
--- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
MAJOR = 3.0
|
||||
MINOR = 0
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += -I.
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c
|
||||
--- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800
|
||||
@@ -865,7 +865,7 @@
|
||||
{
|
||||
unsigned int offset, datalen;
|
||||
struct node *node;
|
||||
- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
|
||||
+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */
|
||||
char *name;
|
||||
|
||||
/* Extra "strings" can be created by binary data. */
|
||||
diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile
|
||||
--- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
LDFLAGS += $(LDFLAGS_libxenctrl)
|
||||
Only in xen-3.4.2/: Werror.sh
|
||||
diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk
|
||||
--- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800
|
||||
@@ -68,7 +68,7 @@
|
||||
CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK
|
||||
endif
|
||||
ifeq ($(no_warns),y)
|
||||
-CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized
|
||||
+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized
|
||||
endif
|
||||
ifneq ($(vhpt_disable),y)
|
||||
CFLAGS += -DVHPT_ENABLED=1
|
||||
diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk
|
||||
--- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800
|
||||
@@ -8,7 +8,7 @@
|
||||
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector)
|
||||
$(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all)
|
||||
|
||||
-CFLAGS += -Werror -fno-builtin -msoft-float
|
||||
+CFLAGS += -fno-builtin -msoft-float
|
||||
|
||||
# NB. awk invocation is a portable alternative to 'head -n -1'
|
||||
%.S: %.bin
|
||||
diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk
|
||||
--- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800
|
||||
+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800
|
||||
@@ -17,7 +17,7 @@
|
||||
endif
|
||||
|
||||
CFLAGS += -fno-builtin -fno-common
|
||||
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
|
||||
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
|
||||
CFLAGS += -I$(BASEDIR)/include
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
|
||||
@ -0,0 +1,120 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0.ebuild,v 1.1 2012/12/04 12:35:44 idella4 Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic toolchain-funcs ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug flask pae xsm"
|
||||
|
||||
RDEPEND="|| ( sys-boot/grub
|
||||
sys-boot/grub-static )"
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="
|
||||
flask? ( xsm )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
|
||||
# Drop .config
|
||||
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# remove -Werror for gcc-4.6's sake
|
||||
find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
|
||||
xargs sed -i 's/ *-Werror */ /'
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${ED}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
if use pae; then
|
||||
echo
|
||||
ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
|
||||
fi
|
||||
}
|
||||
@ -1,9 +1,18 @@
|
||||
AUX radeontool-1.5-mmap.patch 502 SHA256 27d14db7d811636a66ca6a3ea5d468a56cfce83b10e1087fc0fed81027b3a542 SHA512 cab24313f5149831ac2edf2bebb58cbaed281af8cd4153b699344e3af47f90c9460b7b2be3126d4c24fabcb7d1eaf47e91494877affc4d6e2ca1cf7557019cbe WHIRLPOOL 809cacbb924c5194e7ae2fe767a24693b7366f8a44c23ffaabcdf0c6f258c65f1c0ac6670f42a9b62e01a298048787a145bfb55049ac9b871a15b5abc53dcaae
|
||||
AUX radeontool-1.5-pagesize.patch 1018 SHA256 f8d7020cd5c4f55e1496a1906e8bd00a49c2937bb352876b4a324fd93f683adc SHA512 6fa99835774267549804a38ab0eeaae62ab5bd7602dfbacc01f149d0932deae65a8512cda50bc8d23f399c27611baca62fdaaf19705005a77f0c2e2468eac0c1 WHIRLPOOL 089a63e8c1b0286afed6ad3fe4c974cae948ffedc2246113e798ec3147c381735658395928af56d8c6c31261ab2d22cee3594733de5b8c7590ee63c256310c66
|
||||
AUX radeontool-1.5-vga-ati.patch 612 SHA256 16ae055e6d6cebd8c38bdd71066857099d85492d872a20d4a271d27ee1e09a98 SHA512 5e65533b0fa6fa02330a68674eb41c7775dd9240d3840680e569a3118eefea78cfec9d35e8c6d8c5e6584ecee0869a6867bf9820533aa7745403a17cd43aed8f WHIRLPOOL 2cc001bf19766e90e4812fb5d77c1efa049939067dd971648a1d35f0d4f6b0803f1d8e3e4c5b5c72cc6249a7b852c71b43fd733fa761d48f316aad8aa0238a80
|
||||
DIST radeontool-1.5.tar.gz 20869 SHA256 598190677279001fd8d2724ac28aae11820d3c01f850bc167ec0030c21577361 SHA512 985771cbaff3d6451563ac388b6b303410b7e1088c9a7404de63964c465f3708f9fede40fde7dfeaeb3779dff86a9007fcf982cced23cdc2f6bdd555494f78aa WHIRLPOOL 92cc22fd8575d6bc5c2feffa0900eeea7dec48ab031dbe1f22a31953666d17e6b19d39210b807085e72a178f0e1c76e109b7f353efbb12e5c404b5efb9a37bc4
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST radeontool-1.6.3.tar.bz2 367487 SHA256 f73d1ec1a962822e681c2eefa77d9843a02ee0c63196ba0c1181cc1da016a76c SHA512 937ddf3e2b7dc35b9bc872d770b184303ac9e8199c0de6c17d187acfc5c398abc0cec2071c1af5ad16b0df2976418e06db8b1f90775fe59a8a80bdb3f8e2dca6 WHIRLPOOL 59a2542dbe865fa6e834eff2fbab9a05ef768849d575c260add0fc7b374cb084638f471a6df7d7be3c16c4d9223ee775b2eb47e286bf58c8d3ecf1b91e833ab8
|
||||
EBUILD radeontool-1.5-r3.ebuild 935 SHA256 d3c1f146997508569dbd20976b05db6e68f46138a659b9a8214fbc3d766e231f SHA512 62eb34c125c0fc2b5032a16db0a056af0d24149dbebfe779a06d2d043937f9abe9903d44a62ff0588e13da0f97a1c797a11195662ff1423b6d630b43981b1553 WHIRLPOOL d32a4cb446258c4e7ac2b1809bef7f78805b3563ecddad7b2ef603e492625f07c27adff34e7cc031eb02598d190a2ceeae2a3ce8df6d13db3d915c55b3f9a01d
|
||||
EBUILD radeontool-1.6.3.ebuild 684 SHA256 2912fe52866d67e49f4461f107974f8945af0b24b07cae6b5239ca3941f4e9b7 SHA512 976a91f55ffc2ffb13e135374fad0c3b8ead3b845692ffc6dc6544fc9256dd4891937d56a086adbc4112ceeb62980c55df532b9451139e57d69f97f5a309420e WHIRLPOOL cd801fd1d307ede57c680a074701589bce7b80fc53966a67821d8d0889306fbd1444d3f0be8076ec001cd2d458a0dfb64b10447576f03fd750eff9fed4f1a442
|
||||
MISC ChangeLog 4254 SHA256 73bf3194f9546f4643d41586977438505a948d0067aff36588be70236fabeed1 SHA512 e62847950b99c4acdf6f68467c958fd2432689314555ce9464165964e2e8454c815a88827cc5173d46799567b423dbaf9e38223ead0ca7cb2d1afeb00328eaad WHIRLPOOL 910016ef42b683e6605f270ef978b95b2c6926fe6941c5fd1323daa31858aab82c3136ba8af5c2aeff5221f2b366c5ff75d037b832ca61520447d968fcc02303
|
||||
MISC ChangeLog 4472 SHA256 ea1d91e24ec1d99507d1a520bd0f77d54c2aeee00c4936fd385a7e6dd34eecb0 SHA512 90a9fc2e45db76e7a4adc16bb911ea9aaeb44b03e01119a00210b6c3611fc46ab3e93e4f0c03ebb242fbb251ea822c3906e3f0e35aa23a75f268edf92db19272 WHIRLPOOL 3b82e067ff6cba26c32626230e4237d53b072d6cd6fd758f658726dc9399da1b07cc4644d5a92a5b863484baa6c0a0000aee1928c84b799f5668088de3201acb
|
||||
MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iQEcBAEBCAAGBQJQvtGrAAoJEMbwO6tnXQ0sRbMIAIggXLqmDL+KMZ0LF3EYOoTv
|
||||
lg9fDfOkETs9cd3M5/zN1q0xOznBnGxT2MnScRaQRBzMqxTW/xc4zsdiYU72dp33
|
||||
SxuxJTlORGMQU50+DaC/jt3NzEp/Bh7u8ulvFDdRYt1/Dxv3DRd//NJw8BT26EpQ
|
||||
o5yJA3MeOqAYu5RamccikvDrsp0ebLeRtnsYjs16VepOItODa1sh6RuwWye5mO/a
|
||||
GhTBY4RyD8RmU6g7Badm6gepu3VliPK4ykZZ4mg/DMBRf718rt601QRPFYHbThJj
|
||||
aiwITQr+agNCp1eIv489ZYe54AEZupZVxPwYnzB/lDULs1wx6tbH2cyB6nNhVEI=
|
||||
=TF3r
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -urp radeontool-1.5/radeontool.c radeontool-1.5-mmap/radeontool.c
|
||||
--- radeontool-1.5/radeontool.c 2004-02-11 04:50:27.000000000 +0100
|
||||
+++ radeontool-1.5-mmap/radeontool.c 2005-01-20 13:12:50.000000000 +0100
|
||||
@@ -107,7 +107,7 @@ static unsigned char * map_devince_memor
|
||||
mem_fd,
|
||||
base
|
||||
);
|
||||
- if ((long)device_mem < 0) {
|
||||
+ if (device_mem == MAP_FAILED) {
|
||||
if(debug)
|
||||
fprintf(stderr,"mmap returned %d\n",(int)device_mem);
|
||||
fatal("mmap error \n");
|
||||
@ -1,33 +0,0 @@
|
||||
--- radeontool.c.orig 2007-03-15 11:25:23.000000000 +0000
|
||||
+++ radeontool.c 2007-03-15 11:27:30.000000000 +0000
|
||||
@@ -21,7 +21,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/mman.h>
|
||||
-#include <asm/page.h>
|
||||
|
||||
#include "radeon_reg.h"
|
||||
|
||||
@@ -87,6 +86,7 @@
|
||||
{
|
||||
int mem_fd;
|
||||
unsigned char *device_mem;
|
||||
+ long page_size = sysconf(_SC_PAGESIZE);
|
||||
|
||||
/* open /dev/mem */
|
||||
if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) {
|
||||
@@ -94,11 +94,11 @@
|
||||
}
|
||||
|
||||
/* mmap graphics memory */
|
||||
- if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) {
|
||||
+ if ((device_mem = malloc(length + (page_size-1))) == NULL) {
|
||||
fatal("allocation error \n");
|
||||
}
|
||||
- if ((unsigned long)device_mem % PAGE_SIZE)
|
||||
- device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE);
|
||||
+ if ((unsigned long)device_mem % page_size)
|
||||
+ device_mem += page_size - ((unsigned long)device_mem % page_size);
|
||||
device_mem = (unsigned char *)mmap(
|
||||
(caddr_t)device_mem,
|
||||
length,
|
||||
@ -1,11 +0,0 @@
|
||||
--- radeontool-1.5/radeontool.c 2005-07-26 20:59:16.000000000 +0200
|
||||
+++ radeontool-1.5-ati-vga/radeontool.c 2005-07-26 20:59:48.000000000 +0200
|
||||
@@ -293,7 +293,7 @@
|
||||
if(fgets(line,sizeof(line),fp) == NULL) { /* if end of file */
|
||||
fatal("Radeon hardware not found in lspci output.\n");
|
||||
}
|
||||
- if(strstr(line,"Radeon") || strstr(line,"ATI Tech")) { /* if line contains a "radeon" string */
|
||||
+ if(strstr(line,"Radeon") || strstr(line,"VGA compatible controller: ATI Tech")) { /* if line contains a "radeon" string */
|
||||
if(skip-- < 1) {
|
||||
break;
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/radeontool-1.5-r3.ebuild,v 1.6 2009/10/16 18:53:02 bangert Exp $
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Control the backlight and external video output of ATI Radeon Mobility graphics cards"
|
||||
|
||||
HOMEPAGE="http://fdd.com/software/radeon/"
|
||||
SRC_URI="http://fdd.com/software/radeon/${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc x86"
|
||||
|
||||
IUSE=""
|
||||
|
||||
DEPEND="sys-apps/sed"
|
||||
RDEPEND="sys-apps/pciutils"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}/${P}"-mmap.patch
|
||||
epatch "${FILESDIR}/${P}"-vga-ati.patch
|
||||
epatch "${FILESDIR}/${P}"-pagesize.patch
|
||||
|
||||
sed -i \
|
||||
-e "s:-Wall -O2:${CFLAGS} ${LDFLAGS}:" \
|
||||
-e "s:gcc:$(tc-getCC):" \
|
||||
"${S}"/Makefile
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin radeontool
|
||||
dodoc CHANGES
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
DIST reptyr-0.4.tar.gz 15654 SHA256 9cc682693d962d78ce1da58720823034ef2fa67d5ef5110144ce78d9c81e7341 SHA512 d3a713eaf338b9750aa8734afb3a88343ba05fe9a3494f129012a7da016c5cce359eddee1931aa0993e285c0eb012d7574026a2c56df9ac6ccae040c5f3f64d0 WHIRLPOOL 3df5aa947575a95e9d1c6d81dc8a6b7dc4b7d0420a4a5cd302d0bc0cf993586c0325a9e3c13861a9e54f1016afd6c4cdc06eca6aa8bed785f7ae3ee56073773e
|
||||
EBUILD reptyr-0.4.ebuild 741 SHA256 669ae99fc1ca5bfccfa07dcba5b599024e708d2606b22c361b8048d26e989e9d SHA512 ea912f129289bd535884c9fd2a80e669b7ba7c37557fff0523719f87a182a108527be1bbeef78118975d2048d31f78888aefdadd4c50c84ec113e9f91d1e30f0 WHIRLPOOL 03a247e74e8fa57edd29eddb57238617de8474110e335b498614be08b313758c37cf1b72c862d2fefbeab85d00361862d29ebe0be243dde3f8588e0896497342
|
||||
MISC ChangeLog 1115 SHA256 263c8817e6a83abd643a95bd0fa29e6c2bccc0ba2a5069195361a0d2afceea1c SHA512 f6a2a9a9d3b742dc74b51025f08693bf69cc315600473cba7cd5ed6841b40cd6c6971c1d4e3c91e52fa8739fe88e764fe01d2b7c9b4f43747661a3ebf2995ad1 WHIRLPOOL 5b6adcbdccc666f25af0bc81fe27fada918f542debbd5c7d81b89fb6aaf0fa29436ac99c28f1fe1206b1996baa2954299375159b489c23a039d97f74615d3c5e
|
||||
EBUILD reptyr-0.4.ebuild 735 SHA256 aeb4d261d8841a721568e85b41e23bab7b1007c027393867ee2a89a63c611ab9 SHA512 9025af4615092c0434830de67f4b44e1ea88fb8cd8e62e1ad2454ce4c82fcfbed98ea1de67bd1b009ea7fb508ab4694aaa6615f27af2290c4e630cfa929bcb29 WHIRLPOOL 941881a14674125f321c9ec974393bed77bdb11a627abfae731ccace39d41ac99a4b255f645e54b01cc71b3f43be5075558d69f32b993f79ec5899bca30e7aa2
|
||||
MISC ChangeLog 1196 SHA256 02fb140d6514271dcc17c7a592bd26dccb554474741f0c94b86411949371d8a0 SHA512 986e6e04f0245da3ceb07a9990e310da5330b2114f3e8bb48ded7b514385786f9dbf2bbd8aafca6b0841e95e01304290c98b0b0d5a80136d3a1c602ff1559433 WHIRLPOOL 9a1175159bcdc3e636418a0186ade805e5d0b5fc88ce35c25e647f9d86aa743721545d361ca903c9c370d3527f988143a1ef6e6bdbfd2806845b011dbeb31342
|
||||
MISC metadata.xml 258 SHA256 5d9cb5f6599e3297f3e1b511f86b755c36241d2b243832dd530a2a2f0958d31a SHA512 6a78bb414565e8c7c22127f5244f06ef650acbb6f1db80c93dc1dbc7d76a860b7df469eed45363e81bbd5c4270a3421f8b445fcca4ce533298815e2cd22004af WHIRLPOOL 1e2543825e58fb3c72f560a5104fcce64e2a7e7cbf69ceea444677b941f43fea77d36a63b82a266dde180600d3e767314d39a8b490d137fc4c3119742aa2e097
|
||||
|
||||
@ -1,7 +1,17 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX cflags.patch 473 SHA256 49747e59754595932523a67dfa3fd4825da548783ffcff6cc366b039fff94d89 SHA512 46d83c4d9a6ea3b855f5bda984b1c72e9c1cb7d908c1ffa128f5a06eba11c3d92e9e38755b6f7f2ca0340efa9a86596dd016e2043e26988c611288b0badbd433 WHIRLPOOL 2542dc7e1c02a8509e68a0968563d631c00022e35e3a3ab44b3918ff4cf4c6bad1e1178c806d207f8631c166647748d811bfc2ef2f4910582be78be8609e83e1
|
||||
AUX srm-1.2.11-cflags.patch 572 SHA256 e2215079b437013171e9ab2d76dce9f648b3f27d964b39b678051a68f87f16df SHA512 ff776f2b76c5fd2423927fd903fb3d19080b3fab36eb491f9e116f7d9b9bca4a92bdea3c63369f10edd5b76283d737e64deaff418d861980f6c6b493a683827d WHIRLPOOL 8660d9958f76cd5a3d3b04545db6491a7a2580243d3ecf1467154287112a056366559b61eac409df75e47878e9dda5d4a4a94b2c678f23e07df0d63a5c195674
|
||||
AUX srm-1.2.8-remove-mount.patch 298 SHA256 73272bca010b1282dea4dad4adeb1c466bbcce556dc43baa67d0111990ba778b SHA512 245c68043a42e8ae91c4106da5689950d4e3a0ebf6ee6d1949d36029ff001d61ca0844947d2e2af8c74133419d1c4a284f94b18e98fbbf895a2593a01ddd4ff4 WHIRLPOOL 93cb3affea126229d41e6a0128969de914f67e64c7deb20b2623c11b649c259643e4e0507937ffd0b68e77eae0950294e63bf4a0b87e2b1c2bac41d1b7f153f6
|
||||
DIST srm-1.2.11.tar.gz 124982 SHA256 5105152d1d8e6166a5b1bef6b4ec945fd9dcc03289ff8916e98f44bfa8f25a8a SHA512 4b9b80242242dc64dcf97e4180676a1dc8b64d43f144ad4278d6762716e5e1b77b4c794900c298a919be7bdf1af71dcaf7286d4fae909ec5314752bfb73da8db WHIRLPOOL cf9980c745d79564adf913e5729f223861128d7cb1eea7b90829b09425f4d2e34ccc20d233dca88370467500826ca766f912fa565c16f3b959982c00b43204bc
|
||||
EBUILD srm-1.2.11-r2.ebuild 935 SHA256 ee42744e1b03efeebc02110997a760c6e6558d20f63de7095b4dd549033a4e4e SHA512 0a32c27a017fa47e13f2eeadefc019a12e25cb0ea01af8c190b274b05c09ca96c52fd65de3d5b86b0457abec1644a884cf0dbe607fc41f54b80c2b48e5fc2a03 WHIRLPOOL 199b4fb5c9770e83c26d21e31832783416fbf613a3cc882ae477e539b7ec244fb90641da4cd551ef56e896e03c59b0402657083269ec0110e69f564632135aa2
|
||||
MISC ChangeLog 4019 SHA256 d3982861f12cda93d5f610361d0c94e34881b4fc76f7bbab15f4d8d0b9e10644 SHA512 c2489a77a5d1de28e9747d4a53479cc1303176c09b152ea6d2d0f372ef3084ac55959d80cbae562fb7b4e64578f5473f9c3b4e6ac1dd93ba94f9e52e42a2d6b9 WHIRLPOOL 5f7dd0f772f3d068aa8c07cdd985310b6d6b9e00fdd106dcc7a286a19f76b0a392075d9161f0b88dbeecc520986c627d054ccd0fe3eb2000dee1443400bf6d86
|
||||
MISC metadata.xml 390 SHA256 2afeea8258a2bb4e929e083526fe617c24473711ade7f7647aab47ec87a65c5c SHA512 a101e1129106fbf3216de195be2cdbd4a9f96d1181e8d5e2b38a24513945e0d65897e97461e68c4b59c781ce6d1aa3b2f10971d9e1d7a37d9096ff62c0d0d6ee WHIRLPOOL 4a01a887e401e44c68fe36bf5f2dcd9cd7720dc1d64fc8cffd1f39961604afc68d20ee33e63b39a1e855e2cbaa2d27a9ae4a95cf8f2bfbb2405ae298844856c6
|
||||
MISC ChangeLog 4117 SHA256 842274cbaab5ebbcf4b5b68131317350465529734dca422e5c768ef1346594f6 SHA512 52faf21d8f0dd3d6251e6406ab886ce4fa94e021b4bbf9fee37ae0c0ba8e106b0fc5166a7b42a5115f1d47284997ebe3ddf069408485e7702e8fcb04e9da027b WHIRLPOOL 6ec0385a2baf6e7b0ed0d77c8dc1956d49cbfe54104332d3b5a6009e1e722188f8b8c5795e045df6fe96e9ca16e5253f67cb177c131f89dc0cb6ba01081f81f5
|
||||
MISC metadata.xml 331 SHA256 2387e9a8e5c2a2981adcce9462d220b76b64a601362b92bade13e30b3af070ee SHA512 da41c2c7ee8ffaaf226bf40fd317821afa22d96ea8a2c0482c9bc769309b2fcd7ebe578d8175cdcd6caf27ba95c04a856d774116d3858b4750bd19bfecd5ec32 WHIRLPOOL 6d82a4b3c5468a38d84f92b0b573ebbcd436b04b6e079a9c484cbd2e5c7f9c4424f6278a74747f0e654acd2e87ebea2a3f7143794cd86d0998f5b9f47200b9d7
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlC+pMgACgkQVWmRsqeSphPmNACdFUmWzy7rXF24bbqoayGCkjwN
|
||||
2h8An3PPTVaKp/HgWbFAIakIw0amIQ0S
|
||||
=BM7C
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,580 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
QT_MINIMAL="4.7.4"
|
||||
KDE_SCM="git"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
PYTHON_USE_WITH="threads,xml"
|
||||
|
||||
# experimental ; release ; old
|
||||
# Usually the tarballs are moved a lot so this should make
|
||||
# everyone happy.
|
||||
DEV_URI="
|
||||
http://dev-builds.libreoffice.org/pre-releases/src
|
||||
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
|
||||
http://download.documentfoundation.org/libreoffice/old/${PV}/
|
||||
"
|
||||
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
|
||||
ADDONS_URI="http://dev-www.libreoffice.org/src/"
|
||||
|
||||
BRANDING="${PN}-branding-gentoo-0.6.tar.xz"
|
||||
# PATCHSET="${P}-patchset-01.tar.xz"
|
||||
|
||||
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
|
||||
inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
|
||||
unset SCM_ECLASS
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
|
||||
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
|
||||
|
||||
# Split modules following git/tarballs
|
||||
# Core MUST be first!
|
||||
# Help is used for the image generator
|
||||
MODULES="core binfilter help"
|
||||
# Only release has the tarballs
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for i in ${DEV_URI}; do
|
||||
for mod in ${MODULES}; do
|
||||
if [[ ${mod} == binfilter ]]; then
|
||||
SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
|
||||
else
|
||||
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
|
||||
fi
|
||||
done
|
||||
unset mod
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
unset DEV_URI
|
||||
|
||||
# Really required addons
|
||||
# These are bundles that can't be removed for now due to huge patchsets.
|
||||
# If you want them gone, patches are welcome.
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
|
||||
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
|
||||
ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
|
||||
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
|
||||
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
|
||||
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
|
||||
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
|
||||
SRC_URI+=" ${ADDONS_SRC}"
|
||||
|
||||
unset ADDONS_URI
|
||||
unset EXT_URI
|
||||
unset ADDONS_SRC
|
||||
|
||||
IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
|
||||
jemalloc kde mysql odk opengl postgres test +vba +webdav"
|
||||
|
||||
LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
|
||||
# Unpackaged separate extensions:
|
||||
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
|
||||
# hunart: only on ooo extensions -> fubared download path somewhere on sf
|
||||
# numbertext, typo, validator, watch-window: ^^
|
||||
# oooblogger: no homepage or anything
|
||||
# Extensions that need extra work:
|
||||
# report-builder: missing java packages
|
||||
for lo_xt in ${LO_EXTS}; do
|
||||
IUSE+=" libreoffice_extensions_${lo_xt}"
|
||||
done
|
||||
unset lo_xt
|
||||
|
||||
LICENSE="|| ( LGPL-3 MPL-1.1 )"
|
||||
SLOT="0"
|
||||
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r3
|
||||
app-text/mythes
|
||||
>=app-text/libexttextcat-3.2
|
||||
app-text/libwpd:0.9[tools]
|
||||
app-text/libwpg:0.2
|
||||
>=app-text/libwps-0.2.2
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
>=dev-cpp/libcmis-0.2:0.2
|
||||
dev-db/unixODBC
|
||||
dev-libs/expat
|
||||
>=dev-libs/glib-2.28
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1.1
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-1.0.0d
|
||||
>=dev-libs/redland-1.0.14[ssl]
|
||||
gnome-base/librsvg
|
||||
media-gfx/graphite2
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
media-libs/freetype:2
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.4
|
||||
>=media-libs/libcdr-0.0.5
|
||||
media-libs/libvisio
|
||||
>=net-misc/curl-7.21.4
|
||||
sci-mathematics/lpsolve
|
||||
>=sys-libs/db-4.8
|
||||
virtual/jpeg
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
cups? ( net-print/cups )
|
||||
dbus? ( >=dev-libs/dbus-glib-0.92 )
|
||||
eds? ( gnome-extra/evolution-data-server )
|
||||
gnome? ( gnome-base/gconf:2 )
|
||||
gtk? (
|
||||
x11-libs/gdk-pixbuf[X]
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
)
|
||||
gstreamer? (
|
||||
>=media-libs/gstreamer-0.10:0.10
|
||||
>=media-libs/gst-plugins-base-0.10:0.10
|
||||
)
|
||||
jemalloc? ( dev-libs/jemalloc )
|
||||
libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
|
||||
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
|
||||
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
|
||||
libreoffice_extensions_wiki-publisher? (
|
||||
dev-java/commons-codec:0
|
||||
dev-java/commons-httpclient:3
|
||||
dev-java/commons-lang:2.1
|
||||
dev-java/commons-logging:0
|
||||
dev-java/tomcat-servlet-api:3.0
|
||||
)
|
||||
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
|
||||
opengl? (
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
)
|
||||
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
|
||||
webdav? ( net-libs/neon )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice-bin
|
||||
!app-office/libreoffice-bin-debug
|
||||
!<app-office/openoffice-bin-3.4.0-r1
|
||||
!app-office/openoffice
|
||||
media-fonts/libertine-ttf
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/urw-fonts
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
=app-office/libreoffice-l10n-3.6*
|
||||
"
|
||||
|
||||
# FIXME: cppunit should be moved to test conditional
|
||||
# after everything upstream is under gbuild
|
||||
# as dmake execute tests right away
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/boost-1.46
|
||||
>=dev-libs/libxml2-2.7.8
|
||||
dev-libs/libxslt
|
||||
dev-perl/Archive-Zip
|
||||
dev-util/cppunit
|
||||
>=dev-util/gperf-3
|
||||
dev-util/intltool
|
||||
dev-util/mdds
|
||||
virtual/pkgconfig
|
||||
net-misc/npapi-sdk
|
||||
>=sys-apps/findutils-4.4.2
|
||||
sys-devel/bison
|
||||
sys-apps/coreutils
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
>=sys-devel/make-3.82
|
||||
sys-libs/zlib
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
x11-proto/randrproto
|
||||
x11-proto/xextproto
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto
|
||||
java? (
|
||||
>=virtual/jdk-1.6
|
||||
>=dev-java/ant-core-1.7
|
||||
)
|
||||
odk? ( app-doc/doxygen )
|
||||
test? ( dev-util/cppunit )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# not upstreamable stuff
|
||||
"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
|
||||
"${FILESDIR}/${PN}-3.6-separate-checks.patch"
|
||||
)
|
||||
|
||||
REQUIRED_USE="
|
||||
gnome? ( gtk )
|
||||
eds? ( gnome )
|
||||
libreoffice_extensions_nlpsolver? ( java )
|
||||
libreoffice_extensions_scripting-beanshell? ( java )
|
||||
libreoffice_extensions_scripting-javascript? ( java )
|
||||
libreoffice_extensions_wiki-publisher? ( java )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-core-${PV}"
|
||||
|
||||
CHECKREQS_MEMORY="512M"
|
||||
CHECKREQS_DISK_BUILD="6G"
|
||||
|
||||
pkg_pretend() {
|
||||
local pgslot
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
check-reqs_pkg_pretend
|
||||
|
||||
if [[ $(gcc-major-version) -lt 4 ]] || \
|
||||
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]] ) \
|
||||
; then
|
||||
eerror "Compilation with gcc older than 4.5 is not supported"
|
||||
die "Too old gcc found."
|
||||
fi
|
||||
fi
|
||||
|
||||
# ensure pg version
|
||||
if use postgres; then
|
||||
pgslot=$(postgresql-config show)
|
||||
if [[ ${pgslot//.} < 90 ]] ; then
|
||||
eerror "PostgreSQL slot must be set to 9.0 or higher."
|
||||
eerror " postgresql-config set 9.0"
|
||||
die "PostgreSQL slot is not set to 9.0 or higher."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
kde4-base_pkg_setup
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local mod dest tmplfile tmplname mypv
|
||||
|
||||
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
|
||||
if use branding; then
|
||||
unpack "${BRANDING}"
|
||||
fi
|
||||
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for mod in ${MODULES}; do
|
||||
if [[ ${mod} == binfilter ]] && ! use binfilter; then
|
||||
continue
|
||||
fi
|
||||
unpack "${PN}-${mod}-${PV}.tar.xz"
|
||||
if [[ ${mod} != core ]]; then
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
else
|
||||
for mod in ${MODULES}; do
|
||||
if [[ ${mod} == binfilter ]] && ! use binfilter; then
|
||||
continue
|
||||
fi
|
||||
mypv=${PV/.9999}
|
||||
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
|
||||
EGIT_PROJECT="${PN}/${mod}"
|
||||
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
|
||||
EGIT_NOUNPACK="true"
|
||||
git-2_src_unpack
|
||||
if [[ ${mod} != core ]]; then
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# optimization flags
|
||||
export ARCH_FLAGS="${CXXFLAGS}"
|
||||
export LINKFLAGSOPTIMIZE="${LDFLAGS}"
|
||||
export GMAKE_OPTIONS="${MAKEOPTS}"
|
||||
|
||||
# patchset
|
||||
if [[ -n ${PATCHSET} ]]; then
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
|
||||
EPATCH_SUFFIX="patch" \
|
||||
epatch
|
||||
fi
|
||||
|
||||
base_src_prepare
|
||||
|
||||
# please no debug in binfilter, it blows up things insanely
|
||||
if use binfilter && ! use binfilterdebug ; then
|
||||
for name in $(find "${S}/binfilter" -name makefile.mk) ; do
|
||||
sed -i -e '1i\CFLAGS+= -g0' $name || die
|
||||
done
|
||||
fi
|
||||
|
||||
AT_M4DIR="m4"
|
||||
eautoreconf
|
||||
# hack in the autogen.sh
|
||||
touch autogen.lastrun
|
||||
|
||||
# system pyuno mess
|
||||
sed \
|
||||
-e "s:%eprefix%:${EPREFIX}:g" \
|
||||
-e "s:%libdir%:$(get_libdir):g" \
|
||||
-i pyuno/source/module/uno.py \
|
||||
-i scripting/source/pyprov/officehelper.py || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local java_opts
|
||||
local internal_libs
|
||||
local lo_ext
|
||||
local ext_opts
|
||||
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
|
||||
|
||||
# Workaround the boost header include issue for older gccs
|
||||
if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; then
|
||||
append-cppflags -DBOOST_NO_0X_HDR_TYPEINDEX
|
||||
append-cppflags -DBOOST_NO_CXX11_HDR_TYPEINDEX
|
||||
fi
|
||||
|
||||
# recheck that there is some value in jobs
|
||||
[[ -z ${jbs} ]] && jbs="1"
|
||||
|
||||
# sane: just sane.h header that is used for scan in writer, not
|
||||
# linked or anything else, worthless to depend on
|
||||
# vigra: just uses templates from there
|
||||
# it is serious pain in the ass for packaging
|
||||
# should be replaced by boost::gil if someone interested
|
||||
internal_libs+="
|
||||
--without-system-sane
|
||||
--without-system-vigra
|
||||
"
|
||||
|
||||
# libreoffice extensions handling
|
||||
for lo_xt in ${LO_EXTS}; do
|
||||
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
|
||||
done
|
||||
|
||||
if use java; then
|
||||
# hsqldb: system one is too new
|
||||
# saxon: system one does not work properly
|
||||
java_opts="
|
||||
--without-junit
|
||||
--without-system-hsqldb
|
||||
--without-system-saxon
|
||||
--with-ant-home="${ANT_HOME}"
|
||||
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
|
||||
--with-java-target-version=$(java-pkg_get-target)
|
||||
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
|
||||
"
|
||||
|
||||
use libreoffice_extensions_scripting-beanshell && \
|
||||
java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
|
||||
|
||||
use libreoffice_extensions_scripting-javascript && \
|
||||
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
|
||||
|
||||
if use libreoffice_extensions_wiki-publisher; then
|
||||
java_opts+="
|
||||
--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
|
||||
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
|
||||
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
|
||||
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
|
||||
--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
|
||||
"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use branding; then
|
||||
# hack...
|
||||
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
|
||||
fi
|
||||
|
||||
# system headers/libs/...: enforce using system packages
|
||||
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
|
||||
# --enable-cairo: ensure that cairo is always required
|
||||
# --enable-*-link: link to the library rather than just dlopen on runtime
|
||||
# --enable-release-build: build the libreoffice as release
|
||||
# --disable-fetch-external: prevent dowloading during compile phase
|
||||
# --disable-gnome-vfs: old gnome virtual fs support
|
||||
# --disable-kdeab: kde3 adressbook
|
||||
# --disable-kde: kde3 support
|
||||
# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
|
||||
# --disable-mozilla: disable mozilla build that is used for adresbook, not
|
||||
# affecting the nsplugin that is always ON
|
||||
# --disable-pch: precompiled headers cause build crashes
|
||||
# --disable-rpath: relative runtime path is not desired
|
||||
# --disable-systray: quickstarter does not actually work at all so do not
|
||||
# promote it
|
||||
# --disable-zenity: disable build icon
|
||||
# --enable-extension-integration: enable any extension integration support
|
||||
# --with-{max-jobs,num-cpus}: ensuring parallel building
|
||||
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
|
||||
# --without-stlport: disable deprecated extensions framework
|
||||
# --disable-ext-report-builder: too much java packages pulled in
|
||||
econf \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
|
||||
--with-system-headers \
|
||||
--with-system-libs \
|
||||
--with-system-jars \
|
||||
--with-system-dicts \
|
||||
--enable-graphite \
|
||||
--enable-cairo-canvas \
|
||||
--enable-largefile \
|
||||
--enable-mergelibs \
|
||||
--enable-python=system \
|
||||
--enable-librsvg=system \
|
||||
--enable-randr \
|
||||
--enable-randr-link \
|
||||
--enable-release-build \
|
||||
--enable-unix-qstart-libpng \
|
||||
--enable-xmlsec \
|
||||
--disable-ccache \
|
||||
--disable-crashdump \
|
||||
--disable-dependency-tracking \
|
||||
--disable-epm \
|
||||
--disable-fetch-external \
|
||||
--disable-gnome-vfs \
|
||||
--disable-ext-report-builder \
|
||||
--disable-kdeab \
|
||||
--disable-kde \
|
||||
--disable-ldap \
|
||||
--disable-mozilla \
|
||||
--disable-nsplugin \
|
||||
--disable-online-update \
|
||||
--disable-pch \
|
||||
--disable-rpath \
|
||||
--disable-systray \
|
||||
--disable-zenity \
|
||||
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
|
||||
--with-build-version="Gentoo official package" \
|
||||
--enable-extension-integration \
|
||||
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-tar="${DISTDIR}" \
|
||||
--with-lang="" \
|
||||
--with-max-jobs=${jbs} \
|
||||
--with-num-cpus=${jbs} \
|
||||
--with-unix-wrapper=libreoffice \
|
||||
--with-vendor="Gentoo Foundation" \
|
||||
--with-x \
|
||||
--without-afms \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
--without-stlport \
|
||||
--without-system-mozilla \
|
||||
--without-help \
|
||||
--with-helppack-integration \
|
||||
--without-sun-templates \
|
||||
--disable-gtk3 \
|
||||
$(use_enable binfilter) \
|
||||
$(use_enable cups) \
|
||||
$(use_enable dbus) \
|
||||
$(use_enable eds evolution2) \
|
||||
$(use_enable gnome gconf) \
|
||||
$(use_enable gnome gio) \
|
||||
$(use_enable gnome lockdown) \
|
||||
$(use_enable gstreamer) \
|
||||
$(use_enable gtk) \
|
||||
$(use_enable kde kde4) \
|
||||
$(use_enable mysql ext-mysql-connector) \
|
||||
$(use_enable odk) \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable postgres postgresql-sdbc) \
|
||||
$(use_enable test linkoo) \
|
||||
$(use_enable vba) \
|
||||
$(use_enable webdav neon) \
|
||||
$(use_with java) \
|
||||
$(use_with mysql system-mysql-cppconn) \
|
||||
$(use_with odk doxygen) \
|
||||
${internal_libs} \
|
||||
${java_opts} \
|
||||
${ext_opts}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# hack for offlinehelp, this needs fixing upstream at some point
|
||||
# it is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
(
|
||||
source "${S}/config_host.mk" 2&> /dev/null
|
||||
|
||||
local path="${SOLARVER}/${INPATH}/res/img"
|
||||
mkdir -p "${path}" || die
|
||||
|
||||
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
|
||||
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
|
||||
-dir=icon-themes/galaxy/res/helpimg \
|
||||
> "${path}/helpimg.ilst"
|
||||
[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
|
||||
)
|
||||
|
||||
# this is not a proper make script
|
||||
make build || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
make unitcheck || die
|
||||
make slowcheck || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# This is not Makefile so no buildserver
|
||||
make DESTDIR="${D}" distro-pack-install -o build -o check || die
|
||||
|
||||
# Fix bash completion placement
|
||||
newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
|
||||
rm -rf "${ED}"/etc/
|
||||
|
||||
if use branding; then
|
||||
insinto /usr/$(get_libdir)/${PN}/program
|
||||
newins "${WORKDIR}/branding-sofficerc" sofficerc
|
||||
fi
|
||||
|
||||
# Hack for offlinehelp, this needs fixing upstream at some point.
|
||||
# It is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
insinto /usr/$(get_libdir)/libreoffice/help
|
||||
doins xmlhelp/util/*.xsl
|
||||
|
||||
# Remove desktop files for support to old installs that can't parse mime
|
||||
rm -rf "${ED}"/usr/share/mimelnk/
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Cache updates - all handled by kde eclass for all environments
|
||||
kde4-base_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
|
||||
use java || \
|
||||
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@ -0,0 +1,583 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
QT_MINIMAL="4.7.4"
|
||||
KDE_SCM="git"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
PYTHON_DEPEND="3:3.3"
|
||||
PYTHON_USE_WITH="threads,xml"
|
||||
|
||||
# experimental ; release ; old
|
||||
# Usually the tarballs are moved a lot so this should make
|
||||
# everyone happy.
|
||||
DEV_URI="
|
||||
http://dev-builds.libreoffice.org/pre-releases/src
|
||||
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
|
||||
http://download.documentfoundation.org/libreoffice/old/${PV}/
|
||||
"
|
||||
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
|
||||
ADDONS_URI="http://dev-www.libreoffice.org/src/"
|
||||
|
||||
BRANDING="${PN}-branding-gentoo-0.7.tar.xz"
|
||||
# PATCHSET="${P}-patchset-01.tar.xz"
|
||||
|
||||
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
|
||||
inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
|
||||
unset SCM_ECLASS
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
|
||||
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
|
||||
|
||||
# Split modules following git/tarballs
|
||||
# Core MUST be first!
|
||||
# Help is used for the image generator
|
||||
MODULES="core help"
|
||||
# Only release has the tarballs
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for i in ${DEV_URI}; do
|
||||
for mod in ${MODULES}; do
|
||||
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
|
||||
done
|
||||
unset mod
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
unset DEV_URI
|
||||
|
||||
# Really required addons
|
||||
# These are bundles that can't be removed for now due to huge patchsets.
|
||||
# If you want them gone, patches are welcome.
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
|
||||
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
|
||||
ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
|
||||
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
|
||||
ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
|
||||
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
|
||||
SRC_URI+=" ${ADDONS_SRC}"
|
||||
|
||||
unset ADDONS_URI
|
||||
unset EXT_URI
|
||||
unset ADDONS_SRC
|
||||
|
||||
IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
|
||||
gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres
|
||||
telepathy test +vba +webdav"
|
||||
|
||||
LO_EXTS="nlpsolver presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
|
||||
# Unpackaged separate extensions:
|
||||
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
|
||||
# hunart: only on ooo extensions -> fubared download path somewhere on sf
|
||||
# numbertext, typo, validator, watch-window: ^^
|
||||
# oooblogger: no homepage or anything
|
||||
# Extensions that need extra work:
|
||||
# report-builder: missing java packages
|
||||
for lo_xt in ${LO_EXTS}; do
|
||||
IUSE+=" libreoffice_extensions_${lo_xt}"
|
||||
done
|
||||
unset lo_xt
|
||||
|
||||
LICENSE="|| ( LGPL-3 MPL-1.1 )"
|
||||
SLOT="0"
|
||||
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r3
|
||||
app-text/mythes
|
||||
>=app-text/libexttextcat-3.2
|
||||
app-text/liblangtag
|
||||
app-text/libmspub
|
||||
app-text/libwpd:0.9[tools]
|
||||
app-text/libwpg:0.2
|
||||
>=app-text/libwps-0.2.2
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
dev-cpp/libcmis:0.3
|
||||
dev-db/unixODBC
|
||||
dev-libs/expat
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1.1
|
||||
>=dev-libs/liborcus-0.3
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-1.0.0d
|
||||
>=dev-libs/redland-1.0.14[ssl]
|
||||
media-gfx/graphite2
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
media-libs/freetype:2
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.4
|
||||
>=media-libs/libcdr-0.0.5
|
||||
media-libs/libvisio
|
||||
>=net-misc/curl-7.21.4
|
||||
net-nds/openldap
|
||||
sci-mathematics/lpsolve
|
||||
virtual/jpeg
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
cups? ( net-print/cups )
|
||||
dbus? ( >=dev-libs/dbus-glib-0.92 )
|
||||
eds? ( gnome-extra/evolution-data-server )
|
||||
gnome? ( gnome-base/gconf:2 )
|
||||
gtk? (
|
||||
x11-libs/gdk-pixbuf[X]
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
)
|
||||
gtk3? ( >=x11-libs/gtk+-3.2:3 )
|
||||
gstreamer? (
|
||||
>=media-libs/gstreamer-0.10:0.10
|
||||
>=media-libs/gst-plugins-base-0.10:0.10
|
||||
)
|
||||
jemalloc? ( dev-libs/jemalloc )
|
||||
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
|
||||
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
|
||||
libreoffice_extensions_wiki-publisher? (
|
||||
dev-java/commons-codec:0
|
||||
dev-java/commons-httpclient:3
|
||||
dev-java/commons-lang:2.1
|
||||
dev-java/commons-logging:0
|
||||
dev-java/tomcat-servlet-api:3.0
|
||||
)
|
||||
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
|
||||
nsplugin? ( net-misc/npapi-sdk )
|
||||
opengl? (
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
)
|
||||
pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
|
||||
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
|
||||
telepathy? (
|
||||
dev-libs/glib:2
|
||||
>=net-libs/telepathy-glib-0.18.0
|
||||
)
|
||||
webdav? ( net-libs/neon )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice-bin
|
||||
!app-office/libreoffice-bin-debug
|
||||
!<app-office/openoffice-bin-3.4.0-r1
|
||||
!app-office/openoffice
|
||||
media-fonts/libertine-ttf
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/urw-fonts
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
=app-office/libreoffice-l10n-3.6*
|
||||
"
|
||||
|
||||
# FIXME: cppunit should be moved to test conditional
|
||||
# after everything upstream is under gbuild
|
||||
# as dmake execute tests right away
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/boost-1.46
|
||||
>=dev-libs/libxml2-2.7.8
|
||||
dev-libs/libxslt
|
||||
dev-perl/Archive-Zip
|
||||
dev-util/cppunit
|
||||
>=dev-util/gperf-3
|
||||
dev-util/intltool
|
||||
dev-util/mdds
|
||||
virtual/pkgconfig
|
||||
net-misc/npapi-sdk
|
||||
>=sys-apps/findutils-4.4.2
|
||||
sys-devel/bison
|
||||
sys-apps/coreutils
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
>=sys-devel/make-3.82
|
||||
sys-devel/ucpp
|
||||
sys-libs/zlib
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
x11-proto/randrproto
|
||||
x11-proto/xextproto
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto
|
||||
java? (
|
||||
>=virtual/jdk-1.6
|
||||
>=dev-java/ant-core-1.7
|
||||
)
|
||||
odk? ( app-doc/doxygen )
|
||||
test? ( dev-util/cppunit )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# not upstreamable stuff
|
||||
"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
|
||||
"${FILESDIR}/${PN}-3.7-separate-checks.patch"
|
||||
)
|
||||
|
||||
REQUIRED_USE="
|
||||
bluetooth? ( dbus )
|
||||
gnome? ( gtk )
|
||||
eds? ( gnome )
|
||||
libreoffice_extensions_nlpsolver? ( java )
|
||||
libreoffice_extensions_scripting-beanshell? ( java )
|
||||
libreoffice_extensions_scripting-javascript? ( java )
|
||||
libreoffice_extensions_wiki-publisher? ( java )
|
||||
nsplugin? ( gtk )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-core-${PV}"
|
||||
|
||||
CHECKREQS_MEMORY="512M"
|
||||
CHECKREQS_DISK_BUILD="6G"
|
||||
|
||||
pkg_pretend() {
|
||||
local pgslot
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
check-reqs_pkg_pretend
|
||||
|
||||
if [[ $(gcc-major-version) -lt 4 ]] || \
|
||||
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
|
||||
; then
|
||||
eerror "Compilation with gcc older than 4.6 is not supported"
|
||||
die "Too old gcc found."
|
||||
fi
|
||||
fi
|
||||
|
||||
# ensure pg version
|
||||
if use postgres; then
|
||||
pgslot=$(postgresql-config show)
|
||||
if [[ ${pgslot//.} < 90 ]] ; then
|
||||
eerror "PostgreSQL slot must be set to 9.0 or higher."
|
||||
eerror " postgresql-config set 9.0"
|
||||
die "PostgreSQL slot is not set to 9.0 or higher."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
kde4-base_pkg_setup
|
||||
|
||||
python_set_active_version 3
|
||||
python_pkg_setup
|
||||
|
||||
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local mod mod2 dest tmplfile tmplname mypv
|
||||
|
||||
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
|
||||
if use branding; then
|
||||
unpack "${BRANDING}"
|
||||
fi
|
||||
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for mod in ${MODULES}; do
|
||||
unpack "${PN}-${mod}-${PV}.tar.xz"
|
||||
if [[ ${mod} != core ]]; then
|
||||
mod2=${mod}
|
||||
# mapping does not match on help
|
||||
[[ ${mod} == help ]] && mod2="helpcontent2"
|
||||
mkdir -p "${S}/${mod2}/" || die
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
else
|
||||
for mod in ${MODULES}; do
|
||||
mypv=${PV/.9999}
|
||||
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
|
||||
EGIT_PROJECT="${PN}/${mod}"
|
||||
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
|
||||
EGIT_NOUNPACK="true"
|
||||
git-2_src_unpack
|
||||
if [[ ${mod} != core ]]; then
|
||||
mod2=${mod}
|
||||
# mapping does not match on help
|
||||
[[ ${mod} == help ]] && mod2="helpcontent2"
|
||||
mkdir -p "${S}/${mod2}/" || die
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# optimization flags
|
||||
export ARCH_FLAGS="${CXXFLAGS}"
|
||||
export LINKFLAGSOPTIMIZE="${LDFLAGS}"
|
||||
export GMAKE_OPTIONS="${MAKEOPTS}"
|
||||
|
||||
# patchset
|
||||
if [[ -n ${PATCHSET} ]]; then
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
|
||||
EPATCH_SUFFIX="patch" \
|
||||
epatch
|
||||
fi
|
||||
|
||||
base_src_prepare
|
||||
|
||||
AT_M4DIR="m4"
|
||||
eautoreconf
|
||||
# hack in the autogen.sh
|
||||
touch autogen.lastrun
|
||||
|
||||
# system pyuno mess
|
||||
sed \
|
||||
-e "s:%eprefix%:${EPREFIX}:g" \
|
||||
-e "s:%libdir%:$(get_libdir):g" \
|
||||
-i pyuno/source/module/uno.py \
|
||||
-i scripting/source/pyprov/officehelper.py || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local java_opts
|
||||
local internal_libs
|
||||
local lo_ext
|
||||
local ext_opts
|
||||
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
|
||||
|
||||
# recheck that there is some value in jobs
|
||||
[[ -z ${jbs} ]] && jbs="1"
|
||||
|
||||
# sane: just sane.h header that is used for scan in writer, not
|
||||
# linked or anything else, worthless to depend on
|
||||
# vigra: just uses templates from there
|
||||
# it is serious pain in the ass for packaging
|
||||
# should be replaced by boost::gil if someone interested
|
||||
internal_libs+="
|
||||
--without-system-sane
|
||||
--without-system-vigra
|
||||
"
|
||||
|
||||
# libreoffice extensions handling
|
||||
for lo_xt in ${LO_EXTS}; do
|
||||
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
|
||||
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
|
||||
else
|
||||
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
|
||||
fi
|
||||
done
|
||||
|
||||
if use java; then
|
||||
# hsqldb: system one is too new
|
||||
java_opts="
|
||||
--without-junit
|
||||
--without-system-hsqldb
|
||||
--with-ant-home="${ANT_HOME}"
|
||||
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
|
||||
--with-java-target-version=$(java-pkg_get-target)
|
||||
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
|
||||
"
|
||||
|
||||
use libreoffice_extensions_scripting-beanshell && \
|
||||
java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
|
||||
|
||||
use libreoffice_extensions_scripting-javascript && \
|
||||
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
|
||||
|
||||
if use libreoffice_extensions_wiki-publisher; then
|
||||
java_opts+="
|
||||
--with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
|
||||
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
|
||||
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
|
||||
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
|
||||
--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
|
||||
"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use branding; then
|
||||
# hack...
|
||||
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
|
||||
fi
|
||||
|
||||
# system headers/libs/...: enforce using system packages
|
||||
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
|
||||
# --enable-cairo: ensure that cairo is always required
|
||||
# --enable-graphite: disabling causes build breakages
|
||||
# --enable-*-link: link to the library rather than just dlopen on runtime
|
||||
# --enable-release-build: build the libreoffice as release
|
||||
# --disable-fetch-external: prevent dowloading during compile phase
|
||||
# --disable-gnome-vfs: old gnome virtual fs support
|
||||
# --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now
|
||||
# --disable-kdeab: kde3 adressbook
|
||||
# --disable-kde: kde3 support
|
||||
# --disable-mozilla: mozilla internal is for contact integration, never
|
||||
# worked on linux
|
||||
# --disable-pch: precompiled headers cause build crashes
|
||||
# --disable-rpath: relative runtime path is not desired
|
||||
# --disable-systray: quickstarter does not actually work at all so do not
|
||||
# promote it
|
||||
# --disable-zenity: disable build icon
|
||||
# --enable-extension-integration: enable any extension integration support
|
||||
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
|
||||
# --without-stlport: disable deprecated extensions framework
|
||||
# --disable-ext-report-builder: too much java packages pulled in
|
||||
econf \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
|
||||
--with-system-headers \
|
||||
--with-system-libs \
|
||||
--with-system-jars \
|
||||
--with-system-dicts \
|
||||
--enable-cairo-canvas \
|
||||
--enable-graphite \
|
||||
--enable-largefile \
|
||||
--enable-mergelibs \
|
||||
--enable-python=system \
|
||||
--enable-randr \
|
||||
--enable-randr-link \
|
||||
--enable-release-build \
|
||||
--enable-unix-qstart-libpng \
|
||||
--disable-ccache \
|
||||
--disable-crashdump \
|
||||
--disable-dependency-tracking \
|
||||
--disable-epm \
|
||||
--disable-fetch-external \
|
||||
--disable-gnome-vfs \
|
||||
--disable-gstreamer \
|
||||
--disable-ext-report-builder \
|
||||
--disable-kdeab \
|
||||
--disable-kde \
|
||||
--disable-mozilla \
|
||||
--disable-online-update \
|
||||
--disable-pch \
|
||||
--disable-rpath \
|
||||
--disable-systray \
|
||||
--disable-zenity \
|
||||
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
|
||||
--with-build-version="Gentoo official package" \
|
||||
--enable-extension-integration \
|
||||
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-tar="${DISTDIR}" \
|
||||
--with-lang="" \
|
||||
--with-parallelism=${jbs} \
|
||||
--with-system-ucpp \
|
||||
--with-unix-wrapper=libreoffice \
|
||||
--with-vendor="Gentoo Foundation" \
|
||||
--with-x \
|
||||
--without-afms \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
--without-stlport \
|
||||
--without-system-mozilla \
|
||||
--without-help \
|
||||
--with-helppack-integration \
|
||||
--without-sun-templates \
|
||||
$(use_enable bluetooth sdremote-bluetooth) \
|
||||
$(use_enable cups) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable dbus) \
|
||||
$(use_enable eds evolution2) \
|
||||
$(use_enable gnome gconf) \
|
||||
$(use_enable gnome gio) \
|
||||
$(use_enable gnome lockdown) \
|
||||
$(use_enable gstreamer gstreamer-0-10) \
|
||||
$(use_enable gtk) \
|
||||
$(use_enable gtk3) \
|
||||
$(use_enable kde kde4) \
|
||||
$(use_enable mysql ext-mysql-connector) \
|
||||
$(use_enable nsplugin) \
|
||||
$(use_enable odk) \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable pdfimport) \
|
||||
$(use_enable postgres postgresql-sdbc) \
|
||||
$(use_enable telepathy) \
|
||||
$(use_enable test linkoo) \
|
||||
$(use_enable vba) \
|
||||
$(use_enable webdav neon) \
|
||||
$(use_with java) \
|
||||
$(use_with mysql system-mysql-cppconn) \
|
||||
$(use_with odk doxygen) \
|
||||
${internal_libs} \
|
||||
${java_opts} \
|
||||
${ext_opts}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# hack for offlinehelp, this needs fixing upstream at some point
|
||||
# it is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
(
|
||||
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
|
||||
source "${T}/config_host.mk" 2&> /dev/null
|
||||
|
||||
local path="${SOLARVER}/${INPATH}/res/img"
|
||||
mkdir -p "${path}" || die
|
||||
|
||||
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
|
||||
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
|
||||
-dir=icon-themes/galaxy/res/helpimg \
|
||||
> "${path}/helpimg.ilst"
|
||||
[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
|
||||
)
|
||||
|
||||
# this is not a proper make script
|
||||
make build || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
make unitcheck || die
|
||||
make slowcheck || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# This is not Makefile so no buildserver
|
||||
make DESTDIR="${D}" distro-pack-install -o build -o check || die
|
||||
|
||||
# Fix bash completion placement
|
||||
newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
|
||||
rm -rf "${ED}"/etc/
|
||||
|
||||
if use branding; then
|
||||
insinto /usr/$(get_libdir)/${PN}/program
|
||||
newins "${WORKDIR}/branding-sofficerc" sofficerc
|
||||
fi
|
||||
|
||||
# symlink the nsplugin to proper location
|
||||
use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
|
||||
|
||||
# Hack for offlinehelp, this needs fixing upstream at some point.
|
||||
# It is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
insinto /usr/$(get_libdir)/libreoffice/help
|
||||
doins xmlhelp/util/*.xsl
|
||||
|
||||
# Remove desktop files for support to old installs that can't parse mime
|
||||
rm -rf "${ED}"/usr/share/mimelnk/
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Cache updates - all handled by kde eclass for all environments
|
||||
kde4-base_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
|
||||
use java || \
|
||||
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.5.ebuild,v 1.1 2012/12/04 21:46:28 axs Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PLOCALES="de ru"
|
||||
inherit bash-completion-r1 eutils multilib l10n
|
||||
|
||||
DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
|
||||
HOMEPAGE="http://eix.berlios.de"
|
||||
SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
|
||||
IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
|
||||
|
||||
RDEPEND="app-shells/push
|
||||
sqlite? ( >=dev-db/sqlite-3 )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/xz-utils
|
||||
clang? ( sys-devel/clang )
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${REPLACING_VERSIONS//./} -lt 0253 ]]; then
|
||||
local eixcache="${EROOT}"/var/cache/${PN}
|
||||
[[ -f ${eixcache} ]] && rm -f "${eixcache}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch_user
|
||||
# consider inheriting autotools.eclass and adding eautoreconf here
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_with sqlite) $(use_with doc extra-doc) \
|
||||
$(use_with zsh-completion) \
|
||||
$(use_enable nls) $(use_enable tools separate-tools) \
|
||||
$(use_enable security) $(use_enable optimization) \
|
||||
$(use_enable strong-optimization) $(use_enable debug debugging) \
|
||||
$(use_with prefix always-accept-keywords) \
|
||||
$(use_with dep dep-default) \
|
||||
$(use_with clang nongnu-cxx clang++) \
|
||||
--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
|
||||
--with-portage-rootpath="${ROOTPATH}" \
|
||||
--with-eprefix-default="${EPREFIX}" \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
|
||||
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dobashcomp bash/eix
|
||||
keepdir "/var/cache/${PN}"
|
||||
fowners portage:portage "/var/cache/${PN}"
|
||||
fperms 775 "/var/cache/${PN}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# fowners in src_install doesn't work for owner/group portage:
|
||||
# merging changes this owner/group back to root.
|
||||
use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
|
||||
local obs="${EROOT}var/cache/eix.previous"
|
||||
! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
|
||||
}
|
||||
@ -1,6 +1,16 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX cedilla-gentoo-r1.patch 645 SHA256 ea80f4221ba773f1eb5cef090f0ad8847af3eeb5ab91379e53cc700b1a92acdb SHA512 4a9d4c4f28509e2b527568a28a69dbcce0c4e7a8d6ae9a967dfb33ff639f12a5dae16a885b0f51686d3d444c9f651cf904bb5c93326308fc37e13d4ec8bb4162 WHIRLPOOL 28ead6a9b3d053f14a97f883181aa52a7c1c05e1dda5d3e793adaaaba7f041e2055fa7a0798f6f759fca86f149199e8aa9fe885f3ef36bff00897d506168d8e0
|
||||
AUX cedilla-gentoo.patch 633 SHA256 aa467656f3e48e2a845cd7f6b864f673d3d5698fd51d94f2e2d5f4765127269a SHA512 810c8c5fffe43c4f1dd90873064ad7694f97d4155293f8ecdfa85bf78b98665f9bddcdf63e0188aee0d10ec7e8288d974d49f9b980ba96c2a76d42fff8b949a1 WHIRLPOOL 7c792030cb24486228a282a51a1eabf4c63015d909e164ab0bfd45a6720254aed0976897c3af08c5b2d412250c2353dad6d6cd66a935924408201006a83f42d3
|
||||
DIST cedilla-0.6.tar.gz 130676 SHA256 c5840c3e125fab29af844540239dfb475b59c6ecd67270736898608de743df43 SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38 WHIRLPOOL fff84c8c7e2e1c1452dfbaf6bf58d97d405c1f56269cadb0d852ba7c183dec0b73906dfa62ca732e84a7eeb472d4ee2d66adebdd1fc224e56a5c45792a5f1117
|
||||
EBUILD cedilla-0.6.ebuild 812 SHA256 30cd23d9c5c397cfbe81a3f09a904a984deffd2f011221473f95518a4895dbce SHA512 ddf08a52a1c1ac29befc00b6be84e7d76c9ed10829ecd403b9bd4c6e6f5afc1749f90443fa0f4fcbedf0f8d5918bf8921b4644bda4943316387f4a94b46a3a18 WHIRLPOOL cd04365fdea0e1f5e58cc3fb3f4de5747e863ef775e552a7e27557381ebdd763865184889f1ea7af1a8524b09e96e0a77a964e248654384bed8fb572f90d31ba
|
||||
MISC ChangeLog 1725 SHA256 5ddc06c38008a53155ea5468eb4a3dafdd1167932ff684884553107c4af944d9 SHA512 90c9f3637802dabe01449b67e359bc5ae6bc5459de0e3d2bc7bab0048f5d78d4e97015931beb1055c39519422fac35b9cc7ff0c84326dd9ffa51c9fd66a8e33e WHIRLPOOL d93ea3441e950f2ba84b6ff553fe897f53a11bc4d64da473e62ad4437c2dc15d396fe5dbb4c7cfa01f579502661b84433d9e9cadc6195e244980f5af02af586f
|
||||
MISC metadata.xml 390 SHA256 2afeea8258a2bb4e929e083526fe617c24473711ade7f7647aab47ec87a65c5c SHA512 a101e1129106fbf3216de195be2cdbd4a9f96d1181e8d5e2b38a24513945e0d65897e97461e68c4b59c781ce6d1aa3b2f10971d9e1d7a37d9096ff62c0d0d6ee WHIRLPOOL 4a01a887e401e44c68fe36bf5f2dcd9cd7720dc1d64fc8cffd1f39961604afc68d20ee33e63b39a1e855e2cbaa2d27a9ae4a95cf8f2bfbb2405ae298844856c6
|
||||
MISC ChangeLog 1822 SHA256 bcc70062daac94d1e475e93dded82e2bcacc58707a7c585293bce89e1d615b8d SHA512 87b37f89dd146cc3e923a66e1bce8edd00b1fb3fc051abb9ee8902466188f5f743a9b4800a5cf997ac309df5749fb0e9ac57a11214bddc7b6cb32341ff17669c WHIRLPOOL c9180a292f017f966cb9d32fe0719caa166e29e2db84e2fa8436365f2cd23c3994b8ddde8480b3d2f8a8b8e06e02a472e3591db410e38c4dbd77a57df87cc3f8
|
||||
MISC metadata.xml 331 SHA256 2387e9a8e5c2a2981adcce9462d220b76b64a601362b92bade13e30b3af070ee SHA512 da41c2c7ee8ffaaf226bf40fd317821afa22d96ea8a2c0482c9bc769309b2fcd7ebe578d8175cdcd6caf27ba95c04a856d774116d3858b4750bd19bfecd5ec32 WHIRLPOOL 6d82a4b3c5468a38d84f92b0b573ebbcd436b04b6e079a9c484cbd2e5c7f9c4424f6278a74747f0e654acd2e87ebea2a3f7143794cd86d0998f5b9f47200b9d7
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iEYEAREIAAYFAlC+pP8ACgkQVWmRsqeSphP/CQCbBi4R/nKUPBXJAJ0uGsfX1TdI
|
||||
FSgAnRl/Ig4iNVUhViKAMZ5/Edaavv9g
|
||||
=zDGA
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue