sys-kernel/geos_one-sources: delete old and repoman cleanup
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1213 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
51349a3dbc
commit
61bb4f07a7
@ -2,6 +2,31 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
17 May 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
-files/alsa-driver-1.0.18a-xa3530.patch,
|
||||
-files/alsa-driver-1.0.19-input.patch,
|
||||
-files/linux-2.6-defaults-fat-utf8.patch,
|
||||
-files/colored-printk-2.6.26.patch, -geos_one-sources-2.6.27.ebuild,
|
||||
-files/linux-2.6-x86-tune-generic.patch,
|
||||
-geos_one-sources-2.6.27-r3.ebuild, -geos_one-sources-2.6.27-r4.ebuild,
|
||||
-geos_one-sources-2.6.27-r5.ebuild, -geos_one-sources-2.6.27-r7.ebuild,
|
||||
-files/linux-2.6.27-lirc.patch, -files/squashfs-2.6.28,
|
||||
-geos_one-sources-2.6.28.ebuild, -geos_one-sources-2.6.28-r1.ebuild,
|
||||
-geos_one-sources-2.6.28-r2.ebuild, -geos_one-sources-2.6.28-r3.ebuild,
|
||||
-geos_one-sources-2.6.28-r4.ebuild, -files/fix-unionfs-for-2.6.28.1.patch,
|
||||
-files/fix-reiser4-for-2.6.28.1.patch,
|
||||
-files/linux-sabayon-2.6.28-ignore-mouse-interface-on-macbooks.patch,
|
||||
geos_one-sources-2.6.29-r1.ebuild, geos_one-sources-2.6.29-r2.ebuild,
|
||||
geos_one-sources-2.6.29-r3.ebuild, geos_one-sources-2.6.29-r4.ebuild,
|
||||
-files/enable-4k-stacks-default-2.6.24.patch,
|
||||
-files/hz-864-kconfig-option.patch, -files/1-bcm5974-headers.patch,
|
||||
-files/2-bcm5974-quad-finger-tapping.patch,
|
||||
-files/hz-432-kconfig-option.patch,
|
||||
-files/3-bcm5974-macbook5-support.patch, -files/cloneconfig.diff,
|
||||
-files/drm-modesetting-radeon.patch, -files/drm-next.patch,
|
||||
-files/drm-nouveau.patch, -files/intel-hda-a3530:
|
||||
delete old and repoman cleanup
|
||||
|
||||
*geos_one-sources-2.6.29-r4 (17 May 2009)
|
||||
*geos_one-sources-2.6.29-r3 (17 May 2009)
|
||||
|
||||
|
||||
@ -1,50 +1,3 @@
|
||||
AUX 1-bcm5974-headers.patch 4839 RMD160 83f5ca0a53ebe19aeaaa7d952da5c79187e563af SHA1 157ecb6994b5903cd5a4eccc8552cc2c62b7463d SHA256 33ffab37c533a3a75ac628209bf8ab70e89c3ad81fd4491f2c4051cb66ba1043
|
||||
AUX 2-bcm5974-quad-finger-tapping.patch 2014 RMD160 8ae24293dd608db76316ea0ebb90ce7e215df14a SHA1 a02b87b190916b193fe3b183e0fed86d34d863d6 SHA256 9ca9ddc1ffe2c9e23b74597479834c11fb98679aa258b61e1b025d3541f43c28
|
||||
AUX 3-bcm5974-macbook5-support.patch 4515 RMD160 e69c5aa44b925c76995b5a040327b2ed4b7acc79 SHA1 62a729437a289cd7474d202dbe3fac0607152a83 SHA256 c1f5027fa74591123ff38968aceb9df715a40922efc865ec2ae2b58b728c49cd
|
||||
AUX alsa-driver-1.0.18a-xa3530.patch 14509 RMD160 7b64bd5303d4e646957c1e49a53adfb012b3de8e SHA1 148a444560bb9473325147d44a6f813b084d4819 SHA256 6236e6e64d09284c13f16aaefb20e54e891d5b7f1d93cdb64cf5d6901f94761c
|
||||
AUX alsa-driver-1.0.19-input.patch 608 RMD160 be8e1f14e5a7ec33102a87dc2fd443a8b49ba329 SHA1 0d4f66a40ccebc034c859b3fd4ff34e436cf4d41 SHA256 414dc3663be345c42e34c3c44087e1b316e67eea6b7979c447effd39e05a8652
|
||||
AUX cloneconfig.diff 1252 RMD160 074487bb0363789fa0f27a78311e52df3bcddee4 SHA1 b9b8d6400d425041280e0fc90e73920c7cbff6e1 SHA256 f374d97468f8ee7a5c265bb51c46104bdfcdeb825b42fe0766c6cdb12cd68e08
|
||||
AUX colored-printk-2.6.26.patch 11265 RMD160 1e520168b8813754906513317f5c683dbec2b31b SHA1 d321509ccc286b29b8c0fac9ae18205705fea332 SHA256 e8afce0c43cd534a6f707dc9f8769d0ba03322efccd55e3dc3edc3375e44c4ba
|
||||
AUX drm-modesetting-radeon.patch 1348501 RMD160 d89e04413554815f4a94f684a7f1e0f5a9e62b2b SHA1 39fb1193f0643798705786c85f3c90cdf28fd27a SHA256 a126a762c7df6e9bde0a65b500fefd2e8188b10cd1d15454668d91cbe1a38f7b
|
||||
AUX drm-next.patch 643528 RMD160 3ec76231e1268821db9c18c11677b0661b1af7fc SHA1 848f637d414433f86b35983827e6465d24674499 SHA256 8f36e6418aa33c51af8b3567ca09a65024fcef5bcec73040a1bc87e5f71a5bf4
|
||||
AUX drm-nouveau.patch 546241 RMD160 a79f37c94fdb13b16ae939206477b781b1a235af SHA1 28f6a2e7ebd98b4c491c4cdb036a043b6c13bf0f SHA256 8977a121eb90b6f543b4408bcafd424fab5c55357ebefa192f5b1daed7b725f0
|
||||
AUX enable-4k-stacks-default-2.6.24.patch 350 RMD160 b6ea063adaa4ce4f97da967ce84a96d24bd8614c SHA1 799ac8293e84fb723630dcb28be986065dba131d SHA256 fd2f9a3f42ae0512e84ea5979ab8359872b9a0520de0e485ca3846dc84ea0da2
|
||||
AUX fix-reiser4-for-2.6.28.1.patch 396 RMD160 fc8874e25e2e66d58a49dd6775e483feab8b36e4 SHA1 97f49e0d228bdb590493cb4f07650ab0525133af SHA256 3b2c79070f580003b4fc5229999aff2f871a31997ca6fd65c9688bcb1cb05d0c
|
||||
AUX fix-unionfs-for-2.6.28.1.patch 407 RMD160 62a5c00e357faea5dd802dae40ceff46d2a3b7b2 SHA1 1b4d1c1eb151ea2d4b4d77de37ba05eb1291bad5 SHA256 0c7220bec0afdebf735fa8cd61ab39d72cebdfeb3e17ac3ee9cae5a03350d73e
|
||||
AUX hz-432-kconfig-option.patch 835 RMD160 932004d8a7a6a1c5b7bbb20750d5a0e3afc9bc3d SHA1 9b7e85abcdac10f899e6b69123dd818e73e3a115 SHA256 3d416e1fccf16d5fa8b27959a9273858c6bcc9edfb5e064fcc1c4492d9b6990a
|
||||
AUX hz-864-kconfig-option.patch 793 RMD160 bbb6e93838c95dd62b4597b5cec2e3107502c225 SHA1 1182dcd468a5c07e73e611db2ec07f15b81505b4 SHA256 3669964da54cab30579264d129364c04cdf842442f3a190c1f4bcc6d2dea8d74
|
||||
AUX intel-hda-a3530 13174 RMD160 e9fd8a6ffa3689e68edce74733e76378c467ba72 SHA1 5656993837d657271b0001d8bd4d5047d854713e SHA256 b4543cae20203bbd8d144d92f4ef48348c29bf28b44a9de9eece15e05959979f
|
||||
AUX linux-2.6-defaults-fat-utf8.patch 538 RMD160 4bd6376084e1c2946ab4efe62ee0acddfde9320f SHA1 ddacdab00dc7e2b3f911152bbbd78d80e3dc3305 SHA256 a27450c6b8ee032fe5442c3637272856552ec28bd83fac299d3250ab9e95576f
|
||||
AUX linux-2.6-x86-tune-generic.patch 661 RMD160 86b4ee5a704717cd1a6a47e19cd7941e3d4edd64 SHA1 310ef3fc420d33a72aefb440294e96c63e5042d3 SHA256 0d0b58175241cb519930158766a9b8b92f87155fbce8e7f513b198a848a78916
|
||||
AUX linux-2.6.27-lirc.patch 392002 RMD160 1fbfb00708859a2cb9b1b58a6db438b9d2f2d2a4 SHA1 5915ab107a468bed6b4b9a7206ec8a8e87f4c073 SHA256 bc13af0a28f10233e4461fa118c511c161740cc303f59a5cb9c53fabb93b6fd1
|
||||
AUX linux-sabayon-2.6.28-ignore-mouse-interface-on-macbooks.patch 1446 RMD160 2673b06b8f88a88f8da3e8153e630e52accc149e SHA1 0741eb958644769f4388ec9200b7d25196af94b4 SHA256 9c88c82cd1cda89752fc603362f52f3deea794f88aff8af1c6d082ca63d6b247
|
||||
AUX squashfs-2.6.28 219 RMD160 c1a3ae8e02643051f171500928005ca85d9d83cf SHA1 cf541d09ec2a8fe77525ebb91dd8e73060a4741a SHA256 a3b608a493ad09c983a5a697e05156697d6875a146690b8cda142854c298a9b1
|
||||
DIST 2.6.27-AA2.3.tgz 96714 RMD160 ad5ed3f35f15fc10ee45020dd7a80926ef9201c8 SHA1 faf2a096b58a704d33a9a633e8e7ced0859cce26 SHA256 c94064437e6655beb9fd399fdbc443fd8a8db4acd3328ae04f23faf834d82e2e
|
||||
DIST 2.6.27.4-ext4.tar.gz 167096 RMD160 943c56a52034f0423a3517c97a2ab0faac18b6b8 SHA1 3b83be52ef9c11915e3a07a79f7cc06c2722e90b SHA256 ec041900086ca6e3a2e2b3f4ae1ae2fcfbdca6dbe9b3484e5fb16ba7e0252f62
|
||||
DIST 2.6.28-AA2.3.tgz 96986 RMD160 52ee4bc79f07e54a191e904fe06834cf4eea7977 SHA1 222b33b1cb8c2acb27fda9cf5b1f63faab6abbef SHA256 f9591d1db0005aef4791fec1e16b4e84d05cc542a1a8ac23bd4b6d88b206bbe5
|
||||
DIST UnionFS_2.5-AppArmor_2.3.patch 10524 RMD160 808fce3fb3eb2f7d98ed95b654f44908ed5d8e19 SHA1 727db0d207a308bfccf7ad547f4976aa50a1ccaf SHA256 5fa66d26774d388c643151bb975e65354e5c7193dfc0ac3a83ff761bed18eba1
|
||||
DIST UnionFS_2.5.1-AppArmor_2.3.patch 10524 RMD160 808fce3fb3eb2f7d98ed95b654f44908ed5d8e19 SHA1 727db0d207a308bfccf7ad547f4976aa50a1ccaf SHA256 5fa66d26774d388c643151bb975e65354e5c7193dfc0ac3a83ff761bed18eba1
|
||||
DIST acpi-dsdt-initrd-v0.9c-2.6.26.patch 10058 RMD160 f568e92e79d95892e8e56396f83b2628bd34fd6e SHA1 0581b78d842ba8ba4a3be58974a2abbcf67124a2 SHA256 4c63609b13ea1a4abbd27e173c96cdd62faa51758e934607403471c518a7290f
|
||||
DIST acpi-dsdt-initrd-v0.9c-2.6.28.patch 9992 RMD160 3d29ad2cdc6232282a85569979368c85a76879b1 SHA1 a219e0896346936a402d6f188174271d8e706eff SHA256 286a88dd244addc0f0bab1b8cb20cd435a471c1927b55220e892bdec1a0ea759
|
||||
DIST alsa-driver-1.0.18a.tar.bz2 2833780 RMD160 c06c0b68999802da80becb58ea86596f031fa406 SHA1 c8ca0d2f9093f697ee519c45c13dd7d166f6fb2a SHA256 31148e6722da1ffbbc96504a106ef2f9a06cfcc0843c3306996d4379abaff833
|
||||
DIST genpatches-2.6.27-4.base.tar.bz2 23928 RMD160 d50a94ec3038dd80d38a52d139f2f4185792df49 SHA1 b671e45b169920b7b6b056ec373620e2df840358 SHA256 d0c321279ce26750cd159a5d4a736182dca871fb12574f256786df03e99f12f6
|
||||
DIST genpatches-2.6.27-4.extras.tar.bz2 41456 RMD160 bd6e5fc57d4895c23401f22892f630097174aead SHA1 35a86799ee1d4f55e347b2f01f64e4abbda8a7ae SHA256 384ecb94815261a960dd57b942206d73e2a7ad0e4d883400860a47f01573bd41
|
||||
DIST genpatches-2.6.27-5.base.tar.bz2 66486 RMD160 3ca48c4498fc9847aa25fd4892f7b22488bf5088 SHA1 69871df039a229e53313c46174587c804cda4fb6 SHA256 2c479c575a7c5d40f87e87b38152ea9de37b3f4ca2e1df398d22de37e5eec05d
|
||||
DIST genpatches-2.6.27-5.extras.tar.bz2 41426 RMD160 397613722743a32ab81400e012f55218ae22364c SHA1 fc53b3275807e628cbdce2a3b6e6f55bfae56256 SHA256 623210e5c141e99ae65f8729e44a242e3e6799bf5d0d3dba5d74db10766862aa
|
||||
DIST genpatches-2.6.27-6.base.tar.bz2 81909 RMD160 01613128158ea5e59b155dcce7b05dd44685c4f0 SHA1 6d37177472f80dd85371a183570e748ea3aaba1c SHA256 86c43daf525ad7fb7ddbe71806a2132dd57b294e6efa5ab3c30e0fd6661ededb
|
||||
DIST genpatches-2.6.27-6.extras.tar.bz2 41456 RMD160 bd6e5fc57d4895c23401f22892f630097174aead SHA1 35a86799ee1d4f55e347b2f01f64e4abbda8a7ae SHA256 384ecb94815261a960dd57b942206d73e2a7ad0e4d883400860a47f01573bd41
|
||||
DIST genpatches-2.6.27-9.base.tar.bz2 165591 RMD160 d2be1a56b8bafd7de330379f322699d2b05d6e7f SHA1 7303a1ff17427fc70b8e1e8ab41cdc8d74b2f296 SHA256 426891253109b520da1fe308e8544bdefd14255402fd72d3646ced48b64d2858
|
||||
DIST genpatches-2.6.27-9.extras.tar.bz2 41456 RMD160 bd6e5fc57d4895c23401f22892f630097174aead SHA1 35a86799ee1d4f55e347b2f01f64e4abbda8a7ae SHA256 384ecb94815261a960dd57b942206d73e2a7ad0e4d883400860a47f01573bd41
|
||||
DIST genpatches-2.6.28-1.base.tar.bz2 7410 RMD160 70f0b01b5e5cae6f01cfa202219b1e5503c6fea2 SHA1 de553ff85be1619f5679c9a6c3eaf867380ead3d SHA256 fedfe7b685786733f259bbed106bf37c85e8561cb4b5a28e3c3902bf9e8bc361
|
||||
DIST genpatches-2.6.28-1.extras.tar.bz2 41314 RMD160 58a67311e49d68a62256143af166d362e501f43d SHA1 8219f7c373341bf07651960490a8ec636254ed64 SHA256 a19f6757e0a70c076012f51bfc366efe95f61d5f402d407cac95c13b919397dd
|
||||
DIST genpatches-2.6.28-2.base.tar.bz2 61118 RMD160 892e3dceb49fa7df420222df2d5e5a3bce949fde SHA1 11d6835dbe9d77885568294237e2e27e0ef84b30 SHA256 4f0770074806d66b1636e352a9ffb4fed3ab69908a5919cfcf2baf08ee726245
|
||||
DIST genpatches-2.6.28-2.extras.tar.bz2 41314 RMD160 58a67311e49d68a62256143af166d362e501f43d SHA1 8219f7c373341bf07651960490a8ec636254ed64 SHA256 a19f6757e0a70c076012f51bfc366efe95f61d5f402d407cac95c13b919397dd
|
||||
DIST genpatches-2.6.28-3.base.tar.bz2 111511 RMD160 e33fb8e3f8a9c97df15785d12bbfb5049f6ba5a1 SHA1 8677467a48e15ea3eed7621583a5042a71c14647 SHA256 4264a988c8c6a42e47a2c050fec4b74dab91214867d52a7be07dd7f835c9446d
|
||||
DIST genpatches-2.6.28-3.extras.tar.bz2 41311 RMD160 8962c2dca7881155646aadb2a1a880b4e4c16838 SHA1 6d0a8d0f5b03cf876986ec5a0c80973bf8b946f1 SHA256 a303b741cac0a0067ad611294516014875d4bfb35f5623bf9bc5c1b00eaa329c
|
||||
DIST genpatches-2.6.28-4.base.tar.bz2 145207 RMD160 77aab4e40ab2d55a4c3c208462c739d84f048fe6 SHA1 e1db8dcfb7f9b47acecbaa9859e234034870e03b SHA256 50f23def6778cd36d4474ef4be56d57c5179cc36c5c88df5bdf1a5a9065dfb93
|
||||
DIST genpatches-2.6.28-4.extras.tar.bz2 41365 RMD160 6517f7245778dcc4f3f52bd90c230b953d2f8028 SHA1 1f058531ffe48125f8c98e88aa5e43dd29df8889 SHA256 8a098ca1153d0ddf76a6eb3da3e7bda482b3efa13c51815c70be5603b4f53e5f
|
||||
DIST genpatches-2.6.28-7.base.tar.bz2 180022 RMD160 a73a586284962243eb79562c0a73f2d9833902a8 SHA1 a24244a3b9e64ef735e1e2bd0dda27af8b6510c4 SHA256 9119e3048c69ed454925f58eaa1148ccb36cb0a76453f89c7117430c7ce841aa
|
||||
DIST genpatches-2.6.28-7.extras.tar.bz2 42243 RMD160 d83c72599a0718c605433040d26ca2eec8dbff11 SHA1 2504ac8a94fa163cc15d819ab84b0a0a984114ea SHA256 f40b1ec84f4c9ba5808854d9b9f79af725e728fef223cc38b4db5f59c7e9a80a
|
||||
DIST genpatches-2.6.29-2.base.tar.bz2 17861 RMD160 1b9bcf6e025e3cdd06002875dca374dee22753f2 SHA1 34edd169b5acfa3533878d6a0027de88c71f5526 SHA256 8683c44bcdf85b24db06c382a6c7c31f5bcec54986041d5bef5a788e14fa3cf5
|
||||
DIST genpatches-2.6.29-2.extras.tar.bz2 24597 RMD160 f43cad26f1744a1c629f2a4e29dfa98f9c99f65c SHA1 d2fef4c503d586a4fff3b5900f18036478381258 SHA256 f93a7cb4a2040b800750b32bf33a96825fb5bab2771e23e94e1fca4399fe1325
|
||||
DIST genpatches-2.6.29-4.base.tar.bz2 53647 RMD160 ae02fa5b5b5a4120f39ffce08aa422213176eec7 SHA1 8a096a13b25c96a21514f78508caddc0a9447391 SHA256 245e4fcad1549926b70167bf4d7faa4192c58473dd6a17d54214dd062ae6ea5b
|
||||
@ -56,32 +9,11 @@ DIST genpatches-2.6.29-6.extras.tar.bz2 24680 RMD160 51b986cb7efa8790ac9a5fdf88f
|
||||
DIST geos_one-patches-2.6.29-1-p1.tar.bz2 637622 RMD160 b5247372c35226f0c2c83f53db0aafea7947fb24 SHA1 d7a72224da930e5073e1a2381fe4e1c8a1f7a0ba SHA256 e9e79cf1d49f87cee56f627d8570f2fd025b07a98139dae25470197ad2927b6b
|
||||
DIST geos_one-patches-2.6.29-4-p1.tar.bz2 1064932 RMD160 220e3b83b0b6d0b7397b1323415bf29badd453b6 SHA1 83d5eb4285980c90305fa386c7f7393c29718958 SHA256 e44690a745c6e4b24a1cde7832b45e9cc805ff06d9f546fcd99ec1d362626a28
|
||||
DIST geos_one-patches-2.6.29-6-p3.tar.bz2 1069587 RMD160 72f1d2de339e14c4121d15a3b4855473cbfd505a SHA1 1644bbc709352162ca7b66a72bc96742f53ff663 SHA256 12ccbc131de6a552af3fe56d25fb219a4413386552c747087e06bd54a37e45b9
|
||||
DIST hda_realtek_xa3530.diff.bz2 3246 RMD160 4e65261a1d90971ed9fc57662cb2f4e9868a59e6 SHA1 9b363b2e5511d06d9d3552475d5df0baa1e05db1 SHA256 801cf43fddf060beedf0dfe6b8944be0ee5e508b68246a5251d0a432dd314967
|
||||
DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
|
||||
DIST linux-2.6.28.tar.bz2 52665364 RMD160 47e8925220e29e239f9478228fc53543c1f7b300 SHA1 4f40f8bf3fd110b0cc6e1fea5f539c98f9959e94 SHA256 ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
|
||||
DIST linux-2.6.29.tar.bz2 56579370 RMD160 e0e8c0635665ed34618b04fe1140015a4b6ff806 SHA1 0640a2f4bea3fc272541f322b74ea365ad7f2349 SHA256 58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
|
||||
DIST linux-sabayon-2.6.27-from-ext4dev-to-ext4.patch 532 RMD160 0f76679d1aea9317d4c52377daf63b5bdaff60fd SHA1 dec8291c9eedd615839f5c8dbe6bcee5d1088b10 SHA256 0d1e159bee5e7128e4c2b8b201d7811db66a0e224cd54803508c6bfdb4558a74
|
||||
DIST reiser4-for-2.6.27.patch.bz2 449626 RMD160 d4efaac12976068799cb32ce7c157bf086161e77 SHA1 95e94375bd691f7453f39d4fca7873b5eb92fcc0 SHA256 24f5e1eceaa513bace23ee34c50051e9cdf21bf20a36eb2b19706375d928962f
|
||||
DIST reiser4-for-2.6.28.patch.bz2 449709 RMD160 e1703babe49c2b68c4e0fbc94e996d0af9ad3761 SHA1 eb7cadc5d0f1ea3cdc6c33cdd1da68491f326b85 SHA256 031469a11e4fe998a1e187c69a5f078c3c4c7ddd57e0ab579baae07e5abb6ce5
|
||||
DIST tuxonice-3.0-rc7a-for-2.6.27-rc3.patch.bz2 113142 RMD160 99cde80e345320fe786ec1218c73f0a0226a412d SHA1 37063e593b20e1cc7b356bd9600ed471f010610c SHA256 b62d43d8ddf127c05463dbacc17267a58fd24ade0da2aedf44047f1ac9356f7c
|
||||
DIST tuxonice-3.0-rc7a-for-2.6.28-rc7.diff.bz2 112744 RMD160 95a30678bd8cf72d058f660600f4495d4d3fcf63 SHA1 75580d281f02ce2ae54c50cb474d8a65c0037cae SHA256 9f27235ec2778903cb81230ea2b41667210586a472e38a54941cca557c4d0dbe
|
||||
DIST tuxonice-3.0-rc8-for-2.6.28.patch.bz2 111532 RMD160 808d33d1484ee30f75606831c2df38e5e70e40ba SHA1 cb8564cbc9579361daa58da1c2abbcd814dfe737 SHA256 c7d72a964926e063ca9ff79adee7be90ab49c131c91ebf40ac9fc7c7cd852657
|
||||
DIST unionfs-2.5.1_for_2.6.28.1.diff.gz 79872 RMD160 d73122068c403d4e12c12fcef41ee052fdcbbf7b SHA1 4e27fd9c363a2f41ce69388b1add14cd0a230383 SHA256 f1b4d8c7018b4243735a0a569e872cef16547076294fe5622f6c542104a044ef
|
||||
DIST unionfs-2.5_for_2.6.27-rc6.diff.gz 79653 RMD160 76865cec929c03aebec728e1526c0e4e0cf49d87 SHA1 82be9b593102a6053433c1964c9b7b4fbfc2ede6 SHA256 15a79b5c88f5a76877f2940736edac3416e29c9e38411d2417f3d81d10a52bd4
|
||||
EBUILD geos_one-sources-2.6.27-r3.ebuild 2821 RMD160 46df90d8793972b9852d459dd384a10fb0ab80af SHA1 9756995c28ac654cd8f2f9322f419c1c7750f7b2 SHA256 3431f24d4006c4df6232aa90f084cc397ab591f07a2111ed869e199417cdd7a0
|
||||
EBUILD geos_one-sources-2.6.27-r4.ebuild 3191 RMD160 310291b7ef6d9015128e5cc04e219e8c1fe57c00 SHA1 96d18d711497e77e31f7c64fbbb21cf0be27cea1 SHA256 88ed2216e4659b6d55d71f83f6789e90e72cb4739223a356c74aaddef3f299ab
|
||||
EBUILD geos_one-sources-2.6.27-r5.ebuild 3268 RMD160 fe08f99491a001054194a78df6aa3f89d23e41f0 SHA1 4c14a4f4765a82eebaa29433bcdf189ee342b1dd SHA256 48dbf7e70fd3caa2b99272173afc94119298278f14a7c3bac7bb93c29437e233
|
||||
EBUILD geos_one-sources-2.6.27-r7.ebuild 2924 RMD160 425863b77e2fc04cca9051061dcdc9c34588ce4f SHA1 f62de54668415fd45d880a1fccd9702c4d0db9f2 SHA256 03a34dd1bae6de85243ca1c3e2bbb494a59ee11042f6d443c87513c42d8eb58b
|
||||
EBUILD geos_one-sources-2.6.27.ebuild 2821 RMD160 8cddc77851562dcdd261fdda1a98b416a8539cdb SHA1 87f501974802d83ef142114c01c1b7c9dea27a59 SHA256 20cb29a2fcc71d86f85232d092a1339f02f13ac042c570af632d026bad024d54
|
||||
EBUILD geos_one-sources-2.6.28-r1.ebuild 4178 RMD160 9a0334be5c2e2c9453ae8f2c9a585f0178e238c6 SHA1 cdedcf7bcbfceed568afe1af2f8f8ba01ff02061 SHA256 649853331ba5cfc28917e0ec4c572fc9d19b74f44ca88e271ac378085596f092
|
||||
EBUILD geos_one-sources-2.6.28-r2.ebuild 4178 RMD160 e66a7981525ede4e7e96db413e4bf7be9f604b8c SHA1 636b7888e10079c50eb335b16b603ec92ffe62e7 SHA256 5c8aa5c14d2cc5142da54301d56efd400c49ee82b0e2a8cfb5a51c6600976e53
|
||||
EBUILD geos_one-sources-2.6.28-r3.ebuild 4178 RMD160 e1e2267bd936f49f104df16a93d8c73eb1a38db5 SHA1 89c15bbc5c2c385a942f5fec7dc6c47927cd80c9 SHA256 89cf23e997f6f9672585a0ba32b9ebd43fa22fa8dad8ea1ba9f83def6a3f2526
|
||||
EBUILD geos_one-sources-2.6.28-r4.ebuild 4181 RMD160 f20fed4f3879cf05165fe597fdefec826016da92 SHA1 d3dcdc5c6de8113d4284ec93388cba78b59ad722 SHA256 2c34fdd51d294f4c3272a45927675a565f536780348f3925f535eef97070e29d
|
||||
EBUILD geos_one-sources-2.6.28.ebuild 2724 RMD160 59ef67d038f90f54f7ad0224263fe3b8309db45d SHA1 f1e32cf7640706c4843679339d1774bbf89bed45 SHA256 dcb53c7bdbe81d51d74cc5f82e6efbade931fd33e962fd37cf71e7800d5d257c
|
||||
EBUILD geos_one-sources-2.6.29-r1.ebuild 1354 RMD160 2122591fcdf0472434fe2c5bbe7079f907844a11 SHA1 8f7e56dc5239f684383cd52dbf343119a348671f SHA256 9eb841861909b740cab2faac7d8e6612223a064a8fa9bc473083a40a19eb71a4
|
||||
EBUILD geos_one-sources-2.6.29-r2.ebuild 1354 RMD160 0d9b7c38040c63b3206d1063f4dfbee7714b56c7 SHA1 bce49ba40b6f3ae246480ccf5f987ec5a0b3dd97 SHA256 9e635f57bd28a8c2c6443f22c4e3038ba6eafb61fa5ff96f6a4f794bfd2da2b0
|
||||
EBUILD geos_one-sources-2.6.29-r3.ebuild 1354 RMD160 6be57aefa90a17268f068cd193f756742af57682 SHA1 6c10e9de8b95cf09c0b527648f9c4a982b5aecf7 SHA256 267f63d6814d799112687c6c806b4e0adb3c6a52b902e6f6dea21183809ca901
|
||||
EBUILD geos_one-sources-2.6.29-r4.ebuild 1449 RMD160 80193e278a7a78011a7f934c567185aef79ecb38 SHA1 03d6f654ff73ad690b19a3541d11c5f4d97215c7 SHA256 0a49eb40d22ba5c4aa04fca57b712312c2222760848a858ed2bd253d7834dbee
|
||||
EBUILD geos_one-sources-2.6.29-r1.ebuild 1356 RMD160 92bd30568f91764ebf544956e37cded97457a59e SHA1 31f094f62d435aa5d9ff2010e3ddb7c5de771100 SHA256 19bb754a643a9714c07033ad3e2a7a42137d7b90263546b6f436bdc291e67738
|
||||
EBUILD geos_one-sources-2.6.29-r2.ebuild 1356 RMD160 c68c467a737eb381c9cae948f67bd6d6097d2e04 SHA1 f8897743ae973ea67b332e760a362fa03b884d36 SHA256 438aed04b55d094eac4055085909c9e6af401c0455ccfcc1fdec742a151801e1
|
||||
EBUILD geos_one-sources-2.6.29-r3.ebuild 1356 RMD160 03aa9148d57a10cd1441e711392d4f335d13fbca SHA1 ca508de7d73712ca7b7ff4a05ef80283bb0c2cdc SHA256 5251d1ead4d76a39a465c69e35ffcbf5f287ea77c0e38b08c8e6738c7ba48e44
|
||||
EBUILD geos_one-sources-2.6.29-r4.ebuild 1451 RMD160 30743e657c4d59642c56c10c2e8190316b22fd20 SHA1 a6b51be243a023fe4b1ee739c338cb4ab394c6ea SHA256 cb0bc753d3717b8d664b247fa7f1b8f4ec08b60d954f4cab09b6207759e99f7f
|
||||
EBUILD geos_one-sources-2.6.29.ebuild 1354 RMD160 368e1724b54059367036b1754e116c52f02cf176 SHA1 0cf8d0a347e65db24de14991894ce7c04e6e2a14 SHA256 097dc9f80d436ead181cd8453899de004ad5f3c3de447c53bfd04a134f2e02e6
|
||||
MISC ChangeLog 5944 RMD160 f780fe9ad42b41ab978bf859d42476da87dfc5d8 SHA1 e0c822296b3a2252c7a8c32f526440159807a3e8 SHA256 d1c2058bede7c8f449fe96ff1b3da0d9604460f77edbe3cab147830cb17da4da
|
||||
MISC ChangeLog 7340 RMD160 732bdbf169211563b92b125dc97003b692014cbe SHA1 c0d05523869092112e8e3754fb22baeb8cd54bcc SHA256 e273a297b0bf036eb08821264c724619ff02bad0584e197c99ac719b9828801e
|
||||
MISC metadata.xml 413 RMD160 7e4e48d47e48804072f4ce93e1948fda82433a90 SHA1 cd61cf36ba79f6635ab7b7957f31609ecf52cc90 SHA256 74fe6520890eaf800a1759f3e4f772fd0e433e5de9cf775a50c7af95b199518b
|
||||
|
||||
@ -1,126 +0,0 @@
|
||||
The new unibody Macbooks are equipped with an integrated button and
|
||||
trackpad. The package header of the trackpad interface has changed to
|
||||
also contain information about the integrated button. This patch
|
||||
performs the necessary preparations to allow for the new package
|
||||
header.
|
||||
|
||||
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
|
||||
---
|
||||
drivers/input/mouse/bcm5974.c | 42 ++++++++++++++++++++++------------------
|
||||
1 files changed, 23 insertions(+), 19 deletions(-)
|
||||
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
|
||||
index 2998a6a..e97462e 100644
|
||||
--- a/drivers/input/mouse/bcm5974.c
|
||||
+++ b/drivers/input/mouse/bcm5974.c
|
||||
@@ -96,13 +96,14 @@ struct bt_data {
|
||||
u8 rel_y; /* relative y coordinate */
|
||||
};
|
||||
|
||||
-/* trackpad header structure */
|
||||
-struct tp_header {
|
||||
- u8 unknown1[16]; /* constants, timers, etc */
|
||||
- u8 fingers; /* number of fingers on trackpad */
|
||||
- u8 unknown2[9]; /* constants, timers, etc */
|
||||
+/* trackpad header types */
|
||||
+enum tp_type {
|
||||
+ TYPE1 /* plain trackpad */
|
||||
};
|
||||
|
||||
+/* trackpad finger data offsets */
|
||||
+#define FINGER_TYPE1 26
|
||||
+
|
||||
/* trackpad finger structure */
|
||||
struct tp_finger {
|
||||
__le16 origin; /* zero when switching track finger */
|
||||
@@ -119,11 +120,9 @@ struct tp_finger {
|
||||
__le16 multi; /* one finger: varies, more fingers: constant */
|
||||
};
|
||||
|
||||
-/* trackpad data structure, empirically at least ten fingers */
|
||||
-struct tp_data {
|
||||
- struct tp_header header;
|
||||
- struct tp_finger finger[16];
|
||||
-};
|
||||
+/* trackpad finger data size, empirically at least ten fingers */
|
||||
+#define SIZEOF_FINGER sizeof(struct tp_finger)
|
||||
+#define SIZEOF_ALL_FINGERS (16 * SIZEOF_FINGER)
|
||||
|
||||
/* device-specific parameters */
|
||||
struct bcm5974_param {
|
||||
@@ -139,6 +138,8 @@ struct bcm5974_config {
|
||||
int bt_ep; /* the endpoint of the button interface */
|
||||
int bt_datalen; /* data length of the button interface */
|
||||
int tp_ep; /* the endpoint of the trackpad interface */
|
||||
+ enum tp_type tp_type; /* type of trackpad interface */
|
||||
+ int tp_offset; /* offset to trackpad finger data */
|
||||
int tp_datalen; /* data length of the trackpad interface */
|
||||
struct bcm5974_param p; /* finger pressure limits */
|
||||
struct bcm5974_param w; /* finger width limits */
|
||||
@@ -158,7 +159,7 @@ struct bcm5974 {
|
||||
struct urb *bt_urb; /* button usb request block */
|
||||
struct bt_data *bt_data; /* button transferred data */
|
||||
struct urb *tp_urb; /* trackpad usb request block */
|
||||
- struct tp_data *tp_data; /* trackpad transferred data */
|
||||
+ u8 *tp_data; /* trackpad transferred data */
|
||||
int fingers; /* number of fingers on trackpad */
|
||||
};
|
||||
|
||||
@@ -184,7 +185,7 @@ static const struct bcm5974_config bcm5974_config_table[] = {
|
||||
USB_DEVICE_ID_APPLE_WELLSPRING_ISO,
|
||||
USB_DEVICE_ID_APPLE_WELLSPRING_JIS,
|
||||
0x84, sizeof(struct bt_data),
|
||||
- 0x81, sizeof(struct tp_data),
|
||||
+ 0x81, TYPE1, FINGER_TYPE1, FINGER_TYPE1 + SIZEOF_ALL_FINGERS,
|
||||
{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },
|
||||
{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
|
||||
{ DIM_X, DIM_X / SN_COORD, -4824, 5342 },
|
||||
@@ -195,7 +196,7 @@ static const struct bcm5974_config bcm5974_config_table[] = {
|
||||
USB_DEVICE_ID_APPLE_WELLSPRING2_ISO,
|
||||
USB_DEVICE_ID_APPLE_WELLSPRING2_JIS,
|
||||
0x84, sizeof(struct bt_data),
|
||||
- 0x81, sizeof(struct tp_data),
|
||||
+ 0x81, TYPE1, FINGER_TYPE1, FINGER_TYPE1 + SIZEOF_ALL_FINGERS,
|
||||
{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },
|
||||
{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
|
||||
{ DIM_X, DIM_X / SN_COORD, -4824, 4824 },
|
||||
@@ -276,18 +277,20 @@ static int report_bt_state(struct bcm5974 *dev, int size)
|
||||
static int report_tp_state(struct bcm5974 *dev, int size)
|
||||
{
|
||||
const struct bcm5974_config *c = &dev->cfg;
|
||||
- const struct tp_finger *f = dev->tp_data->finger;
|
||||
+ const struct tp_finger *f;
|
||||
struct input_dev *input = dev->input;
|
||||
- const int fingers = (size - 26) / 28;
|
||||
- int raw_p, raw_w, raw_x, raw_y;
|
||||
+ int raw_p, raw_w, raw_x, raw_y, raw_n;
|
||||
int ptest = 0, origin = 0, nmin = 0, nmax = 0;
|
||||
int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;
|
||||
|
||||
- if (size < 26 || (size - 26) % 28 != 0)
|
||||
+ if (size < c->tp_offset || (size - c->tp_offset) % SIZEOF_FINGER != 0)
|
||||
return -EIO;
|
||||
|
||||
+ f = (const struct tp_finger *)(dev->tp_data + c->tp_offset);
|
||||
+ raw_n = (size - c->tp_offset) / SIZEOF_FINGER;
|
||||
+
|
||||
/* always track the first finger; when detached, start over */
|
||||
- if (fingers) {
|
||||
+ if (raw_n) {
|
||||
raw_p = raw2int(f->force_major);
|
||||
raw_w = raw2int(f->size_major);
|
||||
raw_x = raw2int(f->abs_x);
|
||||
@@ -307,12 +310,13 @@ static int report_tp_state(struct bcm5974 *dev, int size)
|
||||
abs_w = int2bound(&c->w, raw_w);
|
||||
abs_x = int2bound(&c->x, raw_x - c->x.devmin);
|
||||
abs_y = int2bound(&c->y, c->y.devmax - raw_y);
|
||||
- for (; f != dev->tp_data->finger + fingers; f++) {
|
||||
+ while (raw_n--) {
|
||||
ptest = int2bound(&c->p, raw2int(f->force_major));
|
||||
if (ptest > PRESSURE_LOW)
|
||||
nmax++;
|
||||
if (ptest > PRESSURE_HIGH)
|
||||
nmin++;
|
||||
+ f++;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
The integrated button on the new unibody Macbooks presents a need to
|
||||
report explicit four-finger actions. Evidently, the finger pressing
|
||||
the button is also touching the trackpad, so in order to fully support
|
||||
three-finger actions, the driver must be able to report four-finger
|
||||
actions. This patch adds a new button, BTN_TOOL_QUADTAP, which
|
||||
achieves this.
|
||||
|
||||
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
|
||||
---
|
||||
drivers/input/mouse/bcm5974.c | 4 +++-
|
||||
include/linux/input.h | 1 +
|
||||
2 files changed, 4 insertions(+), 1 deletions(-)
|
||||
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
|
||||
index e97462e..a170574 100644
|
||||
--- a/drivers/input/mouse/bcm5974.c
|
||||
+++ b/drivers/input/mouse/bcm5974.c
|
||||
@@ -258,6 +258,7 @@ static void setup_events_to_report(struct input_dev *input_dev,
|
||||
__set_bit(BTN_TOOL_FINGER, input_dev->keybit);
|
||||
__set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
|
||||
__set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
|
||||
+ __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
|
||||
__set_bit(BTN_LEFT, input_dev->keybit);
|
||||
}
|
||||
|
||||
@@ -328,7 +329,8 @@ static int report_tp_state(struct bcm5974 *dev, int size)
|
||||
input_report_key(input, BTN_TOUCH, dev->fingers > 0);
|
||||
input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1);
|
||||
input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2);
|
||||
- input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2);
|
||||
+ input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers == 3);
|
||||
+ input_report_key(input, BTN_TOOL_QUADTAP, dev->fingers > 3);
|
||||
|
||||
input_report_abs(input, ABS_PRESSURE, abs_p);
|
||||
input_report_abs(input, ABS_TOOL_WIDTH, abs_w);
|
||||
diff --git a/include/linux/input.h b/include/linux/input.h
|
||||
index b86fb55..0082b24 100644
|
||||
--- a/include/linux/input.h
|
||||
+++ b/include/linux/input.h
|
||||
@@ -443,6 +443,7 @@ struct input_absinfo {
|
||||
#define BTN_STYLUS2 0x14c
|
||||
#define BTN_TOOL_DOUBLETAP 0x14d
|
||||
#define BTN_TOOL_TRIPLETAP 0x14e
|
||||
+#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */
|
||||
|
||||
#define BTN_WHEEL 0x150
|
||||
#define BTN_GEAR_DOWN 0x150
|
||||
@ -1,129 +0,0 @@
|
||||
This patch adds support for the new unibody Macbook, with physically
|
||||
integrated button and trackpad. A new button, BTN_TOOL_PRESS, is
|
||||
introduced to allow for non-trivial handling of this device in user
|
||||
space.
|
||||
|
||||
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
|
||||
Tested-by: David M. Lary <dmlary@gmail.com>
|
||||
---
|
||||
drivers/input/mouse/bcm5974.c | 42 +++++++++++++++++++++++++++++++++++++++-
|
||||
include/linux/input.h | 1 +
|
||||
2 files changed, 41 insertions(+), 2 deletions(-)
|
||||
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
|
||||
index a170574..f85a296 100644
|
||||
--- a/drivers/input/mouse/bcm5974.c
|
||||
+++ b/drivers/input/mouse/bcm5974.c
|
||||
@@ -51,6 +51,10 @@
|
||||
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230
|
||||
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231
|
||||
#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232
|
||||
+/* Macbook5,1 (unibody), aka wellspring3 */
|
||||
+#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
|
||||
+#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
|
||||
+#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
|
||||
|
||||
#define BCM5974_DEVICE(prod) { \
|
||||
.match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
|
||||
@@ -72,6 +76,10 @@ static const struct usb_device_id bcm5974_table[] = {
|
||||
BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
|
||||
BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
|
||||
BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
|
||||
+ /* Macbook5,1 */
|
||||
+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
|
||||
+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
|
||||
+ BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
|
||||
/* Terminating entry */
|
||||
{}
|
||||
};
|
||||
@@ -98,11 +106,19 @@ struct bt_data {
|
||||
|
||||
/* trackpad header types */
|
||||
enum tp_type {
|
||||
- TYPE1 /* plain trackpad */
|
||||
+ TYPE1, /* plain trackpad */
|
||||
+ TYPE2 /* button integrated in trackpad */
|
||||
};
|
||||
|
||||
/* trackpad finger data offsets */
|
||||
#define FINGER_TYPE1 26
|
||||
+#define FINGER_TYPE2 30
|
||||
+
|
||||
+/* trackpad button data offsets */
|
||||
+#define BUTTON_TYPE2 15
|
||||
+
|
||||
+/* integrated button capability by configuration */
|
||||
+#define HAS_INTEGRATED_BUTTON(c) (c->tp_type == TYPE2)
|
||||
|
||||
/* trackpad finger structure */
|
||||
struct tp_finger {
|
||||
@@ -202,6 +218,17 @@ static const struct bcm5974_config bcm5974_config_table[] = {
|
||||
{ DIM_X, DIM_X / SN_COORD, -4824, 4824 },
|
||||
{ DIM_Y, DIM_Y / SN_COORD, -172, 4290 }
|
||||
},
|
||||
+ {
|
||||
+ USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI,
|
||||
+ USB_DEVICE_ID_APPLE_WELLSPRING3_ISO,
|
||||
+ USB_DEVICE_ID_APPLE_WELLSPRING3_JIS,
|
||||
+ 0x84, sizeof(struct bt_data),
|
||||
+ 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
|
||||
+ { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
|
||||
+ { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
|
||||
+ { DIM_X, DIM_X / SN_COORD, -4460, 5166 },
|
||||
+ { DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -259,6 +286,8 @@ static void setup_events_to_report(struct input_dev *input_dev,
|
||||
__set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
|
||||
__set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
|
||||
__set_bit(BTN_TOOL_QUADTAP, input_dev->keybit);
|
||||
+ if (HAS_INTEGRATED_BUTTON(cfg))
|
||||
+ __set_bit(BTN_TOOL_PRESS, input_dev->keybit);
|
||||
__set_bit(BTN_LEFT, input_dev->keybit);
|
||||
}
|
||||
|
||||
@@ -281,7 +310,7 @@ static int report_tp_state(struct bcm5974 *dev, int size)
|
||||
const struct tp_finger *f;
|
||||
struct input_dev *input = dev->input;
|
||||
int raw_p, raw_w, raw_x, raw_y, raw_n;
|
||||
- int ptest = 0, origin = 0, nmin = 0, nmax = 0;
|
||||
+ int ptest = 0, origin = 0, ibt = 0, nmin = 0, nmax = 0;
|
||||
int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;
|
||||
|
||||
if (size < c->tp_offset || (size - c->tp_offset) % SIZEOF_FINGER != 0)
|
||||
@@ -303,6 +332,10 @@ static int report_tp_state(struct bcm5974 *dev, int size)
|
||||
|
||||
ptest = int2bound(&c->p, raw_p);
|
||||
origin = raw2int(f->origin);
|
||||
+
|
||||
+ /* set the integrated button if applicable */
|
||||
+ if (c->tp_type == TYPE2)
|
||||
+ ibt = raw2int(dev->tp_data[BUTTON_TYPE2]);
|
||||
}
|
||||
|
||||
/* while tracking finger still valid, count all fingers */
|
||||
@@ -346,6 +379,11 @@ static int report_tp_state(struct bcm5974 *dev, int size)
|
||||
|
||||
}
|
||||
|
||||
+ if (HAS_INTEGRATED_BUTTON(c)) {
|
||||
+ input_report_key(input, BTN_TOOL_PRESS, ibt);
|
||||
+ input_report_key(input, BTN_LEFT, ibt);
|
||||
+ }
|
||||
+
|
||||
input_sync(input);
|
||||
|
||||
return 0;
|
||||
diff --git a/include/linux/input.h b/include/linux/input.h
|
||||
index 0082b24..6afa6b3 100644
|
||||
--- a/include/linux/input.h
|
||||
+++ b/include/linux/input.h
|
||||
@@ -438,6 +438,7 @@ struct input_absinfo {
|
||||
#define BTN_TOOL_FINGER 0x145
|
||||
#define BTN_TOOL_MOUSE 0x146
|
||||
#define BTN_TOOL_LENS 0x147
|
||||
+#define BTN_TOOL_PRESS 0x148 /* The trackpad is a physical button */
|
||||
#define BTN_TOUCH 0x14a
|
||||
#define BTN_STYLUS 0x14b
|
||||
#define BTN_STYLUS2 0x14c
|
||||
@ -1,416 +0,0 @@
|
||||
diff -uNr alsa-driver-1.0.18a.orig/alsa-kernel/pci/hda/patch_realtek.c alsa-driver-1.0.18a/alsa-kernel/pci/hda/patch_realtek.c
|
||||
--- alsa-driver-1.0.18a.orig/alsa-kernel/pci/hda/patch_realtek.c 2008-11-12 11:02:25.000000000 +0100
|
||||
+++ alsa-driver-1.0.18a/alsa-kernel/pci/hda/patch_realtek.c 2008-12-04 21:43:59.000000000 +0100
|
||||
@@ -216,6 +216,7 @@
|
||||
ALC883_TARGA_2ch_DIG,
|
||||
ALC883_ACER,
|
||||
ALC883_ACER_ASPIRE,
|
||||
+ ALC888_ACER_ASPIRE_4930G,
|
||||
ALC883_MEDION,
|
||||
ALC883_MEDION_MD2,
|
||||
ALC883_LAPTOP_EAPD,
|
||||
@@ -229,9 +230,11 @@
|
||||
ALC883_MITAC,
|
||||
ALC883_CLEVO_M720,
|
||||
ALC883_FUJITSU_PI2515,
|
||||
+ ALC888_FUJITSU_XA3530,
|
||||
ALC883_3ST_6ch_INTEL,
|
||||
ALC888_ASUS_M90V,
|
||||
ALC888_ASUS_EEE1601,
|
||||
+ ALC1200_ASUS_P5Q,
|
||||
ALC883_AUTO,
|
||||
ALC883_MODEL_LAST,
|
||||
};
|
||||
@@ -381,11 +384,15 @@
|
||||
{
|
||||
struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
|
||||
struct alc_spec *spec = codec->spec;
|
||||
- const struct hda_input_mux *imux = spec->input_mux;
|
||||
+ const struct hda_input_mux *imux;
|
||||
unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
|
||||
+ unsigned int mux_idx;
|
||||
hda_nid_t nid = spec->capsrc_nids ?
|
||||
spec->capsrc_nids[adc_idx] : spec->adc_nids[adc_idx];
|
||||
|
||||
+ mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
|
||||
+ imux = &spec->input_mux[mux_idx];
|
||||
+
|
||||
if (spec->is_mix_capture) {
|
||||
/* Matrix-mixer style (e.g. ALC882) */
|
||||
unsigned int *cur_val = &spec->cur_mux[adc_idx];
|
||||
@@ -406,10 +413,7 @@
|
||||
return 1;
|
||||
} else {
|
||||
/* MUX style (e.g. ALC880) */
|
||||
- unsigned int mux_idx;
|
||||
- mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
|
||||
- return snd_hda_input_mux_put(codec, &spec->input_mux[mux_idx],
|
||||
- ucontrol, nid,
|
||||
+ return snd_hda_input_mux_put(codec, imux, ucontrol, nid,
|
||||
&spec->cur_mux[adc_idx]);
|
||||
}
|
||||
}
|
||||
@@ -1153,6 +1157,226 @@
|
||||
}
|
||||
|
||||
/*
|
||||
+ * ALC888
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * 2ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch2_intel_init[] = {
|
||||
+/* Mic-in jack as mic in */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-in jack as Line in */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-Out as Front */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 4ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch4_intel_init[] = {
|
||||
+/* Mic-in jack as mic in */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as Front */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 6ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch6_intel_init[] = {
|
||||
+/* Mic-in jack as CLFE */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as CLFE (workaround because Mic-in is not loud enough) */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 8ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch8_intel_init[] = {
|
||||
+/* Mic-in jack as CLFE */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as Side */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {
|
||||
+ { 2, alc888_4ST_ch2_intel_init },
|
||||
+ { 4, alc888_4ST_ch4_intel_init },
|
||||
+ { 6, alc888_4ST_ch6_intel_init },
|
||||
+ { 8, alc888_4ST_ch8_intel_init },
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * ALC888 Fujitsu Siemens Amillo xa3530
|
||||
+ */
|
||||
+
|
||||
+static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
|
||||
+/* Front Mic: set to PIN_IN (empty by default) */
|
||||
+ {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
+/* Connect Internal HP to Front */
|
||||
+ {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect Bass HP to Front */
|
||||
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect Line-Out side jack (SPDIF) to Side */
|
||||
+ {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+/* Connect Mic jack to CLFE */
|
||||
+ {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x18, AC_VERB_SET_CONNECT_SEL, 0x02},
|
||||
+/* Connect Line-in jack to Surround */
|
||||
+ {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
+/* Connect HP out jack to Front */
|
||||
+ {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Enable unsolicited event for HP jack and Line-out jack */
|
||||
+ {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+ {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static void alc888_fujitsu_xa3530_automute(struct hda_codec *codec)
|
||||
+{
|
||||
+ unsigned int present;
|
||||
+ unsigned int bits;
|
||||
+ /* Line out presence */
|
||||
+ present = snd_hda_codec_read(codec, 0x17, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ /* HP out presence */
|
||||
+ present = present || snd_hda_codec_read(codec, 0x1b, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ bits = present ? HDA_AMP_MUTE : 0;
|
||||
+ /* Toggle internal speakers muting */
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+ /* Toggle internal bass muting */
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+}
|
||||
+
|
||||
+static void alc888_fujitsu_xa3530_unsol_event(struct hda_codec *codec,
|
||||
+ unsigned int res)
|
||||
+{
|
||||
+ if (res >> 26 == ALC880_HP_EVENT)
|
||||
+ alc888_fujitsu_xa3530_automute(codec);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * ALC888 Acer Aspire 4930G model
|
||||
+ */
|
||||
+
|
||||
+static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
|
||||
+/* Front Mic: set to PIN_IN (empty by default) */
|
||||
+ {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
+/* Unselect Front Mic by default in input mixer 3 */
|
||||
+ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},
|
||||
+/* Enable unsolicited event for HP jack */
|
||||
+ {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+/* Connect Internal HP to front */
|
||||
+ {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect HP out to front */
|
||||
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static struct hda_input_mux alc888_2_capture_sources[2] = {
|
||||
+ /* Front mic only available on one ADC */
|
||||
+ {
|
||||
+ .num_items = 4,
|
||||
+ .items = {
|
||||
+ { "Mic", 0x0 },
|
||||
+ { "Line", 0x2 },
|
||||
+ { "CD", 0x4 },
|
||||
+ { "Front Mic", 0xb },
|
||||
+ },
|
||||
+ },
|
||||
+ {
|
||||
+ .num_items = 3,
|
||||
+ .items = {
|
||||
+ { "Mic", 0x0 },
|
||||
+ { "Line", 0x2 },
|
||||
+ { "CD", 0x4 },
|
||||
+ },
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct snd_kcontrol_new alc888_base_mixer[] = {
|
||||
+ HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
|
||||
+ HDA_OUTPUT),
|
||||
+ HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
|
||||
+ HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+static void alc888_acer_aspire_4930g_automute(struct hda_codec *codec)
|
||||
+{
|
||||
+ unsigned int present;
|
||||
+ unsigned int bits;
|
||||
+ present = snd_hda_codec_read(codec, 0x15, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ bits = present ? HDA_AMP_MUTE : 0;
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+}
|
||||
+
|
||||
+static void alc888_acer_aspire_4930g_unsol_event(struct hda_codec *codec,
|
||||
+ unsigned int res)
|
||||
+{
|
||||
+ if (res >> 26 == ALC880_HP_EVENT)
|
||||
+ alc888_acer_aspire_4930g_automute(codec);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
* ALC880 3-stack model
|
||||
*
|
||||
* DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e)
|
||||
@@ -6868,6 +7092,8 @@
|
||||
#define ALC883_DIGOUT_NID 0x06
|
||||
#define ALC883_DIGIN_NID 0x0a
|
||||
|
||||
+#define ALC1200_DIGOUT_NID 0x10
|
||||
+
|
||||
static hda_nid_t alc883_dac_nids[4] = {
|
||||
/* front, rear, clfe, rear_surr */
|
||||
0x02, 0x03, 0x04, 0x05
|
||||
@@ -6883,8 +7109,15 @@
|
||||
0x08,
|
||||
};
|
||||
|
||||
+static hda_nid_t alc883_adc_nids_rev[2] = {
|
||||
+ /* ADC2-1 */
|
||||
+ 0x09, 0x08
|
||||
+};
|
||||
+
|
||||
static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 };
|
||||
|
||||
+static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 };
|
||||
+
|
||||
/* input MUX */
|
||||
/* FIXME: should be a matrix-type input source selection */
|
||||
|
||||
@@ -8176,6 +8409,7 @@
|
||||
[ALC883_TARGA_2ch_DIG] = "targa-2ch-dig",
|
||||
[ALC883_ACER] = "acer",
|
||||
[ALC883_ACER_ASPIRE] = "acer-aspire",
|
||||
+ [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g",
|
||||
[ALC883_MEDION] = "medion",
|
||||
[ALC883_MEDION_MD2] = "medion-md2",
|
||||
[ALC883_LAPTOP_EAPD] = "laptop-eapd",
|
||||
@@ -8189,7 +8423,9 @@
|
||||
[ALC883_MITAC] = "mitac",
|
||||
[ALC883_CLEVO_M720] = "clevo-m720",
|
||||
[ALC883_FUJITSU_PI2515] = "fujitsu-pi2515",
|
||||
+ [ALC888_FUJITSU_XA3530] = "fujitsu-xa3530",
|
||||
[ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel",
|
||||
+ [ALC1200_ASUS_P5Q] = "asus-p5q",
|
||||
[ALC883_AUTO] = "auto",
|
||||
};
|
||||
|
||||
@@ -8200,6 +8436,8 @@
|
||||
SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),
|
||||
SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
|
||||
SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),
|
||||
+ SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G",
|
||||
+ ALC888_ACER_ASPIRE_4930G),
|
||||
SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
|
||||
SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
|
||||
SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
|
||||
@@ -8208,6 +8446,7 @@
|
||||
SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V),
|
||||
SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
|
||||
+ SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q),
|
||||
SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),
|
||||
SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),
|
||||
@@ -8245,6 +8484,7 @@
|
||||
SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
|
||||
SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
|
||||
SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),
|
||||
+ SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530", ALC888_FUJITSU_XA3530),
|
||||
SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch),
|
||||
SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),
|
||||
@@ -8370,6 +8610,26 @@
|
||||
.unsol_event = alc883_acer_aspire_unsol_event,
|
||||
.init_hook = alc883_acer_aspire_automute,
|
||||
},
|
||||
+ [ALC888_ACER_ASPIRE_4930G] = {
|
||||
+ .mixers = { alc888_base_mixer,
|
||||
+ alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
|
||||
+ alc888_acer_aspire_4930g_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
|
||||
+ .adc_nids = alc883_adc_nids_rev,
|
||||
+ .capsrc_nids = alc883_capsrc_nids_rev,
|
||||
+ .dig_out_nid = ALC883_DIGOUT_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
|
||||
+ .channel_mode = alc883_3ST_6ch_modes,
|
||||
+ .need_dac_fix = 1,
|
||||
+ .num_mux_defs =
|
||||
+ ARRAY_SIZE(alc888_2_capture_sources),
|
||||
+ .input_mux = alc888_2_capture_sources,
|
||||
+ .unsol_event = alc888_acer_aspire_4930g_unsol_event,
|
||||
+ .init_hook = alc888_acer_aspire_4930g_automute,
|
||||
+ },
|
||||
[ALC883_MEDION] = {
|
||||
.mixers = { alc883_fivestack_mixer,
|
||||
alc883_chmode_mixer },
|
||||
@@ -8513,6 +8773,23 @@
|
||||
.unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event,
|
||||
.init_hook = alc883_2ch_fujitsu_pi2515_automute,
|
||||
},
|
||||
+ [ALC888_FUJITSU_XA3530] = {
|
||||
+ .mixers = { alc888_base_mixer, alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs, alc888_fujitsu_xa3530_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
|
||||
+ .adc_nids = alc883_adc_nids_rev,
|
||||
+ .capsrc_nids = alc883_capsrc_nids_rev,
|
||||
+ .dig_out_nid = ALC883_DIGOUT_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc888_4ST_8ch_intel_modes),
|
||||
+ .channel_mode = alc888_4ST_8ch_intel_modes,
|
||||
+ .num_mux_defs =
|
||||
+ ARRAY_SIZE(alc888_2_capture_sources),
|
||||
+ .input_mux = alc888_2_capture_sources,
|
||||
+ .unsol_event = alc888_fujitsu_xa3530_unsol_event,
|
||||
+ .init_hook = alc888_fujitsu_xa3530_automute,
|
||||
+ },
|
||||
[ALC888_LENOVO_SKY] = {
|
||||
.mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer },
|
||||
.init_verbs = { alc883_init_verbs, alc888_lenovo_sky_verbs},
|
||||
@@ -8555,6 +8832,17 @@
|
||||
.unsol_event = alc883_eee1601_unsol_event,
|
||||
.init_hook = alc883_eee1601_inithook,
|
||||
},
|
||||
+ [ALC1200_ASUS_P5Q] = {
|
||||
+ .mixers = { alc883_base_mixer, alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .dig_out_nid = ALC1200_DIGOUT_NID,
|
||||
+ .dig_in_nid = ALC883_DIGIN_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
|
||||
+ .channel_mode = alc883_sixstack_modes,
|
||||
+ .input_mux = &alc883_capture_source,
|
||||
+ },
|
||||
};
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- linux-2.6.28-geos_one-r1/include/linux/input.h.orig 2008-12-25 00:26:37.000000000 +0100
|
||||
+++ linux-2.6.28-geos_one-r1/include/linux/input.h 2009-01-28 00:47:35.941439136 +0100
|
||||
@@ -659,6 +659,9 @@
|
||||
#define SW_RADIO SW_RFKILL_ALL /* deprecated */
|
||||
#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */
|
||||
#define SW_DOCK 0x05 /* set = plugged into dock */
|
||||
+#define SW_LINEOUT_INSERT 0x06 /* set = inserted */
|
||||
+#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */
|
||||
+#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */
|
||||
#define SW_MAX 0x0f
|
||||
#define SW_CNT (SW_MAX+1)
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From: Andreas Gruenbacher <agruen@suse.de>
|
||||
Subject: Add ``cloneconfig'' target
|
||||
|
||||
Cloneconfig takes the first configuration it finds which appears
|
||||
to belong to the running kernel, and configures the kernel sources
|
||||
to match this configuration as closely as possible.
|
||||
|
||||
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
||||
|
||||
scripts/kconfig/Makefile | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
--- a/scripts/kconfig/Makefile
|
||||
+++ b/scripts/kconfig/Makefile
|
||||
@@ -65,6 +65,22 @@ allnoconfig: $(obj)/conf
|
||||
allmodconfig: $(obj)/conf
|
||||
$< -m $(Kconfig)
|
||||
|
||||
+UNAME_RELEASE := $(shell uname -r)
|
||||
+CLONECONFIG := $(firstword $(wildcard /proc/config.gz \
|
||||
+ /lib/modules/$(UNAME_RELEASE)/.config \
|
||||
+ /etc/kernel-config \
|
||||
+ /boot/config-$(UNAME_RELEASE)))
|
||||
+cloneconfig: $(obj)/conf
|
||||
+ $(Q)case "$(CLONECONFIG)" in \
|
||||
+ '') echo -e "The configuration of the running" \
|
||||
+ "kernel could not be determined\n"; \
|
||||
+ false ;; \
|
||||
+ *.gz) gzip -cd $(CLONECONFIG) > .config.running ;; \
|
||||
+ *) cat $(CLONECONFIG) > .config.running ;; \
|
||||
+ esac && \
|
||||
+ echo -e "Cloning configuration file $(CLONECONFIG)\n"
|
||||
+ $(Q)$< -D .config.running arch/$(SRCARCH)/Kconfig
|
||||
+
|
||||
defconfig: $(obj)/conf
|
||||
ifeq ($(KBUILD_DEFCONFIG),)
|
||||
$< -d $(Kconfig)
|
||||
@ -1,355 +0,0 @@
|
||||
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
|
||||
index 643fd86..837f3c2 100644
|
||||
--- a/arch/x86/kernel/early_printk.c
|
||||
+++ b/arch/x86/kernel/early_printk.c
|
||||
@@ -15,7 +15,8 @@
|
||||
static int max_ypos = 25, max_xpos = 80;
|
||||
static int current_ypos = 25, current_xpos;
|
||||
|
||||
-static void early_vga_write(struct console *con, const char *str, unsigned n)
|
||||
+static void early_vga_write(struct console *con, const char *str, unsigned n,
|
||||
+ unsigned int loglevel)
|
||||
{
|
||||
char c;
|
||||
int i, k, j;
|
||||
@@ -84,7 +85,8 @@ static int early_serial_putc(unsigned char ch)
|
||||
return timeout ? 0 : -1;
|
||||
}
|
||||
|
||||
-static void early_serial_write(struct console *con, const char *s, unsigned n)
|
||||
+static void early_serial_write(struct console *con, const char *s, unsigned n,
|
||||
+ unsigned int loglevel)
|
||||
{
|
||||
while (*s && n-- > 0) {
|
||||
if (*s == '\n')
|
||||
@@ -180,7 +182,8 @@ static void __init simnow_init(char *str)
|
||||
simnow_fd = simnow(XOPEN, (unsigned long)fn, O_WRONLY|O_APPEND|O_CREAT, 0644);
|
||||
}
|
||||
|
||||
-static void simnow_write(struct console *con, const char *s, unsigned n)
|
||||
+static void simnow_write(struct console *con, const char *s, unsigned n,
|
||||
+ unsigned int loglevel)
|
||||
{
|
||||
simnow(XWRITE, simnow_fd, (unsigned long)s, n);
|
||||
}
|
||||
@@ -204,7 +207,7 @@ void early_printk(const char *fmt, ...)
|
||||
|
||||
va_start(ap, fmt);
|
||||
n = vscnprintf(buf, 512, fmt, ap);
|
||||
- early_console->write(early_console, buf, n);
|
||||
+ early_console->write(early_console, buf, n, 0);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
|
||||
index 57ba5c2..10556dd 100644
|
||||
--- a/drivers/char/Kconfig
|
||||
+++ b/drivers/char/Kconfig
|
||||
@@ -71,6 +71,111 @@ config NR_TTY_DEVICES
|
||||
|
||||
If unsure, say 63.
|
||||
|
||||
+menuconfig VT_CKO
|
||||
+ bool "Colored kernel message output"
|
||||
+ depends on VT_CONSOLE
|
||||
+ ---help---
|
||||
+ This option enables kernel messages to be emitted in
|
||||
+ colors other than the default.
|
||||
+
|
||||
+ The color value you need to enter is composed (OR-ed)
|
||||
+ of a foreground and a background color.
|
||||
+
|
||||
+ Foreground:
|
||||
+ 0x00 = black, 0x08 = dark gray,
|
||||
+ 0x01 = red, 0x09 = light red,
|
||||
+ 0x02 = green, 0x0A = light green,
|
||||
+ 0x03 = brown, 0x0B = yellow,
|
||||
+ 0x04 = blue, 0x0C = light blue,
|
||||
+ 0x05 = magenta, 0x0D = light magenta,
|
||||
+ 0x06 = cyan, 0x0E = light cyan,
|
||||
+ 0x07 = gray, 0x0F = white,
|
||||
+
|
||||
+ (Foreground colors 0x08 to 0x0F do not work when a VGA
|
||||
+ console font with 512 glyphs is used.)
|
||||
+
|
||||
+ Background:
|
||||
+ 0x00 = black, 0x40 = blue,
|
||||
+ 0x10 = red, 0x50 = magenta,
|
||||
+ 0x20 = green, 0x60 = cyan,
|
||||
+ 0x30 = brown, 0x70 = gray,
|
||||
+
|
||||
+ For example, 0x1F would yield white on red.
|
||||
+
|
||||
+ If unsure, say N.
|
||||
+
|
||||
+config VT_PRINTK_EMERG_COLOR
|
||||
+ hex "Emergency messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel emergency messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
+config VT_PRINTK_ALERT_COLOR
|
||||
+ hex "Alert messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel alert messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
+config VT_PRINTK_CRIT_COLOR
|
||||
+ hex "Critical messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel critical messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
+config VT_PRINTK_ERR_COLOR
|
||||
+ hex "Error messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel error messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
+config VT_PRINTK_WARNING_COLOR
|
||||
+ hex "Warning messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel warning messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
+config VT_PRINTK_NOTICE_COLOR
|
||||
+ hex "Notice messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel notice messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
+config VT_PRINTK_INFO_COLOR
|
||||
+ hex "Information messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel information messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
+config VT_PRINTK_DEBUG_COLOR
|
||||
+ hex "Debug messages color"
|
||||
+ range 0x00 0xFF
|
||||
+ depends on VT_CKO
|
||||
+ default 0x07
|
||||
+ ---help---
|
||||
+ This option defines with which color kernel debug messages will
|
||||
+ be printed to the console.
|
||||
+
|
||||
config HW_CONSOLE
|
||||
bool
|
||||
depends on VT && !S390 && !UML
|
||||
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
|
||||
index 935f1c2..1fee2dc 100644
|
||||
--- a/drivers/char/vt.c
|
||||
+++ b/drivers/char/vt.c
|
||||
@@ -73,6 +73,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
+#include <linux/moduleparam.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/tty.h>
|
||||
@@ -2409,17 +2410,45 @@ struct tty_driver *console_driver;
|
||||
|
||||
#ifdef CONFIG_VT_CONSOLE
|
||||
|
||||
+#ifdef CONFIG_VT_CKO
|
||||
+static unsigned int printk_color[8] __read_mostly = {
|
||||
+ CONFIG_VT_PRINTK_EMERG_COLOR, /* KERN_EMERG */
|
||||
+ CONFIG_VT_PRINTK_ALERT_COLOR, /* KERN_ALERT */
|
||||
+ CONFIG_VT_PRINTK_CRIT_COLOR, /* KERN_CRIT */
|
||||
+ CONFIG_VT_PRINTK_ERR_COLOR, /* KERN_ERR */
|
||||
+ CONFIG_VT_PRINTK_WARNING_COLOR, /* KERN_WARNING */
|
||||
+ CONFIG_VT_PRINTK_NOTICE_COLOR, /* KERN_NOTICE */
|
||||
+ CONFIG_VT_PRINTK_INFO_COLOR, /* KERN_INFO */
|
||||
+ CONFIG_VT_PRINTK_DEBUG_COLOR, /* KERN_DEBUG */
|
||||
+};
|
||||
+module_param_array(printk_color, uint, NULL, S_IRUGO | S_IWUSR);
|
||||
+
|
||||
+static inline void vc_set_color(struct vc_data *vc, unsigned char color)
|
||||
+{
|
||||
+ vc->vc_color = color_table[color & 0xF] |
|
||||
+ (color_table[(color >> 4) & 0x7] << 4) |
|
||||
+ (color & 0x80);
|
||||
+ update_attr(vc);
|
||||
+}
|
||||
+#else
|
||||
+static unsigned int printk_color[8];
|
||||
+static inline void vc_set_color(const struct vc_data *vc, unsigned char c)
|
||||
+{
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* Console on virtual terminal
|
||||
*
|
||||
* The console must be locked when we get here.
|
||||
*/
|
||||
|
||||
-static void vt_console_print(struct console *co, const char *b, unsigned count)
|
||||
+static void vt_console_print(struct console *co, const char *b, unsigned count,
|
||||
+ unsigned int loglevel)
|
||||
{
|
||||
struct vc_data *vc = vc_cons[fg_console].d;
|
||||
- unsigned char c;
|
||||
static DEFINE_SPINLOCK(printing_lock);
|
||||
+ unsigned char current_color, c;
|
||||
const ushort *start;
|
||||
ushort cnt = 0;
|
||||
ushort myx;
|
||||
@@ -2452,11 +2481,19 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
|
||||
|
||||
start = (ushort *)vc->vc_pos;
|
||||
|
||||
+ /*
|
||||
+ * We always get a valid loglevel - <8> and "no level" is transformed
|
||||
+ * to <4> in the typical kernel.
|
||||
+ */
|
||||
+ current_color = printk_color[loglevel];
|
||||
+ vc_set_color(vc, current_color);
|
||||
+
|
||||
/* Contrived structure to try to emulate original need_wrap behaviour
|
||||
* Problems caused when we have need_wrap set on '\n' character */
|
||||
while (count--) {
|
||||
c = *b++;
|
||||
if (c == 10 || c == 13 || c == 8 || vc->vc_need_wrap) {
|
||||
+ vc_set_color(vc, vc->vc_def_color);
|
||||
if (cnt > 0) {
|
||||
if (CON_IS_VISIBLE(vc))
|
||||
vc->vc_sw->con_putcs(vc, start, cnt, vc->vc_y, vc->vc_x);
|
||||
@@ -2469,6 +2506,7 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
|
||||
bs(vc);
|
||||
start = (ushort *)vc->vc_pos;
|
||||
myx = vc->vc_x;
|
||||
+ vc_set_color(vc, current_color);
|
||||
continue;
|
||||
}
|
||||
if (c != 13)
|
||||
@@ -2476,6 +2514,7 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
|
||||
cr(vc);
|
||||
start = (ushort *)vc->vc_pos;
|
||||
myx = vc->vc_x;
|
||||
+ vc_set_color(vc, current_color);
|
||||
if (c == 10 || c == 13)
|
||||
continue;
|
||||
}
|
||||
@@ -2498,6 +2537,7 @@ static void vt_console_print(struct console *co, const char *b, unsigned count)
|
||||
vc->vc_need_wrap = 1;
|
||||
}
|
||||
}
|
||||
+ vc_set_color(vc, vc->vc_def_color);
|
||||
set_cursor(vc);
|
||||
notify_update(vc);
|
||||
|
||||
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
|
||||
index 665341e..4c27de8 100644
|
||||
--- a/drivers/net/netconsole.c
|
||||
+++ b/drivers/net/netconsole.c
|
||||
@@ -694,7 +694,8 @@ static struct notifier_block netconsole_netdev_notifier = {
|
||||
.notifier_call = netconsole_netdev_event,
|
||||
};
|
||||
|
||||
-static void write_msg(struct console *con, const char *msg, unsigned int len)
|
||||
+static void write_msg(struct console *con, const char *msg, unsigned int len,
|
||||
+ unsigned int loglevel)
|
||||
{
|
||||
int frag, left;
|
||||
unsigned long flags;
|
||||
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
|
||||
index 1bc00b7..b4f1b6f 100644
|
||||
--- a/drivers/serial/8250.c
|
||||
+++ b/drivers/serial/8250.c
|
||||
@@ -2527,7 +2527,8 @@ static void serial8250_console_putchar(struct uart_port *port, int ch)
|
||||
* The console_lock must be held when we get here.
|
||||
*/
|
||||
static void
|
||||
-serial8250_console_write(struct console *co, const char *s, unsigned int count)
|
||||
+serial8250_console_write(struct console *co, const char *s, unsigned int count,
|
||||
+ unsigned int loglevel)
|
||||
{
|
||||
struct uart_8250_port *up = &serial8250_ports[co->index];
|
||||
unsigned long flags;
|
||||
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
|
||||
index f279745..2a928bd 100644
|
||||
--- a/drivers/serial/8250_early.c
|
||||
+++ b/drivers/serial/8250_early.c
|
||||
@@ -83,7 +83,7 @@ static void __init serial_putc(struct uart_port *port, int c)
|
||||
}
|
||||
|
||||
static void __init early_serial8250_write(struct console *console,
|
||||
- const char *s, unsigned int count)
|
||||
+ const char *s, unsigned int count, unsigned int loglevel)
|
||||
{
|
||||
struct uart_port *port = &early_device.port;
|
||||
unsigned int ier;
|
||||
diff --git a/include/linux/console.h b/include/linux/console.h
|
||||
index a4f27fb..46fcfd3 100644
|
||||
--- a/include/linux/console.h
|
||||
+++ b/include/linux/console.h
|
||||
@@ -95,7 +95,7 @@ void give_up_console(const struct consw *sw);
|
||||
|
||||
struct console {
|
||||
char name[16];
|
||||
- void (*write)(struct console *, const char *, unsigned);
|
||||
+ void (*write)(struct console *, const char *, unsigned, unsigned int);
|
||||
int (*read)(struct console *, char *, unsigned);
|
||||
struct tty_driver *(*device)(struct console *, int *);
|
||||
void (*unblank)(void);
|
||||
diff --git a/kernel/printk.c b/kernel/printk.c
|
||||
index 6e920ce..a1aaa3f 100644
|
||||
--- a/kernel/printk.c
|
||||
+++ b/kernel/printk.c
|
||||
@@ -444,7 +444,8 @@ asmlinkage long sys_syslog(int type, char __user *buf, int len)
|
||||
/*
|
||||
* Call the console drivers on a range of log_buf
|
||||
*/
|
||||
-static void __call_console_drivers(unsigned start, unsigned end)
|
||||
+static void __call_console_drivers(unsigned start, unsigned end,
|
||||
+ unsigned int loglevel)
|
||||
{
|
||||
struct console *con;
|
||||
|
||||
@@ -452,7 +453,7 @@ static void __call_console_drivers(unsigned start, unsigned end)
|
||||
if ((con->flags & CON_ENABLED) && con->write &&
|
||||
(cpu_online(smp_processor_id()) ||
|
||||
(con->flags & CON_ANYTIME)))
|
||||
- con->write(con, &LOG_BUF(start), end - start);
|
||||
+ con->write(con, &LOG_BUF(start), end - start, loglevel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -479,10 +480,11 @@ static void _call_console_drivers(unsigned start,
|
||||
if ((start & LOG_BUF_MASK) > (end & LOG_BUF_MASK)) {
|
||||
/* wrapped write */
|
||||
__call_console_drivers(start & LOG_BUF_MASK,
|
||||
- log_buf_len);
|
||||
- __call_console_drivers(0, end & LOG_BUF_MASK);
|
||||
+ log_buf_len, msg_log_level);
|
||||
+ __call_console_drivers(0, end & LOG_BUF_MASK,
|
||||
+ msg_log_level);
|
||||
} else {
|
||||
- __call_console_drivers(start, end);
|
||||
+ __call_console_drivers(start, end, msg_log_level);
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,10 +0,0 @@
|
||||
--- linux-2.6.24.orig/arch/x86/Kconfig.debug
|
||||
+++ linux-2.6.24/arch/x86/Kconfig.debug
|
||||
@@ -59,6 +59,7 @@
|
||||
config 4KSTACKS
|
||||
bool "Use 4Kb for kernel stacks instead of 8Kb"
|
||||
depends on DEBUG_KERNEL
|
||||
+ default y
|
||||
help
|
||||
If you say Y here the kernel will use a 4Kb stacksize for the
|
||||
kernel stack attached to each process/thread. This facilitates
|
||||
@ -1,12 +0,0 @@
|
||||
--- a/fs/reiser4/plugin/file/file_conversion.c
|
||||
+++ b/fs/reiser4/plugin/file/file_conversion.c
|
||||
@@ -686,7 +686,8 @@ int reiser4_write_begin_careful(struct f
|
||||
start = pos & (PAGE_CACHE_SIZE - 1);
|
||||
end = start + len;
|
||||
|
||||
- page = __grab_cache_page(mapping, index);
|
||||
+ page = grab_cache_page_write_begin(mapping, index,
|
||||
+ flags & AOP_FLAG_NOFS);
|
||||
*pagep = page;
|
||||
if (!page)
|
||||
return -ENOMEM;
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/security/security.c b/security/security.c
|
||||
index c0acfa7..dad3183 100644
|
||||
--- a/security/security.c
|
||||
+++ b/security/security.c
|
||||
@@ -448,6 +448,5 @@ int security_inode_permission(struct inode *inode, int mask)
|
||||
return 0;
|
||||
return security_ops->inode_permission(inode, mask);
|
||||
}
|
||||
-EXPORT_SYMBOL(security_inode_permission);
|
||||
|
||||
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
{
|
||||
@ -1,25 +0,0 @@
|
||||
diff -urN oldtree/kernel/Kconfig.hz newtree/kernel/Kconfig.hz
|
||||
--- oldtree/kernel/Kconfig.hz 2007-03-06 15:00:55.000000000 -0500
|
||||
+++ newtree/kernel/Kconfig.hz 2007-03-06 17:52:36.000000000 -0500
|
||||
@@ -39,6 +39,14 @@
|
||||
on SMP and NUMA systems and exactly dividing by both PAL and
|
||||
NTSC frame rates for video and multimedia work.
|
||||
|
||||
+ config HZ_432
|
||||
+ bool "432 HZ"
|
||||
+ help
|
||||
+ 432 HZ is the best value for desktop systems. Most responsive
|
||||
+ out of all the options. This is for Dual Core/Processor systems only.
|
||||
+ as timer frequencies * number of processors = actual frequency.
|
||||
+ Try this if you have a dual-core/dual processor system.
|
||||
+
|
||||
config HZ_1000
|
||||
bool "1000 HZ"
|
||||
help
|
||||
@@ -52,5 +60,6 @@
|
||||
default 100 if HZ_100
|
||||
default 250 if HZ_250_NODEFAULT
|
||||
default 300 if HZ_300
|
||||
+ default 432 if HZ_432
|
||||
default 1000 if HZ_1000
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff -urN oldtree/kernel/Kconfig.hz newtree/kernel/Kconfig.hz
|
||||
--- oldtree/kernel/Kconfig.hz 2007-03-06 15:00:55.000000000 -0500
|
||||
+++ newtree/kernel/Kconfig.hz 2007-03-06 17:52:36.000000000 -0500
|
||||
@@ -39,6 +39,14 @@
|
||||
as timer frequencies * number of processors = actual frequency.
|
||||
Try this if you have a dual-core/dual processor system.
|
||||
|
||||
+ config HZ_864
|
||||
+ bool "864 HZ"
|
||||
+ help
|
||||
+ 864 HZ is the best value for desktop systems. Most responsive
|
||||
+ out of all the options. The only reason it is not default is
|
||||
+ because it may break few drivers. Give it a try if you have
|
||||
+ a desktop :).
|
||||
+
|
||||
config HZ_1000
|
||||
bool "1000 HZ"
|
||||
help
|
||||
@@ -52,5 +60,6 @@
|
||||
default 250 if HZ_250_NODEFAULT
|
||||
default 300 if HZ_300
|
||||
default 432 if HZ_432
|
||||
+ default 864 if HZ_864
|
||||
default 1000 if HZ_1000
|
||||
|
||||
@ -1,384 +0,0 @@
|
||||
--- a/sound/pci/hda/patch_realtek.c
|
||||
+++ b/sound/pci/hda/patch_realtek.c
|
||||
@@ -212,6 +212,7 @@
|
||||
ALC883_TARGA_2ch_DIG,
|
||||
ALC883_ACER,
|
||||
ALC883_ACER_ASPIRE,
|
||||
+ ALC888_ACER_ASPIRE_4930G,
|
||||
ALC883_MEDION,
|
||||
ALC883_MEDION_MD2,
|
||||
ALC883_LAPTOP_EAPD,
|
||||
@@ -225,9 +226,11 @@
|
||||
ALC883_MITAC,
|
||||
ALC883_CLEVO_M720,
|
||||
ALC883_FUJITSU_PI2515,
|
||||
+ ALC888_FUJITSU_XA3530,
|
||||
ALC883_3ST_6ch_INTEL,
|
||||
ALC888_ASUS_M90V,
|
||||
ALC888_ASUS_EEE1601,
|
||||
+ ALC1200_ASUS_P5Q,
|
||||
ALC883_AUTO,
|
||||
ALC883_MODEL_LAST,
|
||||
};
|
||||
@@ -1107,6 +1110,226 @@
|
||||
}
|
||||
|
||||
/*
|
||||
+ * ALC888
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * 2ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch2_intel_init[] = {
|
||||
+/* Mic-in jack as mic in */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-in jack as Line in */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-Out as Front */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 4ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch4_intel_init[] = {
|
||||
+/* Mic-in jack as mic in */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as Front */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 6ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch6_intel_init[] = {
|
||||
+/* Mic-in jack as CLFE */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as CLFE (workaround because Mic-in is not loud enough) */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * 8ch mode
|
||||
+ */
|
||||
+static struct hda_verb alc888_4ST_ch8_intel_init[] = {
|
||||
+/* Mic-in jack as CLFE */
|
||||
+ { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-in jack as Surround */
|
||||
+ { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
|
||||
+ { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
|
||||
+/* Line-Out as Side */
|
||||
+ { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {
|
||||
+ { 2, alc888_4ST_ch2_intel_init },
|
||||
+ { 4, alc888_4ST_ch4_intel_init },
|
||||
+ { 6, alc888_4ST_ch6_intel_init },
|
||||
+ { 8, alc888_4ST_ch8_intel_init },
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * ALC888 Fujitsu Siemens Amillo xa3530
|
||||
+ */
|
||||
+
|
||||
+static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
|
||||
+/* Front Mic: set to PIN_IN (empty by default) */
|
||||
+ {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
+/* Connect Internal HP to Front */
|
||||
+ {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect Bass HP to Front */
|
||||
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect Line-Out side jack (SPDIF) to Side */
|
||||
+ {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
|
||||
+/* Connect Mic jack to CLFE */
|
||||
+ {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x18, AC_VERB_SET_CONNECT_SEL, 0x02},
|
||||
+/* Connect Line-in jack to Surround */
|
||||
+ {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
+/* Connect HP out jack to Front */
|
||||
+ {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Enable unsolicited event for HP jack and Line-out jack */
|
||||
+ {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+ {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static void alc888_fujitsu_xa3530_automute(struct hda_codec *codec)
|
||||
+{
|
||||
+ unsigned int present;
|
||||
+ unsigned int bits;
|
||||
+ /* Line out presence */
|
||||
+ present = snd_hda_codec_read(codec, 0x17, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ /* HP out presence */
|
||||
+ present = present || snd_hda_codec_read(codec, 0x1b, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ bits = present ? HDA_AMP_MUTE : 0;
|
||||
+ /* Toggle internal speakers muting */
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+ /* Toggle internal bass muting */
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+}
|
||||
+
|
||||
+static void alc888_fujitsu_xa3530_unsol_event(struct hda_codec *codec,
|
||||
+ unsigned int res)
|
||||
+{
|
||||
+ if (res >> 26 == ALC880_HP_EVENT)
|
||||
+ alc888_fujitsu_xa3530_automute(codec);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * ALC888 Acer Aspire 4930G model
|
||||
+ */
|
||||
+
|
||||
+static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
|
||||
+/* Front Mic: set to PIN_IN (empty by default) */
|
||||
+ {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
+/* Unselect Front Mic by default in input mixer 3 */
|
||||
+ {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},
|
||||
+/* Enable unsolicited event for HP jack */
|
||||
+ {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
|
||||
+/* Connect Internal HP to front */
|
||||
+ {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+/* Connect HP out to front */
|
||||
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
+ {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
+ {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static struct hda_input_mux alc888_2_capture_sources[2] = {
|
||||
+ /* Front mic only available on one ADC */
|
||||
+ {
|
||||
+ .num_items = 4,
|
||||
+ .items = {
|
||||
+ { "Mic", 0x0 },
|
||||
+ { "Line", 0x2 },
|
||||
+ { "CD", 0x4 },
|
||||
+ { "Front Mic", 0xb },
|
||||
+ },
|
||||
+ },
|
||||
+ {
|
||||
+ .num_items = 3,
|
||||
+ .items = {
|
||||
+ { "Mic", 0x0 },
|
||||
+ { "Line", 0x2 },
|
||||
+ { "CD", 0x4 },
|
||||
+ },
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+static struct snd_kcontrol_new alc888_base_mixer[] = {
|
||||
+ HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
|
||||
+ HDA_OUTPUT),
|
||||
+ HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
|
||||
+ HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
|
||||
+ HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
+ HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
|
||||
+ HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
|
||||
+ { } /* end */
|
||||
+};
|
||||
+
|
||||
+static void alc888_acer_aspire_4930g_automute(struct hda_codec *codec)
|
||||
+{
|
||||
+ unsigned int present;
|
||||
+ unsigned int bits;
|
||||
+ present = snd_hda_codec_read(codec, 0x15, 0,
|
||||
+ AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
|
||||
+ bits = present ? HDA_AMP_MUTE : 0;
|
||||
+ snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
|
||||
+ HDA_AMP_MUTE, bits);
|
||||
+}
|
||||
+
|
||||
+static void alc888_acer_aspire_4930g_unsol_event(struct hda_codec *codec,
|
||||
+ unsigned int res)
|
||||
+{
|
||||
+ if (res >> 26 == ALC880_HP_EVENT)
|
||||
+ alc888_acer_aspire_4930g_automute(codec);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
* ALC880 3-stack model
|
||||
*
|
||||
* DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e)
|
||||
@@ -3170,6 +3393,7 @@
|
||||
SND_PCI_QUIRK(0x1025, 0xe309, "ULI", ALC880_3ST_DIG),
|
||||
SND_PCI_QUIRK(0x1025, 0xe310, "ULI", ALC880_3ST),
|
||||
SND_PCI_QUIRK(0x1039, 0x1234, NULL, ALC880_6ST_DIG),
|
||||
+ SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G", ALC888_ACER_ASPIRE_4930G),
|
||||
SND_PCI_QUIRK(0x103c, 0x2a09, "HP", ALC880_5ST),
|
||||
SND_PCI_QUIRK(0x1043, 0x10b3, "ASUS W1V", ALC880_ASUS_W1V),
|
||||
SND_PCI_QUIRK(0x1043, 0x10c2, "ASUS W6A", ALC880_ASUS_DIG),
|
||||
@@ -6415,6 +6639,7 @@
|
||||
SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_W2JC),
|
||||
SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),
|
||||
+ SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q),
|
||||
SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),
|
||||
SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */
|
||||
@@ -6879,6 +7104,8 @@
|
||||
#define ALC883_DIGOUT_NID 0x06
|
||||
#define ALC883_DIGIN_NID 0x0a
|
||||
|
||||
+#define ALC1200_DIGOUT_NID 0x10
|
||||
+
|
||||
static hda_nid_t alc883_dac_nids[4] = {
|
||||
/* front, rear, clfe, rear_surr */
|
||||
0x02, 0x03, 0x04, 0x05
|
||||
@@ -6889,8 +7116,15 @@
|
||||
0x08, 0x09,
|
||||
};
|
||||
|
||||
+static hda_nid_t alc883_adc_nids_rev[2] = {
|
||||
+ /* ADC2-1 */
|
||||
+ 0x09, 0x08
|
||||
+};
|
||||
+
|
||||
static hda_nid_t alc883_capsrc_nids[2] = { 0x23, 0x22 };
|
||||
|
||||
+static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 };
|
||||
+
|
||||
/* input MUX */
|
||||
/* FIXME: should be a matrix-type input source selection */
|
||||
|
||||
@@ -8394,6 +8628,7 @@
|
||||
[ALC883_TARGA_2ch_DIG] = "targa-2ch-dig",
|
||||
[ALC883_ACER] = "acer",
|
||||
[ALC883_ACER_ASPIRE] = "acer-aspire",
|
||||
+ [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g",
|
||||
[ALC883_MEDION] = "medion",
|
||||
[ALC883_MEDION_MD2] = "medion-md2",
|
||||
[ALC883_LAPTOP_EAPD] = "laptop-eapd",
|
||||
@@ -8407,7 +8642,9 @@
|
||||
[ALC883_MITAC] = "mitac",
|
||||
[ALC883_CLEVO_M720] = "clevo-m720",
|
||||
[ALC883_FUJITSU_PI2515] = "fujitsu-pi2515",
|
||||
+ [ALC888_FUJITSU_XA3530] = "fujitsu-xa3530",
|
||||
[ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel",
|
||||
+ [ALC1200_ASUS_P5Q] = "asus-p5q",
|
||||
[ALC883_AUTO] = "auto",
|
||||
};
|
||||
|
||||
@@ -8463,6 +8700,7 @@
|
||||
SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
|
||||
SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
|
||||
SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),
|
||||
+ SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530", ALC888_FUJITSU_XA3530),
|
||||
SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch),
|
||||
SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),
|
||||
@@ -8586,6 +8824,26 @@
|
||||
.unsol_event = alc883_acer_aspire_unsol_event,
|
||||
.init_hook = alc883_acer_aspire_automute,
|
||||
},
|
||||
+ [ALC888_ACER_ASPIRE_4930G] = {
|
||||
+ .mixers = { alc888_base_mixer,
|
||||
+ alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
|
||||
+ alc888_acer_aspire_4930g_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
|
||||
+ .adc_nids = alc883_adc_nids_rev,
|
||||
+ .capsrc_nids = alc883_capsrc_nids_rev,
|
||||
+ .dig_out_nid = ALC883_DIGOUT_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
|
||||
+ .channel_mode = alc883_3ST_6ch_modes,
|
||||
+ .need_dac_fix = 1,
|
||||
+ .num_mux_defs =
|
||||
+ ARRAY_SIZE(alc888_2_capture_sources),
|
||||
+ .input_mux = alc888_2_capture_sources,
|
||||
+ .unsol_event = alc888_acer_aspire_4930g_unsol_event,
|
||||
+ .init_hook = alc888_acer_aspire_4930g_automute,
|
||||
+ },
|
||||
[ALC883_MEDION] = {
|
||||
.mixers = { alc883_fivestack_mixer,
|
||||
alc883_chmode_mixer },
|
||||
@@ -8653,6 +8911,22 @@
|
||||
.unsol_event = alc883_medion_md2_unsol_event,
|
||||
.init_hook = alc883_medion_md2_automute,
|
||||
},
|
||||
+ [ALC888_FUJITSU_XA3530] = {
|
||||
+ .mixers = { alc888_base_mixer, alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs, alc888_fujitsu_xa3530_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
|
||||
+ .adc_nids = alc883_adc_nids_rev,
|
||||
+ .capsrc_nids = alc883_capsrc_nids_rev,
|
||||
+ .dig_out_nid = ALC883_DIGOUT_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc888_4ST_8ch_intel_modes),
|
||||
+ .channel_mode = alc888_4ST_8ch_intel_modes,
|
||||
+ .num_mux_defs = ARRAY_SIZE(alc888_2_capture_sources),
|
||||
+ .input_mux = alc888_2_capture_sources,
|
||||
+ .unsol_event = alc888_fujitsu_xa3530_unsol_event,
|
||||
+ .init_hook = alc888_fujitsu_xa3530_automute,
|
||||
+ },
|
||||
[ALC888_LENOVO_MS7195_DIG] = {
|
||||
.mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
|
||||
.init_verbs = { alc883_init_verbs, alc888_lenovo_ms7195_verbs},
|
||||
@@ -8768,6 +9042,17 @@
|
||||
.unsol_event = alc883_eee1601_unsol_event,
|
||||
.init_hook = alc883_eee1601_inithook,
|
||||
},
|
||||
+ [ALC1200_ASUS_P5Q] = {
|
||||
+ .mixers = { alc883_base_mixer, alc883_chmode_mixer },
|
||||
+ .init_verbs = { alc883_init_verbs },
|
||||
+ .num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
||||
+ .dac_nids = alc883_dac_nids,
|
||||
+ .dig_out_nid = ALC1200_DIGOUT_NID,
|
||||
+ .dig_in_nid = ALC883_DIGIN_NID,
|
||||
+ .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
|
||||
+ .channel_mode = alc883_sixstack_modes,
|
||||
+ .input_mux = &alc883_capture_source,
|
||||
+ },
|
||||
};
|
||||
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
|
||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181963
|
||||
|
||||
--- linux-2.6.15.noarch/fs/fat/inode.c~ 2006-02-20 23:20:12.000000000 -0500
|
||||
+++ linux-2.6.15.noarch/fs/fat/inode.c 2006-02-20 23:21:42.000000000 -0500
|
||||
@@ -952,7 +952,8 @@ static int parse_options(char *options,
|
||||
opts->shortname = 0;
|
||||
opts->name_check = 'n';
|
||||
opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK = 0;
|
||||
- opts->utf8 = opts->unicode_xlate = 0;
|
||||
+ opts->utf8 = 1;
|
||||
+ opts->unicode_xlate = 0;
|
||||
opts->numtail = 1;
|
||||
opts->nocase = 0;
|
||||
*debug = 0;
|
||||
@ -1,13 +0,0 @@
|
||||
* Optimise for today's CPUs.
|
||||
|
||||
--- linux-2.6/arch/x86/Makefile_32.cpu 2006-01-09 11:39:04.000000000 -0500
|
||||
+++ linux-2.6/arch/x86/Makefile_32.cpu 2006-01-09 11:39:36.000000000 -0500
|
||||
@@ -15,7 +15,7 @@ cflags-$(CONFIG_M486) += -march=i486
|
||||
cflags-$(CONFIG_M586) += -march=i586
|
||||
cflags-$(CONFIG_M586TSC) += -march=i586
|
||||
cflags-$(CONFIG_M586MMX) += -march=pentium-mmx
|
||||
-cflags-$(CONFIG_M686) += -march=i686
|
||||
+cflags-$(CONFIG_M686) += -march=i686 $(call tune,generic)
|
||||
cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call tune,pentium2)
|
||||
cflags-$(CONFIG_MPENTIUMIII) += -march=i686 $(call tune,pentium3)
|
||||
cflags-$(CONFIG_MPENTIUMM) += -march=i686 $(call tune,pentium3)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
From: Jiri Kosina <jkosina@suse.cz>
|
||||
Date: Thu, 20 Nov 2008 10:27:02 +0000 (+0100)
|
||||
Subject: HID: ignore mouse interface for unibody macbooks
|
||||
X-Git-Tag: v2.6.29-rc1~498^2~18
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ac26fca3e14c8882e382daa7e96ab73e0186cf03
|
||||
|
||||
HID: ignore mouse interface for unibody macbooks
|
||||
|
||||
The mouse interface on unibody macbooks is going to be handled by
|
||||
bcm59743 driver in 2.6.29.
|
||||
|
||||
Reported-by: Henrik Rydberg <rydberg@euromail.se>
|
||||
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
||||
---
|
||||
|
||||
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
||||
index 40df3e1..839de38 100644
|
||||
--- a/drivers/hid/hid-core.c
|
||||
+++ b/drivers/hid/hid-core.c
|
||||
@@ -1577,6 +1577,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
|
||||
{ }
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/fs/squashfs/inode.c
|
||||
+++ b/fs/squashfs/inode.c
|
||||
@@ -656,7 +656,7 @@
|
||||
goto failure;
|
||||
}
|
||||
|
||||
- dentry = d_alloc_anon(i);
|
||||
+ dentry = d_obtain_alias(i);
|
||||
if (dentry == NULL) {
|
||||
iput(i);
|
||||
dentry = ERR_PTR(-ENOMEM);
|
||||
@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.27-r2.ebuild,v 1.1 2008/10/30 21:44:25 dsd Exp $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="5"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.27"
|
||||
EXT4_KV="2.6.27.4"
|
||||
REISER4_KV="2.6.27"
|
||||
TUXONICE_VER="3.0-rc7a"
|
||||
TUXONICE_KV="2.6.27-rc3"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.26"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
EXT4_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${EXT4_KV}-ext4.tar.gz
|
||||
http://ftp.mars.arge.at/pub/${EXT4_KV}-ext4.tar.gz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
ttp://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir ext4
|
||||
cd ext4
|
||||
unpack "${EXT4_KV}-ext4.tar.gz"
|
||||
sed -e '/^#/d' -i patches/series
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
for f in $(<../ext4/patches/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying ext4's ${f}" \
|
||||
epatch ../ext4/patches/${f}
|
||||
done
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_NETWORK=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.27-r2.ebuild,v 1.1 2008/10/30 21:44:25 dsd Exp $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="6"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.27"
|
||||
EXT4_KV="2.6.27.4"
|
||||
REISER4_KV="2.6.27"
|
||||
TUXONICE_VER="3.0-rc7a"
|
||||
TUXONICE_KV="2.6.27-rc3"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.26"
|
||||
UNION_VER="2.5"
|
||||
UNION_KV="2.6.27-rc6"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
EXT4_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${EXT4_KV}-ext4.tar.gz
|
||||
http://ftp.mars.arge.at/pub/${EXT4_KV}-ext4.tar.gz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir ext4
|
||||
cd ext4
|
||||
unpack "${EXT4_KV}-ext4.tar.gz"
|
||||
sed -e '/^#/d' -i patches/series
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
for f in $(<../ext4/patches/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying ext4's ${f}" \
|
||||
epatch ../ext4/patches/${f}
|
||||
done
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_NETWORK=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,92 +0,0 @@
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.27-r2.ebuild,v 1.1 2008/10/30 21:44:25 dsd Exp $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="6"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.27"
|
||||
EXT4_KV="2.6.27.4"
|
||||
EXT4GIT_KV="2.6.27-git7"
|
||||
REISER4_KV="2.6.27"
|
||||
TUXONICE_VER="3.0-rc7a"
|
||||
TUXONICE_KV="2.6.27-rc3"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.26"
|
||||
UNION_VER="2.5"
|
||||
UNION_KV="2.6.27-rc6"
|
||||
XA3530="hda_realtek_xa3530.diff.bz2"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
EXT4_SRC="http://ftp.mars.arge.at/pub/${EXT4_KV}-ext4.tar.gz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
XA3530_SRC="http://ftp.mars.arge.at/pub/${XA3530}"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC} ${XA3530_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir ext4
|
||||
cd ext4
|
||||
unpack "${EXT4_KV}-ext4.tar.gz"
|
||||
sed -e '/^#/d' -i patches/series
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
for f in $(<../ext4/patches/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying ext4's ${f}" \
|
||||
epatch ../ext4/patches/${f}
|
||||
done
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
epatch ${DISTDIR}/${XA3530}
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_NETWORK=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.27-r2.ebuild,v 1.1 2008/10/30 21:44:25 dsd Exp $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="9"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.27"
|
||||
EXT4_KV="2.6.27"
|
||||
REISER4_KV="2.6.27"
|
||||
TUXONICE_VER="3.0-rc7a"
|
||||
TUXONICE_KV="2.6.27-rc3"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.26"
|
||||
UNION_VER="2.5"
|
||||
UNION_KV="2.6.27-rc6"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
EXT4_SRC="http://ftp.mars.arge.at/pub/linux-sabayon-${EXT4_KV}-from-ext4dev-to-ext4.patch"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
epatch ${DISTDIR}/linux-sabayon-${EXT4_KV}-from-ext4dev-to-ext4.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.27-r2.ebuild,v 1.1 2008/10/30 21:44:25 dsd Exp $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="4"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.27"
|
||||
EXT4_KV="2.6.27.4"
|
||||
REISER4_KV="2.6.27"
|
||||
TUXONICE_VER="3.0-rc7a"
|
||||
TUXONICE_KV="2.6.27-rc3"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.26"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
EXT4_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${EXT4_KV}-ext4.tar.gz
|
||||
http://ftp.mars.arge.at/pub/${EXT4_KV}-ext4.tar.gz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
ttp://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir ext4
|
||||
cd ext4
|
||||
unpack "${EXT4_KV}-ext4.tar.gz"
|
||||
sed -e '/^#/d' -i patches/series
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
for f in $(<../ext4/patches/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying ext4's ${f}" \
|
||||
epatch ../ext4/patches/${f}
|
||||
done
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_NETWORK=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="2"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.28"
|
||||
REISER4_KV="2.6.28"
|
||||
TUXONICE_VER="3.0-rc8"
|
||||
TUXONICE_KV="2.6.28"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.28"
|
||||
UNION_VER="2.5.1"
|
||||
UNION_KV="2.6.28.1"
|
||||
ALSA_VER="1.0.18a"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://www-user.tu-chemnitz.de/~doto/kernel/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
ALSA_SRC="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC} ${ALSA_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir alsa
|
||||
cd alsa
|
||||
unpack "alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.18a-xa3530.patch
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
einfo "integrating ALSA ${ALSA_VER}"
|
||||
# rm -rf sound/pci/hda/*
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/* sound/
|
||||
rm -rf sound/include
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/include/* include/sound/
|
||||
rm -rf sound/Documentation
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/Documentation/* Documentation
|
||||
rm -rf sound/scripts
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.19-input.patch
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${FILESDIR}/fix-reiser4-for-2.6.28.1.patch
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
epatch ${FILESDIR}/fix-unionfs-for-2.6.28.1.patch
|
||||
epatch ${FILESDIR}/colored-printk-2.6.26.patch
|
||||
epatch ${FILESDIR}/linux-2.6-x86-tune-generic.patch
|
||||
epatch ${FILESDIR}/linux-2.6-defaults-fat-utf8.patch
|
||||
epatch ${FILESDIR}/linux-2.6.27-lirc.patch
|
||||
epatch ${FILESDIR}/hz-432-kconfig-option.patch
|
||||
epatch ${FILESDIR}/hz-864-kconfig-option.patch
|
||||
epatch ${FILESDIR}/enable-4k-stacks-default-2.6.24.patch
|
||||
epatch ${FILESDIR}/drm-next.patch
|
||||
epatch ${FILESDIR}/drm-modesetting-radeon.patch
|
||||
epatch ${FILESDIR}/drm-nouveau.patch
|
||||
epatch ${FILESDIR}/1-bcm5974-headers.patch
|
||||
epatch ${FILESDIR}/2-bcm5974-quad-finger-tapping.patch
|
||||
epatch ${FILESDIR}/3-bcm5974-macbook5-support.patch
|
||||
epatch ${FILESDIR}/linux-sabayon-2.6.28-ignore-mouse-interface-on-macbooks.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="3"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.28"
|
||||
REISER4_KV="2.6.28"
|
||||
TUXONICE_VER="3.0-rc8"
|
||||
TUXONICE_KV="2.6.28"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.28"
|
||||
UNION_VER="2.5.1"
|
||||
UNION_KV="2.6.28.1"
|
||||
ALSA_VER="1.0.18a"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://www-user.tu-chemnitz.de/~doto/kernel/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
ALSA_SRC="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC} ${ALSA_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir alsa
|
||||
cd alsa
|
||||
unpack "alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.18a-xa3530.patch
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
einfo "integrating ALSA ${ALSA_VER}"
|
||||
# rm -rf sound/pci/hda/*
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/* sound/
|
||||
rm -rf sound/include
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/include/* include/sound/
|
||||
rm -rf sound/Documentation
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/Documentation/* Documentation
|
||||
rm -rf sound/scripts
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.19-input.patch
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${FILESDIR}/fix-reiser4-for-2.6.28.1.patch
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
epatch ${FILESDIR}/fix-unionfs-for-2.6.28.1.patch
|
||||
epatch ${FILESDIR}/colored-printk-2.6.26.patch
|
||||
epatch ${FILESDIR}/linux-2.6-x86-tune-generic.patch
|
||||
epatch ${FILESDIR}/linux-2.6-defaults-fat-utf8.patch
|
||||
epatch ${FILESDIR}/linux-2.6.27-lirc.patch
|
||||
epatch ${FILESDIR}/hz-432-kconfig-option.patch
|
||||
epatch ${FILESDIR}/hz-864-kconfig-option.patch
|
||||
epatch ${FILESDIR}/enable-4k-stacks-default-2.6.24.patch
|
||||
epatch ${FILESDIR}/drm-next.patch
|
||||
epatch ${FILESDIR}/drm-modesetting-radeon.patch
|
||||
epatch ${FILESDIR}/drm-nouveau.patch
|
||||
epatch ${FILESDIR}/1-bcm5974-headers.patch
|
||||
epatch ${FILESDIR}/2-bcm5974-quad-finger-tapping.patch
|
||||
epatch ${FILESDIR}/3-bcm5974-macbook5-support.patch
|
||||
epatch ${FILESDIR}/linux-sabayon-2.6.28-ignore-mouse-interface-on-macbooks.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="4"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.28"
|
||||
REISER4_KV="2.6.28"
|
||||
TUXONICE_VER="3.0-rc8"
|
||||
TUXONICE_KV="2.6.28"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.28"
|
||||
UNION_VER="2.5.1"
|
||||
UNION_KV="2.6.28.1"
|
||||
ALSA_VER="1.0.18a"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://www-user.tu-chemnitz.de/~doto/kernel/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
ALSA_SRC="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC} ${ALSA_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir alsa
|
||||
cd alsa
|
||||
unpack "alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.18a-xa3530.patch
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
einfo "integrating ALSA ${ALSA_VER}"
|
||||
# rm -rf sound/pci/hda/*
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/* sound/
|
||||
rm -rf sound/include
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/include/* include/sound/
|
||||
rm -rf sound/Documentation
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/Documentation/* Documentation
|
||||
rm -rf sound/scripts
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.19-input.patch
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${FILESDIR}/fix-reiser4-for-2.6.28.1.patch
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
epatch ${FILESDIR}/fix-unionfs-for-2.6.28.1.patch
|
||||
epatch ${FILESDIR}/colored-printk-2.6.26.patch
|
||||
epatch ${FILESDIR}/linux-2.6-x86-tune-generic.patch
|
||||
epatch ${FILESDIR}/linux-2.6-defaults-fat-utf8.patch
|
||||
epatch ${FILESDIR}/linux-2.6.27-lirc.patch
|
||||
epatch ${FILESDIR}/hz-432-kconfig-option.patch
|
||||
epatch ${FILESDIR}/hz-864-kconfig-option.patch
|
||||
epatch ${FILESDIR}/enable-4k-stacks-default-2.6.24.patch
|
||||
epatch ${FILESDIR}/drm-next.patch
|
||||
epatch ${FILESDIR}/drm-modesetting-radeon.patch
|
||||
epatch ${FILESDIR}/drm-nouveau.patch
|
||||
epatch ${FILESDIR}/1-bcm5974-headers.patch
|
||||
epatch ${FILESDIR}/2-bcm5974-quad-finger-tapping.patch
|
||||
epatch ${FILESDIR}/3-bcm5974-macbook5-support.patch
|
||||
epatch ${FILESDIR}/linux-sabayon-2.6.28-ignore-mouse-interface-on-macbooks.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="7"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.28"
|
||||
REISER4_KV="2.6.28"
|
||||
TUXONICE_VER="3.0-rc8"
|
||||
TUXONICE_KV="2.6.28"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.28"
|
||||
UNION_VER="2.5.1"
|
||||
UNION_KV="2.6.28.1"
|
||||
ALSA_VER="1.0.18a"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
http://www-user.tu-chemnitz.de/~doto/kernel/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
ALSA_SRC="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC} ${ALSA_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
mkdir alsa
|
||||
cd alsa
|
||||
unpack "alsa-driver-${ALSA_VER}.tar.bz2"
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.18a-xa3530.patch
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
einfo "integrating ALSA ${ALSA_VER}"
|
||||
# rm -rf sound/pci/hda/*
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/* sound/
|
||||
rm -rf sound/include
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/include/* include/sound/
|
||||
rm -rf sound/Documentation
|
||||
cp -rf ../alsa/alsa-driver-${ALSA_VER}/alsa-kernel/Documentation/* Documentation
|
||||
rm -rf sound/scripts
|
||||
epatch ${FILESDIR}/alsa-driver-1.0.19-input.patch
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${FILESDIR}/fix-reiser4-for-2.6.28.1.patch
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
epatch ${FILESDIR}/fix-unionfs-for-2.6.28.1.patch
|
||||
epatch ${FILESDIR}/colored-printk-2.6.26.patch
|
||||
epatch ${FILESDIR}/linux-2.6-x86-tune-generic.patch
|
||||
epatch ${FILESDIR}/linux-2.6-defaults-fat-utf8.patch
|
||||
epatch ${FILESDIR}/linux-2.6.27-lirc.patch
|
||||
epatch ${FILESDIR}/hz-432-kconfig-option.patch
|
||||
epatch ${FILESDIR}/hz-864-kconfig-option.patch
|
||||
epatch ${FILESDIR}/enable-4k-stacks-default-2.6.24.patch
|
||||
# epatch ${FILESDIR}/drm-next.patch
|
||||
# epatch ${FILESDIR}/drm-modesetting-radeon.patch
|
||||
# epatch ${FILESDIR}/drm-nouveau.patch
|
||||
epatch ${FILESDIR}/1-bcm5974-headers.patch
|
||||
epatch ${FILESDIR}/2-bcm5974-quad-finger-tapping.patch
|
||||
epatch ${FILESDIR}/3-bcm5974-macbook5-support.patch
|
||||
epatch ${FILESDIR}/linux-sabayon-2.6.28-ignore-mouse-interface-on-macbooks.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras"
|
||||
K_GENPATCHES_VER="1"
|
||||
AA_VER="2.3"
|
||||
AA_KV="2.6.28"
|
||||
REISER4_KV="2.6.28"
|
||||
TUXONICE_VER="3.0-rc7a"
|
||||
TUXONICE_KV="2.6.28-rc7"
|
||||
DSDT_VER="0.9c"
|
||||
DSDT_KV="2.6.28"
|
||||
UNION_VER="2.5"
|
||||
UNION_KV="2.6.27-rc6"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
|
||||
|
||||
DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
|
||||
AA_SRC="ftp://forgeftp.novell.com/apparmor/AppArmor%202.3-Beta1/${AA_KV}-AA${AA_VER}.tgz
|
||||
http://ftp.mars.arge.at/apparmor/${AA_KV}-AA${AA_VER}.tgz"
|
||||
REISER4_SRC="http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-${REISER4_KV}.patch.bz2"
|
||||
TUXONICE_SRC="http://www.tuxonice.net/downloads/all/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.diff.bz2
|
||||
http://user.it.uu.se/~mikpe/linux/patches/tuxonice/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.diff.bz2
|
||||
http://www-user.tu-chemnitz.de/~doto/kernel/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.diff.bz2"
|
||||
DSDT_SRC="http://gaugusch.at/acpi-dsdt-initrd-patches/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch"
|
||||
UNION_SRC="http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
http://ftp.mars.arge.at/apparmor/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AA_SRC} ${EXT4_SRC} ${REISER4_SRC} ${TUXONICE_SRC} ${DSDT_SRC} ${UNION_SRC}"
|
||||
|
||||
src_unpack() {
|
||||
mkdir apparmor
|
||||
cd apparmor
|
||||
unpack "${AA_KV}-AA${AA_VER}.tgz"
|
||||
sed -e '/^#/d' -i ${AA_KV}/series
|
||||
cd ..
|
||||
|
||||
kernel-2_src_unpack
|
||||
|
||||
for f in $(<../apparmor/${AA_KV}/series) ; do
|
||||
EPATCH_OPTS="-p1" \
|
||||
EPATCH_SINGLE_MSG="Applying AppArmor's ${f}" \
|
||||
epatch ../apparmor/${AA_KV}/${f}
|
||||
done
|
||||
|
||||
epatch ${DISTDIR}/reiser4-for-${REISER4_KV}.patch.bz2
|
||||
epatch ${DISTDIR}/tuxonice-${TUXONICE_VER}-for-${TUXONICE_KV}.diff.bz2
|
||||
epatch ${DISTDIR}/acpi-dsdt-initrd-v${DSDT_VER}-${DSDT_KV}.patch
|
||||
epatch ${DISTDIR}/unionfs-${UNION_VER}_for_${UNION_KV}.diff.gz
|
||||
epatch ${DISTDIR}/UnionFS_${UNION_VER}-AppArmor_${AA_VER}.patch
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
einfo
|
||||
einfo "Make sure that your kernel configuration file is set with:"
|
||||
einfo " CONFIG_SECURITY=y"
|
||||
einfo " CONFIG_SECURITY_APPARMOR=y"
|
||||
einfo "Without these, apparmor will not function."
|
||||
}
|
||||
@ -31,7 +31,7 @@ UNIPATCH_LIST="${DISTDIR}/${GOPATCHES}"
|
||||
src_unpack() {
|
||||
kernel-2_src_unpack
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
find "${WORKDIR}" -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ UNIPATCH_LIST="${DISTDIR}/${GOPATCHES}"
|
||||
src_unpack() {
|
||||
kernel-2_src_unpack
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
find "${WORKDIR}" -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ UNIPATCH_LIST="${DISTDIR}/${GOPATCHES}"
|
||||
src_unpack() {
|
||||
kernel-2_src_unpack
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
find "${WORKDIR}" -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ UNIPATCH_EXCLUDE="6012_UnionFS_2.5.1-1-AppArmor_2.3.patch 6013_fix-unionfs-for-2
|
||||
src_unpack() {
|
||||
kernel-2_src_unpack
|
||||
|
||||
find ${WORKDIR} -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
find "${WORKDIR}" -iname "*.orig" -exec rm {} \; 2> /dev/null
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user