From ca658c368adff2c7e6c1e0c52f725317d32c9470 Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 17 Dec 2010 19:21:18 +0000 Subject: [PATCH] app-emulation/opencbm: add 2.6.36 patch (Portage version: 2.2.0_alpha8-r1/svn/Linux x86_64) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2783 6952d904-891a-0410-993b-d76249ca496b --- app-emulation/opencbm/ChangeLog | 5 ++++ app-emulation/opencbm/Manifest | 7 +++--- .../files/0.4.3_rc2/05_-unolcked_ioctl.diff | 23 +++++++++++++++++++ app-emulation/opencbm/metadata.xml | 5 +++- .../opencbm/opencbm-0.4.3_rc2.ebuild | 2 +- 5 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 app-emulation/opencbm/files/0.4.3_rc2/05_-unolcked_ioctl.diff diff --git a/app-emulation/opencbm/ChangeLog b/app-emulation/opencbm/ChangeLog index 1aa0fad9..11de9e3b 100644 --- a/app-emulation/opencbm/ChangeLog +++ b/app-emulation/opencbm/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Dec 2010; Mario Fetka + +files/0.4.3_rc2/05_-unolcked_ioctl.diff, opencbm-0.4.3_rc2.ebuild, + metadata.xml: + add 2.6.36 patch + 07 Nov 2010; Mario Fetka -files/0.4.2a, -opencbm-0.4.2a.ebuild: delete old ebuild diff --git a/app-emulation/opencbm/Manifest b/app-emulation/opencbm/Manifest index e84265e4..d4d11c14 100644 --- a/app-emulation/opencbm/Manifest +++ b/app-emulation/opencbm/Manifest @@ -3,8 +3,9 @@ AUX 0.4.3_rc2/01_skip-targets.diff 1031 RMD160 8d393f4cb5deba8c6cbf8bfc9fb3536eb AUX 0.4.3_rc2/02_module_makefile.diff 1405 RMD160 08f6ddf5c8b4c32575060d48d416317060dba4fe SHA1 617de01c3c5126f2233a6ddb808eb4dda7bf43cd SHA256 99d66ab4c20b9cdcab57e6c69544acd48c3a7e14c15b8be8944fccf00659b707 AUX 0.4.3_rc2/03_module_flatten.diff 1108 RMD160 9b8f87d5ca8dc076d80713cb6106f27c35de9f8a SHA1 421db9529d80db2b5a49c5c9542f2dc0002d984e SHA256 99aa88e1027d9958a172f123a11588858014744731067f0e9283a16de8cc2d77 AUX 0.4.3_rc2/04_irq_count.diff 2665 RMD160 7d25f39deb6212a64ffbe15638743458877c103e SHA1 626f5c3b30d8e789097ce839b4132507c8475444 SHA256 1a6408762f49a6092bfaafeea2d0b8a100c9aa34dbca35bdd3032b3e390e8537 +AUX 0.4.3_rc2/05_-unolcked_ioctl.diff 953 RMD160 66b006f9e628cccd6228f9dbcc03afdaf415648a SHA1 5be351f834ea1512c0acd896795360ced90fb2c8 SHA256 e3eac56e1a0ed6eb4e63fc883c2a1fb82270e9737cbc1e0355c73e2dadf7d143 AUX Makefile 1003 RMD160 7f70ec429c51206864e72d82aee80aa5ef655d70 SHA1 c072491f3b775b00463805a6b70744d8ccf56501 SHA256 7b2d7f35f20d72a1e0a5f6bde2d9da8168891c2994b4b9828b7892f8cbb8a93c DIST opencbm_0.4.3~rc2.orig.tar.gz 678232 RMD160 140f33641e685c78638a44747e2b3f156b88cc8a SHA1 a25ab221cb06b08ab4e0a7e2633be6b6c15d2d31 SHA256 27ea6c0499d6e99dc9f10a9fed9ee85e588164a11c7bd66c307aeec62fd51922 -EBUILD opencbm-0.4.3_rc2.ebuild 1816 RMD160 3d94e3e6767f0a97a24f64e9117391a07c55aa33 SHA1 770046bd69bb5ad3ead7b245fa0c3d10a25be3c6 SHA256 b1646c4a7f688cc8ea5588ed85fcf02c47bfcf865401e556e6cdf50e34a4db60 -MISC ChangeLog 681 RMD160 916ca8eba0f300b7e538a8101284468e654ec715 SHA1 c9afaa79acbe8d37a7ce5ed0ce6cccf3ac6ec2cc SHA256 5032106db08ca736319c10f59e27cde87ff9f5af4a054f4d47e2f3172c074693 -MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 +EBUILD opencbm-0.4.3_rc2.ebuild 1811 RMD160 3238931c2ec2b0f7b05f55f15d01dabad791caa8 SHA1 ad28cfa45130c341b94ab98d2c0eb618320552d7 SHA256 a79a1dabeb7df66a1920aa81789424578c7cc838cd933aa612ad3576b0574e9f +MISC ChangeLog 838 RMD160 1c001c2ee956c56ac920a8f4ab799022b7980338 SHA1 fa57dbc063e402cf0ce91a5c2e7f2492d26f7757 SHA256 733a0633326d473b13fb6d49d5ca821e1c66f0c0dcbcca87c51d5e262e96a4c8 +MISC metadata.xml 226 RMD160 bebcbe7a5e3d2be83c25e006192f71ebf45abb14 SHA1 ec2b713fc2363b8c51e9c164d0802eeb59d9d296 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2 diff --git a/app-emulation/opencbm/files/0.4.3_rc2/05_-unolcked_ioctl.diff b/app-emulation/opencbm/files/0.4.3_rc2/05_-unolcked_ioctl.diff new file mode 100644 index 00000000..994212bf --- /dev/null +++ b/app-emulation/opencbm/files/0.4.3_rc2/05_-unolcked_ioctl.diff @@ -0,0 +1,23 @@ +Submitted By: Mario Fetka (mario dot fetka at gmail dot com) +Date: 2010-12-17 +Initial Package Version: 0.4.3rc2 +Origin: me +Upstream Status: unknown +Description: make it compile with 2.6.36 + +diff -Naur opencbm-0.4.3rc2.orig/sys/linux/.cbm_module.o.d opencbm-0.4.3rc2/sys/linux/.cbm_module.o.d +diff -Naur opencbm-0.4.3rc2.orig/sys/linux/cbm_module.c opencbm-0.4.3rc2/sys/linux/cbm_module.c +--- opencbm-0.4.3rc2.orig/sys/linux/cbm_module.c 2010-12-17 19:10:28.000000000 +0000 ++++ opencbm-0.4.3rc2/sys/linux/cbm_module.c 2010-12-17 19:12:33.000000000 +0000 +@@ -924,7 +924,11 @@ + #endif + .read = cbm_read, /* read */ + .write = cbm_write, /* write */ ++# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) + .ioctl = cbm_ioctl, /* ioctl */ ++# else ++ .unlocked_ioctl = cbm_ioctl, /* ioctl */ ++# endif + .open = cbm_open, /* open */ + .release = cbm_release, /* release */ + }; diff --git a/app-emulation/opencbm/metadata.xml b/app-emulation/opencbm/metadata.xml index 7e328698..6589d3b0 100644 --- a/app-emulation/opencbm/metadata.xml +++ b/app-emulation/opencbm/metadata.xml @@ -1,5 +1,8 @@ -maintainer-wanted +no-herd + + mario.fetka@gmail.com + diff --git a/app-emulation/opencbm/opencbm-0.4.3_rc2.ebuild b/app-emulation/opencbm/opencbm-0.4.3_rc2.ebuild index a29606a5..d76efa30 100644 --- a/app-emulation/opencbm/opencbm-0.4.3_rc2.ebuild +++ b/app-emulation/opencbm/opencbm-0.4.3_rc2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.fbriere.net/debian/dists/unstable/opencbm/src/opencbm_${PV/_ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~x86" IUSE="doc" DEPEND="virtual/linux-sources