diff options
| author |   Dennis Freise <dennis.freise@final-frontier.org> | 2011-09-04 17:33:01 +0200 |
|---|---|---|
| committer | Dennis Freise <dennis.freise@final-frontier.org> | 2011-09-04 17:33:01 +0200 |
| commit | 2f2dfd5c63d66b9934ec51a73afa621c54f287c3 (patch) | |
| tree | 57b77061baf302fef020c109ef816c0f3ce0096d | |
| parent | Modified KEYWORDS to "-amd64" (diff) | |
| download | dfreise-2f2dfd5c63d66b9934ec51a73afa621c54f287c3.tar.gz dfreise-2f2dfd5c63d66b9934ec51a73afa621c54f287c3.tar.bz2 dfreise-2f2dfd5c63d66b9934ec51a73afa621c54f287c3.zip | |
Patch for amd64-sources by Arnd Feldmueller added, ebuild fcpci-0.1-r6
reverted back to ~amd64 for now.
| -rw-r--r-- | net-dialup/fcpci/Manifest | 3 | ||||
| -rw-r--r-- | net-dialup/fcpci/fcpci-0.1-r6.ebuild | 8 | ||||
| -rw-r--r-- | net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch | 53 |
3 files changed, 61 insertions, 3 deletions
diff --git a/net-dialup/fcpci/Manifest b/net-dialup/fcpci/Manifest index f9fdaa0..e5e4c8b 100644 --- a/net-dialup/fcpci/Manifest +++ b/net-dialup/fcpci/Manifest @@ -1,9 +1,10 @@ AUX fcpci-kernel-2.6.34.patch 4358 RMD160 63ba14a64be689ac4f15cfe010106a9a3c4e7c41 SHA1 8b53b1a43cb5615995502239a40687d61443a27c SHA256 82f72dda3f5a6956e5e35990e0b431ff11c8f9a4f046f991d19aca95d79dfd6e +AUX fcpci-kernel-2.6.39-amd64.patch 1716 RMD160 df5a10616b8200805448b4a2b55beb0193dc3650 SHA1 6b0b82b13a37c14323edecd1bc21305c6877d057 SHA256 e70d51393b7096ad20e56c0c995277294ca009fbeaa7662c6378670290179510 AUX fcpci-kernel-2.6.39.patch 850 RMD160 d6f8573a5aa8b15fce6ee8096e20d23ca3032397 SHA1 cb67c68483a0c71e1b5800c7c76bbe415522dda2 SHA256 9f56ee45159365216fd58b1d76ce878fd4db2eee456c04354c56330db7a257d6 AUX kernel-2.6.34.patch 4515 RMD160 679ad014f799d9bf9f13c1aa1fd6451faebc5bc8 SHA1 d5c94106b43f9f4371274efe47aaeb6e4347fce7 SHA256 94e83fad32998596f97d7f5df3e9c674419616a3bcfb3cb7309c220204ac0de7 AUX kernel-2.6.39.patch 810 RMD160 811e597fa65a65a4aa59eb176f5e95b401b9124c SHA1 edb7f9e66331997a52023f6fb6c5ab9a3e762f45 SHA256 5ceb47f364064b11d8ed12f73cf6cbaf22b53cd5f9109d7b1beb7943620bc2af DIST fcpci-0.1-0.src.rpm 1419782 RMD160 d6313192d01e0f6a64f890b3015e0541c9dbfbd3 SHA1 08e88c9b395b783dc8dce91b61f286f1c05a261e SHA256 f39c7cb83b21fa9ba1de71f357c72552aa1c5327d7ad4ac55274e71e9da3f8e4 EBUILD fcpci-0.1-r5.ebuild 1535 RMD160 06a08d96f69d5afa4d0480d355d4b7a93ad21f8a SHA1 c9dea569088a9f6d9c96e45c4d34d6a2f88f44fd SHA256 f5458a60ae2dd955f1a6ed6527b89f18ff981c6364bff50f0c18a7d555412c97 -EBUILD fcpci-0.1-r6.ebuild 1569 RMD160 62a077d40917f44bf673483be9361a9312fef079 SHA1 957015fd9983d0a1c47f002ad63e1fd47d5eb52c SHA256 834960ced734a2c5713f3928d4c6c6adbdb79100e1afeeace428c98d604c5642 +EBUILD fcpci-0.1-r6.ebuild 1659 RMD160 c60e0ec4b0dc81198351aca20c4acc92c814f150 SHA1 445eb90548a18a846a93d0c3226e7d105a95ea38 SHA256 f3ef07ba92ed05943a55da310a1ac251344b60bdccebc081fbca2025b2332340 MISC ChangeLog 2726 RMD160 0731476eb55b156e0ec16cb6e9dc86902e8e18b2 SHA1 2c561727b2e28d47c94fa88dd12e67ba33a715b5 SHA256 0c31a8415c672054bc66f3816b7c26a01a2d7605b0cac0fb0f8ee781f7766732 MISC metadata.xml 263 RMD160 ea2e7ecb186a7fd9b309bd3aff02c9e139981ce8 SHA1 62ca0c83d00d102d78427e59920cf79b62d37dc1 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 diff --git a/net-dialup/fcpci/fcpci-0.1-r6.ebuild b/net-dialup/fcpci/fcpci-0.1-r6.ebuild index ff68a4b..79e4707 100644 --- a/net-dialup/fcpci/fcpci-0.1-r6.ebuild +++ b/net-dialup/fcpci/fcpci-0.1-r6.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://opensuse.foehr-it.de/rpms/11_2/src/${P}-0.src.rpm" LICENSE="AVM-FC" SLOT="0" -KEYWORDS="-amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="!net-dialup/fritzcapi" @@ -53,7 +53,11 @@ src_unpack() { fi if kernel_is ge 2 6 39 ; then - epatch "${FILESDIR}"/fcpci-kernel-2.6.39.patch + if use amd64; then + epatch "${FILESDIR}"/fcpci-kernel-2.6.39-amd64.patch + else + epatch "${FILESDIR}"/fcpci-kernel-2.6.39.patch + fi fi convert_to_m src/Makefile diff --git a/net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch b/net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch new file mode 100644 index 0000000..25045b0 --- /dev/null +++ b/net-dialup/fcpci/files/fcpci-kernel-2.6.39-amd64.patch @@ -0,0 +1,53 @@ +--- fritz/src/driver.c_orig 2011-09-04 16:54:30.000000000 +0200
++++ fritz/src/driver.c 2011-09-04 16:55:02.000000000 +0200
+@@ -101,7 +101,8 @@
+ static unsigned long crit_flags;
+ static atomic_t scheduler_enabled = ATOMIC_INIT (0);
+ static atomic_t scheduler_id = ATOMIC_INIT (-1);
+-static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
++//static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(sched_lock);
+ #if !defined (__fcclassic__)
+ static int card_id = 0;
+ #endif
+@@ -815,7 +816,7 @@
+
+ UNUSED_ARG (data);
+ atomic_set (&scheduler_id, smp_processor_id ());
+- if (spin_trylock (&stack_lock)) {
++ if (spin_trylock (&sched_lock)) {
+ while (!atomic_read (&dont_sched)) {
+ atomic_set (&dont_sched, 1);
+ os_timer_poll ();
+@@ -823,7 +824,7 @@
+ scheduler_control (TRUE);
+ }
+ }
+- spin_unlock (&stack_lock);
++ spin_unlock (&sched_lock);
+ }
+ atomic_set (&scheduler_id, -1);
+ } /* scheduler */
+@@ -839,9 +840,9 @@
+ if (atomic_read (&scheduler_id) == smp_processor_id ()) {
+ res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ());
+ } else {
+- spin_lock (&stack_lock);
++ spin_lock (&sched_lock);
+ res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ());
+- spin_unlock (&stack_lock);
++ spin_unlock (&sched_lock);
+ }
+ if (res == IRQ_HANDLED) {
+ atomic_set (&dont_sched, 0);
+--- fritz/src/tools.c_orig 2011-09-04 16:54:36.000000000 +0200
++++ fritz/src/tools.c 2011-09-04 16:55:06.000000000 +0200
+@@ -529,7 +529,7 @@
+ ERROR("Could not allocate lock structure!!!\n");
+ return 0;
+ }
+- tmp->lock = SPIN_LOCK_UNLOCKED;
++ spin_lock_init(&tmp->lock);
+ *plock = tmp;
+ return 1;
+ } /* lock_init */
|