diff options
author | Henrik Brix Andersen <brix@gentoo.org> | 2006-04-14 14:40:26 +0000 |
---|---|---|
committer | Henrik Brix Andersen <brix@gentoo.org> | 2006-04-14 14:40:26 +0000 |
commit | 32d0d584d89339a47c808a707c6c3ecae1eb519c (patch) | |
tree | 5b765272303164e523b9476413e5a1c5c6568200 /sys-kernel/suspend2-sources | |
parent | Add powerd's init script based on the one contributed by Stefano Takekawa in ... (diff) | |
download | historical-32d0d584d89339a47c808a707c6c3ecae1eb519c.tar.gz historical-32d0d584d89339a47c808a707c6c3ecae1eb519c.tar.bz2 historical-32d0d584d89339a47c808a707c6c3ecae1eb519c.zip |
Pruned old ebuilds.
Package-Manager: portage-2.0.54
Diffstat (limited to 'sys-kernel/suspend2-sources')
54 files changed, 35 insertions, 2622 deletions
diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog index d48928d64165..913b05ef5c4a 100644 --- a/sys-kernel/suspend2-sources/ChangeLog +++ b/sys-kernel/suspend2-sources/ChangeLog @@ -1,6 +1,39 @@ # ChangeLog for sys-kernel/suspend2-sources # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.47 2006/04/12 21:30:12 morfic Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.48 2006/04/14 14:40:25 brix Exp $ + + 14 Apr 2006; Henrik Brix Andersen <brix@gentoo.org> + -files/suspend2-2.2-rc13-filewriter.patch, + -files/suspend2-2.2-rc14-do-correct-init-routine.patch, + -files/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch, + -files/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch, + -files/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch, + -files/suspend2-2.2-rc14-test-filewriter.patch, + -files/suspend2-2.2-rc15-get-next-bit-on.patch, + -files/suspend2-2.2-rc15-listen-to-abort-request.patch, + -files/suspend2-2.2-rc15-mce-config.patch, + -files/suspend2-2.2-rc15-no-pageflags.patch, + -files/suspend2-2.2-rc15-pageflags.h.patch, + -files/suspend2-2.2-rc16-amd64-is-ram.patch, + -files/suspend2-2.2-rc16-amd64-temporary-mapping.patch, + -files/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch, + -files/suspend2-2.2-rc16-debug-rodata-define.patch, + -files/suspend2-2.2-rc16-debug-writing-header.patch, + -files/suspend2-2.2-rc16-filewriter-fix.patch, + -files/suspend2-2.2-rc16-remove-block-dump.patch, + -files/suspend2-2.2-rc16-swapwriter-selects-swap.patch, + -files/suspend2-2.2-rc16-workqueue-post-suspend2.patch, + -files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch, + -files/suspend2-2.2-rc16-write-header-chunk-finish.patch, + -suspend2-sources-2.6.14.ebuild, -suspend2-sources-2.6.14-r4.ebuild, + -suspend2-sources-2.6.14-r5.ebuild, -suspend2-sources-2.6.14-r6.ebuild, + -suspend2-sources-2.6.14-r7.ebuild, -suspend2-sources-2.6.14-r8.ebuild, + -suspend2-sources-2.6.14-r10.ebuild, -suspend2-sources-2.6.15.ebuild, + -suspend2-sources-2.6.15-r1.ebuild, -suspend2-sources-2.6.15-r2.ebuild, + -suspend2-sources-2.6.15-r3.ebuild, -suspend2-sources-2.6.15-r4.ebuild, + -suspend2-sources-2.6.15-r5.ebuild, -suspend2-sources-2.6.15-r6.ebuild, + -suspend2-sources-2.6.15-r7.ebuild: + Pruned old ebuilds. 12 Apr 2006; Daniel Goller <morfic@gentoo.org> suspend2-sources-2.6.16-r2.ebuild: diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest index b4d5bd50ace8..1b7dfc8aebe8 100644 --- a/sys-kernel/suspend2-sources/Manifest +++ b/sys-kernel/suspend2-sources/Manifest @@ -1,196 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 e0fa52a674040fa8c64659fe6436d00d ChangeLog 11485 -RMD160 954d54336fd774fddad842c807297545b3f0c7c7 ChangeLog 11485 -SHA256 2fc61446a1f8adde05c2c06323111b17005e71e394fbb7708b53ea449fb0fe6c ChangeLog 11485 -MD5 ae95e997f0e9496adfb824ee7f166c5d files/digest-suspend2-sources-2.6.14 301 -RMD160 0a822af18c2d844be76175f104cc2cdd1ab8b365 files/digest-suspend2-sources-2.6.14 301 -SHA256 0f2f1fb85b376b8bc44a2596db8a5fdab404b8d5b046a388bc5673205c959524 files/digest-suspend2-sources-2.6.14 301 -MD5 bafcb8b6afdd5ecf198e3ee604a410ee files/digest-suspend2-sources-2.6.14-r10 303 -RMD160 d43d7be83cbb93623fa0bebdd85d7d677c18dd36 files/digest-suspend2-sources-2.6.14-r10 303 -SHA256 54e891ed1948447e89ea5d5e1e74fc38cc6174315c8c6127f2996034ba6d59bd files/digest-suspend2-sources-2.6.14-r10 303 -MD5 92ba5acc4df4d19ceaa8d998eb57738d files/digest-suspend2-sources-2.6.14-r4 303 -RMD160 0ccc23fb7b95322e1bf6157e2d0bc7de4161d07b files/digest-suspend2-sources-2.6.14-r4 303 -SHA256 b6df76512b587de38004de6eccf3636d4270a792422cc30515bdc76f463e5284 files/digest-suspend2-sources-2.6.14-r4 303 -MD5 92ba5acc4df4d19ceaa8d998eb57738d files/digest-suspend2-sources-2.6.14-r5 303 -RMD160 0ccc23fb7b95322e1bf6157e2d0bc7de4161d07b files/digest-suspend2-sources-2.6.14-r5 303 -SHA256 b6df76512b587de38004de6eccf3636d4270a792422cc30515bdc76f463e5284 files/digest-suspend2-sources-2.6.14-r5 303 -MD5 55fb5d3c6fea0515663795871515faf9 files/digest-suspend2-sources-2.6.14-r6 303 -RMD160 2d66fbbe31feb85a852b61630ab4f8422e37964c files/digest-suspend2-sources-2.6.14-r6 303 -SHA256 36909f5b482edd8efeb65008b239779a45ebd1ffb9a22fc52cd33d163fcb6243 files/digest-suspend2-sources-2.6.14-r6 303 -MD5 55fb5d3c6fea0515663795871515faf9 files/digest-suspend2-sources-2.6.14-r7 303 -RMD160 2d66fbbe31feb85a852b61630ab4f8422e37964c files/digest-suspend2-sources-2.6.14-r7 303 -SHA256 36909f5b482edd8efeb65008b239779a45ebd1ffb9a22fc52cd33d163fcb6243 files/digest-suspend2-sources-2.6.14-r7 303 -MD5 da3f42bad1e36436b75ebe041d853c0a files/digest-suspend2-sources-2.6.14-r8 303 -RMD160 ef227d7ad616cfc41059453abfb34829d4935d8f files/digest-suspend2-sources-2.6.14-r8 303 -SHA256 c7d136092d52af3390d2faf505ec383bb16722595465fc389c14d3bf2630130c files/digest-suspend2-sources-2.6.14-r8 303 -MD5 be9478be473d2185379b70443b714c65 files/digest-suspend2-sources-2.6.15 302 -RMD160 3c51317c6265b4204aef9fc0e4a15b53d27bc405 files/digest-suspend2-sources-2.6.15 302 -SHA256 9dbeb071b68540d0738e2f50a4addcc0f6b00fab3bce8664fac54a2ef8d83c17 files/digest-suspend2-sources-2.6.15 302 -MD5 514a1a6b724c2da7d174db76741c1a31 files/digest-suspend2-sources-2.6.15-r1 303 -RMD160 388a3a75187a2a4f3847d81884708fcf6f967b28 files/digest-suspend2-sources-2.6.15-r1 303 -SHA256 17ba73db0b4ae628868144067a8f574dcba487c29e442008c5ba35ef51297e64 files/digest-suspend2-sources-2.6.15-r1 303 -MD5 57cb3e2f103c1f69e64ea6a48b2526cb files/digest-suspend2-sources-2.6.15-r2 305 -RMD160 21c9ce2839832a45c53d096259939b2c9fe96292 files/digest-suspend2-sources-2.6.15-r2 305 -SHA256 b9d058a7c89850f7d6eff138fe2f01a59c9a7e538200e574439434394d53174e files/digest-suspend2-sources-2.6.15-r2 305 -MD5 9fb73e4e5ba2db8c0b482963cb7ff013 files/digest-suspend2-sources-2.6.15-r3 305 -RMD160 f25defb58e280dca3da885c3640f3214d444782a files/digest-suspend2-sources-2.6.15-r3 305 -SHA256 d9f3b59d18bef26afa280b3f920ad9accd3bb676b2dac84f6afeb7f3e4655aad files/digest-suspend2-sources-2.6.15-r3 305 -MD5 f82dc1db113eaf657226ba3dd874d77b files/digest-suspend2-sources-2.6.15-r4 300 -RMD160 67133146f2f98d83a1748630c3bf0841696bc88c files/digest-suspend2-sources-2.6.15-r4 300 -SHA256 eedfe03a37613e036cd02238f73fe87da47cbbf6e7f9d21cc97796b5d6b4783b files/digest-suspend2-sources-2.6.15-r4 300 -MD5 d53e3c097234f5bd2eb0588481ace291 files/digest-suspend2-sources-2.6.15-r5 300 -RMD160 670b6ec28e35118f75dfa6b356d80955bec59f7d files/digest-suspend2-sources-2.6.15-r5 300 -SHA256 65558038514d4c6fe9f0689b47d404dd5a40a277aeb9e77ba2fa2c8ed20d316c files/digest-suspend2-sources-2.6.15-r5 300 -MD5 627196410edd6e4906fd540cd3f3703d files/digest-suspend2-sources-2.6.15-r6 300 -RMD160 2587019a936378597102082f3ac56f1e60c78778 files/digest-suspend2-sources-2.6.15-r6 300 -SHA256 85e72d79e155c79b29509cf1e3f9c801417593cbc0ce5fd44cf54b62753efd95 files/digest-suspend2-sources-2.6.15-r6 300 -MD5 01c70a13eaa2445ed2b89c417d309546 files/digest-suspend2-sources-2.6.15-r7 300 -RMD160 626d564f1c8969db72ff1e1197e718d2b9f9bd57 files/digest-suspend2-sources-2.6.15-r7 300 -SHA256 ffc7b63d7192b998e0acac53fb39c20401a41f75dd4dadf4bdb4ad3ab6a68b82 files/digest-suspend2-sources-2.6.15-r7 300 +MD5 b03877b42306cf407c953d2cd3a78809 ChangeLog 13327 MD5 8438d5030157141e4836cf8ba44ca178 files/digest-suspend2-sources-2.6.15-r8 302 -RMD160 a9c5e6fb7ace7afd3aa4011065ffcdbe4bfd3bbb files/digest-suspend2-sources-2.6.15-r8 302 -SHA256 cde5e2fc8640d4dc07b6ef1cd1d7db6c49d4e181030f0b99e96896b95277d4be files/digest-suspend2-sources-2.6.15-r8 302 MD5 245f0ad4d0673fd4e98b822fb13264c2 files/digest-suspend2-sources-2.6.16 301 -RMD160 f8de123488744af903939c8cee6434789c6c6308 files/digest-suspend2-sources-2.6.16 301 -SHA256 4d73cd8b59fd4aecf6ae6161de50f56e83e1b1a2f3c8497378de1befd04d041d files/digest-suspend2-sources-2.6.16 301 MD5 b5bca010f3e90aa88f47d28ef5a9f24c files/digest-suspend2-sources-2.6.16-r1 302 -RMD160 cf7998d95d8dc7e2e43f2d1ef404e70672cfb7ac files/digest-suspend2-sources-2.6.16-r1 302 -SHA256 4498f913cf1a37127fd334d6a41dceea01fc04ef37dd93e34a603db1594d832e files/digest-suspend2-sources-2.6.16-r1 302 MD5 e4f349121637aaf90a70fe464b151868 files/digest-suspend2-sources-2.6.16-r2 1084 -RMD160 8001b0027b91c7f8348486ad5387d5f90a1fa27b files/digest-suspend2-sources-2.6.16-r2 1084 -SHA256 0fc9c5769b284278337ee9b4c3d579143d2da4f8f8f26da4a82edcfa3da04819 files/digest-suspend2-sources-2.6.16-r2 1084 -MD5 4c9a2a6532217c3e54a52f6633e33c9f files/suspend2-2.2-rc13-filewriter.patch 5283 -RMD160 95826639d533d39b308dc53a99bd0e2bba83bc55 files/suspend2-2.2-rc13-filewriter.patch 5283 -SHA256 8309c170c7949659e4fc298f933f0677c96f196c7de40998b23faaeaa168a4d2 files/suspend2-2.2-rc13-filewriter.patch 5283 -MD5 3a1912556d15f96edb9a356555dadf67 files/suspend2-2.2-rc14-do-correct-init-routine.patch 744 -RMD160 1969254390e4932b008134a7e22e00c25ef3bb66 files/suspend2-2.2-rc14-do-correct-init-routine.patch 744 -SHA256 4c3fe1d4c109ed8c112ddf6ee407f886150c1165dd9ed03c582cbe713de491bc files/suspend2-2.2-rc14-do-correct-init-routine.patch 744 -MD5 185ab2bbe913834d2839b1f010120e5b files/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch 2487 -RMD160 af17b49587d217a7ac4c90317998f4b8df678d29 files/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch 2487 -SHA256 3b6f0ab08c00872bd3ff34f7a72d0d299f11b9f4181ec972d2ab024c06d0ca39 files/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch 2487 -MD5 10e1c89732c17d3cb31f8742aedcee13 files/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch 1149 -RMD160 91f32abe6dbe428a3a8a0e834bd6cad140333800 files/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch 1149 -SHA256 e3a9110a5ba35c3f4d405735a8ca2be5234ccf68d1847e0ea88200b14bad2ff5 files/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch 1149 -MD5 55ffe19645dea1cc8df6866ff95737dd files/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch 671 -RMD160 8a43c68399d07a14376828b00eae49cb56e77675 files/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch 671 -SHA256 6bed96b4a7f9bacd741aa97baf5884c9499022ebb73e573a7238aeffc64ff4a4 files/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch 671 -MD5 ae183cf8eb4f23506651725c3ba32f67 files/suspend2-2.2-rc14-test-filewriter.patch 6262 -RMD160 03e7e7edcc8d210ba68e348e160d38073a2604c0 files/suspend2-2.2-rc14-test-filewriter.patch 6262 -SHA256 dd39a26aef06ec24c1a44e1de5c62f57381c45b11347695547c4dd46f6815233 files/suspend2-2.2-rc14-test-filewriter.patch 6262 -MD5 f4d1a2c278cb3e823c8f7da71afed4ee files/suspend2-2.2-rc15-get-next-bit-on.patch 5368 -RMD160 cb4a33562d0687dd814f106499ab746e46c55afe files/suspend2-2.2-rc15-get-next-bit-on.patch 5368 -SHA256 86f8fd6f7f568e323668b52584c1d0c5c9ad698eaaefafc84e6e4dd5d601528b files/suspend2-2.2-rc15-get-next-bit-on.patch 5368 -MD5 aa1349c52fa5f56680b2e612d415a6cb files/suspend2-2.2-rc15-listen-to-abort-request.patch 956 -RMD160 85d4a69532e87e1aa1c6e25629551fad546e008c files/suspend2-2.2-rc15-listen-to-abort-request.patch 956 -SHA256 f91f07bd4ac1a8550c66162ee8529e5b9ad238e372940ef3716e7ada23ca23f9 files/suspend2-2.2-rc15-listen-to-abort-request.patch 956 -MD5 7761c9dd108bf9dca9d3427b721f44f1 files/suspend2-2.2-rc15-mce-config.patch 873 -RMD160 8fae55b866d22c0e07ff83278ba1c7e6cb840540 files/suspend2-2.2-rc15-mce-config.patch 873 -SHA256 005a97db9a92b41747e8c43c6d656cc31e34007a7e00f6c5d9c69cf7231adcce files/suspend2-2.2-rc15-mce-config.patch 873 -MD5 d33577823e512a90a2b24754f74fdc07 files/suspend2-2.2-rc15-no-pageflags.patch 998 -RMD160 498dd43d01f34e4791db135d49c1e0121ef5b65e files/suspend2-2.2-rc15-no-pageflags.patch 998 -SHA256 9e7e70d073118ca600e43fab918ee72ef13cedc9b257a2c09ebf434ac6b0d835 files/suspend2-2.2-rc15-no-pageflags.patch 998 -MD5 6cd7d0c37cc50881f3d3b0feffedb4f1 files/suspend2-2.2-rc15-pageflags.h.patch 3990 -RMD160 1632722d09f62ccf2082f11a28ef8eae972b8ed0 files/suspend2-2.2-rc15-pageflags.h.patch 3990 -SHA256 66c1b72ca69b41528d0ca84f243214dd43e88b2a60afc843cbeef5daf75305c6 files/suspend2-2.2-rc15-pageflags.h.patch 3990 -MD5 417ee135d00c8e35c1f576c37f55e2d8 files/suspend2-2.2-rc16-amd64-is-ram.patch 1574 -RMD160 59c2180b0b8377b867069a3b7c53c584acb81227 files/suspend2-2.2-rc16-amd64-is-ram.patch 1574 -SHA256 4d32675aaee58557bdf8945a9b5e4a15a6766918876426dbfc38d86ff39a2d31 files/suspend2-2.2-rc16-amd64-is-ram.patch 1574 -MD5 eb08f1e0877c1949bb649bd278f8ad5b files/suspend2-2.2-rc16-amd64-temporary-mapping.patch 4459 -RMD160 860300265df4b8b0646a01b280faebb3100f28d4 files/suspend2-2.2-rc16-amd64-temporary-mapping.patch 4459 -SHA256 d48cdd71f48a8ee9fd8a756a59efd62586eb3eb0c6fdb46e45ea70e99de06d53 files/suspend2-2.2-rc16-amd64-temporary-mapping.patch 4459 -MD5 6e588370dc66e90b705b5e87ed22dc14 files/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch 2093 -RMD160 4d9d999829b8de1230affe1984eb652fcddc2dd8 files/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch 2093 -SHA256 39f67db7f4b308f027e1696836132003c9f9fd23c1d12e14a0413602eea8d585 files/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch 2093 -MD5 9e649815f55422127e1e239627ee2971 files/suspend2-2.2-rc16-debug-rodata-define.patch 1155 -RMD160 b7329e0420c740dae316684a92cc91fa7426db1b files/suspend2-2.2-rc16-debug-rodata-define.patch 1155 -SHA256 3037e771ee0732df1541c63799b67dd67b5706f663203ff2967712dcea6a68de files/suspend2-2.2-rc16-debug-rodata-define.patch 1155 -MD5 4700d50d9d279ad1d8d61aba313dcfaf files/suspend2-2.2-rc16-debug-writing-header.patch 2290 -RMD160 39b393243c1782c395592d99a2587244fec1c04a files/suspend2-2.2-rc16-debug-writing-header.patch 2290 -SHA256 701fb9da0f7649dc3fe90369f4c0f63c33ac9bf423714c3d8eec589fce2d37bc files/suspend2-2.2-rc16-debug-writing-header.patch 2290 -MD5 b353a7f443c97a1681251f6657686a0d files/suspend2-2.2-rc16-filewriter-fix.patch 2344 -RMD160 9a3aecb9111fd7b0ec00b5f96743c8d14d474cfb files/suspend2-2.2-rc16-filewriter-fix.patch 2344 -SHA256 32c8a5752a2a130edded535776bb58d388e7b7eab89fa572c7d596f285a966af files/suspend2-2.2-rc16-filewriter-fix.patch 2344 -MD5 ff097383fa8607f8da27f2d62fe3e313 files/suspend2-2.2-rc16-remove-block-dump.patch 1037 -RMD160 64a1e4e85b32991ef220f25eda202f3203da438a files/suspend2-2.2-rc16-remove-block-dump.patch 1037 -SHA256 7cfab3c0d7afe320679db279d84b908e5ffc68626ee7c704a90930586eea5d23 files/suspend2-2.2-rc16-remove-block-dump.patch 1037 -MD5 003a076c7965317f25792c5ee8c59b76 files/suspend2-2.2-rc16-swapwriter-selects-swap.patch 656 -RMD160 05e9b9b6ad45c7365741fa16788ecd541aa42d5d files/suspend2-2.2-rc16-swapwriter-selects-swap.patch 656 -SHA256 8a4b488e3b1af2aa6ab032f5c11aa398c8eacf6c14846941c9b7c707d95b65db files/suspend2-2.2-rc16-swapwriter-selects-swap.patch 656 -MD5 7b1dd9333115cf6aa3ca5241f5f07392 files/suspend2-2.2-rc16-workqueue-post-suspend2.patch 462 -RMD160 12deddeab4c1d465a08547e7e5bb7be52d3095ae files/suspend2-2.2-rc16-workqueue-post-suspend2.patch 462 -SHA256 3bbb55fe4a1dbe577660a3dab745331482ea107caf4ea8a8323f8c02a92e4326 files/suspend2-2.2-rc16-workqueue-post-suspend2.patch 462 -MD5 f3c382e7ff5bc9c62f303b6482a5b434 files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch 480 -RMD160 6c22d3d5916d134f0a8ec1624a34fb7cafaf2426 files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch 480 -SHA256 68320988dd74682f4949cdb020a57959b478423759e7774e856add6ac860ebba files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch 480 -MD5 5c00a3bc7a4e8410fae25bef22884041 files/suspend2-2.2-rc16-write-header-chunk-finish.patch 3937 -RMD160 4d0eab22a3139c0fb3070357e39b086b6675a281 files/suspend2-2.2-rc16-write-header-chunk-finish.patch 3937 -SHA256 82743adbd98d1781147bb42ead34abc473bd82d23a3a7ecf060c68113f08c1ba files/suspend2-2.2-rc16-write-header-chunk-finish.patch 3937 MD5 e40cb3df546efa5003fe3778c5a50854 metadata.xml 275 -RMD160 bb9c8ef3c69fe86366b78e657943d96a76dd0fd0 metadata.xml 275 -SHA256 f956e35dc8b0f2b7cee025ed720ca170482a7f3a6810733b10dbd7038530817d metadata.xml 275 -MD5 b7705bf1bdab57d3e57b3d9cb1a8cf55 suspend2-sources-2.6.14-r10.ebuild 2020 -RMD160 917868e8ef5c0ad13a52d0be56405130591e8d99 suspend2-sources-2.6.14-r10.ebuild 2020 -SHA256 99e82dc1fb2e28910ffc46c3946f7dc7bdcdcd43563d28039eacebcdeb6da8f9 suspend2-sources-2.6.14-r10.ebuild 2020 -MD5 aa65b078bf0942f139815933db9c3a46 suspend2-sources-2.6.14-r4.ebuild 1762 -RMD160 10a01f48992f5897824024cec80da205e6ddd7d9 suspend2-sources-2.6.14-r4.ebuild 1762 -SHA256 d3a4b16250fd5f657b0a49d7a01b856af18f9187cb04ecdaaf1dd5841f5fa085 suspend2-sources-2.6.14-r4.ebuild 1762 -MD5 5cfda97b5ce288a6978bc4cb747df913 suspend2-sources-2.6.14-r5.ebuild 1809 -RMD160 1194a65c2da624964f4f6ec8fc70b54239db2376 suspend2-sources-2.6.14-r5.ebuild 1809 -SHA256 40ed8537160655c1e4aca34bbd4643b5e7a9f6fc0c0a14fe2d78af593130d012 suspend2-sources-2.6.14-r5.ebuild 1809 -MD5 ef0d8e7f3382db7f92650dca96517ac3 suspend2-sources-2.6.14-r6.ebuild 1762 -RMD160 64b1f40a2938f3a4cd178ee25c606add00a8049e suspend2-sources-2.6.14-r6.ebuild 1762 -SHA256 7c207f7c5d46207e934b43fbafc8ef10c80015922862a7045e07839420931449 suspend2-sources-2.6.14-r6.ebuild 1762 -MD5 47b7971f89ffc40fd62aded939d754c3 suspend2-sources-2.6.14-r7.ebuild 2079 -RMD160 87e89731cf75fa2ef0baf7b62d7dd86886589165 suspend2-sources-2.6.14-r7.ebuild 2079 -SHA256 5cdd98dcfe40aab119c33271380d2b2c85333225c4621075a2434e3cf3fea025 suspend2-sources-2.6.14-r7.ebuild 2079 -MD5 d472627bfcb34566f5b3ef71e410737a suspend2-sources-2.6.14-r8.ebuild 2019 -RMD160 6563415d706b258c1eb6ea1c85be005108e6dd6e suspend2-sources-2.6.14-r8.ebuild 2019 -SHA256 a2a6cc6a3d8d16477c1853833a8a416a78cd45b0d7b2d1d541eb64eb4f3007e7 suspend2-sources-2.6.14-r8.ebuild 2019 -MD5 a24f87b3199f5a851070c6ce817dc3ca suspend2-sources-2.6.14.ebuild 1758 -RMD160 d6cadde4896e980b43b5b1661d0382e492178f45 suspend2-sources-2.6.14.ebuild 1758 -SHA256 2e16064df3068ca80678573845b669bfb3f8ef752d4f01af5886e46302eabca8 suspend2-sources-2.6.14.ebuild 1758 -MD5 498a52cfb7b6046820f62cfbe3bfd7d3 suspend2-sources-2.6.15-r1.ebuild 2100 -RMD160 8818741f669efe07bce81eb65262b7e53b935281 suspend2-sources-2.6.15-r1.ebuild 2100 -SHA256 9476a7cdb8f598d4636ede33b8379400c36429a66b19792403708b7031ffbcd4 suspend2-sources-2.6.15-r1.ebuild 2100 -MD5 1ca94d7fe636ae46eec711f47f67e358 suspend2-sources-2.6.15-r2.ebuild 2285 -RMD160 55a5a057d33fa04678836519a71488f0ebb28ea4 suspend2-sources-2.6.15-r2.ebuild 2285 -SHA256 403abf0879ac0abddb5917f98d6f7e82cf04cda2aaf322e353c4020f2f23bfab suspend2-sources-2.6.15-r2.ebuild 2285 -MD5 bee70b9b48f2fd8713365db32291680f suspend2-sources-2.6.15-r3.ebuild 2285 -RMD160 b40d2e39e549dee225fee4362421d3fa00d734a9 suspend2-sources-2.6.15-r3.ebuild 2285 -SHA256 2767aea16bdd28345809e0cba990e957a0580af160ff5932f8a3af8c7f36f401 suspend2-sources-2.6.15-r3.ebuild 2285 -MD5 ebb339d2463a43ed8d1aa20d099aa56f suspend2-sources-2.6.15-r4.ebuild 1760 -RMD160 ecc3e611f8d47703dd277c12f96cf10baf016415 suspend2-sources-2.6.15-r4.ebuild 1760 -SHA256 fda64643b05b851dc4b622fefdd856539194c82b1311c1b23031c98e8854cc88 suspend2-sources-2.6.15-r4.ebuild 1760 -MD5 0832258beebcb3439f70a45358a4d0f3 suspend2-sources-2.6.15-r5.ebuild 1760 -RMD160 d345adbdd67ab8b261f09dc88e759fe1af8606d3 suspend2-sources-2.6.15-r5.ebuild 1760 -SHA256 111ddf2a56176f0fcf33e7e5868aecb3d05871e1ed66037e987b779f2dd548f3 suspend2-sources-2.6.15-r5.ebuild 1760 -MD5 6f278e1c0a6b441f0805cfe96657c96f suspend2-sources-2.6.15-r6.ebuild 1759 -RMD160 ef8e599c8c2434cc8acb8948943d501d9543ae5a suspend2-sources-2.6.15-r6.ebuild 1759 -SHA256 33a527041d1baf9637ee57f00a9affbd1fc00993c1476f002a563af999045dcf suspend2-sources-2.6.15-r6.ebuild 1759 -MD5 d2448b7204ecec58dcbfe8263d96776a suspend2-sources-2.6.15-r7.ebuild 1760 -RMD160 4d3cb6257ec6f82171906e7f7e5f44aef65da7ba suspend2-sources-2.6.15-r7.ebuild 1760 -SHA256 14231e24f176fc9fd5e66f55ebaa31734d0753e8769a4def22123913610c0856 suspend2-sources-2.6.15-r7.ebuild 1760 MD5 76cab61eda6acf9fb765ea77a5b4b22a suspend2-sources-2.6.15-r8.ebuild 1760 -RMD160 970d6790acf85d9ef1678a070be560d89c435890 suspend2-sources-2.6.15-r8.ebuild 1760 -SHA256 7f2d7017a8d6413e5088d1a4875a102089ca79dabccc518bceb18d41ab739fa1 suspend2-sources-2.6.15-r8.ebuild 1760 -MD5 f6140ecc2feb0c046a6d5cb812bce375 suspend2-sources-2.6.15.ebuild 1759 -RMD160 504233fc5b42a3df902fa84b4f327b840f04561e suspend2-sources-2.6.15.ebuild 1759 -SHA256 e6a39c98b9ea7121ca0c0adf86b75d2dec4ae9c188acf21e5c8eca7877cab55a suspend2-sources-2.6.15.ebuild 1759 MD5 9207b38ba998315444e4d0de90a224e5 suspend2-sources-2.6.16-r1.ebuild 1761 -RMD160 383c2741d1abe46e670147f84d994ac45b522ccb suspend2-sources-2.6.16-r1.ebuild 1761 -SHA256 8a6b864fb3a2c5022fbeed7ed0e615dc08181802df8407b0afc171d973591bdf suspend2-sources-2.6.16-r1.ebuild 1761 MD5 fe9a125faed4abf5adc0881757b88c9e suspend2-sources-2.6.16-r2.ebuild 1768 -RMD160 e469294d22d12913979fc3ad07e1be3ca841521b suspend2-sources-2.6.16-r2.ebuild 1768 -SHA256 265b2d3b3af2a99a233b991403671cf89473dbe3ba7a78b98b57619dd0f8af12 suspend2-sources-2.6.16-r2.ebuild 1768 MD5 0b4bbc0927e855b30842a13061746329 suspend2-sources-2.6.16.ebuild 1758 -RMD160 0c646112286a9f667c05990526ba7f61cfc7eef2 suspend2-sources-2.6.16.ebuild 1758 -SHA256 bee12a7c1feba5a9159c70beba4ee4391a6a6ffbab207560735d9691c3cf5c2a suspend2-sources-2.6.16.ebuild 1758 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.1 (GNU/Linux) - -iD8DBQFEPXFk/aM9DdBw91cRAvv2AKC2VkF06CcwwUUaw91TMKcVaYgCKQCdGxeH -QRF0PELo/3bvMG0D0g6Ig08= -=8KbZ ------END PGP SIGNATURE----- diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14 deleted file mode 100644 index 602c3d61728a..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 -MD5 aea18c4938456c90a32fc482ad901350 genpatches-2.6.14-1.base.tar.bz2 5500 -MD5 caf818895a2c66c8e9a7244265005e4e genpatches-2.6.14-1.extras.tar.bz2 143042 -MD5 b5fc93cd6546aa5e0f279b23094bdbc5 suspend2-2.2-rc9-for-2.6.14.tar.bz2 114477 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r10 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r10 deleted file mode 100644 index 96d1092d880c..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r10 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 ff911a951afb455c13fd22f8a15a7444 genpatches-2.6.14-8.base.tar.bz2 53291 -MD5 44829e05b45d03c70ddf794fece4c202 genpatches-2.6.14-8.extras.tar.bz2 143076 -MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 -MD5 a390d689dc5de91222f905cae7d0d406 suspend2-2.2-rc15-for-2.6.14.tar.bz2 113332 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r4 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r4 deleted file mode 100644 index d796720edbf3..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r4 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 -MD5 8805ba0aea374e8dbdd8adeaf5e1b973 genpatches-2.6.14-4.base.tar.bz2 30355 -MD5 9f4f1a2c33dcbf0e90cd03d8429ff0af genpatches-2.6.14-4.extras.tar.bz2 142535 -MD5 ef869200f9280552d45a2c38782d6c9a suspend2-2.2-rc13-for-2.6.14.tar.bz2 116467 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r5 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r5 deleted file mode 100644 index d796720edbf3..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r5 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 -MD5 8805ba0aea374e8dbdd8adeaf5e1b973 genpatches-2.6.14-4.base.tar.bz2 30355 -MD5 9f4f1a2c33dcbf0e90cd03d8429ff0af genpatches-2.6.14-4.extras.tar.bz2 142535 -MD5 ef869200f9280552d45a2c38782d6c9a suspend2-2.2-rc13-for-2.6.14.tar.bz2 116467 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r6 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r6 deleted file mode 100644 index 484cd3408cad..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r6 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 -MD5 d7c6b3a322fd6f164af6b363e3adbe22 genpatches-2.6.14-5.base.tar.bz2 33008 -MD5 9f4f1a2c33dcbf0e90cd03d8429ff0af genpatches-2.6.14-5.extras.tar.bz2 142535 -MD5 6b24ba97453135f430594bb2fac8c007 suspend2-2.2-rc14-for-2.6.14.tar.bz2 114943 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r7 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r7 deleted file mode 100644 index 484cd3408cad..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r7 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 -MD5 d7c6b3a322fd6f164af6b363e3adbe22 genpatches-2.6.14-5.base.tar.bz2 33008 -MD5 9f4f1a2c33dcbf0e90cd03d8429ff0af genpatches-2.6.14-5.extras.tar.bz2 142535 -MD5 6b24ba97453135f430594bb2fac8c007 suspend2-2.2-rc14-for-2.6.14.tar.bz2 114943 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r8 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r8 deleted file mode 100644 index 615037c70523..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r8 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 7b4596d457b6ee6555467510f93beae1 genpatches-2.6.14-6.base.tar.bz2 43416 -MD5 9f4f1a2c33dcbf0e90cd03d8429ff0af genpatches-2.6.14-6.extras.tar.bz2 142535 -MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 -MD5 a390d689dc5de91222f905cae7d0d406 suspend2-2.2-rc15-for-2.6.14.tar.bz2 113332 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15 deleted file mode 100644 index 286565a840dc..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 2bbead9c7758b5180b2798fb8173659f genpatches-2.6.15-1.base.tar.bz2 2450 -MD5 05dbcd06217c03ce38bba4be2271818e genpatches-2.6.15-1.extras.tar.bz2 174205 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 b9e02ade7b5a1f41b5efbe693d3520e3 suspend2-2.2-rc16-for-2.6.15.tar.bz2 112822 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r1 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r1 deleted file mode 100644 index 8cac6a6a1d13..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r1 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 2673e8dcce81159f82aa457fd4c5591c genpatches-2.6.15-2.base.tar.bz2 15169 -MD5 484d94377e15e4ab3ddf84b897d8a09d genpatches-2.6.15-2.extras.tar.bz2 175417 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 b9e02ade7b5a1f41b5efbe693d3520e3 suspend2-2.2-rc16-for-2.6.15.tar.bz2 112822 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r2 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r2 deleted file mode 100644 index 41f510f078b0..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r2 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 2673e8dcce81159f82aa457fd4c5591c genpatches-2.6.15-2.base.tar.bz2 15169 -MD5 484d94377e15e4ab3ddf84b897d8a09d genpatches-2.6.15-2.extras.tar.bz2 175417 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 aa6bbcc7930ed7a11ff5504a90ad7aef suspend2-2.2-rc16-for-2.6.15.1.tar.bz2 112722 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r3 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r3 deleted file mode 100644 index b72360811f88..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r3 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 1d5fbdacd817651e4ff4f8ec178ed2d2 genpatches-2.6.15-3.base.tar.bz2 16532 -MD5 484d94377e15e4ab3ddf84b897d8a09d genpatches-2.6.15-3.extras.tar.bz2 175417 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 aa6bbcc7930ed7a11ff5504a90ad7aef suspend2-2.2-rc16-for-2.6.15.1.tar.bz2 112722 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r4 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r4 deleted file mode 100644 index 1635b961a149..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r4 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 1d5fbdacd817651e4ff4f8ec178ed2d2 genpatches-2.6.15-3.base.tar.bz2 16532 -MD5 484d94377e15e4ab3ddf84b897d8a09d genpatches-2.6.15-3.extras.tar.bz2 175417 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 a642bdebb019017b53315853bb57c34f suspend2-2.2-for-2.6.15.1.tar.bz2 113093 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r5 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r5 deleted file mode 100644 index 059465667ab5..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r5 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 c2df158db069700a712d049ab633cdd2 genpatches-2.6.15-5.base.tar.bz2 24590 -MD5 bc17afc67ba19b1ff205574aa24d125f genpatches-2.6.15-5.extras.tar.bz2 176893 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 a642bdebb019017b53315853bb57c34f suspend2-2.2-for-2.6.15.1.tar.bz2 113093 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r6 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r6 deleted file mode 100644 index c9871153a6b1..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r6 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 da86adff3b8090c9f64e7482d186820f genpatches-2.6.15-8.base.tar.bz2 37662 -MD5 a561eaa38567d6db81962dfb54ffd181 genpatches-2.6.15-8.extras.tar.bz2 176962 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 a642bdebb019017b53315853bb57c34f suspend2-2.2-for-2.6.15.1.tar.bz2 113093 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r7 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r7 deleted file mode 100644 index 09f41e138bc0..000000000000 --- a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.15-r7 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 1341b58b4d9afd1ca27ec9f6f2e914a4 genpatches-2.6.15-9.base.tar.bz2 51865 -MD5 a561eaa38567d6db81962dfb54ffd181 genpatches-2.6.15-9.extras.tar.bz2 176962 -MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836 -MD5 a642bdebb019017b53315853bb57c34f suspend2-2.2-for-2.6.15.1.tar.bz2 113093 diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc13-filewriter.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc13-filewriter.patch deleted file mode 100644 index eee9fc9fea98..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc13-filewriter.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -ruNp 9770-filewriter.patch-old/kernel/power/io.c 9770-filewriter.patch-new/kernel/power/io.c ---- 9770-filewriter.patch-old/kernel/power/io.c 2005-11-26 00:09:09.000000000 +1100 -+++ 9770-filewriter.patch-new/kernel/power/io.c 2005-11-26 00:07:52.000000000 +1100 -@@ -690,11 +690,9 @@ int write_image_header(void) - } - - /* Write suspend header */ -- printk("Writing image header.\n"); - fill_suspend_header((struct suspend_header *) header_buffer); - active_writer->ops.writer.write_header_chunk(header_buffer, - sizeof(struct suspend_header)); -- printk("Done.\n"); - - free_page((unsigned long) header_buffer); - -diff -ruNp 9770-filewriter.patch-old/kernel/power/suspend_file.c 9770-filewriter.patch-new/kernel/power/suspend_file.c ---- 9770-filewriter.patch-old/kernel/power/suspend_file.c 2005-11-26 00:09:09.000000000 +1100 -+++ 9770-filewriter.patch-new/kernel/power/suspend_file.c 2005-11-26 00:02:36.000000000 +1100 -@@ -300,7 +300,8 @@ static void filewriter_cleanup(int finis - } - } - --static void filewriter_get_target_info(char *target, int get_size) -+static void filewriter_get_target_info(char *target, int get_size, -+ int resume2) - { - if (target_file) - filewriter_cleanup(0); -@@ -310,7 +311,7 @@ static void filewriter_get_target_info(c - - target_file = filp_open(target, O_RDWR, 0); - -- if (target_file <= 0) { -+ if (IS_ERR(target_file) || !target_file) { - printk("Open file %s returned %p.\n", target, target_file); - target_file = NULL; - return; -@@ -333,10 +334,11 @@ static void filewriter_get_target_info(c - } else - target_bdev = target_inode->i_sb->s_bdev; - -- target_firstblock = bmap(target_inode, 0); -- - get_target_info(get_size); - -+ if (!resume2) -+ target_firstblock = bmap(target_inode, 0) << target_bmap_shift; -+ - return; - cleanup: - target_inode = NULL; -@@ -672,13 +674,13 @@ static int filewriter_write_header_clean - - /* Adjust image header */ - suspend_bio_ops.bdev_page_io(READ, target_bdev, -- target_firstblock << target_bmap_shift, -+ target_firstblock, - virt_to_page(filewriter_buffer)); - - prepare_signature(first_header_submit_info, filewriter_buffer); - - suspend_bio_ops.bdev_page_io(WRITE, target_bdev, -- target_firstblock << target_bmap_shift, -+ target_firstblock, - virt_to_page(filewriter_buffer)); - - free_page((unsigned long) filewriter_buffer); -@@ -736,13 +738,12 @@ static int file_init(void) - - /* Read filewriter configuration */ - suspend_bio_ops.bdev_page_io(READ, target_bdev, -- target_firstblock << target_bmap_shift, -+ target_firstblock, - virt_to_page((unsigned long) filewriter_buffer)); - - suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0, -- "Retrieving %d bytes from %x:%x to page %d, %p-%p.\n", -+ "Retrieving from %x:%x to page %d, %p-%p.\n", - target_bdev->bd_dev, target_firstblock, -- sizeof(filewriter_header_data), - filewriter_page_index, - filewriter_buffer, filewriter_buffer + sizeof(filewriter_header_data) - 1); - -@@ -826,17 +827,9 @@ static int filewriter_read_header_chunk( - suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0, - "Reading header page %d. ", - filewriter_page_index); -- suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0, -- "Dev is %x. Block is %lu. Blocksperpage is %d. ", -- target_bdev, -- next, -- target_blocksperpage); -- suspend_message(SUSPEND_WRITER, SUSPEND_HIGH, 0, -- "Bd_block_size is %d.\n", -- target_bdev->bd_block_size); - - suspend_bio_ops.bdev_page_io(READ, target_bdev, -- next << target_bmap_shift, -+ next, - virt_to_page(filewriter_buffer)); - } - -@@ -1088,7 +1081,7 @@ static int filewriter_signature_op(int o - } - - suspend_bio_ops.bdev_page_io(READ, target_bdev, -- target_firstblock << target_bmap_shift, -+ target_firstblock, - virt_to_page(cur)); - - result = parse_signature(cur); -@@ -1112,7 +1105,7 @@ static int filewriter_signature_op(int o - - if (changed) - suspend_bio_ops.bdev_page_io(WRITE, target_bdev, -- target_firstblock << target_bmap_shift, -+ target_firstblock, - virt_to_page(cur)); - - out: -@@ -1282,7 +1275,7 @@ static int filewriter_parse_sig_location - } - } - -- filewriter_get_target_info(commandline, 0); -+ filewriter_get_target_info(commandline, 0, 1); - - if (colon) - *colon = ':'; -@@ -1333,7 +1326,7 @@ static void filewriter_set_resume2(void) - - if (sector) - offset += snprintf(buffer + offset, PAGE_SIZE - offset, -- ":0x%lx", sector); -+ ":0x%lx", sector << target_bmap_shift); - } else - offset += snprintf(buffer + offset, PAGE_SIZE - offset, - "%s is not a valid target.", filewriter_target); -@@ -1373,7 +1366,7 @@ static void filewriter_load_config_info( - - static void test_filewriter_target(void) - { -- filewriter_get_target_info(filewriter_target, 0); -+ filewriter_get_target_info(filewriter_target, 0, 0); - if (filewriter_signature_op(GET_IMAGE_EXISTS) > -1) { - printk(name_suspend "Filewriter: File signature found.\n"); - filewriter_set_resume2(); -@@ -1403,7 +1396,7 @@ static int filewriter_initialise(int sta - } - - if (filewriter_target) -- filewriter_get_target_info(filewriter_target, starting_cycle); -+ filewriter_get_target_info(filewriter_target, starting_cycle, 0); - - if (starting_cycle && (filewriter_image_exists() == -1)) { - printk("%s is does not have a valid signature for suspending.\n", diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-do-correct-init-routine.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-do-correct-init-routine.patch deleted file mode 100644 index fe33c7fbf631..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-do-correct-init-routine.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruNp 9130-do-correct-init-routine.patch-old/kernel/power/io.c 9130-do-correct-init-routine.patch-new/kernel/power/io.c ---- 9130-do-correct-init-routine.patch-old/kernel/power/io.c 2005-12-04 23:44:17.000000000 +1000 -+++ 9130-do-correct-init-routine.patch-new/kernel/power/io.c 2005-12-04 23:43:42.000000000 +1000 -@@ -191,8 +191,8 @@ static int rw_init_plugins(int write, in - } - - /* Initialise writer */ -- if ((write && active_writer->read_init(which)) || -- (!write && active_writer->write_init(which))) { -+ if ((write && active_writer->write_init(which)) || -+ (!write && active_writer->read_init(which))) { - abort_suspend("Failed to initialise the writer."); - if (!write) - active_writer->ops.writer.invalidate_image(); diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch deleted file mode 100644 index 87e0242d7961..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -ruNp 9140-freeze-fses-in-reverse-mount-order.patch-old/kernel/power/process.c 9140-freeze-fses-in-reverse-mount-order.patch-new/kernel/power/process.c ---- 9140-freeze-fses-in-reverse-mount-order.patch-old/kernel/power/process.c 2005-12-05 10:00:42.000000000 +1000 -+++ 9140-freeze-fses-in-reverse-mount-order.patch-new/kernel/power/process.c 2005-12-05 09:53:03.000000000 +1000 -@@ -66,25 +66,26 @@ static atomic_t nr_kernelspace_frozen; - - struct frozen_fs - { -+ struct list_head fsb_list; - struct super_block *sb; -- struct frozen_fs *next; --} *frozen_fs_list; -+}; -+ -+LIST_HEAD(frozen_fs_list); - - void freezer_make_fses_rw(void) - { -- while (frozen_fs_list) { -- struct frozen_fs *this; -- char b[255]; -+ struct frozen_fs *fs, *next_fs; - -- this = frozen_fs_list; -- frozen_fs_list = frozen_fs_list->next; -- -- bdevname(this->sb->s_bdev, b); -+ list_for_each_entry_safe(fs, next_fs, &frozen_fs_list, fsb_list) { -+ char b[255]; -+ -+ bdevname(fs->sb->s_bdev, b); - - printk("Thawing %s.\n", b); -- thaw_bdev(this->sb->s_bdev, this->sb); -+ thaw_bdev(fs->sb->s_bdev, fs->sb); - -- kfree(this); -+ list_del(&fs->fsb_list); -+ kfree(fs); - } - } - -@@ -94,31 +95,33 @@ void freezer_make_fses_rw(void) - */ - int freezer_make_fses_ro(void) - { -- struct frozen_fs *new; -+ struct frozen_fs *fs; - struct super_block *sb; - -+ /* Generate the list */ - list_for_each_entry(sb, &super_blocks, s_list) { -- if (!sb->s_root || !sb->s_bdev) -- continue; -+ char b[255]; - -- if (sb->s_frozen == SB_FREEZE_TRANS) -+ if (!sb->s_root || !sb->s_bdev || -+ (sb->s_frozen == SB_FREEZE_TRANS) || -+ (sb->s_flags & MS_RDONLY)) - continue; - -- if (!(sb->s_flags & MS_RDONLY)) { -- char b[255]; -- -- new = kmalloc(sizeof(struct frozen_fs), GFP_ATOMIC); -- new->sb = sb; -- new->next = frozen_fs_list; -- -- bdevname(sb->s_bdev, b); -- -- printk("Attemting to freeze %s.\n", b); -- -- freeze_bdev(sb->s_bdev); -- -- frozen_fs_list = new; -- } -+ bdevname(sb->s_bdev, b); -+ printk("Adding %s to freeze list.\n", b); -+ fs = kmalloc(sizeof(struct frozen_fs), GFP_ATOMIC); -+ fs->sb = sb; -+ list_add_tail(&fs->fsb_list, &frozen_fs_list); -+ }; -+ -+ /* Do the freezing in reverse order so filesystems dependant -+ * upon others are frozen in the right order. (Eg loopback -+ * on ext3). */ -+ list_for_each_entry_reverse(fs, &frozen_fs_list, fsb_list) { -+ char b[255]; -+ bdevname(fs->sb->s_bdev, b); -+ printk("Attempting to freeze %s.\n", b); -+ freeze_bdev(fs->sb->s_bdev); - } - - return 0; diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch deleted file mode 100644 index ecf45c0a4a2b..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruNp 9110-remove-pfn_to_kaddr.patch-old/kernel/power/atomic_copy.c 9110-remove-pfn_to_kaddr.patch-new/kernel/power/atomic_copy.c ---- 9110-remove-pfn_to_kaddr.patch-old/kernel/power/atomic_copy.c 2005-12-03 18:44:01.000000000 +1000 -+++ 9110-remove-pfn_to_kaddr.patch-new/kernel/power/atomic_copy.c 2005-12-03 17:58:45.000000000 +1000 -@@ -254,8 +254,8 @@ static inline void copyback_low(void) - - while (origoffset < max_pfn) { - if (!is_highmem(o_zone)) { -- origpage = (unsigned long *) pfn_to_kaddr(origoffset); -- copypage = (unsigned long *) pfn_to_kaddr(copyoffset); -+ origpage = (unsigned long *) __va(origoffset << PAGE_SHIFT); -+ copypage = (unsigned long *) __va(copyoffset << PAGE_SHIFT); - - loop = (PAGE_SIZE / sizeof(unsigned long)) - 1; - -@@ -291,7 +291,7 @@ void copyback_high(void) - while (origoffset < max_pfn) { - if (PageHighMem(pfn_to_page(origoffset))) { - origpage = (unsigned long *) kmap_atomic(pfn_to_page(origoffset), KM_USER1); -- copypage = (unsigned long *) pfn_to_kaddr(copyoffset); -+ copypage = (unsigned long *) __va(copyoffset << PAGE_SHIFT); - - memcpy(origpage, copypage, PAGE_SIZE); - - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch deleted file mode 100644 index 112cdff9dc12..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruNp 9120-select-hotplug-cpu-instead-of-depending-on.patch-old/kernel/power/Kconfig 9120-select-hotplug-cpu-instead-of-depending-on.patch-new/kernel/power/Kconfig ---- 9120-select-hotplug-cpu-instead-of-depending-on.patch-old/kernel/power/Kconfig 2005-12-03 22:29:19.000000000 +1000 -+++ 9120-select-hotplug-cpu-instead-of-depending-on.patch-new/kernel/power/Kconfig 2005-12-03 22:25:08.000000000 +1000 -@@ -103,7 +103,8 @@ config SUSPEND2_CRYPTO - menuconfig SUSPEND2 - bool "Suspend2" - select DYN_PAGEFLAGS -- depends on PM && (!SMP || SUSPEND_SMP) -+ depends on PM -+ select HOTPLUG_CPU if SMP - ---help--- - Suspend2 is the 'new and improved' suspend support. - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-test-filewriter.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-test-filewriter.patch deleted file mode 100644 index d40dab54e704..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc14-test-filewriter.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff -ruNp 9200-test-filewriter.patch-old/kernel/power/suspend_file.c 9200-test-filewriter.patch-new/kernel/power/suspend_file.c ---- 9200-test-filewriter.patch-old/kernel/power/suspend_file.c 2005-12-06 13:36:12.000000000 +1000 -+++ 9200-test-filewriter.patch-new/kernel/power/suspend_file.c 2005-12-06 10:46:59.000000000 +1000 -@@ -305,14 +305,30 @@ static void filewriter_get_target_info(c - return; - } - -+ target_file = NULL; - resume_dev_t = name_to_dev_t(target); - if (!resume_dev_t) { - printk("Open file %s returned %p and name_to_devt failed.\n", target, target_file); -+ if (!resume_dev_t) { -+ struct kstat stat; -+ int error = vfs_stat(target, &stat); -+ if (error) { -+ printk("Stating the file also failed. Nothing more we can do.\n"); -+ return; -+ } -+ resume_dev_t = stat.rdev; -+ } - return; - } - target_bdev = open_by_devnum(resume_dev_t, FMODE_READ); -+ if (IS_ERR(target_bdev)) { -+ printk("Got a dev_num (%lx) but failed to open it.\n", -+ (unsigned long) resume_dev_t); -+ return; -+ } - printk("Set bdev in get target info.\n"); - used_devt = 1; -+ target_inode = target_bdev->bd_inode; - } else - target_inode = target_file->f_mapping->host; - -@@ -344,8 +360,10 @@ static void filewriter_get_target_info(c - return; - cleanup: - target_inode = NULL; -- filp_close(target_file, NULL); -- target_file = NULL; -+ if (target_file) { -+ filp_close(target_file, NULL); -+ target_file = NULL; -+ } - get_target_info(0); - } - -@@ -948,6 +966,65 @@ static void filewriter_mark_resume_attem - filewriter_signature_op(MARK_RESUME_ATTEMPTED); - } - -+static void filewriter_set_resume2(void) -+{ -+ char *buffer = (char *) get_zeroed_page(GFP_ATOMIC); -+ char *buffer2 = (char *) get_zeroed_page(GFP_ATOMIC); -+ unsigned long sector = bmap(target_inode, 0); -+ int offset = 0; -+ -+ if (target_bdev) { -+ set_devinfo(target_bdev, target_inode->i_blkbits); -+ -+ bdevname(target_bdev, buffer2); -+ offset += snprintf(buffer + offset, PAGE_SIZE - offset, -+ "/dev/%s", buffer2); -+ -+ if (sector) -+ offset += snprintf(buffer + offset, PAGE_SIZE - offset, -+ ":0x%lx", sector << devinfo.bmap_shift); -+ } else -+ offset += snprintf(buffer + offset, PAGE_SIZE - offset, -+ "%s is not a valid target.", filewriter_target); -+ -+ sprintf(resume2_file, "file:%s", buffer); -+ -+ free_page((unsigned long) buffer); -+ free_page((unsigned long) buffer2); -+ -+ attempt_to_parse_resume_device(); -+} -+ -+static int __test_filewriter_target(char *target, int resume_time) -+{ -+ filewriter_get_target_info(filewriter_target, 0, 0); -+ if (filewriter_signature_op(GET_IMAGE_EXISTS) > -1) { -+ printk(name_suspend "Filewriter: File signature found.\n"); -+ if (!resume_time) -+ filewriter_set_resume2(); -+ -+ suspend_bio_ops.set_posn(&filewriter_posn); -+ suspend_bio_ops.set_devinfo(&devinfo); -+ -+ return 0; -+ } -+ -+ if (*filewriter_target) -+ printk(KERN_ERR name_suspend -+ "Filewriter: Sorry. No signature found at %s.\n", -+ filewriter_target); -+ else -+ printk(KERN_ERR name_suspend -+ "Filewriter: Sorry. No signature found.\n"); -+ -+ return 1; -+} -+ -+static void test_filewriter_target(void) -+{ -+ __test_filewriter_target(filewriter_target, 0); -+} -+ - /* - * Parse Image Location - * -@@ -969,7 +1046,7 @@ static void filewriter_mark_resume_attem - static int filewriter_parse_sig_location(char *commandline, int only_writer) - { - char *thischar, *devstart = NULL, *colon = NULL, *at_symbol = NULL; -- int signature_found, result = -EINVAL, target_blocksize = 0; -+ int result = -EINVAL, target_blocksize = 0; - - if (strncmp(commandline, "file:", 5)) { - if (!only_writer) -@@ -1020,11 +1097,6 @@ static int filewriter_parse_sig_location - - filewriter_get_target_info(commandline, 0, 1); - -- if (colon) -- *colon = ':'; -- if (at_symbol) -- *at_symbol = '@'; -- - if (!target_bdev || IS_ERR(target_bdev)) { - target_bdev = NULL; - result = -1; -@@ -1034,52 +1106,15 @@ static int filewriter_parse_sig_location - if (target_blocksize) - set_devinfo(target_bdev, generic_ffs(target_blocksize)); - -- signature_found = filewriter_signature_op(GET_IMAGE_EXISTS); -- -- if (signature_found > -1) { -- printk(name_suspend "Filewriter: File signature found.\n"); -- result = 0; -- } else { -- if (*filewriter_target) -- printk(KERN_ERR name_suspend -- "Filewriter: Sorry. No signature found at %s\n", -- filewriter_target); -- else -- printk(KERN_ERR name_suspend -- "Filewriter: Sorry. No signature found.\n"); -- } -+ result = __test_filewriter_target(commandline, 1); - - out: -- return result; --} -- --static void filewriter_set_resume2(void) --{ -- char *buffer = (char *) get_zeroed_page(GFP_ATOMIC); -- char *buffer2 = (char *) get_zeroed_page(GFP_ATOMIC); -- unsigned long sector = bmap(target_inode, 0); -- int offset = 0; -- -- if (target_bdev) { -- set_devinfo(target_bdev, target_inode->i_blkbits); -- -- bdevname(target_bdev, buffer2); -- offset += snprintf(buffer + offset, PAGE_SIZE - offset, -- "/dev/%s", buffer2); -- -- if (sector) -- offset += snprintf(buffer + offset, PAGE_SIZE - offset, -- ":0x%lx", sector << devinfo.bmap_shift); -- } else -- offset += snprintf(buffer + offset, PAGE_SIZE - offset, -- "%s is not a valid target.", filewriter_target); -- -- sprintf(resume2_file, "file:%s", buffer); -- -- free_page((unsigned long) buffer); -- free_page((unsigned long) buffer2); -+ if (colon) -+ *colon = ':'; -+ if (at_symbol) -+ *at_symbol = '@'; - -- attempt_to_parse_resume_device(); -+ return result; - } - - /* filewriter_save_config_info -@@ -1107,26 +1142,6 @@ static void filewriter_load_config_info( - strcpy(filewriter_target, buffer); - } - --static void test_filewriter_target(void) --{ -- filewriter_get_target_info(filewriter_target, 0, 0); -- if (filewriter_signature_op(GET_IMAGE_EXISTS) > -1) { -- printk(name_suspend "Filewriter: File signature found.\n"); -- filewriter_set_resume2(); -- -- suspend_bio_ops.set_posn(&filewriter_posn); -- suspend_bio_ops.set_devinfo(&devinfo); -- } else { -- if (*filewriter_target) -- printk(KERN_ERR name_suspend -- "Filewriter: Sorry. No signature found at %s.\n", -- filewriter_target); -- else -- printk(KERN_ERR name_suspend -- "Filewriter: Sorry. No signature found.\n"); -- } --} -- - static int filewriter_initialise(int starting_cycle) - { - int result = 0; diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-get-next-bit-on.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-get-next-bit-on.patch deleted file mode 100644 index ca39df44ec31..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-get-next-bit-on.patch +++ /dev/null @@ -1,173 +0,0 @@ -Hi. - -This patch makes a backup of zone info we use before starting the -restoration of original kernel data, and uses that info rather than the -struct zones themselves when restoring the kernel data. - -Regards, - -Nigel - - atomic_copy.c | 74 ++++++++++++++++++++++++++++++++++++++++------------------ - 1 files changed, 52 insertions(+), 22 deletions(-) -diff -ruNp 9040-get-next-bit-on.patch-old/kernel/power/atomic_copy.c 9040-get-next-bit-on.patch-new/kernel/power/atomic_copy.c ---- 9040-get-next-bit-on.patch-old/kernel/power/atomic_copy.c 2005-12-27 20:52:30.000000000 +1000 -+++ 9040-get-next-bit-on.patch-new/kernel/power/atomic_copy.c 2005-12-27 20:52:18.000000000 +1000 -@@ -32,11 +32,12 @@ static dyn_pageflags_t __nosavedata copy - static int __nosavedata origoffset; - static int __nosavedata copyoffset; - static int __nosavedata loop; --static __nosavedata struct zone *o_zone, *c_zone; - static __nosavedata int o_zone_num, c_zone_num; - static __nosavedata int is_resuming; - - __nosavedata char resume_commandline[COMMAND_LINE_SIZE]; -+static __nosavedata unsigned long *zone_nosave; -+static __nosavedata int num_zones; - - static atomic_t atomic_copy_hold; - static atomic_t restore_thread_ready; -@@ -44,28 +45,59 @@ static atomic_t restore_thread_ready; - suspend2_saved_context_t suspend2_saved_context; /* temporary storage */ - cpumask_t saved_affinity[NR_IRQS]; - -+/* -+ * Zone information might be overwritten during the copy back, -+ * so we copy the fields we need to a non-conflicting page and -+ * use it. -+ */ -+static void init_nosave_zone_table(void) -+{ -+ struct zone *zone; -+ -+ zone_nosave = (unsigned long *) suspend2_get_nonconflicting_pages(0); -+ -+ BUG_ON(!zone_nosave); -+ -+ for_each_zone(zone) { -+ if (zone->spanned_pages) { -+ zone_nosave[num_zones * 3 ] = zone->zone_start_pfn; -+ zone_nosave[num_zones * 3 + 1] = zone->zone_start_pfn + -+ zone->spanned_pages; -+ zone_nosave[num_zones * 3 + 2] = is_highmem(zone); -+ } -+ num_zones++; -+ } -+} -+ - /* For Suspend2, where this all has to be inlined */ --static int __get_next_bit_on(dyn_pageflags_t bitmap, struct zone **zone, -- int *zone_num, int counter) -+static int __get_next_bit_on(dyn_pageflags_t bitmap, int *zone_num, int counter) - { - unsigned long *ul_ptr = NULL; - int reset_ul_ptr = 1; - BUG_ON(counter == max_pfn); - -- if (counter == -1) -- counter = pgdat_list->node_zones->zone_start_pfn - 1; -+ if (counter == -1) { -+ *zone_num = 0; -+ -+ /* -+ * Test the end because the start can validly -+ * be zero. -+ */ -+ while (!zone_nosave[(*zone_num) * 3 + 1]) -+ *zone_num++; -+ counter = zone_nosave[*zone_num * 3] - 1; -+ } - - do { - counter++; -- if (counter >= ((*zone)->zone_start_pfn + (*zone)->spanned_pages)) { -- do { -- *zone = next_zone(*zone); -+ if (counter >= zone_nosave[(*zone_num) * 3 + 1]) { -+ (*zone_num)++; -+ while (!zone_nosave[(*zone_num) * 3 + 1] && *zone_num < num_zones) - (*zone_num)++; -- } while (*zone && !(*zone)->spanned_pages); - -- if (!*zone) -+ if (*zone_num == num_zones) - return max_pfn; -- counter = (*zone)->zone_start_pfn; -+ counter = zone_nosave[(*zone_num) * 3]; - reset_ul_ptr = 1; - } else - if (!(counter & BIT_NUM_MASK)) -@@ -73,9 +105,9 @@ static int __get_next_bit_on(dyn_pagefla - if (reset_ul_ptr) { - reset_ul_ptr = 0; - ul_ptr = PAGE_UL_PTR(bitmap, *zone_num, -- (counter - (*zone)->zone_start_pfn)); -+ (counter - zone_nosave[(*zone_num) * 3])); - if (!*ul_ptr) { -- counter += BIT_NUM_MASK; -+ counter += BIT_NUM_MASK - 1; - continue; - } - } -@@ -100,6 +132,8 @@ static void copyback_prepare(void) - io_speed_save[loop/2][loop%2] = - suspend_io_time[loop/2][loop%2]; - -+ init_nosave_zone_table(); -+ - memcpy(resume_commandline, saved_command_line, COMMAND_LINE_SIZE); - - suspend2_map_atomic_copy_pages(); -@@ -235,19 +269,17 @@ static inline void copyback_low(void) - unsigned long *origpage; - unsigned long *copypage; - -- o_zone = pgdat_list->node_zones; - o_zone_num = 0; -- c_zone = pgdat_list->node_zones; - c_zone_num = 0; - - origmap = pageset1_map; - copymap = pageset1_copy_map; - -- origoffset = __get_next_bit_on(origmap, &o_zone, &o_zone_num, -1); -- copyoffset = __get_next_bit_on(copymap, &c_zone, &c_zone_num, -1); -+ origoffset = __get_next_bit_on(origmap, &o_zone_num, -1); -+ copyoffset = __get_next_bit_on(copymap, &c_zone_num, -1); - - while (origoffset < max_pfn) { -- if (!is_highmem(o_zone)) { -+ if (!zone_nosave[o_zone_num * 3 + 2]) { - origpage = (unsigned long *) __va(origoffset << PAGE_SHIFT); - copypage = (unsigned long *) __va(copyoffset << PAGE_SHIFT); - -@@ -259,9 +291,9 @@ static inline void copyback_low(void) - } - } - -- origoffset = __get_next_bit_on(origmap, &o_zone, &o_zone_num, -+ origoffset = __get_next_bit_on(origmap, &o_zone_num, - origoffset); -- copyoffset = __get_next_bit_on(copymap, &c_zone, &c_zone_num, -+ copyoffset = __get_next_bit_on(copymap, &c_zone_num, - copyoffset); - } - } -@@ -274,9 +306,7 @@ void copyback_high(void) - unsigned long *origpage; - unsigned long *copypage; - -- o_zone = pgdat_list->node_zones; - o_zone_num = 0; -- c_zone = pgdat_list->node_zones; - c_zone_num = 0; - - origoffset = get_next_bit_on(origmap, -1); - - - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-listen-to-abort-request.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-listen-to-abort-request.patch deleted file mode 100644 index 312967671c2b..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-listen-to-abort-request.patch +++ /dev/null @@ -1,32 +0,0 @@ -Hi. - -The loop in the i/o core that submits I/O lost the check for aborting in -the recent cleanup. - -This patch restores it. - -Nigel - - io.c | 3 +++ - 1 files changed, 3 insertions(+) -diff -ruNp 9030-listen-to-abort-request.patch-old/kernel/power/io.c 9030-listen-to-abort-request.patch-new/kernel/power/io.c ---- 9030-listen-to-abort-request.patch-old/kernel/power/io.c 2005-12-27 20:44:56.000000000 +1000 -+++ 9030-listen-to-abort-request.patch-new/kernel/power/io.c 2005-12-26 21:42:20.000000000 +1000 -@@ -315,6 +315,9 @@ static int do_rw_loop(int write, int fin - /* Interactivity*/ - check_shift_keys(0, NULL); - -+ if (test_result_state(SUSPEND_ABORTED) && write) -+ return 1; -+ - /* Prepare next */ - current_page_index = get_next_bit_on(*pageflags, - current_page_index); - - - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config.patch deleted file mode 100644 index 3179f86314b4..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -Hi. - -This patch makes reinitialising mces dependant upon support for mces -actually being compiled in. - -Regards, - -Nigel - - suspend2.h | 2 ++ - 1 files changed, 2 insertions(+) -diff -ruNp 9010-mce-config.patch-old/include/asm-i386/suspend2.h 9010-mce-config.patch-new/include/asm-i386/suspend2.h ---- 9010-mce-config.patch-old/include/asm-i386/suspend2.h 2005-12-27 20:44:01.000000000 +1000 -+++ 9010-mce-config.patch-new/include/asm-i386/suspend2.h 2005-12-26 20:56:11.000000000 +1000 -@@ -258,7 +258,9 @@ static inline void suspend2_arch_restore - do_fpu_end(); - - mtrr_ap_init(); -+#ifdef CONFIG_X86_MCE - mcheck_init(&boot_cpu_data); -+#endif - } - - static inline void suspend2_arch_flush_caches(void) - - - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-no-pageflags.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-no-pageflags.patch deleted file mode 100644 index c96600e85e77..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-no-pageflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -Hi. - -This patch against 2.2-rc15 removes the only use of a pageflags macro. -The macro itself is removed in a forthcoming patch. - -Regards, - -Nigel - - prepare_image.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) -diff -ruNp 9000.patch-old/kernel/power/prepare_image.c 9000.patch-new/kernel/power/prepare_image.c ---- 9000.patch-old/kernel/power/prepare_image.c 2005-12-27 20:43:33.000000000 +1000 -+++ 9000.patch-new/kernel/power/prepare_image.c 2005-12-26 17:13:02.000000000 +1000 -@@ -108,7 +108,7 @@ static inline int header_storage_needed( - sizeof(struct suspend_header) + - sizeof(struct plugin_header) + - (int) header_storage_for_plugins() + -- (PAGES_PER_DYN_PAGEFLAG << PAGE_SHIFT) + -+ (dyn_pageflags_pages_per_bitmap() << PAGE_SHIFT) + - num_plugins * - (sizeof(struct plugin_header) + sizeof(int))); - - - - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-pageflags.h.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-pageflags.h.patch deleted file mode 100644 index 57e7e922d333..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-pageflags.h.patch +++ /dev/null @@ -1,100 +0,0 @@ -Hi. - -This patch cleans up some duplication in include/linux/dyn_pageflags, -kernel/power/pageflags.h and lib/dyn_pageflags.c. - -Regards, - -Nigel - - include/linux/dyn_pageflags.h | 16 +++++++++------- - kernel/power/pageflags.h | 4 ---- - lib/dyn_pageflags.c | 19 ------------------- - 3 files changed, 9 insertions(+), 30 deletions(-) -diff -ruNp 9050-pageflags.h-old/include/linux/dyn_pageflags.h 9050-pageflags.h-new/include/linux/dyn_pageflags.h ---- 9050-pageflags.h-old/include/linux/dyn_pageflags.h 2005-12-27 20:25:56.000000000 +1000 -+++ 9050-pageflags.h-new/include/linux/dyn_pageflags.h 2005-12-27 20:25:49.000000000 +1000 -@@ -40,23 +40,25 @@ typedef unsigned long *** dyn_pageflags_ - - #define PAGE_UL_PTR(bitmap, zone_num, zone_pfn) \ - ((bitmap[zone_num][PAGENUMBER(zone_pfn)])+PAGEINDEX(zone_pfn)) --#define PAGES_PER_DYN_PAGEFLAG (dyn_pageflags_pages_per_bitmap()) - - /* With the above macros defined, you can do... - --#define PageInUse(page) \ -- test_bit(PAGEBIT(page), PAGE_UL_PTR(in_use_map, page)) --#define SetPageInUse(page) \ -- set_bit(PAGEBIT(page), PAGE_UL_PTR(in_use_map, page)) --#define ClearPageInUse(page) \ -- clear_bit(PAGEBIT(page), PAGE_UL_PTR(in_use_map, page)) -+#define PagePageset1(page) (test_dynpageflag(&pageset1_map, page)) -+#define SetPagePageset1(page) (set_dynpageflag(&pageset1_map, page)) -+#define ClearPagePageset1(page) (clear_dynpageflag(&pageset1_map, page)) - */ - -+#define BITMAP_FOR_EACH_SET(bitmap, counter) \ -+ for (counter = get_next_bit_on(bitmap, -1); counter < max_pfn; \ -+ counter = get_next_bit_on(bitmap, counter)) -+ - extern void clear_dyn_pageflags(dyn_pageflags_t pagemap); - extern int allocate_dyn_pageflags(dyn_pageflags_t *pagemap); - extern int free_dyn_pageflags(dyn_pageflags_t *pagemap); - extern int dyn_pageflags_pages_per_bitmap(void); - extern int get_next_bit_on(dyn_pageflags_t bitmap, int counter); -+extern unsigned long *dyn_pageflags_ul_ptr(dyn_pageflags_t *bitmap, -+ struct page *pg); - - extern int test_dynpageflag(dyn_pageflags_t *bitmap, struct page *page); - extern void set_dynpageflag(dyn_pageflags_t *bitmap, struct page *page); -diff -ruNp 9050-pageflags.h-old/kernel/power/pageflags.h 9050-pageflags.h-new/kernel/power/pageflags.h ---- 9050-pageflags.h-old/kernel/power/pageflags.h 2005-12-27 20:25:56.000000000 +1000 -+++ 9050-pageflags.h-new/kernel/power/pageflags.h 2005-12-27 10:17:51.000000000 +1000 -@@ -80,10 +80,6 @@ static inline void ClearPageChecksumIgno - clear_dynpageflag(&checksum_map, page); - }; - --#define BITMAP_FOR_EACH_SET(bitmap, counter) \ -- for (counter = get_next_bit_on(bitmap, -1); counter < max_pfn; \ -- counter = get_next_bit_on(bitmap, counter)) -- - extern void save_dyn_pageflags(dyn_pageflags_t pagemap); - extern void load_dyn_pageflags(dyn_pageflags_t pagemap); - void relocate_dyn_pageflags(dyn_pageflags_t *pagemap); -diff -ruNp 9050-pageflags.h-old/lib/dyn_pageflags.c 9050-pageflags.h-new/lib/dyn_pageflags.c ---- 9050-pageflags.h-old/lib/dyn_pageflags.c 2005-12-27 20:25:56.000000000 +1000 -+++ 9050-pageflags.h-new/lib/dyn_pageflags.c 2005-12-27 10:07:36.000000000 +1000 -@@ -23,25 +23,6 @@ - - #define page_to_zone_offset(pg) (page_to_pfn(pg) - page_zone(pg)->zone_start_pfn) - --#if BITS_PER_LONG == 32 --#define UL_SHIFT 5 --#else --#if BITS_PER_LONG == 64 --#define UL_SHIFT 6 --#else --#error Bits per long not 32 or 64? --#endif --#endif -- --#define BIT_NUM_MASK (sizeof(unsigned long) * 8 - 1) --#define PAGE_NUM_MASK (~((1 << (PAGE_SHIFT + 3)) - 1)) --#define UL_NUM_MASK (~(BIT_NUM_MASK | PAGE_NUM_MASK)) -- --#define BITS_PER_PAGE (PAGE_SIZE << 3) --#define PAGENUMBER(zone_offset) (zone_offset >> (PAGE_SHIFT + 3)) --#define PAGEINDEX(zone_offset) ((zone_offset & UL_NUM_MASK) >> UL_SHIFT) --#define PAGEBIT(zone_offset) (zone_offset & BIT_NUM_MASK) -- - int num_zones(void) - { - int result = 0; - - - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-is-ram.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-is-ram.patch deleted file mode 100644 index ec5d8980562d..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-is-ram.patch +++ /dev/null @@ -1,41 +0,0 @@ -Hi. - -The vanilla AMD64 code doesn't include a page_is_ram function so I implemented one, and managed to get it horribly wrong, but didn't notice until this morning. This patch fixes the issue. - -Regards, - -Nigel - - arch/x86_64/kernel/e820.c | 2 +- - include/asm-x86_64/page.h | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) -diff -ruNp 9180-amd64-page-is-ram.patch-old/arch/x86_64/kernel/e820.c 9180-amd64-page-is-ram.patch-new/arch/x86_64/kernel/e820.c ---- 9180-amd64-page-is-ram.patch-old/arch/x86_64/kernel/e820.c 2006-01-10 13:20:41.000000000 +1000 -+++ 9180-amd64-page-is-ram.patch-new/arch/x86_64/kernel/e820.c 2006-01-10 12:48:26.000000000 +1000 -@@ -197,7 +197,7 @@ int page_is_ram(unsigned long pagenr) - ei->addr >= (start + PAGE_SIZE)) - continue; - -- return (ei->type != E820_RAM); -+ return (ei->type == E820_RAM); - } - - return 0; -diff -ruNp 9180-amd64-page-is-ram.patch-old/include/asm-x86_64/page.h 9180-amd64-page-is-ram.patch-new/include/asm-x86_64/page.h ---- 9180-amd64-page-is-ram.patch-old/include/asm-x86_64/page.h 2006-01-03 15:08:44.000000000 +1000 -+++ 9180-amd64-page-is-ram.patch-new/include/asm-x86_64/page.h 2006-01-10 12:48:26.000000000 +1000 -@@ -93,6 +93,8 @@ typedef struct { unsigned long pgprot; } - - #include <asm/bug.h> - -+extern int page_is_ram(unsigned long pagenr); -+ - #endif /* __ASSEMBLY__ */ - - #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-temporary-mapping.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-temporary-mapping.patch deleted file mode 100644 index 0fc03ddcc91a..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-amd64-temporary-mapping.patch +++ /dev/null @@ -1,136 +0,0 @@ - arch/x86_64/kernel/suspend.c | 6 --- - include/asm-x86_64/suspend2.h | 68 ++++++++++++++++++++++++++++++++++++++++-- - kernel/power/atomic_copy.c | 3 + - 3 files changed, 69 insertions(+), 8 deletions(-) -diff -ruNp 9020-amd64-temporary-mapping.patch-old/arch/x86_64/kernel/suspend.c 9020-amd64-temporary-mapping.patch-new/arch/x86_64/kernel/suspend.c ---- 9020-amd64-temporary-mapping.patch-old/arch/x86_64/kernel/suspend.c 2006-01-11 16:53:54.000000000 +1000 -+++ 9020-amd64-temporary-mapping.patch-new/arch/x86_64/kernel/suspend.c 2006-01-11 16:50:14.000000000 +1000 -@@ -144,7 +144,7 @@ void fix_processor_context(void) - - } - --#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_SUSPEND2) -+#if defined(CONFIG_SOFTWARE_SUSPEND) - /* Defined in arch/x86_64/kernel/suspend_asm.S */ - extern int restore_image(void); - -@@ -224,8 +224,4 @@ int swsusp_arch_resume(void) - return 0; - } - --int suspend2_mapping_prepare(void) --{ -- return set_up_temporary_mappings(); --} - #endif /* CONFIG_SOFTWARE_SUSPEND */ -diff -ruNp 9020-amd64-temporary-mapping.patch-old/include/asm-x86_64/suspend2.h 9020-amd64-temporary-mapping.patch-new/include/asm-x86_64/suspend2.h ---- 9020-amd64-temporary-mapping.patch-old/include/asm-x86_64/suspend2.h 2006-01-11 16:53:54.000000000 +1000 -+++ 9020-amd64-temporary-mapping.patch-new/include/asm-x86_64/suspend2.h 2006-01-11 16:53:29.000000000 +1000 -@@ -14,7 +14,7 @@ - #include <asm/proto.h> - #include <asm/page.h> - --extern pgd_t *temp_level4_pgt; -+static pgd_t *temp_level4_pgt; - extern int suspend2_mapping_prepare(void); - - /* image of the saved processor states */ -@@ -303,13 +303,77 @@ static inline void suspend2_arch_post_co - { - } - -+/* Based on the version from swsusp */ -+static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end) -+{ -+ long i, j; -+ -+ i = pud_index(address); -+ pud = pud + i; -+ for (; i < PTRS_PER_PUD; pud++, i++) { -+ unsigned long paddr; -+ pmd_t *pmd; -+ -+ paddr = address + i*PUD_SIZE; -+ if (paddr >= end) -+ break; -+ -+ pmd = (pmd_t *)suspend2_get_nonconflicting_pages(0); -+ if (!pmd) -+ return -ENOMEM; -+ set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE)); -+ for (j = 0; j < PTRS_PER_PMD; pmd++, j++, paddr += PMD_SIZE) { -+ unsigned long pe; -+ -+ if (paddr >= end) -+ break; -+ pe = _PAGE_NX | _PAGE_PSE | _KERNPG_TABLE | paddr; -+ pe &= __supported_pte_mask; -+ set_pmd(pmd, __pmd(pe)); -+ } -+ } -+ return 0; -+} -+ -+static int set_up_temporary_mappings_suspend2(void) -+{ -+ unsigned long start, end, next; -+ int error; -+ -+ temp_level4_pgt = (pgd_t *)suspend2_get_nonconflicting_pages(0); -+ if (!temp_level4_pgt) -+ return -ENOMEM; -+ -+ /* It is safe to reuse the original kernel mapping */ -+ set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map), -+ init_level4_pgt[pgd_index(__START_KERNEL_map)]); -+ -+ /* Set up the direct mapping from scratch */ -+ start = (unsigned long)pfn_to_kaddr(0); -+ end = (unsigned long)pfn_to_kaddr(end_pfn); -+ -+ for (; start < end; start = next) { -+ pud_t *pud = (pud_t *)suspend2_get_nonconflicting_pages(0); -+ if (!pud) -+ return -ENOMEM; -+ next = start + PGDIR_SIZE; -+ if (next > end) -+ next = end; -+ if ((error = res_phys_pud_init(pud, __pa(start), __pa(next)))) -+ return error; -+ set_pgd(temp_level4_pgt + pgd_index(start), -+ mk_kernel_pgd(__pa(pud))); -+ } -+ return 0; -+} -+ - static inline void suspend2_arch_pre_copyback(void) - { - /* We want to run from swsusp_pg_dir, since swsusp_pg_dir is stored in - * constant place in memory. - */ - -- suspend2_mapping_prepare(); -+ set_up_temporary_mappings_suspend2(); - - asm volatile ("movq $0xffff810000000000, %rdx"); - asm volatile ("movq temp_level4_pgt(%rip), %rax"); -diff -ruNp 9020-amd64-temporary-mapping.patch-old/kernel/power/atomic_copy.c 9020-amd64-temporary-mapping.patch-new/kernel/power/atomic_copy.c ---- 9020-amd64-temporary-mapping.patch-old/kernel/power/atomic_copy.c 2006-01-11 16:53:55.000000000 +1000 -+++ 9020-amd64-temporary-mapping.patch-new/kernel/power/atomic_copy.c 2006-01-11 16:30:07.000000000 +1000 -@@ -5,7 +5,6 @@ - #include <linux/highmem.h> - #include <linux/kthread.h> - #include <asm/setup.h> --#include <asm/suspend2.h> - #include <asm/param.h> - #include <asm/thread_info.h> - #include "suspend2_common.h" -@@ -21,6 +20,8 @@ - #include "debug_pagealloc.h" - #include "storage.h" - -+#include <asm/suspend2.h> -+ - volatile static int state1 __nosavedata = 0; - volatile static int state2 __nosavedata = 0; - volatile static int state3 __nosavedata = 0; diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch deleted file mode 100644 index 87f2707cf4fe..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch +++ /dev/null @@ -1,53 +0,0 @@ - prepare_image.c | 7 ++++--- - suspend.c | 12 +++++------- - 2 files changed, 9 insertions(+), 10 deletions(-) -diff -ruNp 9060-clean-prepare-image-result-testing.patch-old/kernel/power/prepare_image.c 9060-clean-prepare-image-result-testing.patch-new/kernel/power/prepare_image.c ---- 9060-clean-prepare-image-result-testing.patch-old/kernel/power/prepare_image.c 2006-01-12 13:56:09.000000000 +1000 -+++ 9060-clean-prepare-image-result-testing.patch-new/kernel/power/prepare_image.c 2006-01-12 10:14:43.000000000 +1000 -@@ -744,7 +744,7 @@ - header_space_allocated = 0; - - if (attempt_to_freeze()) -- return 0; -+ return 1; - - if (!extra_pd1_pages_allowance) - get_extra_pd1_allowance(); -@@ -755,7 +755,7 @@ - printk(KERN_ERR "You need some storage available to be able to suspend.\n"); - set_result_state(SUSPEND_ABORTED); - set_result_state(SUSPEND_NOSTORAGE_AVAILABLE); -- return 0; -+ return 1; - } - - do { -@@ -780,5 +780,5 @@ - - check_shift_keys(1, "Image preparation complete."); - -- return !result; -+ return result; - } -diff -ruNp 9060-clean-prepare-image-result-testing.patch-old/kernel/power/suspend.c 9060-clean-prepare-image-result-testing.patch-new/kernel/power/suspend.c ---- 9060-clean-prepare-image-result-testing.patch-old/kernel/power/suspend.c 2006-01-12 13:56:08.000000000 +1000 -+++ 9060-clean-prepare-image-result-testing.patch-new/kernel/power/suspend.c 2006-01-12 10:29:52.000000000 +1000 -@@ -646,13 +646,11 @@ - if (test_result_state(SUSPEND_KEPT_IMAGE) && check_still_keeping_image()) - goto cleanup; - -- if (suspend2_init() && suspend2_prepare_image() && !test_result_state(SUSPEND_ABORTED) && -- !test_action_state(SUSPEND_FREEZER_TEST)) -- { -- if (!test_result_state(SUSPEND_ABORTED)) { -- suspend2_prepare_status(DONT_CLEAR_BAR, "Starting to save the image.."); -- save_image(); -- } -+ -+ if (suspend2_init() && !suspend2_prepare_image() && !test_result_state(SUSPEND_ABORTED) && -+ !test_action_state(SUSPEND_FREEZER_TEST)) { -+ suspend2_prepare_status(DONT_CLEAR_BAR, "Starting to save the image.."); -+ save_image(); - } - - suspend2_cleanup(); diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-rodata-define.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-rodata-define.patch deleted file mode 100644 index 9c031e152c7d..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-rodata-define.patch +++ /dev/null @@ -1,29 +0,0 @@ -Hi. - -Per Bojan's email from earlier in the day, this patch fixes a typo in the arch /config specific code for determining whether a page should be saved. - -Nigel - - prepare_image.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) -diff -ruNp 9160-debug-rodata-define.patch-old/kernel/power/prepare_image.c 9160-debug-rodata-define.patch-new/kernel/power/prepare_image.c ---- 9160-debug-rodata-define.patch-old/kernel/power/prepare_image.c 2006-01-10 13:22:07.000000000 +1000 -+++ 9160-debug-rodata-define.patch-new/kernel/power/prepare_image.c 2006-01-10 12:48:26.000000000 +1000 -@@ -228,8 +228,10 @@ static struct page *rodata_start, *rodat - static struct page *rotext_start, *rotext_end; - static struct page *nosave_start, *nosave_end; - static struct page *rtas_start, *rtas_end; --#ifdef CONFIG_PPC_RTAS -+#ifdef CONFIG_DEBUG_RODATA - extern char __start_rodata, __end_rodata; -+#endif -+#ifdef CONFIG_PPC_RTAS - extern unsigned int rtas_data, rtas_size; - #endif - #ifdef CONFIG_PPC - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-writing-header.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-writing-header.patch deleted file mode 100644 index 2518ed881f3c..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-debug-writing-header.patch +++ /dev/null @@ -1,75 +0,0 @@ - block_io.h | 1 + - suspend_block_io.c | 34 +++++++++++++++++++++++++++++----- - suspend_file.c | 14 ++++++-------- - suspend_swap.c | 18 ++---------------- - 4 files changed, 38 insertions(+), 29 deletions(-) ---- 9050-misc-other.patch-old/kernel/power/suspend_block_io.c 2006-01-12 14:02:12.000000000 +1000 -+++ 9050-misc-other.patch-new/kernel/power/suspend_block_io.c 2006-01-12 11:21:39.000000000 +1000 -@@ -810,8 +810,8 @@ - return 0; - } - --static int suspend_rw_page(int rw, struct page *page, -- int readahead_index, int sync) -+static int __suspend_rw_page(int rw, struct page *page, -+ int readahead_index, int sync, int debug) - { - int i, current_chain; - struct submit_params submit_params; -@@ -831,7 +831,10 @@ - s2_devinfo[current_chain].blocks_per_page + 1) << - s2_devinfo[current_chain].bmap_shift; - -- //printk("%s: %lx:%d.\n", rw ? "Write" : "Read", submit_params.dev->bd_dev, submit_params.block[0]); -+ if (debug) -+ printk("%s: %lx:%lx.\n", rw ? "Write" : "Read", -+ (long) submit_params.dev->bd_dev, -+ (long) submit_params.block[0]); - - i = suspend_do_io(rw, &submit_params, sync); - -@@ -841,6 +844,12 @@ - return 0; - } - -+static int suspend_rw_page(int rw, struct page *page, -+ int readahead_index, int sync) -+{ -+ return __suspend_rw_page(rw, page, readahead_index, sync, 0); -+} -+ - static int suspend_bio_read_chunk(struct page *buffer_page, int sync) - { - static int last_result; -@@ -976,12 +985,18 @@ - char *from = rw ? source_start : dest_start; - - if (bytes_left <= capacity) { -+ if (test_debug_state(SUSPEND_HEADER)) -+ printk("Copy %d bytes from %p to %p.\n", -+ bytes_left, to, from); - memcpy(to, from, bytes_left); - suspend_writer_buffer_posn += bytes_left; - return rw ? 0 : buffer_size; - } - - /* Next to read the next page */ -+ if (test_debug_state(SUSPEND_HEADER)) -+ printk("Copy %d bytes from %p to %p.\n", -+ capacity, to, from); - memcpy(to, from, capacity); - bytes_left -= capacity; - -@@ -989,9 +1004,10 @@ - sys_read(suspend_read_fd, - suspend_writer_buffer, BLOCK_SIZE); - else { -- if (suspend_rw_page(rw, -+ if (__suspend_rw_page(rw, - virt_to_page(suspend_writer_buffer), -- -1, !rw)) -+ -1, !rw, -+ test_debug_state(SUSPEND_HEADER))) - return -EIO; - } - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-filewriter-fix.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-filewriter-fix.patch deleted file mode 100644 index f988f4e534a6..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-filewriter-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ - suspend_file.c | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) -diff -ruNp 9040-filewriter-fix.patch-old/kernel/power/suspend_file.c 9040-filewriter-fix.patch-new/kernel/power/suspend_file.c ---- 9040-filewriter-fix.patch-old/kernel/power/suspend_file.c 2006-01-12 14:06:25.000000000 +1000 -+++ 9040-filewriter-fix.patch-new/kernel/power/suspend_file.c 2006-01-12 14:06:29.000000000 +1000 -@@ -453,6 +453,8 @@ static int filewriter_write_header_init( - { - char new_sig[sig_size]; - -+ extent_state_goto_start(&suspend_writer_posn); -+ - suspend_writer_buffer = (char *) get_zeroed_page(GFP_ATOMIC); - suspend_writer_buffer_posn = 0; - -@@ -460,8 +462,6 @@ static int filewriter_write_header_init( - strcpy(new_sig, NoImage); - suspend_bio_ops.write_header_chunk(new_sig, sig_size); - -- extent_state_goto_start(&suspend_writer_posn); -- - /* Info needed to bootstrap goes at the start of the header. - * First we save the basic info needed for reading, including the number - * of header pages. Then we save the structs containing data needed -@@ -473,6 +473,9 @@ static int filewriter_write_header_init( - suspend_bio_ops.write_header_chunk((char *) &suspend_writer_posn_save, - 3 * sizeof(struct extent_iterate_saved_state)); - -+ suspend_bio_ops.write_header_chunk((char *) &devinfo, -+ sizeof(devinfo)); -+ - serialise_extent_chain(&block_chain); - - return 0; -@@ -491,7 +494,7 @@ static int filewriter_write_header_clean - suspend_bio_ops.finish_all_io(); - - extent_state_goto_start(&suspend_writer_posn); -- extent_state_next(&suspend_writer_posn); -+ suspend_bio_ops.forward_one_page(); - - /* Adjust image header */ - suspend_bio_ops.bdev_page_io(READ, target_bdev, -@@ -584,6 +587,7 @@ static int file_init(void) - static int filewriter_read_header_init(void) - { - int result; -+ struct block_device *tmp; - - *(suspend_bio_ops.need_extra_next) = 1; - -@@ -604,6 +608,14 @@ static int filewriter_read_header_init(v - - suspend_writer_buffer_posn += 3 * sizeof(struct extent_iterate_saved_state); - -+ tmp = devinfo.bdev; -+ -+ memcpy(&devinfo, -+ suspend_writer_buffer + suspend_writer_buffer_posn, -+ sizeof(struct suspend2_bdev_info)); -+ devinfo.bdev = tmp; -+ suspend_writer_buffer_posn += sizeof(struct suspend2_bdev_info); -+ - extent_state_goto_start(&suspend_writer_posn); - load_extent_chain(&block_chain); - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-remove-block-dump.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-remove-block-dump.patch deleted file mode 100644 index b82e2495ff41..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-remove-block-dump.patch +++ /dev/null @@ -1,34 +0,0 @@ -Hi. - -This patch removes some debugging code that was using the block dump code to help diagnose some recent issues. I believe it's not needed anymore. - - io.c | 5 ----- - 1 file changed, 5 deletions(-) -diff -ruNp 9190-remove-block-dump.patch-old/kernel/power/io.c 9190-remove-block-dump.patch-new/kernel/power/io.c ---- 9190-remove-block-dump.patch-old/kernel/power/io.c 2006-01-10 13:19:40.000000000 +1000 -+++ 9190-remove-block-dump.patch-new/kernel/power/io.c 2006-01-10 13:04:01.000000000 +1000 -@@ -931,18 +931,13 @@ out_reset_console: - * Description: Attempt to read the header and pageset1 of a suspend image. - * Handle the outcome, complaining where appropriate. - */ --extern int block_dump; - - int read_pageset1(void) - { - int error; - -- block_dump = 1; -- - error = __read_pageset1(); - -- block_dump = 0; -- - switch (error) { - case 0: - case -ENODATA: - -_______________________________________________ -Suspend2-devel mailing list -Suspend2-devel@lists.suspend2.net -http://lists.suspend2.net/mailman/listinfo/suspend2-devel - diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-swapwriter-selects-swap.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-swapwriter-selects-swap.patch deleted file mode 100644 index d04bd9097b67..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-swapwriter-selects-swap.patch +++ /dev/null @@ -1,15 +0,0 @@ - Kconfig | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) -diff -ruNp 9310-swapwriter-selects-swap.patch-old/kernel/power/Kconfig 9310-swapwriter-selects-swap.patch-new/kernel/power/Kconfig ---- 9310-swapwriter-selects-swap.patch-old/kernel/power/Kconfig 2006-01-11 11:13:00.000000000 +1000 -+++ 9310-swapwriter-selects-swap.patch-new/kernel/power/Kconfig 2006-01-11 11:10:57.000000000 +1000 -@@ -133,7 +133,8 @@ menuconfig SUSPEND2 - - config SUSPEND2_SWAPWRITER - bool ' Swap Writer' -- depends on SWAP && SUSPEND2 -+ depends on SUSPEND2 -+ select SWAP - ---help--- - This option enables support for storing an image in your - swap space. diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-post-suspend2.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-post-suspend2.patch deleted file mode 100644 index b7f1958fbf78..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-post-suspend2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.15.y.orig/kernel/workqueue.c.orig 2006-01-11 23:38:58.000000000 +0100 -+++ linux-2.6.15.y/kernel/workqueue.c 2006-01-11 23:40:07.000000000 +0100 -@@ -335,7 +335,7 @@ struct workqueue_struct *__create_workqu - lock_cpu_hotplug(); - if (singlethread) { - INIT_LIST_HEAD(&wq->list); -- p = create_workqueue_thread(wq, any_online_cpu(cpu_online_map), -+ p = create_workqueue_thread(wq, singlethread_cpu, - freezer_flags); - if (!p) - destroy = 1; diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch deleted file mode 100644 index 5f14c6929fc8..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-workqueue-pre-suspend2.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: linux-2.6.15.y/kernel/workqueue.c -=================================================================== ---- linux-2.6.15.y.orig/kernel/workqueue.c.orig -+++ linux-2.6.15.y/kernel/workqueue.c -@@ -335,6 +335,6 @@ struct workqueue_struct *__create_workqu - lock_cpu_hotplug(); - if (singlethread) { - INIT_LIST_HEAD(&wq->list); -- p = create_workqueue_thread(wq, singlethread_cpu); -+ p = create_workqueue_thread(wq, any_online_cpu(cpu_online_map)); - if (!p) - destroy = 1; diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-write-header-chunk-finish.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-write-header-chunk-finish.patch deleted file mode 100644 index 13465e26a399..000000000000 --- a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc16-write-header-chunk-finish.patch +++ /dev/null @@ -1,87 +0,0 @@ - block_io.h | 1 + - suspend_block_io.c | 8 ++++++++ - suspend_file.c | 8 ++------ - suspend_swap.c | 18 ++---------------- - 4 files changed, 13 insertions(+), 22 deletions(-) -diff -ruNp 9070-write-header-chunk-finish.patch-old/kernel/power/block_io.h 9070-write-header-chunk-finish.patch-new/kernel/power/block_io.h ---- 9070-write-header-chunk-finish.patch-old/kernel/power/block_io.h 2006-01-12 14:05:18.000000000 +1000 -+++ 9070-write-header-chunk-finish.patch-new/kernel/power/block_io.h 2006-01-12 10:48:22.000000000 +1000 -@@ -64,6 +64,7 @@ struct suspend_bio_ops { - int (*write_cleanup) (void); - int (*read_header_chunk) (char *buffer, int buffer_size); - int (*write_header_chunk) (char *buffer, int buffer_size); -+ int (*write_header_chunk_finish) (void); - }; - - extern struct suspend_bio_ops suspend_bio_ops; -diff -ruNp 9070-write-header-chunk-finish.patch-old/kernel/power/suspend_block_io.c 9070-write-header-chunk-finish.patch-new/kernel/power/suspend_block_io.c ---- 9070-write-header-chunk-finish.patch-old/kernel/power/suspend_block_io.c 2006-01-12 14:05:19.000000000 +1000 -+++ 9070-write-header-chunk-finish.patch-new/kernel/power/suspend_block_io.c 2006-01-12 11:21:39.000000000 +1000 -@@ -1018,6 +1018,13 @@ static int suspend_rw_header_chunk(int r - return rw ? 0 : buffer_size; - } - -+static int write_header_chunk_finish(void) -+{ -+ return __suspend_rw_page(WRITE, -+ virt_to_page(suspend_writer_buffer), -+ -1, 0, test_debug_state(SUSPEND_HEADER)) ? -EIO : 0; -+} -+ - static int read_header_chunk(char *buffer, int buffer_size) - { - return suspend_rw_header_chunk(READ, buffer, buffer_size); -@@ -1051,6 +1058,7 @@ struct suspend_bio_ops suspend_bio_ops = - .write_cleanup = suspend_write_cleanup, - .read_header_chunk = read_header_chunk, - .write_header_chunk = write_header_chunk, -+ .write_header_chunk_finish = write_header_chunk_finish, - }; - - static struct suspend_plugin_ops suspend_blockwriter_ops = -diff -ruNp 9070-write-header-chunk-finish.patch-old/kernel/power/suspend_file.c 9070-write-header-chunk-finish.patch-new/kernel/power/suspend_file.c ---- 9070-write-header-chunk-finish.patch-old/kernel/power/suspend_file.c 2006-01-12 14:05:19.000000000 +1000 -+++ 9070-write-header-chunk-finish.patch-new/kernel/power/suspend_file.c 2006-01-12 14:05:21.000000000 +1000 -@@ -484,12 +484,8 @@ static int filewriter_write_header_init( - static int filewriter_write_header_cleanup(void) - { - /* Write any unsaved data */ -- if (suspend_writer_buffer_posn) { -- if (suspend_bio_ops.rw_page(WRITE, -- virt_to_page(suspend_writer_buffer), -- -1, 0)) -- return -EIO; -- } -+ if (suspend_writer_buffer_posn) -+ suspend_bio_ops.write_header_chunk_finish(); - - suspend_bio_ops.finish_all_io(); - -diff -ruNp 9070-write-header-chunk-finish.patch-old/kernel/power/suspend_swap.c 9070-write-header-chunk-finish.patch-new/kernel/power/suspend_swap.c ---- 9070-write-header-chunk-finish.patch-old/kernel/power/suspend_swap.c 2006-01-12 14:05:18.000000000 +1000 -+++ 9070-write-header-chunk-finish.patch-new/kernel/power/suspend_swap.c 2006-01-12 12:27:35.000000000 +1000 -@@ -578,22 +578,8 @@ static int swapwriter_write_header_clean - int result; - - /* Write any unsaved data */ -- if (suspend_writer_buffer_posn) { -- struct submit_params submit_params; -- int current_chain; -- -- if (suspend_bio_ops.forward_one_page()) -- return -EIO; -- -- current_chain = suspend_writer_posn.current_chain; -- submit_params.readahead_index = -1; -- submit_params.dev = swap_info[suspend_writer_posn.current_chain].bdev; -- submit_params.block[0] = suspend_writer_posn.current_offset << -- devinfo[current_chain].bmap_shift; -- submit_params.page = virt_to_page(suspend_writer_buffer); -- -- suspend_bio_ops.submit_io(WRITE, &submit_params, 0); -- } -+ if (suspend_writer_buffer_posn) -+ suspend_bio_ops.write_header_chunk_finish(); - - extent_state_goto_start(&suspend_writer_posn); - suspend_bio_ops.forward_one_page(); diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r10.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r10.ebuild deleted file mode 100644 index 639a54cbc4ae..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r10.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r10.ebuild,v 1.1 2006/01/06 19:12:49 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="8" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc15" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 -${FILESDIR}/suspend2-2.2-rc15-no-pageflags.patch -${FILESDIR}/suspend2-2.2-rc15-mce-config.patch -${FILESDIR}/suspend2-2.2-rc15-listen-to-abort-request.patch -${FILESDIR}/suspend2-2.2-rc15-get-next-bit-on.patch -${FILESDIR}/suspend2-2.2-rc15-pageflags.h.patch" - -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r4.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r4.ebuild deleted file mode 100644 index d1176952f196..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r4.ebuild,v 1.2 2005/11/27 17:27:19 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="4" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc13" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r5.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r5.ebuild deleted file mode 100644 index 55317041c310..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r5.ebuild,v 1.2 2005/11/27 17:27:19 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="4" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc13" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 -${FILESDIR}/suspend2-2.2-rc13-filewriter.patch" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r6.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r6.ebuild deleted file mode 100644 index f12828dcceb7..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r6.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r6.ebuild,v 1.1 2005/12/02 17:00:01 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="5" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc14" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r7.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r7.ebuild deleted file mode 100644 index 0d76edde2ea6..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r7.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r7.ebuild,v 1.2 2005/12/14 22:51:39 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="5" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc14" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 -${FILESDIR}/suspend2-2.2-rc14-do-correct-init-routine.patch -${FILESDIR}/suspend2-2.2-rc14-freeze-fses-in-reverse-mount-order.patch -${FILESDIR}/suspend2-2.2-rc14-remove-pfn_to_kaddr.patch -${FILESDIR}/suspend2-2.2-rc14-select-hotplug-cpu-instead-of-depending-on.patch -${FILESDIR}/suspend2-2.2-rc14-test-filewriter.patch" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r8.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r8.ebuild deleted file mode 100644 index 4ee9b2765340..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r8.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r8.ebuild,v 1.1 2005/12/27 22:02:27 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="6" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc15" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 -${FILESDIR}/suspend2-2.2-rc15-no-pageflags.patch -${FILESDIR}/suspend2-2.2-rc15-mce-config.patch -${FILESDIR}/suspend2-2.2-rc15-listen-to-abort-request.patch -${FILESDIR}/suspend2-2.2-rc15-get-next-bit-on.patch -${FILESDIR}/suspend2-2.2-rc15-pageflags.h.patch" - -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14.ebuild deleted file mode 100644 index fc3680c678da..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14.ebuild,v 1.2 2005/11/27 17:27:19 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="1" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc9" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r1.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r1.ebuild deleted file mode 100644 index 2b5f00ecb5fe..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r1.ebuild,v 1.1 2006/01/11 23:37:01 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="2" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc16" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${FILESDIR}/suspend2-2.2-rc16-workqueue-pre-suspend2.patch -${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 -${FILESDIR}/suspend2-2.2-rc16-amd64-is-ram.patch -${FILESDIR}/suspend2-2.2-rc16-debug-rodata-define.patch -${FILESDIR}/suspend2-2.2-rc16-remove-block-dump.patch -${FILESDIR}/suspend2-2.2-rc16-swapwriter-selects-swap.patch -${FILESDIR}/suspend2-2.2-rc16-workqueue-post-suspend2.patch" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r2.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r2.ebuild deleted file mode 100644 index 5c7579561fd7..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r2.ebuild,v 1.1 2006/01/15 12:49:19 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="2" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc16" -SUSPEND2_TARGET="2.6.15.1" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 -${FILESDIR}/suspend2-2.2-rc16-amd64-is-ram.patch -${FILESDIR}/suspend2-2.2-rc16-debug-rodata-define.patch -${FILESDIR}/suspend2-2.2-rc16-remove-block-dump.patch -${FILESDIR}/suspend2-2.2-rc16-swapwriter-selects-swap.patch -${FILESDIR}/suspend2-2.2-rc16-amd64-temporary-mapping.patch -${FILESDIR}/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch -${FILESDIR}/suspend2-2.2-rc16-debug-writing-header.patch -${FILESDIR}/suspend2-2.2-rc16-filewriter-fix.patch -${FILESDIR}/suspend2-2.2-rc16-write-header-chunk-finish.patch" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r3.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r3.ebuild deleted file mode 100644 index 118a55f26ce4..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r3.ebuild,v 1.1 2006/01/19 14:26:50 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="3" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc16" -SUSPEND2_TARGET="2.6.15.1" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 -${FILESDIR}/suspend2-2.2-rc16-amd64-is-ram.patch -${FILESDIR}/suspend2-2.2-rc16-debug-rodata-define.patch -${FILESDIR}/suspend2-2.2-rc16-remove-block-dump.patch -${FILESDIR}/suspend2-2.2-rc16-swapwriter-selects-swap.patch -${FILESDIR}/suspend2-2.2-rc16-amd64-temporary-mapping.patch -${FILESDIR}/suspend2-2.2-rc16-clean-prepare-image-result-testing.patch -${FILESDIR}/suspend2-2.2-rc16-debug-writing-header.patch -${FILESDIR}/suspend2-2.2-rc16-filewriter-fix.patch -${FILESDIR}/suspend2-2.2-rc16-write-header-chunk-finish.patch" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r4.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r4.ebuild deleted file mode 100644 index b7c59824c73e..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r4.ebuild,v 1.1 2006/01/23 22:00:50 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="3" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2" -SUSPEND2_TARGET="2.6.15.1" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r5.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r5.ebuild deleted file mode 100644 index dcfd95dd8564..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r5.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r5.ebuild,v 1.1 2006/02/01 22:12:58 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="5" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2" -SUSPEND2_TARGET="2.6.15.1" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r6.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r6.ebuild deleted file mode 100644 index d27c66d64c63..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r6.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r6.ebuild,v 1.2 2006/02/13 15:41:23 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="8" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2" -SUSPEND2_TARGET="2.6.15.1" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r7.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r7.ebuild deleted file mode 100644 index c76a340e3932..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r7.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15-r7.ebuild,v 1.1 2006/03/02 19:23:00 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="9" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2" -SUSPEND2_TARGET="2.6.15.1" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.15.ebuild deleted file mode 100644 index 489b08705006..000000000000 --- a/sys-kernel/suspend2-sources/suspend2-sources-2.6.15.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.15.ebuild,v 1.1 2006/01/09 13:32:55 brix Exp $ - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="1" - -inherit eutils kernel-2 -detect_version -detect_arch - -DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" - -SUSPEND2_VERSION="2.2-rc16" -SUSPEND2_TARGET="${PV}" -SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" -SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" - -UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt -${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" - -KEYWORDS="~x86" - -IUSE="ultra1" -RDEPEND="${RDEPEND} - >=sys-apps/suspend2-userui-0.6.1 - >=sys-power/hibernate-script-1.12" - -K_EXTRAEINFO="If there are issues with this kernel, please direct any -queries to the suspend2-users mailing list: -http://lists.suspend2.net/mailman/listinfo/suspend2-users/" - -pkg_setup() { - if use sparc; then - # hme lockup hack on ultra1 - use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" - fi -} - -pkg_postinst() { - postinst_sources - - echo - - if [ "${ARCH}" = "sparc" ]; then - if [ x"`cat /proc/openprom/name 2>/dev/null`" \ - = x"'SUNW,Ultra-1'" ]; then - einfo "For users with an Enterprise model Ultra 1 using the HME" - einfo "network interface, please emerge the kernel using the" - einfo "following command: USE=ultra1 emerge ${PN}" - fi - fi -} |