diff options
author | Michele Noberasco <s4t4n@gentoo.org> | 2006-11-27 15:38:05 +0000 |
---|---|---|
committer | Michele Noberasco <s4t4n@gentoo.org> | 2006-11-27 15:38:05 +0000 |
commit | b33d9ac837006b18c8483579db5359ad0163c2b0 (patch) | |
tree | d6b29c2f8ce3e151fbb617f9319622590feb4182 /app-laptop | |
parent | Stable for x86, see bug #156396. Wiped out previous releases. (diff) | |
download | gentoo-2-b33d9ac837006b18c8483579db5359ad0163c2b0.tar.gz gentoo-2-b33d9ac837006b18c8483579db5359ad0163c2b0.tar.bz2 gentoo-2-b33d9ac837006b18c8483579db5359ad0163c2b0.zip |
Stable for x86, see bug #156396. Wiped out previous releases.
(Portage version: 2.1.1-r2)
(Unsigned Manifest commit)
Diffstat (limited to 'app-laptop')
-rw-r--r-- | app-laptop/omnibook/Manifest | 32 | ||||
-rw-r--r-- | app-laptop/omnibook/files/digest-omnibook-20060126 | 3 | ||||
-rw-r--r-- | app-laptop/omnibook/files/omnibook-fix-obtest-segfault.patch | 54 | ||||
-rw-r--r-- | app-laptop/omnibook/files/remove-legacy-isa-fromio.patch | 17 | ||||
-rw-r--r-- | app-laptop/omnibook/omnibook-20060126.ebuild | 48 |
5 files changed, 8 insertions, 146 deletions
diff --git a/app-laptop/omnibook/Manifest b/app-laptop/omnibook/Manifest index 76f96d07046a..7846edb0d0de 100644 --- a/app-laptop/omnibook/Manifest +++ b/app-laptop/omnibook/Manifest @@ -1,32 +1,16 @@ -AUX omnibook-fix-obtest-segfault.patch 1426 RMD160 78c521b19ab3d48300d9ad375a47a57607afa528 SHA1 ec02d80c1a711696b029710cfd16a22a348d9dd4 SHA256 c04287647ab7733f104da5b194f427f9f712da74a975e207b4879e26e026a631 -MD5 5f8b7eeae3ca3cc3a29c274546cba038 files/omnibook-fix-obtest-segfault.patch 1426 -RMD160 78c521b19ab3d48300d9ad375a47a57607afa528 files/omnibook-fix-obtest-segfault.patch 1426 -SHA256 c04287647ab7733f104da5b194f427f9f712da74a975e207b4879e26e026a631 files/omnibook-fix-obtest-segfault.patch 1426 -AUX remove-legacy-isa-fromio.patch 492 RMD160 2449d41af77bccdb38481ba5fc0c77c1b0b7a148 SHA1 b8dd0ff602915393a9c7e810decea0dd333ecf05 SHA256 bdaf3a08c9d9c4987ae90b92a2d4dd2c58132c818629b77437425ae6c7bef177 -MD5 b1262de73e4602f7351f4d8603444de3 files/remove-legacy-isa-fromio.patch 492 -RMD160 2449d41af77bccdb38481ba5fc0c77c1b0b7a148 files/remove-legacy-isa-fromio.patch 492 -SHA256 bdaf3a08c9d9c4987ae90b92a2d4dd2c58132c818629b77437425ae6c7bef177 files/remove-legacy-isa-fromio.patch 492 DIST omnibook-2.20060817.tar.gz 56007 RMD160 b5d7ded487155e0bc9dcecdb913c6d0622a0c74a SHA1 e91071fb61796bade2101016745e0e750ae8c004 SHA256 a22aac0cc653954df65442cff7195de08c96d3f33e96d670baba1e3605391c28 -DIST omnibook-20060126.tar.gz 59125 RMD160 e8a35a1548874406ddbf6d04dca746b50fb52fed SHA1 375d7ac1278d450c35cf139c5582b70d4c56b5fb SHA256 d5b64cd1f0a8dd6da5510c958e9a1c8f53f6ecb5a0d644655732b9812db15ffd -EBUILD omnibook-20060126.ebuild 1131 RMD160 f33a019006766b382e84caecaa41aa9fa48cadf0 SHA1 0bf7eb5a8e28591839fd6e979f19d7ab70822d5c SHA256 0be75378b055a8be137b9bbc7bf5b0bb3119c8e9bbc3de12cd254fc90efa2032 -MD5 6242fa2136386cd9500bc9dd917da820 omnibook-20060126.ebuild 1131 -RMD160 f33a019006766b382e84caecaa41aa9fa48cadf0 omnibook-20060126.ebuild 1131 -SHA256 0be75378b055a8be137b9bbc7bf5b0bb3119c8e9bbc3de12cd254fc90efa2032 omnibook-20060126.ebuild 1131 -EBUILD omnibook-20060817.ebuild 958 RMD160 43eab32dc0dca157c2a95a6c47a15244f60680b4 SHA1 2510dbc88d9d64f87f3af2b24378b4b902e4bb12 SHA256 681cfee5d4656621779c5318d4cdc06274eea882c69157f0174060f567e69aa6 -MD5 6e75580219c7066d19914ece794d9ab1 omnibook-20060817.ebuild 958 -RMD160 43eab32dc0dca157c2a95a6c47a15244f60680b4 omnibook-20060817.ebuild 958 -SHA256 681cfee5d4656621779c5318d4cdc06274eea882c69157f0174060f567e69aa6 omnibook-20060817.ebuild 958 -MISC ChangeLog 4011 RMD160 ac66f1c291a9e67f0855fce16cf954d2343da9e0 SHA1 678396528fd8198d8da83c91f968dbc41841e37e SHA256 ebd76b384cc7931c7b59ffe9d3688ec05b8e4ad2b0819c478876031a5647065b -MD5 794f9ae0f2d45ad32e69ed93979afa68 ChangeLog 4011 -RMD160 ac66f1c291a9e67f0855fce16cf954d2343da9e0 ChangeLog 4011 -SHA256 ebd76b384cc7931c7b59ffe9d3688ec05b8e4ad2b0819c478876031a5647065b ChangeLog 4011 +EBUILD omnibook-20060817.ebuild 957 RMD160 80b1bcb5ea68be6cf779452735c6152a935cb4c9 SHA1 86d6b98d7d861a46ce758f67a924167fe7e8a44f SHA256 64e7f94ea925d5947e7f9ad1b660e8c326b5eaa91501397f86b095546d705dcf +MD5 0bce0d6167c9169d3e548810893466eb omnibook-20060817.ebuild 957 +RMD160 80b1bcb5ea68be6cf779452735c6152a935cb4c9 omnibook-20060817.ebuild 957 +SHA256 64e7f94ea925d5947e7f9ad1b660e8c326b5eaa91501397f86b095546d705dcf omnibook-20060817.ebuild 957 +MISC ChangeLog 4186 RMD160 2da811653252423c9bfabef21c882837ae64b382 SHA1 bd9957b263937909afb2e4f4fa4a2fa74c183cb9 SHA256 109eb74961c6cb5297e8b7967d93ea35596cbcdd02bdf618f75e960fd080b871 +MD5 45c6efd613b68963e9f8708c1ad48824 ChangeLog 4186 +RMD160 2da811653252423c9bfabef21c882837ae64b382 ChangeLog 4186 +SHA256 109eb74961c6cb5297e8b7967d93ea35596cbcdd02bdf618f75e960fd080b871 ChangeLog 4186 MISC metadata.xml 263 RMD160 9823453879bbb8b4e21bf8ef000ea466af72b82c SHA1 342f944838c604ecd01a0da899da58839107f805 SHA256 9e335c962f80867a497bdc60b2dc0b7506da79414ee0a4aa359ea7300fdd7eb5 MD5 d7a9995a4a6279e77855e4ea631e6b11 metadata.xml 263 RMD160 9823453879bbb8b4e21bf8ef000ea466af72b82c metadata.xml 263 SHA256 9e335c962f80867a497bdc60b2dc0b7506da79414ee0a4aa359ea7300fdd7eb5 metadata.xml 263 -MD5 1bd1030f650aefe724c7ef17945348ab files/digest-omnibook-20060126 250 -RMD160 8f85e53c11db5f2a658d8643f00ec23578214f2d files/digest-omnibook-20060126 250 -SHA256 c6b974176b3416cfa7f6bf633b47dc9cab2ab3fe66be08f51bd918b69971795d files/digest-omnibook-20060126 250 MD5 51b3634d0829a670c4fc1758a7cdbee1 files/digest-omnibook-20060817 256 RMD160 a27edce1e2cceacf8146beedb17922dc5b70d39b files/digest-omnibook-20060817 256 SHA256 df2aa52af4e283aeed777eb863a4b082ceff38c818f9047240403db4e9a5ecf5 files/digest-omnibook-20060817 256 diff --git a/app-laptop/omnibook/files/digest-omnibook-20060126 b/app-laptop/omnibook/files/digest-omnibook-20060126 deleted file mode 100644 index e0975985f6e2..000000000000 --- a/app-laptop/omnibook/files/digest-omnibook-20060126 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 856b82770aa9407af435ff9b32444bf9 omnibook-20060126.tar.gz 59125 -RMD160 e8a35a1548874406ddbf6d04dca746b50fb52fed omnibook-20060126.tar.gz 59125 -SHA256 d5b64cd1f0a8dd6da5510c958e9a1c8f53f6ecb5a0d644655732b9812db15ffd omnibook-20060126.tar.gz 59125 diff --git a/app-laptop/omnibook/files/omnibook-fix-obtest-segfault.patch b/app-laptop/omnibook/files/omnibook-fix-obtest-segfault.patch deleted file mode 100644 index ba8a2b190d2f..000000000000 --- a/app-laptop/omnibook/files/omnibook-fix-obtest-segfault.patch +++ /dev/null @@ -1,54 +0,0 @@ -This patch was written by Andrew D. Keyser (aka Legoguy) <andrewdk@sbcglobal.net> -to fix the segfaulting problem described in http://bugs.gentoo.org/86335 -Description: -Don't know why this even worked before, but the 'q' variable was never set in -the case of -r, -c, -k, -i, or -s flags - but it was still operated on after -the switch, so that caused a segfault. Moved the iopl check above the switch -and moved the operations on q into the switch. -Fixes problem. - -diff -urp omnibook-2005-02-17.orig/misc/obtest/obtest.c omnibook-2005-02-17/misc/obtest/obtest.c ---- omnibook-2005-02-17.orig/misc/obtest/obtest.c 2005-06-12 18:09:07.000000000 +0200 -+++ omnibook-2005-02-17/misc/obtest/obtest.c 2005-06-12 18:09:35.000000000 +0200 -@@ -297,13 +297,18 @@ int main(int argc, char *argv[]) - if (sw[0] != '-') - usage(argv[0]); - -+ if (iopl(3)) { -+ perror("iopl"); -+ exit (1); -+ } -+ - switch (sw[1]) { - case 'r': - case 'c': - case 'k': - case 'i': - case 's': -- if (argc == 3) -+ if (argc == 3) - p = argv[2]; - else - usage(argv[0]); -@@ -313,6 +318,7 @@ int main(int argc, char *argv[]) - if (argc == 4) { - p = argv[2]; - q = argv[3]; -+ data = ntoi(q); - } else - usage(argv[0]); - break; -@@ -320,13 +326,7 @@ int main(int argc, char *argv[]) - usage(argv[0]); - } - -- if (iopl(3)) { -- perror("iopl"); -- exit (1); -- } -- - a = ntoi(p); -- data = ntoi(q); - - switch (sw[1]) { - case 'w': diff --git a/app-laptop/omnibook/files/remove-legacy-isa-fromio.patch b/app-laptop/omnibook/files/remove-legacy-isa-fromio.patch deleted file mode 100644 index abb111e2f5eb..000000000000 --- a/app-laptop/omnibook/files/remove-legacy-isa-fromio.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch to fix compile and load problem. -Caused by a cleanup: -http://lkml.org/lkml/2006/1/26/327 - ---- omnibook-20060126/dmi.c 2003-09-29 11:50:34.000000000 +0200 -+++ omnibook-20060126/dmi.c 2006-03-02 02:00:39.000000000 +0100 -@@ -128,7 +128,9 @@ - - while( fp < 0xFFFFF) - { -- isa_memcpy_fromio(buf, fp, 15); -+ void __iomem *addr = ioremap(fp, 15); -+ memcpy_fromio(buf, addr, 15); -+ iounmap(addr); - if(memcmp(buf, "_DMI_", 5)==0 && dmi_checksum(buf)) - { - u16 num=buf[13]<<8|buf[12]; diff --git a/app-laptop/omnibook/omnibook-20060126.ebuild b/app-laptop/omnibook/omnibook-20060126.ebuild deleted file mode 100644 index 15cefc1fddf2..000000000000 --- a/app-laptop/omnibook/omnibook-20060126.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20060126.ebuild,v 1.3 2006/08/23 07:19:19 s4t4n Exp $ - -inherit linux-mod eutils - - -DESCRIPTION="Linux kernel module for (but not limited to) HP Omnibook support" -HOMEPAGE="http://www.sourceforge.net/projects/omke" -SRC_URI="mirror://sourceforge/omke/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="x86 -ppc" -IUSE="" - -MODULE_NAMES="omnibook(char:)" -BUILD_TARGETS=" " - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNEL=${KV_MAJOR}.${KV_MINOR} KSRC=${KV_DIR}" -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/omnibook-fix-obtest-segfault.patch - epatch ${FILESDIR}/remove-legacy-isa-fromio.patch - convert_to_m Makefile - sed -i 's:MODULE_PARM(\([^,]*\), "i");:module_param(\1, int, 0);:' init.c -} - -src_compile() { - cd misc/obtest - emake || die "make obtest failed" - - linux-mod_src_compile -} - -src_install() { - dosbin misc/obtest/obtest - dodoc doc/* - docinto misc - dodoc misc/*.patch misc/*.txt - docinto hotkeys - dodoc misc/hotkeys/* - - linux-mod_src_install -} |