add skypeforlinux

This commit is contained in:
Mario Fetka
2017-11-10 12:02:18 +01:00
parent a692b7a29d
commit 0eead7a92f
27 changed files with 994 additions and 68 deletions

View File

@@ -1,11 +1,20 @@
AUX 0.4.3_rc2/00_autoconf-2.6.33.diff 1020 SHA256 d5d4194fa0ee2a68e5b86530960521533ecafd642734d488b7edcdf54dbb60d0 SHA512 29dc0d7e63b51f32983eab21289ee6f4c46147651de1897335e0df39880f59e5e30fa36a1b2f1d7131c79480cd8888093bffeeec148b7ae38eab36e9062b6894 WHIRLPOOL 45124551633521141d168ad52136a6716f355625b6a663ee8553d1a784c9fee93b24253605d04f26208d23540f2a8112a837d6422593950261e8818a65aa8304
AUX 0.4.3_rc2/01_skip-targets.diff 1031 SHA256 0e65476b88f2296571cc70d75aa86ad1cec5e3e7ddb8a749899e0c9fe818ef1c SHA512 73d799c3f22b1c184ff3344f8b1b8f80acb45a10ab10a2b6aa0fadc07366d97a7218dfa184bd6c171244c205dcbee35dc5ed372bf6ebe969e7165be9aee23ee4 WHIRLPOOL cbd22e95515055e58b10201c416d0ce78129742a61118b3b48025ccb5f563089c2a1f5dfda6578be50325d18b0205de1477e417454653b342be4de0c9f350157
AUX 0.4.3_rc2/02_module_makefile.diff 1405 SHA256 99d66ab4c20b9cdcab57e6c69544acd48c3a7e14c15b8be8944fccf00659b707 SHA512 e71b7d091b7c1050e8c8da5e822604821412192d2c4f692778e44cce5213b949d0e6c71e6c7c57f5940adbafaf361c941696a5aa80f9a82603df210b464f03a4 WHIRLPOOL cf19c6d07a55453b20d21719425067be61ee77c5aea2de6245963a36c924d5fd8cc718ed086d5759425454b7bb58b815634c69376914b9632a926e4f34f456ab
AUX 0.4.3_rc2/03_module_flatten.diff 1108 SHA256 99aa88e1027d9958a172f123a11588858014744731067f0e9283a16de8cc2d77 SHA512 4c03417f3766264ddce842609fc97594e9750705b47f129d311435730f449cd41934037628eea0af645f3fbf8c0351ebb1f424465d7290e41e285eda1844e9f1 WHIRLPOOL 7a83728f18941497ff68f9cec855327f3ffad8e4b921c0649b76a1941885be2af3a1b66267a2e331a2c85b74fee6ba33e2cdd85bbecec19b814ae71558072528
AUX 0.4.3_rc2/04_irq_count.diff 2665 SHA256 1a6408762f49a6092bfaafeea2d0b8a100c9aa34dbca35bdd3032b3e390e8537 SHA512 de5fdc1dc7a67898c28ec9a73ecbcef25d39950482f2364fac5fd6a8783602cb4779cdd85b1876329bbe8be330757d2eb15029f4be48ac008f7bb6862bdaa8eb WHIRLPOOL b4b61cc6bf594eed3c43408cc9e1cb11dc6afc43be63bb6719ccc8d944f923e7d49602fb0dfadc733b90c1272101758bcb119740845fe4f9d121fe7b788886ba
AUX 0.4.3_rc2/05_-unolcked_ioctl.diff 953 SHA256 e3eac56e1a0ed6eb4e63fc883c2a1fb82270e9737cbc1e0355c73e2dadf7d143 SHA512 c71ca69df46372b55a0c424db003430a1fec16339a4dcc8f204dbf8f6710dbd8e3b117d23f5d6253a28b6cfdf3c954ab935a4815f9ab9d98e8e6e3392e7e9648 WHIRLPOOL eb551a0064c5436d6d9fbc48f68a51e31c21e165379a82bd909a0edccfd03ee6369d4b584f261339648b4f7989fd71a9076ca99720b51b42ebb68b5550a955f7
AUX 0.4.3_rc2/0001-Adjusted-autoconf.h-location-for-Linux-2.6.33.patch 1105 SHA256 df95a0fc4ee7d6a5fd73b6acc541d9b155760195a61035be83399577abb9e561 SHA512 5248d7b01c3b32b668d06cf845481119dedeb3db4de2b805ec4156beaf10cb90bd3117ee9b90142cdc5c8f17b340182505aaefb468b5fe2d8ff77f4c878b3ae7 WHIRLPOOL 163ddbf1305e116831cb8656997c5c4aea2dc5cd6dd80350f12ce96af6e184726e68994ac03b2a4a08582dcccb09c1993900c29e888ea2f72f158d7d271ec4d5
AUX 0.4.3_rc2/0002-Skip-various-targets-that-do-not-apply-to-this-Debia.patch 1120 SHA256 ab08722b184fc130447e84cec33b2c63d269bd577587b7b75e496470fed9a0fa SHA512 04906c9c7c797d5e0742530141645b4c0c20188eb559e19463f675b45ed8c14d2f8332d7e9e74ae946febb50ed2b7f135c8a01bda4728a2e0db4d885550f676d WHIRLPOOL 83aec9a27fe9d2f76327710914e33eff7bb57c4c5a4f6d6b32445bdff91e17f2292864772730b95045c93691faed3ec627429f3debc8ff07938a51c04791061f
AUX 0.4.3_rc2/0003-Allow-invoking-the-module-Makefile-from-the-kernel-t.patch 1487 SHA256 d9e2b9e655b001c788fa5a5f4627896823e6a02a085e4bae05238ad3ee84d48b SHA512 345acfea3179faad73a9584c370b38a919b72445eaa93413793aba153109b7cea9c2f2a70ad4c89708f973281f9a2f31ef4b80a536ac0e1f115fce4ba5cc2856 WHIRLPOOL 6ef8f2cf644fe732a409de854ea34dc6531107396d91ad16afd60b24ece9ad7fe2e4ba4dc725e2363d6879a98ccb931582a2e695cd69fe53c77440b03f526882
AUX 0.4.3_rc2/0004-Flatten-the-module-source-tree.patch 1177 SHA256 622a579cf15cf85b2f79db260917d7e743cd4328f8c40ebb9c68b378597469c9 SHA512 50b660a1b80389fc34574ac98592c5656fe611bd672e62597a476ec8214dbeae5b5df5e5edd174b83471fc7e086eb3480b9815d63dfd2796fbdfde4ca3b9e455 WHIRLPOOL b91c2d2f8a354324d0bcdc3e7251ac4415c8b8d175e066b0c73993eb9d9bb4062f7e1e165e8cb226a06c9faddc8e63462cacdbea899ee7e60195b94b13de3889
AUX 0.4.3_rc2/0005-Rename-irq_count-to-cbm_irq_count-in-Linux-kernel-mo.patch 2756 SHA256 9ad68e5af67f74efa2cb266034657745808edbbc91e8f491e666af080ff4f4ab SHA512 d4f61e72e859b7fd8431a84b1aa626e9a71b06e193b5b9105d2a00efad2003ddc680e6cbdb565103146320e00c0111b644d0526b5be11c4c13fafd967a428a65 WHIRLPOOL 31809fffd6d33af8e4a9e77d1d4e0be56c4f7ec714d59aaf72af9aa7b42ad550ee426a28889711079ca315604f35e756a628edd01ced96e629f0f7f51d8c497f
AUX 0.4.3_rc2/0006-Explicitly-run-sbin-ldconfig-as-sbin-may-not-be-in-P.patch 808 SHA256 aeb7bc7565d588473deb9ad60ad42aced1ca5324eca58375dc950ed9be624e80 SHA512 b0c41cea049a1f519f17569e05af031f41d916bae7cf6a781b6526e9acdbf17448f6739212081b74a2ac03e50374b55aea662900610b16c9fe9845ae524bdf76 WHIRLPOOL 2b21eadfd40e273bf9da9a06a83e8e0af4013008e5ca9c0fc68d4d8b3aa78f5d597c139ffa90337ede263622b8846b5f522d27286690e1cc9002d1334c87eae7
AUX 0.4.3_rc2/0007-Linux-module-Use-zu-when-printing-size_t-variables.patch 1899 SHA256 9287ee928dc2a8c5cdd22b1ce77c4894077f9876134f972ba6d3fbb04f8b36ee SHA512 d48a41475d54ee2f2c3847e3847a9c02a3e2ede33fb73f1cc656b414f36e63ccc090672f6bb023fc64a7a611a0fbc2eb924d43788cb4a4e2eeaf686da7657275 WHIRLPOOL d08bf0893be2f23796c468e5ec4765311ce2b17a32e8721f0b9f057744485642e95177f6b32be024ea0143a32cb5c098b04bc2d4eea29797a8d9ab5d07a3eb46
AUX 0.4.3_rc2/0008-Linux-module-Use-.unlocked_ioctl-instead-of-.ioctl.patch 1443 SHA256 da6d757712800bee0650f7cd7d68343b665ec129218833d6ed9ef81638f75c05 SHA512 b300b24736bc1ff8e0dc7d0727f7bfc8a90ae14dac984fac7424c27a39f35ff7b83c17f7b89ec8795ea6803f9ef818035a2f047b7e895e838e28439f1102f528 WHIRLPOOL 81855544d052cab14615859f1552f7296c940eeb023e93203de284fc83dd427dc45a991f8522f100b8f19f9a2dcf108eccfa8a26fc09dfdebd70d54be8f0f075
AUX 0.4.3_rc2/0009-Use-DEFINE_SPINLOCK-instead-of-SPIN_LOCK_UNLOCKED.patch 1000 SHA256 05a78da861c69f4909ea9567b744ac081f2a87a6d61d161fa63b46f4f3ce96ed SHA512 13abfc6e0f0cb8029fead1ddef977d41b2ba0e2b35e8b94611cbf1a89f8605aa7b04ddf0a02b82f635e1d3e2ebac3fb82616cb72e8877e0cb930acb43f4a8b9c WHIRLPOOL 58e89b9edf4ed22c10ab4114b0c63917e71de64d391ca0f8a132d7f10c94c58a2fe73abbb741cdc6e71f191b66a6604047de90864f74dd97ab0b12b78437a056
AUX 0.4.99.94/001_opencbm-0.4.99.94-compat_destdir-1.patch 744 SHA256 6b1ce502c50dcb1d16f03af4d804b9a3107ccb4d1702db80dd6eae47d1614bc5 SHA512 be2c377060d68f1123b07cfca9f7e174243c8e42e210745b890a50380d335665dab7d43e37cd06b665107d0b018a7a7f98c5443476eef681e5c9fdb7e69a5c30 WHIRLPOOL 1b5978cbf99ebdb7a800de69959915a763c64763cba4f22875232d16899150b85a398eb0d38b864bb2f8755e9ddf1b15ba894854a0364ced647ebb4d6470c31e
AUX 0.4.99.94/002_opencbm-0.4.99.94-udev-rules-1.patch 1419 SHA256 b296e597652b0a9900855d04b29d5640209ac4011531fa3b539809c5854289c5 SHA512 93a1941ef26582924a61f1518e69175210fd41eaa2dcafbafa6cdbdec4c71903a6cb56aa55edfeefd30184358fa9968ee312cd881028a1d92505ab9478a1d266 WHIRLPOOL 156b34b99591fbcc80f96df720e64a7225b9f2df846f653c3386da8d532b1a6e2dc5fc3f35f0fa50d486178bbb47a664b85b82b9368f7f987f42f8ad8ba2fb7e
AUX 0.4.99.98/001_opencbm-0.4.99.98-ncurses6-1.patch 698 SHA256 9969114e7d1c7e71fe8c3bfe220cb69ccd1887e8094b61d6edead88d8d50822b SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd WHIRLPOOL 2b4091972243892b8268449dc1be05286d84539fe424be4d36ebdfebfa97ed99f03b12ef914f542cfc2c1b02c8a56682f364803288d0a785b6fbf9332f98fcb8
AUX 0.4.99.98/002_opencbm_usb_USB_LE16_TO_CPU_le16toh.patch 1090 SHA256 dcd55d919a7adefe00144ce57b6507735a5c45aec5fcef7922976919425b650e SHA512 ee1a6ac1ad8285cfcd4da65569f1a08134c127e2deccb020f08d461dd1e544c4271313ee38d844aec0118273f32935c22a810e4db3273bd3817f5075839959a6 WHIRLPOOL 1152548f48e4402b5fa6784109baea0ab8cb236c3f53d9a04720807405637b97df14b018fdd56ad5571809a98e6f51680fc1225f8fbc54872fa8c0b2b413099d
AUX Makefile 1003 SHA256 7b2d7f35f20d72a1e0a5f6bde2d9da8168891c2994b4b9828b7892f8cbb8a93c SHA512 a15c0d5a962d183f6753844aad38ef111ba4c34a4a3c8f947142b7cb5f71868ed77e965317c5aed10b9e3b5a8cb978fdffd505dbc11a6868615e5f11b19b7bd1 WHIRLPOOL 69fd714efcd774a8fc1723ebbcbe84ca5d922933f351294fc11725ec16830c4cfd2bd20cb6931421c71f3ab4a792ec0f6c48130caab3981d9187918ba48e78a3
DIST opencbm-0.4.99.98-source.tar.bz2 8173294 SHA256 ebfa3dc6174229d1323551dbdff242dc0d5107b3fb755c2e737eaf0619dcde12 SHA512 41972905e096245f04bc136982a7c448c8e8d966f9ab1b95eb93a4d2eb55ec2c3dec60ce8c4f484cdab82d99a50d3385ec7252a261b4d1989a36866dbf9beda9 WHIRLPOOL 7a73ef819bc8a49d5bcd20222b85d20694df699453aa251b9b29cf649c924491526b0909c1129cec424ab141c00f7c04244b44be7b183e14e5b6eed73c844461
DIST opencbm_0.4.3~rc2.orig.tar.gz 678232 SHA256 27ea6c0499d6e99dc9f10a9fed9ee85e588164a11c7bd66c307aeec62fd51922 SHA512 5743d83a120a6f806e90a514317b0ac63eb0d9f3772252b8931e23fcfc86df5e66dd4f0f0277a875a2b7249d9bc927a0e631915dbc5c294bcc2cca58b74961dc WHIRLPOOL cb598578babf7a2d99e88de3c2af3dc7cab164b4fa651bf0b5a7620194d682aa38568e5ec873c815e9d5289ebb3d3e6fb31eac500542bb73ec95acd4e8013244
EBUILD opencbm-0.4.3_rc2.ebuild 1906 SHA256 dd5c8f26d2d55cad440cbed53f3683fe9642ecfc69d07c44d8d75666537b1071 SHA512 9588eb2347ebb12f7807cd2c93b65d7b3adb380e548a5902e7563e674378982b469f47bd22d2b7db0db97be1c28360d263229b66acd767c9049ae2224430fab1 WHIRLPOOL 8e059b21fd6a59d79da9a0f1f3abec55fa6561ad8397b59c4028b938897590aa8623da54e5a4578fce2f919ed9deec8ba6036af3e435998ddec029ed4641b458
EBUILD opencbm-0.4.3_rc2-r1.ebuild 1990 SHA256 504211bce814cd8db4350110fa0f59bd431c72ad5789c12a38575bd351451389 SHA512 e7935ee558cec948b44f4aa8c505b7a3e7e5f84187a66a77fc511439bbdf248dbc6a864d17c30ae316036d6bf6955c96fc0d9655db4a5a1861bef560af6c74e3 WHIRLPOOL 3468caa8bd9f7e28ba2cae93166e7807c34d9a4fb2a2ef57b1cffb4aa3bab40b50b8d89268a5236ca77717c77f11e8fb4868bc2cfca94adaeb9fc0deafb08364
EBUILD opencbm-0.4.99.98-r1.ebuild 3031 SHA256 d82aa8bf117edb1cc030340e0b080cf3a1c36f5471bc872e673309e024832b11 SHA512 dee5e9e80c4d78031c1e39bfc190792fdf690d8b17332fc1ac2e4dc1233e216958f11bb0a3bc3320496d5a42d504c89908b43707b06467d2a7d7232d1d87634f WHIRLPOOL 0bbc0a5ac034f1653aae619ab7f1883f752ab9eb89eecf7720ef590323e2b1970900eab063cd24f87aab8315fabf452e4b4d86baef3b11cecd92bedfc21cb9ab
MISC ChangeLog 1019 SHA256 2245f128bad8ea9502bd150cab1673a0a000f1802e27805ebbe1f566b337fccb SHA512 17c59cb8dd37b874de4f354f02c6d84582471475d7451a43cf9cc8982102e3a6a94aeae73799ac1e549343ee9dbac200799b3fee5edb3bd20927c6649de9b696 WHIRLPOOL daa322f42c3bd1694d5c494fda35d13eb7860d307fa30abaea09595d85e00eaaef453165b3b71adebd9ac09e0cf98f0bc053dee150c9f435ea9e2fcb56eb85ea
MISC metadata.xml 226 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2 SHA512 5912920d8f6e9ee5126fb0aaa5717a562feb009cc59b759c6a6eaa909900b19e95e51e3aa7f32fdf2e77073b19878830b97947148e3adeff3b49e7555cfe29e9 WHIRLPOOL c07e2ddb648893f1e9c422e07b0b73a6d0f7e1c9501200b6fcc9d25fe68c3b05fe4f3523e6844067eeca6969973a44004e1ba8a6fa725591a1916648bd2d4834

View File

@@ -1,11 +1,15 @@
From: Frédéric Brière <fbriere@fbriere.net>
Subject: [PATCH] Adjusted autoconf.h location for Linux 2.6.33
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Adjusted autoconf.h location for Linux 2.6.33
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Linux 2.6.33 has moved linux/autoconf.h to generated/autoconf.h.
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Forwarded: yes
Forwarded: yes
---
sys/linux/cbm_module.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
@@ -33,4 +37,3 @@ index d8c5a23..91ea8f3 100644
#ifdef CONFIG_MODVERSIONS
# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
--
tg: (95e2d72..) fixes/autoconf-2.6.33 (depends on: upstream)

View File

@@ -1,5 +1,9 @@
From: Frédéric Brière <fbriere@fbriere.net>
Subject: [PATCH] Skip various targets that do not apply to this Debian package
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Skip various targets that do not apply to this Debian package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This patch removes the following Makefile targets:
@@ -8,8 +12,8 @@ This patch removes the following Makefile targets:
* demo/*: Demo applications, included as examples in libopencbm-dev
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Forwarded: not-needed
Forwarded: not-needed
---
LINUX/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
@@ -31,4 +35,3 @@ index eb4b9f2..6a82370 100644
SUBDIRS_OPTIONAL = mnib36
--
tg: (e590d2a..) debian/skip-targets (depends on: master)

View File

@@ -1,5 +1,9 @@
From: Frédéric Brière <fbriere@fbriere.net>
Subject: [PATCH] Allow invoking the module Makefile from the kernel tree
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Allow invoking the module Makefile from the kernel tree
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This makes it possible to invoke the (renamed) module Makefile directly from
the Linux kernel source tree, without the need to set $(here) or create a
@@ -41,4 +45,3 @@ index cb14aab..19a49a2 100644
endif
--
tg: (e970caa..) features/module_makefile (depends on: upstream)

View File

@@ -1,12 +1,16 @@
From: Frédéric Brière <fbriere@fbriere.net>
Subject: [PATCH] Flatten the module source tree
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Flatten the module source tree
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This allows flattening the module source tree in a simple src/ and
include/ directory pair, getting rid of all the LINUX/ stuff.
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Forwarded: not-needed
Forwarded: not-needed
---
sys/linux/LINUX/Makefile | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
@@ -35,4 +39,3 @@ index 19a49a2..a4ef189 100644
all: cbm.o
--
tg: (ec9570d..) debian/module_flatten (depends on: features/module_makefile)

View File

@@ -1,21 +1,25 @@
From: Frédéric Brière <fbriere@fbriere.net>
Subject: [PATCH] Rename irq_count to cbm_irq_count in Linux kernel module
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Rename irq_count to cbm_irq_count in Linux kernel module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
arch/x86/include/asm/processor.h already defines a variable called
irq_count for CONFIG_X86_64.
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Forwarded: yes
Forwarded: yes
---
sys/linux/cbm_module.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
index d8c5a23..451657c 100644
index 91ea8f3..4b50626 100644
--- a/sys/linux/cbm_module.c
+++ b/sys/linux/cbm_module.c
@@ -254,7 +254,7 @@ static struct wait_queue *cbm_wait_q;
@@ -257,7 +257,7 @@ static struct wait_queue *cbm_wait_q;
static wait_queue_head_t cbm_wait_q;
#endif
volatile static int eoi;
@@ -24,7 +28,7 @@ index d8c5a23..451657c 100644
#ifndef KERNEL_VERSION
# define signal_pending(p) (p->signal & ~p->blocked)
@@ -422,7 +422,7 @@ static void wait_for_listener(void)
@@ -425,7 +425,7 @@ static void wait_for_listener(void)
add_wait_queue(&cbm_wait_q, &wait);
current->state = TASK_INTERRUPTIBLE;
RELEASE(CLK_OUT);
@@ -33,7 +37,7 @@ index d8c5a23..451657c 100644
schedule();
}
remove_wait_queue(&cbm_wait_q, &wait);
@@ -534,7 +534,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
@@ -537,7 +537,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
size_t sent = 0;
unsigned long flags;
@@ -42,7 +46,7 @@ index d8c5a23..451657c 100644
DPRINTK("cbm_write: %d bytes, atn=%d\n", cnt, atn);
@@ -571,7 +571,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
@@ -574,7 +574,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
}
udelay(50);
if(GET(DATA_IN)) {
@@ -51,7 +55,7 @@ index d8c5a23..451657c 100644
wait_for_listener();
if(signal_pending(current)) {
@@ -883,10 +883,10 @@ static irqreturn_t cbm_interrupt(int irq, void *dev_id)
@@ -886,10 +886,10 @@ static irqreturn_t cbm_interrupt(int irq, void *dev_id)
{
POLL(); /* acknowledge interrupt */
@@ -64,7 +68,7 @@ index d8c5a23..451657c 100644
DPRINTK("continue to send (no EOI)\n");
SET(CLK_OUT);
wake_up_interruptible(&cbm_wait_q);
@@ -1028,7 +1028,7 @@ int cbm_init(void)
@@ -1031,7 +1031,7 @@ int cbm_init(void)
#endif
);
@@ -74,4 +78,3 @@ index d8c5a23..451657c 100644
out_bits = (CTRL_READ() ^ out_eor) &
(DATA_OUT|CLK_OUT|ATN_OUT|RESET);
--
tg: (a9f3f01..) fixes/irq_count (depends on: upstream)

View File

@@ -0,0 +1,27 @@
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Explicitly run /sbin/ldconfig, as /sbin may not be in $PATH
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
---
lib/LINUX/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/LINUX/Makefile b/lib/LINUX/Makefile
index f5cc303..edeae4b 100644
--- a/lib/LINUX/Makefile
+++ b/lib/LINUX/Makefile
@@ -37,7 +37,7 @@ install-files:
cd $(LIBDIR) && ln -sf $(SHLIBV3) $(SHLIBV); ln -sf $(SHLIBV) $(SHLIB)
install: install-files
- ldconfig -n $(LIBDIR)
+ $(LDCONFIG) -n $(LIBDIR)
uninstall:
cd $(LIBDIR) && rm -f $(LIB) $(SHLIB) $(SHLIBV) $(SHLIBV3)
--

View File

@@ -0,0 +1,55 @@
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Linux module: Use "%zu" when printing size_t variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Forwarded: yes
---
sys/linux/cbm_module.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
index 4b50626..dd41b78 100644
--- a/sys/linux/cbm_module.c
+++ b/sys/linux/cbm_module.c
@@ -447,7 +447,7 @@ static int cbm_read(struct inode *inode, struct file *f, char *buf, int count)
int ok = 0;
unsigned long flags;
- DPRINTK("cbm_read: %d bytes\n", count);
+ DPRINTK("cbm_read: %zu bytes\n", count);
if(eoi) {
return 0;
@@ -523,7 +523,7 @@ static int cbm_read(struct inode *inode, struct file *f, char *buf, int count)
return -EIO;
}
- DPRINTK("received=%d, count=%d, ok=%d, eoi=%d\n",
+ DPRINTK("received=%zu, count=%zu, ok=%d, eoi=%d\n",
received, count, ok, eoi);
return received;
@@ -539,7 +539,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
eoi = cbm_irq_count = 0;
- DPRINTK("cbm_write: %d bytes, atn=%d\n", cnt, atn);
+ DPRINTK("cbm_write: %zu bytes, atn=%d\n", cnt, atn);
RELEASE(DATA_OUT);
SET(CLK_OUT | (atn ? ATN_OUT : 0));
@@ -593,7 +593,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
rv = -ENODEV;
}
}
- DPRINTK("%d bytes sent, rv=%d\n", sent, rv);
+ DPRINTK("%zu bytes sent, rv=%d\n", sent, rv);
if(talk && (rv == 0)) {
local_irq_save(flags);
--

View File

@@ -0,0 +1,41 @@
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 12:50:53 -0400
Subject: Linux module: Use .unlocked_ioctl instead of .ioctl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
cbm_ioctl() does not assume it is holding the BKL, so we can move it
as-is from .ioctl to .unlocked_ioctl.
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Forwarded: yes
---
sys/linux/cbm_module.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
index dd41b78..f38e388 100644
--- a/sys/linux/cbm_module.c
+++ b/sys/linux/cbm_module.c
@@ -627,8 +627,7 @@ static int cbm_write(struct inode *inode, struct file *f, const char *buf, int c
return cbm_raw_write(buf, cnt, 0, 0);
}
-static int cbm_ioctl(struct inode *inode, struct file *f,
- unsigned int cmd, unsigned long arg)
+static long cbm_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
{
/*linux parallel burst */
@@ -924,7 +923,7 @@ static struct file_operations cbm_fops =
#endif
.read = cbm_read, /* read */
.write = cbm_write, /* write */
- .ioctl = cbm_ioctl, /* ioctl */
+ .unlocked_ioctl = cbm_ioctl, /* ioctl */
.open = cbm_open, /* open */
.release = cbm_release, /* release */
};
--

View File

@@ -0,0 +1,23 @@
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Fri, 20 May 2011 22:05:53 -0400
Subject: Use DEFINE_SPINLOCK instead of SPIN_LOCK_UNLOCKED
SPIN_LOCK_UNLOCKED() has been removed in 2.6.39.
---
sys/linux/cbm_module.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
index f38e388..6b360ef 100644
--- a/sys/linux/cbm_module.c
+++ b/sys/linux/cbm_module.c
@@ -77,7 +77,7 @@ static char *rcsid =
/* Defines needed by parallel burst-routines: */
#include <linux/spinlock.h> /* the spinlock-system, used for parallel burst */
-#define IRQSTOPVARS unsigned long flags; spinlock_t parallel_burst_lock = SPIN_LOCK_UNLOCKED;
+#define IRQSTOPVARS unsigned long flags; DEFINE_SPINLOCK(parallel_burst_lock);
#define disable() spin_lock_irqsave(&parallel_burst_lock, flags)
#define enable() spin_unlock_irqrestore(&parallel_burst_lock, flags)
#define printf(x) printk(x)
--

View File

@@ -1,23 +0,0 @@
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 */
};

View File

@@ -0,0 +1,21 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2017-05-05
Initial Package Version: 0.4.99.94
Origin: me
Upstream Status: unknown
Description: add support for desdir install also on compat
diff -Naur opencbm-0.4.99.94.orig/opencbm/compat/LINUX/Makefile opencbm-0.4.99.94/opencbm/compat/LINUX/Makefile
--- opencbm-0.4.99.94.orig/opencbm/compat/LINUX/Makefile 2017-05-05 13:52:14.110473163 +0000
+++ opencbm-0.4.99.94/opencbm/compat/LINUX/Makefile 2017-05-05 13:49:39.416513289 +0000
@@ -17,8 +17,8 @@
mrproper: clean
install-files:
- install -m 644 $(HDRS) $(INCDIR)
- install -m 644 $(LIBS) $(LIBDIR)
+ install -m 644 $(HDRS) $(DESTDIR)$(INCDIR)
+ install -m 644 $(LIBS) $(DESTDIR)$(LIBDIR)
install: install-files

View File

@@ -0,0 +1,30 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2017-05-05
Initial Package Version: 0.4.99.94
Origin: me
Upstream Status: committed
Description: update rules files for consistency
diff -Naur opencbm-0.4.99.94.orig/xu1541/udev/45-opencbm.rules opencbm-0.4.99.94/xu1541/udev/45-opencbm.rules
--- opencbm-0.4.99.94.orig/xu1541/udev/45-opencbm.rules 2017-05-05 15:27:35.123976085 +0000
+++ opencbm-0.4.99.94/xu1541/udev/45-opencbm.rules 2017-05-05 08:52:45.430454453 +0000
@@ -1,6 +1,6 @@
SUBSYSTEM!="usb_device", ACTION!="add", GOTO="opencbm_rules_end"
# xu1541
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="c632", GROUP="plugdev", MODE="0664"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="c632", GROUP="users", MODE="0664"
LABEL="opencbm_rules_end"
diff -Naur opencbm-0.4.99.94.orig/xum1541/udev/45-opencbm-usb.rules opencbm-0.4.99.94/xum1541/udev/45-opencbm-usb.rules
--- opencbm-0.4.99.94.orig/xum1541/udev/45-opencbm-usb.rules 2017-05-05 15:27:35.132976374 +0000
+++ opencbm-0.4.99.94/xum1541/udev/45-opencbm-usb.rules 2017-05-05 08:52:45.450455086 +0000
@@ -1,7 +1,6 @@
SUBSYSTEM!="usb_device", ACTION!="add", GOTO="opencbm_rules_end"
# xum1541
-SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0504",
-MODE="0664", GROUP="cdrom"
+SUBSYSTEM=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0504", MODE="0664", GROUP="users"
LABEL="opencbm_rules_end"

View File

@@ -11,8 +11,9 @@ PV_MINOR=$(get_version_component_range 2)
DESCRIPTION="OpenCBM is a package to control and use serial devices as used by most Commodore (CBM) 8-bit mach"
HOMEPAGE="http://opencbm.trikaliotis.net/"
SRC_URI="http://www.fbriere.net/debian/dists/unstable/opencbm/src/opencbm_${PV/_/\~}.orig.tar.gz
https://launchpad.net/~mdeslaur/+archive/ppa/+files/opencbm_${PV/_/\~}.orig.tar.gz"
SRC_URI="https://www.fbriere.net/debian/pool/opencbm/o/opencbm/opencbm_${PV/_/~}.orig.tar.gz
http://www.fbriere.net/debian/dists/unstable/opencbm/src/opencbm_${PV/_/~}.orig.tar.gz
https://launchpad.net/~mdeslaur/+archive/ppa/+files/opencbm_${PV/_/~}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -35,7 +36,7 @@ src_prepare() {
# 6502 sources ar always up to date
touch `find . -name '*.?65' -type f`
# add debian patches no demo & doc & no kernel
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="diff" \
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
# sed correct path
sed -e 's,^PREFIX.*,PREFIX = /usr,' \

View File

@@ -0,0 +1,92 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
inherit eutils toolchain-funcs linux-mod versionator udev
PV_MAJOR=$(get_major_version)
PV_MINOR=$(get_version_component_range 2)
SDIR="include libmisc arch/linux lib cbmctrl cbmformat d64copy cbmcopy libtrans cbmforng d82copy demo/flash demo/morse demo/rpm1541 sample/libtrans cbmrpm41"
DESCRIPTION="OpenCBM is a package to control and use serial devices as used by most Commodore (CBM) 8-bit mach"
HOMEPAGE="http://opencbm.trikaliotis.net/"
#SRC_URI="http://debian.trikaliotis.net/opencbm/opencbm_${PV}-1.tar.gz"
SRC_URI="http://www.trikaliotis.net/Download/opencbm-${PV}/opencbm-${PV}-source.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="doc"
DEPEND="virtual/linux-sources
dev-embedded/cc65
app-text/linuxdoc-tools
app-text/docbook-xml-dtd:4.1.2
dev-libs/libusb-compat"
S="${WORKDIR}"/${PN}-${PV}
BUILD_PARAMS="KDIR=$KERNEL_DIR"
MODULE_NAMES="cbm(misc:${S}/opencbm/sys/linux:${S}/opencbm/sys/linux)"
BUILD_TARGETS="all"
src_prepare() {
rm -rf "${WORKDIR}"/${PN}-${PV}/{cbm4wingui,gui4cbm4win.vb6.old,windrv}
# convert linefeed
#edos2unix `find . -name '*' -type f`
# 6502 sources ar always up to date
touch `find . -name '*.?65' -type f`
# add debian patches no demo & doc & no kernel
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
# sed correct path
sed -e 's,^PREFIX.*,PREFIX = /usr,' \
-e 's,/man/man1,/share/man/man1,g' \
-e 's,etc/udev/rules.d,lib/udev/rules.d,g' \
-e 's,/info,/share/info,g' -i ${S}/opencbm/LINUX/config.make
# sed correct path
sed -e 's,opencbm/sys/linux/,,g' \
-e 's,etc/udev/rules.d,lib/udev/rules.d,g' -i ${S}/LINUX/Makefile
# copy module makefile that don't intefer with gentoo kernel build system
cp ${FILESDIR}/Makefile ${S}/opencbm/sys/linux/Makefile
}
src_compile() {
emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" all || die "make fail"
linux-mod_src_compile
}
src_install() {
dodir lib/udev/rules.d
dodir etc/opencbm.conf.d
dodir usr/lib/opencbm
emake -f LINUX/Makefile DESTDIR="${D}" install-all
exeinto usr/lib/opencbm
doexe opencbm/LINUX/plugin_helper_tools
newexe debian/install_plugin.sh install_plugin
insinto lib/udev/rules.d
newins opencbm/sys/linux/45-opencbm-xa1541.rules 45-opencbm-xa1541.rules
rm -rf ${D}/var
linux-mod_src_install
generate_modulesd
# exit 1
}
pkg_postinst() {
linux-mod_pkg_postinst
${EROOT}/usr/lib/opencbm/install_plugin install xa1541
${EROOT}/usr/lib/opencbm/install_plugin install xu1541
${EROOT}/usr/lib/opencbm/install_plugin install xum1541
}
pkg_prerm() {
${EROOT}/usr/lib/opencbm/install_plugin uninstall xa1541
${EROOT}/usr/lib/opencbm/install_plugin uninstall xu1541
${EROOT}/usr/lib/opencbm/install_plugin uninstall xum1541
}
pkg_postrm() {
linux-mod_pkg_postrm
}