Add new pacakges
This commit is contained in:
Mario Fetka
@@ -1,24 +1,8 @@
|
||||
AUX 0.4.3_rc2/0001-Adjusted-autoconf.h-location-for-Linux-2.6.33.patch 1105 BLAKE2B 84707412bff340b4613072f5c5b77cb5e76b2df5f2f589ba7a877b7e428092daa53f4bcc52a9aead6409a84e2787d6481b42760bd489f6d183345d3d8e96954c SHA512 5248d7b01c3b32b668d06cf845481119dedeb3db4de2b805ec4156beaf10cb90bd3117ee9b90142cdc5c8f17b340182505aaefb468b5fe2d8ff77f4c878b3ae7
|
||||
AUX 0.4.3_rc2/0002-Skip-various-targets-that-do-not-apply-to-this-Debia.patch 1120 BLAKE2B 7c6291dfe1fcadd45c7e7e32042e9f6fef9ffebd50d6980757beb3c62493a54ca2d612d1ae5ac9e578c06a059bbe586e7820c27a0e26f0db83a75703fd7de078 SHA512 04906c9c7c797d5e0742530141645b4c0c20188eb559e19463f675b45ed8c14d2f8332d7e9e74ae946febb50ed2b7f135c8a01bda4728a2e0db4d885550f676d
|
||||
AUX 0.4.3_rc2/0003-Allow-invoking-the-module-Makefile-from-the-kernel-t.patch 1487 BLAKE2B bd292b4c7413af7d993edba5b6c953f00aa7e9ea80f568299749f3d83fae1ec71d14f3d2df29ddcb86a1ed1f22f8e9f27e2dffe9b075a93325357822cecd57f8 SHA512 345acfea3179faad73a9584c370b38a919b72445eaa93413793aba153109b7cea9c2f2a70ad4c89708f973281f9a2f31ef4b80a536ac0e1f115fce4ba5cc2856
|
||||
AUX 0.4.3_rc2/0004-Flatten-the-module-source-tree.patch 1177 BLAKE2B a995d700b70c8d4e29f74d1491507f861c12e3053fb5b95a42e166daf8c6801cca6bcf2bae413829ad1714ed89f617bf1c9bf683d6e1df415e14fa053e50fcb2 SHA512 50b660a1b80389fc34574ac98592c5656fe611bd672e62597a476ec8214dbeae5b5df5e5edd174b83471fc7e086eb3480b9815d63dfd2796fbdfde4ca3b9e455
|
||||
AUX 0.4.3_rc2/0005-Rename-irq_count-to-cbm_irq_count-in-Linux-kernel-mo.patch 2756 BLAKE2B a3bae85e78a130095da4762b9d40c9cd218e408f39ddcb28f2eb280b6143d4590d916ac9ea0e0ddd19abad9684fd28639d8b65b6606b13ec7604e96286030848 SHA512 d4f61e72e859b7fd8431a84b1aa626e9a71b06e193b5b9105d2a00efad2003ddc680e6cbdb565103146320e00c0111b644d0526b5be11c4c13fafd967a428a65
|
||||
AUX 0.4.3_rc2/0006-Explicitly-run-sbin-ldconfig-as-sbin-may-not-be-in-P.patch 808 BLAKE2B 6f2ff715878f0ef71d5513a62d52b645c751d1a089c7faabee6ca567e26895f33caa1dba8ba789421729891c8ffdb85fbec6f6b47d801d41c2a4ad33c1ace915 SHA512 b0c41cea049a1f519f17569e05af031f41d916bae7cf6a781b6526e9acdbf17448f6739212081b74a2ac03e50374b55aea662900610b16c9fe9845ae524bdf76
|
||||
AUX 0.4.3_rc2/0007-Linux-module-Use-zu-when-printing-size_t-variables.patch 1899 BLAKE2B 9e73b9bd536acac2739aee4bcfd811fc2d4d71fcd9ab37fdfdaaa8c41cd8e60f9820d9a0ad90afd509602abad37dd6cb8cf66aea3044a61002663c9e27751d24 SHA512 d48a41475d54ee2f2c3847e3847a9c02a3e2ede33fb73f1cc656b414f36e63ccc090672f6bb023fc64a7a611a0fbc2eb924d43788cb4a4e2eeaf686da7657275
|
||||
AUX 0.4.3_rc2/0008-Linux-module-Use-.unlocked_ioctl-instead-of-.ioctl.patch 1443 BLAKE2B 434974ee61a7cb5b2024e4e2af3c8ee0bd8b3a5189124a346c65209e031e7eec44a589cddbd9cbe48ca3f2982949c7545c6719005700d8d21538e26a2d5ffbee SHA512 b300b24736bc1ff8e0dc7d0727f7bfc8a90ae14dac984fac7424c27a39f35ff7b83c17f7b89ec8795ea6803f9ef818035a2f047b7e895e838e28439f1102f528
|
||||
AUX 0.4.3_rc2/0009-Use-DEFINE_SPINLOCK-instead-of-SPIN_LOCK_UNLOCKED.patch 1000 BLAKE2B 6e07f28359501f55f5fe406df548167bcfd46952de989d3c596483380d8267c0dae99c9e2ce24af651299b7bb6947f06c1e29cb2529830dc3a88edbb5c5ac9ee SHA512 13abfc6e0f0cb8029fead1ddef977d41b2ba0e2b35e8b94611cbf1a89f8605aa7b04ddf0a02b82f635e1d3e2ebac3fb82616cb72e8877e0cb930acb43f4a8b9c
|
||||
AUX 0.4.99.94/001_opencbm-0.4.99.94-compat_destdir-1.patch 744 BLAKE2B cd409a444aac4fdbf21a4bd4aad42825caa1ae545df592a703735aed57f804b09de267872d4c3706ecce1baffe2772ec6df91033e32227ca47aa31f5316d71f2 SHA512 be2c377060d68f1123b07cfca9f7e174243c8e42e210745b890a50380d335665dab7d43e37cd06b665107d0b018a7a7f98c5443476eef681e5c9fdb7e69a5c30
|
||||
AUX 0.4.99.94/002_opencbm-0.4.99.94-udev-rules-1.patch 1419 BLAKE2B f6f53b326f4f33d404674a6cbaf324449de24b8e1950878cfd2a61fa7e512e7e1010a84a4cd6e0e467de1c917037ecb0632b910d94fca27a642bcc6674468d2e SHA512 93a1941ef26582924a61f1518e69175210fd41eaa2dcafbafa6cdbdec4c71903a6cb56aa55edfeefd30184358fa9968ee312cd881028a1d92505ab9478a1d266
|
||||
AUX 0.4.99.98/001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
|
||||
AUX 0.4.99.98/002_opencbm_usb_USB_LE16_TO_CPU_le16toh.patch 1090 BLAKE2B 48eee87ebf1a721dd0c6fff9cb74b713d91156e59da77eeb6039be97d87c405b849ddb64ad92cce776c88ff4d2e73bad5c4477ad35f607b3673d348ebcb6365a SHA512 ee1a6ac1ad8285cfcd4da65569f1a08134c127e2deccb020f08d461dd1e544c4271313ee38d844aec0118273f32935c22a810e4db3273bd3817f5075839959a6
|
||||
AUX 0.4.99.99a/001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
|
||||
AUX 0.4.99.99a/002_opencbm-0.4.99.99a-cbm_module.patch 2194 BLAKE2B 047788312b4bc7e4e418da8df0a4b4ee77953b4b8f5f3fafb455046dcdec11e366c6f48a4ccc4389bdee090da05fb9f8d671d54cab8f9c6a0c1d70266ccac3ce SHA512 36e8033aeeb5885988dd3dcc9cf943888872aed2edf1a94dd578e35c3a9f48a1e0be5d08a4b7114d472b92619862c75a13476e8a7948a349ce1ee1fd052f9fa4
|
||||
AUX 9999/001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
|
||||
AUX 001_opencbm-0.4.99.98-ncurses6-1.patch 698 BLAKE2B 3d126aca22c4c1aa7cf6df35c41f1d32c8117aebcbc0fd10c7bd007dbb5752155b703b6a4585ba0a1ac5c3744e95b4b5e412c0d7834c5fcf4aa74d758b3f198d SHA512 a4b017a8bcbd698c01c9e695758826a4768bd316634a585f746460ec35bcffe67a76cd3e8f2ebcabf2eddbbb5e5dc5db2533f8d4881b1030b314253fc22264dd
|
||||
AUX Makefile 1003 BLAKE2B 9e6363f8fb20826f380bae087f461b0f87a2f118be223ca809c84dba7154c6493b8937d7a46437a1773afaf5ba58179d33f9599b0fc063ae53bd5f9984128fa5 SHA512 a15c0d5a962d183f6753844aad38ef111ba4c34a4a3c8f947142b7cb5f71868ed77e965317c5aed10b9e3b5a8cb978fdffd505dbc11a6868615e5f11b19b7bd1
|
||||
DIST opencbm-0.4.99.99a-source.tar.gz 8663325 BLAKE2B 4f338abfd198e4ac9d7de54b01744d2f141492471ee388e322ec2073534171b09f7c08fd2d0c92d852cad146f5318935e46c640555f374d09a63daae2c7621be SHA512 50fb24997b75f1d1218a29d16805943403af571685774a054a5540e63d6114093e86de5046000192eac196b0e7f171e2bc21302ca2f30e4d8b396e92273ca21b
|
||||
DIST opencbm_0.4.3~rc2.orig.tar.gz 678232 BLAKE2B 4a3799cd85fdedceed1c4edddc37e6b1671f8a512934abd22f17652891f8be001a73e35e2ca41dd18061ba9ced5a4e152c31c9cc5d983e9f783c0eb47a8376c5 SHA512 5743d83a120a6f806e90a514317b0ac63eb0d9f3772252b8931e23fcfc86df5e66dd4f0f0277a875a2b7249d9bc927a0e631915dbc5c294bcc2cca58b74961dc
|
||||
EBUILD opencbm-0.4.3_rc2-r1.ebuild 1990 BLAKE2B 6d0bd722d117e1be525f2e83685d56e2a7b709faff2f143acd18b1c80b9d3e439bb4d35739e3fe35298c8e4440da3c5e04aecdc0f6bd0ed42b7d375bd825007b SHA512 e7935ee558cec948b44f4aa8c505b7a3e7e5f84187a66a77fc511439bbdf248dbc6a864d17c30ae316036d6bf6955c96fc0d9655db4a5a1861bef560af6c74e3
|
||||
EBUILD opencbm-0.4.99.99a.ebuild 3142 BLAKE2B 299fb8505ba367afbf8891b719ee81eed17009cfcaab3483e10ecea8fcf3ae9c4b084bd282201432b08d53e4d1c87934a9e10a1b206d1c7724980692c1a4b60d SHA512 d9765a37d0742c785d4a5bcde707b09cd3e6dd214e40743938309849725d32b261de4a3fac6dd0dd4c23b9580d99ab2d17cdf9c308281979f7a4af7039a22e85
|
||||
EBUILD opencbm-9999.ebuild 3342 BLAKE2B 9e5777700ec72078e4149c861ce0d35096606250cad8e6ca1b61e0994848cedca75ec023871c8e01985eaf3c3ac1e494cab36ec38c58a0148eb11579d40be8a1 SHA512 489ce10d47d392ed7ad630898d38288652ba2d7ef7afe09f67b6a20e3cabc14626d1e99f9133c7c0e368b57fbde1d8440d32dd0ff5c68e016168e763d1c89742
|
||||
DIST nibtools-0.4.99.104-source.tar.gz 118200 BLAKE2B c0232c3e591fcc34979cf11663ec4e466d765cd423ef8e56a981c1fc6454c5c2315541961258840341d45a7639e0baad1877bd76e0b2bd9f8885bba72ee8cc87 SHA512 3936c5e68251f7f11a8d912374265ff150887efdf97eb86520413616b14ad689ef0eaa6f8f0b4b66b20e9e5b2733651784a263aafe2522093a39035ac35ec4da
|
||||
DIST opencbm-0.4.99.104-source.tar.gz 13417312 BLAKE2B 1ba6e88c8765a161d6cb7a1c313c2db6cc885c616ac110c0833f59c93e2b2081e67ce730a7ead123a59b83133ddc2edf448de694c72ca582c3a155a463175027 SHA512 1c5c09ed2fd37a6db152eb9739739edee8b2200a4e02b219e982337eeb935cdac1125f59f235b5c3d1203bcd0701c2e9e35da9de921797f1617014f723de0faa
|
||||
EBUILD opencbm-0.4.99.104.ebuild 3528 BLAKE2B 5020774685cb58ccd1bb15799c08922c2e4526b7a2aea6403c54f7436c06cf9f7494f38d094659cef81b5e11e12d67edf8caf123d7b3a98b07da4088f228aeae SHA512 7dcb2938a8532ca6fac35836e93c806a32c55ec857723cea870fe72b4d180273e29ceef485fc53d2227f84deecbfece5279170a96a5bfb12560c3a02bafa1af0
|
||||
EBUILD opencbm-9999.ebuild 3257 BLAKE2B 09c6923d0dc3a8992a0892f5fd371bd88ce2db3d8b8f53109e5f3e0fc8c610591005b5c6c02434b5e526feece95ef81faeb1cf78b65df1a2d1231a37057294cb SHA512 4e0169e145c136ff9145698fe337166b513a3b148903b6c560308748a1122f991ba3bb13057f4248ef9a3b62889a4883fbc1178bc1bee1cbbe13d79470872038
|
||||
MISC ChangeLog 1019 BLAKE2B e98a63469dbe6af89e78a82020cc3f32ff90a6f9818592e11c5366bbf37c2f0d07cb72de876427e660261677a5acf8dcedc16491abf7770ce6210f0ce6c88121 SHA512 17c59cb8dd37b874de4f354f02c6d84582471475d7451a43cf9cc8982102e3a6a94aeae73799ac1e549343ee9dbac200799b3fee5edb3bd20927c6649de9b696
|
||||
MISC metadata.xml 226 BLAKE2B 168ec0c12fabd78e9c8fb3f5ebb90a3bb0f86ce0d3efd90cf476a500c63bf0d2f9968d131c7a47458518dfb4e67c1a934616cf04bebc9de56f5aea93ea2d5618 SHA512 5912920d8f6e9ee5126fb0aaa5717a562feb009cc59b759c6a6eaa909900b19e95e51e3aa7f32fdf2e77073b19878830b97947148e3adeff3b49e7555cfe29e9
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
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
|
||||
---
|
||||
sys/linux/cbm_module.c | 7 +++++--
|
||||
1 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
|
||||
index d8c5a23..91ea8f3 100644
|
||||
--- a/sys/linux/cbm_module.c
|
||||
+++ b/sys/linux/cbm_module.c
|
||||
@@ -22,12 +22,15 @@ static char *rcsid =
|
||||
"@(#) $Id: cbm_module.c,v 1.13.2.21 2009/12/13 20:40:32 strik Exp $";
|
||||
#endif
|
||||
|
||||
+#include <linux/version.h>
|
||||
+
|
||||
#ifdef KERNEL_INCLUDE_OLD_CONFIG_H
|
||||
#include <linux/config.h>
|
||||
-#else
|
||||
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+ #include <generated/autoconf.h>
|
||||
#endif
|
||||
-#include <linux/version.h>
|
||||
|
||||
#ifdef CONFIG_MODVERSIONS
|
||||
# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
|
||||
--
|
||||
@@ -1,37 +0,0 @@
|
||||
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:
|
||||
|
||||
* sys/linux: Linux kernel module, packaged separately
|
||||
* compat: Old cbm4linux kernel module, obsolete
|
||||
* demo/*: Demo applications, included as examples in libopencbm-dev
|
||||
|
||||
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
|
||||
|
||||
Forwarded: not-needed
|
||||
---
|
||||
LINUX/Makefile | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/LINUX/Makefile b/LINUX/Makefile
|
||||
index eb4b9f2..6a82370 100644
|
||||
--- a/LINUX/Makefile
|
||||
+++ b/LINUX/Makefile
|
||||
@@ -6,9 +6,9 @@ CBMDEV = /dev/cbm
|
||||
CBMPERM = 666
|
||||
DEVMAJOR = 10
|
||||
DEVMINOR = 177
|
||||
-SUBDIRS = sys/linux include arch/$(ARCH) lib compat \
|
||||
+SUBDIRS = include arch/$(ARCH) lib \
|
||||
cbmctrl cbmformat cbmforng d64copy cbmcopy \
|
||||
- demo/flash demo/morse demo/rpm1541 docs
|
||||
+ docs
|
||||
|
||||
SUBDIRS_OPTIONAL = mnib36
|
||||
|
||||
--
|
||||
@@ -1,47 +0,0 @@
|
||||
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
|
||||
symlink. In particular, it should make DKMS support a little bit easier.
|
||||
|
||||
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
|
||||
|
||||
---
|
||||
sys/linux/LINUX/Makefile | 4 +---
|
||||
1 files changed, 1 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sys/linux/LINUX/Makefile b/sys/linux/LINUX/Makefile
|
||||
index cb14aab..19a49a2 100644
|
||||
--- a/sys/linux/LINUX/Makefile
|
||||
+++ b/sys/linux/LINUX/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
ifneq ($(KERNELRELEASE),)
|
||||
EXTRA_CFLAGS := $(CBM4LINUX_KERNEL_FLAGS) -I$(here)/../../include -I$(here)/../../include/LINUX
|
||||
+ccflags-y += -I$(src)/../../include -I$(src)/../../include/LINUX
|
||||
obj-m := cbm.o
|
||||
cbm-objs := cbm_module.o
|
||||
|
||||
@@ -18,7 +19,6 @@ all: cbm.o
|
||||
.PHONY: all clean mrproper install uninstall install-files
|
||||
clean:
|
||||
rm -f cbm.mod.c *.o *.ko .cbm* Modules.symvers
|
||||
- rm -f Makefile
|
||||
|
||||
mrproper: clean
|
||||
|
||||
@@ -38,8 +38,6 @@ ifneq ($(UDEV_RULES),)
|
||||
endif
|
||||
|
||||
cbm.o: cbm_module.c
|
||||
- -ln -s LINUX/Makefile Makefile
|
||||
$(MAKE) -C $(KERNEL_SOURCE) here=`pwd` CBM4LINUX_KERNEL_FLAGS=$(KERNEL_FLAGS) SUBDIRS=`pwd` modules
|
||||
- -rm -f Makefile
|
||||
|
||||
endif
|
||||
--
|
||||
@@ -1,41 +0,0 @@
|
||||
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
|
||||
---
|
||||
sys/linux/LINUX/Makefile | 5 ++---
|
||||
1 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sys/linux/LINUX/Makefile b/sys/linux/LINUX/Makefile
|
||||
index 19a49a2..a4ef189 100644
|
||||
--- a/sys/linux/LINUX/Makefile
|
||||
+++ b/sys/linux/LINUX/Makefile
|
||||
@@ -1,8 +1,7 @@
|
||||
# $Id: Makefile,v 1.3.4.3 2007/11/11 16:57:25 strik Exp $
|
||||
|
||||
ifneq ($(KERNELRELEASE),)
|
||||
-EXTRA_CFLAGS := $(CBM4LINUX_KERNEL_FLAGS) -I$(here)/../../include -I$(here)/../../include/LINUX
|
||||
-ccflags-y += -I$(src)/../../include -I$(src)/../../include/LINUX
|
||||
+ccflags-y += -I$(src)/../include
|
||||
obj-m := cbm.o
|
||||
cbm-objs := cbm_module.o
|
||||
|
||||
@@ -12,7 +11,7 @@ modules:
|
||||
|
||||
else
|
||||
|
||||
-include ../../LINUX/config.make
|
||||
+include ../config.make
|
||||
|
||||
all: cbm.o
|
||||
|
||||
--
|
||||
@@ -1,80 +0,0 @@
|
||||
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
|
||||
---
|
||||
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 91ea8f3..4b50626 100644
|
||||
--- a/sys/linux/cbm_module.c
|
||||
+++ b/sys/linux/cbm_module.c
|
||||
@@ -257,7 +257,7 @@ static struct wait_queue *cbm_wait_q;
|
||||
static wait_queue_head_t cbm_wait_q;
|
||||
#endif
|
||||
volatile static int eoi;
|
||||
-volatile static int irq_count;
|
||||
+volatile static int cbm_irq_count;
|
||||
|
||||
#ifndef KERNEL_VERSION
|
||||
# define signal_pending(p) (p->signal & ~p->blocked)
|
||||
@@ -425,7 +425,7 @@ static void wait_for_listener(void)
|
||||
add_wait_queue(&cbm_wait_q, &wait);
|
||||
current->state = TASK_INTERRUPTIBLE;
|
||||
RELEASE(CLK_OUT);
|
||||
- while(irq_count && !signal_pending(current)) {
|
||||
+ while(cbm_irq_count && !signal_pending(current)) {
|
||||
schedule();
|
||||
}
|
||||
remove_wait_queue(&cbm_wait_q, &wait);
|
||||
@@ -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;
|
||||
|
||||
- eoi = irq_count = 0;
|
||||
+ eoi = cbm_irq_count = 0;
|
||||
|
||||
DPRINTK("cbm_write: %d bytes, atn=%d\n", cnt, atn);
|
||||
|
||||
@@ -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)) {
|
||||
- irq_count = ((sent == (cnt-1)) && (atn == 0)) ? 2 : 1;
|
||||
+ cbm_irq_count = ((sent == (cnt-1)) && (atn == 0)) ? 2 : 1;
|
||||
wait_for_listener();
|
||||
|
||||
if(signal_pending(current)) {
|
||||
@@ -886,10 +886,10 @@ static irqreturn_t cbm_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
POLL(); /* acknowledge interrupt */
|
||||
|
||||
- if(irq_count == 0) {
|
||||
+ if(cbm_irq_count == 0) {
|
||||
return IRQ_NONE;
|
||||
}
|
||||
- if(--irq_count == 0) {
|
||||
+ if(--cbm_irq_count == 0) {
|
||||
DPRINTK("continue to send (no EOI)\n");
|
||||
SET(CLK_OUT);
|
||||
wake_up_interruptible(&cbm_wait_q);
|
||||
@@ -1031,7 +1031,7 @@ int cbm_init(void)
|
||||
#endif
|
||||
);
|
||||
|
||||
- irq_count = 0;
|
||||
+ cbm_irq_count = 0;
|
||||
|
||||
out_bits = (CTRL_READ() ^ out_eor) &
|
||||
(DATA_OUT|CLK_OUT|ATN_OUT|RESET);
|
||||
--
|
||||
@@ -1,27 +0,0 @@
|
||||
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)
|
||||
--
|
||||
@@ -1,55 +0,0 @@
|
||||
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);
|
||||
--
|
||||
@@ -1,41 +0,0 @@
|
||||
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 */
|
||||
};
|
||||
--
|
||||
@@ -1,23 +0,0 @@
|
||||
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(¶llel_burst_lock, flags)
|
||||
#define enable() spin_unlock_irqrestore(¶llel_burst_lock, flags)
|
||||
#define printf(x) printk(x)
|
||||
--
|
||||
@@ -1,21 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
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"
|
||||
@@ -1,29 +0,0 @@
|
||||
commit 84b10fc7188de11fade4df963503080acbdb198c (HEAD -> refs/heads/usb_USB_LE16_TO_CPU_le16toh)
|
||||
Author: Uffe Jakobsen <microtop@starion.dk>
|
||||
AuthorDate: Sun Oct 16 17:02:22 2016 +0200
|
||||
Commit: Uffe Jakobsen <microtop@starion.dk>
|
||||
CommitDate: Sun Oct 16 17:02:51 2016 +0200
|
||||
|
||||
Linux: newer usb.h does not have USB_LE16_TO_CPU() macro anymore
|
||||
---
|
||||
:100644 100644 b9f6bd1... d7681cf... M xu1541/misc/usb_echo_test.c
|
||||
xu1541/misc/usb_echo_test.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git xu1541/misc/usb_echo_test.c xu1541/misc/usb_echo_test.c
|
||||
index b9f6bd1..d7681cf 100644
|
||||
--- xu1541/misc/usb_echo_test.c
|
||||
+++ xu1541/misc/usb_echo_test.c
|
||||
@@ -27,6 +27,12 @@ usb_dev_handle *handle = NULL;
|
||||
#define QUIT_KEY
|
||||
#endif
|
||||
|
||||
+// Linux: newer usb.h does not have USB_LE16_TO_CPU() macro anymore
|
||||
+#ifndef USB_LE16_TO_CPU
|
||||
+#include <endian.h>
|
||||
+#define USB_LE16_TO_CPU(x) x=le16toh(x);
|
||||
+#endif
|
||||
+
|
||||
/* send a number of 16 bit words to the xu1541 interface */
|
||||
/* and verify that they are correctly returned by the echo */
|
||||
/* command. This may be used to check the reliability of */
|
||||
@@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2017-05-14
|
||||
Initial Package Version: 0.4.99.98
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: ncurses 6.x has split ncursses/tinfo libs
|
||||
|
||||
|
||||
diff -Naur opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile
|
||||
--- opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile 2017-05-14 06:19:02.585302812 +0000
|
||||
+++ opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile 2017-05-14 06:20:09.604409904 +0000
|
||||
@@ -3,6 +3,6 @@
|
||||
|
||||
PROG = cbmlinetester
|
||||
CFLAGS += -DHAVE_NCURSES
|
||||
-LINK_FLAGS += -lncurses
|
||||
+LINK_FLAGS += -lncurses -ltinfo
|
||||
|
||||
include ${RELATIVEPATH}LINUX/prgrules.make
|
||||
@@ -1,58 +0,0 @@
|
||||
From 32a19cb166f6913dcf9885284bf36082f39b350a Mon Sep 17 00:00:00 2001
|
||||
From: Spiro Trikaliotis <spiro.trikaliotis@gmx.de>
|
||||
Date: Sat, 12 Oct 2019 20:37:30 +0200
|
||||
Subject: [PATCH] Fix compiler error on kernel module compilation
|
||||
|
||||
Before, we tried to determine with HAVE_LINUX_SCHED_SIGNAL_H if we need
|
||||
to include <linux/sched/signal.h>. Unfortunately, the mechanism was not
|
||||
robust.
|
||||
|
||||
So, reworked it and hardcoded it depending on the kernel version (>=
|
||||
4.11.0). This fixes #22.
|
||||
---
|
||||
opencbm/LINUX/config.make | 3 +--
|
||||
opencbm/sys/linux/cbm_module.c | 3 +--
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/opencbm/LINUX/config.make b/opencbm/LINUX/config.make
|
||||
index 7e05f33b..30d42d2c 100644
|
||||
--- a/opencbm/LINUX/config.make
|
||||
+++ b/opencbm/LINUX/config.make
|
||||
@@ -107,7 +107,6 @@ KERNEL_SOURCE = ${shell for d in /lib/modules/`uname -r`/build /usr/src/linux; d
|
||||
ifneq ($(strip $(KERNEL_SOURCE)),)
|
||||
HAVE_KERNEL_SOURCE=-DHAVE_KERNEL_SOURCE=1
|
||||
KERNEL_INCLUDE_CONFIG = ${shell for c in ${KERNEL_SOURCE}/include/linux/autoconf.h ${KERNEL_SOURCE}/include/linux/config.h; do test -f $$c && echo $$c; done | head -n 1}
|
||||
- KERNEL_HAVE_LINUX_SCHED_SIGNAL_H = ${shell test -e ${KERNEL_SOURCE}/include/linux/sched/signal.h && echo -DHAVE_LINUX_SCHED_SIGNAL_H=1}
|
||||
endif
|
||||
|
||||
HAVE_LIBUSB0 = ${shell pkg-config libusb && echo 1}
|
||||
@@ -137,7 +136,7 @@ endif
|
||||
# XE1541-like cable. Don't to it. Upgrade to XM1541 instead.
|
||||
#
|
||||
#KERNEL_FLAGS = -DDIRECT_PORT_ACCESS
|
||||
-KERNEL_FLAGS = "${KERNEL_DEFINE} ${KERNEL_HAVE_LINUX_SCHED_SIGNAL_H}"
|
||||
+KERNEL_FLAGS = "${KERNEL_DEFINE}"
|
||||
endif
|
||||
|
||||
#
|
||||
diff --git a/opencbm/sys/linux/cbm_module.c b/opencbm/sys/linux/cbm_module.c
|
||||
index 94456015..dba88511 100644
|
||||
--- a/opencbm/sys/linux/cbm_module.c
|
||||
+++ b/opencbm/sys/linux/cbm_module.c
|
||||
@@ -32,7 +32,6 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
-
|
||||
/*
|
||||
* Starting with 2.3.10, the IRQ and bi-directional bits are uncoupled from
|
||||
* the control byte.
|
||||
@@ -54,7 +53,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#include <linux/sched.h>
|
||||
-#ifdef HAVE_LINUX_SCHED_SIGNAL_H
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
||||
#include <linux/sched/signal.h>
|
||||
#endif
|
||||
#include <linux/uaccess.h>
|
||||
@@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2017-05-14
|
||||
Initial Package Version: 0.4.99.98
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: ncurses 6.x has split ncursses/tinfo libs
|
||||
|
||||
|
||||
diff -Naur opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile
|
||||
--- opencbm-0.4.99.98.orig/opencbm/cbmlinetester/LINUX/Makefile 2017-05-14 06:19:02.585302812 +0000
|
||||
+++ opencbm-0.4.99.98/opencbm/cbmlinetester/LINUX/Makefile 2017-05-14 06:20:09.604409904 +0000
|
||||
@@ -3,6 +3,6 @@
|
||||
|
||||
PROG = cbmlinetester
|
||||
CFLAGS += -DHAVE_NCURSES
|
||||
-LINK_FLAGS += -lncurses
|
||||
+LINK_FLAGS += -lncurses -ltinfo
|
||||
|
||||
include ${RELATIVEPATH}LINUX/prgrules.make
|
||||
@@ -1,68 +0,0 @@
|
||||
# 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)
|
||||
|
||||
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="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"
|
||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND="virtual/linux-sources
|
||||
dev-embedded/cc65
|
||||
app-text/linuxdoc-tools"
|
||||
|
||||
S="${WORKDIR}"/${PN}-${PV/_/}
|
||||
|
||||
BUILD_PARAMS="KDIR=$KERNEL_DIR"
|
||||
MODULE_NAMES="cbm(misc:${S}/sys/linux:${S}/sys/linux)"
|
||||
BUILD_TARGETS="all"
|
||||
|
||||
src_prepare() {
|
||||
# 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,/info,/share/info,g' -i ${S}/LINUX/config.make
|
||||
# copy module makefile that don't intefer with gentoo kernel build system
|
||||
cp ${FILESDIR}/Makefile ${S}/sys/linux/Makefile
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" showvars || die "showvars fail"
|
||||
emake -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" || die "make fail"
|
||||
linux-mod_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -f LINUX/Makefile PREFIX="${D}/usr" install
|
||||
linux-mod_src_install
|
||||
generate_modulesd
|
||||
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
linux-mod_pkg_postinst
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
linux-mod_pkg_postrm
|
||||
}
|
||||
@@ -2,23 +2,30 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="5"
|
||||
EAPI="7"
|
||||
|
||||
inherit eutils toolchain-funcs linux-mod udev
|
||||
|
||||
if [[ ${PV} = 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/OpenCBM/OpenCBM.git"
|
||||
else
|
||||
#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"
|
||||
SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz
|
||||
https://github.com/OpenCBM/nibtools/tarball/master -> nibtools-${PV}-source.tar.gz"
|
||||
fi
|
||||
|
||||
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"
|
||||
SRC_URI="https://github.com/OpenCBM/OpenCBM/archive/v${PV//./_}.tar.gz -> opencbm-${PV}-source.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
||||
#KEYWORDS=""
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND="virtual/linux-sources
|
||||
@@ -40,22 +47,24 @@ 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="patch" \
|
||||
EPATCH_FORCE="yes" epatch
|
||||
eapply "${FILESDIR}/001_opencbm-0.4.99.98-ncurses6-1.patch"
|
||||
# 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' \
|
||||
sed -e 's,xa1541 opencbm/sys/linux/,xa1541,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
|
||||
cp -r "${WORKDIR}"/OpenCBM-nibtools-*/* ${S}/opencbm/nibtools/
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" all || die "make fail"
|
||||
emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" all || die "make fail"
|
||||
emake -j1 -f LINUX/Makefile CC="$(tc-getCC)" AR="$(tc-getAR)" LIBDIR="/usr/$(get_libdir)" opencbm || die "make fail"
|
||||
linux-mod_src_compile
|
||||
}
|
||||
|
||||
@@ -63,7 +72,7 @@ src_install() {
|
||||
dodir lib/udev/rules.d
|
||||
dodir etc/opencbm.conf.d
|
||||
dodir usr/lib/opencbm
|
||||
emake -f LINUX/Makefile DESTDIR="${D}" install-all
|
||||
emake -f LINUX/Makefile DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install-all
|
||||
exeinto usr/lib/opencbm
|
||||
doexe opencbm/LINUX/plugin_helper_tools
|
||||
newexe debian/install_plugin.sh install_plugin
|
||||
@@ -2,9 +2,9 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="5"
|
||||
EAPI="7"
|
||||
|
||||
inherit eutils toolchain-funcs linux-mod versionator udev
|
||||
inherit eutils toolchain-funcs linux-mod udev
|
||||
|
||||
if [[ ${PV} = 9999* ]]; then
|
||||
inherit git-r3
|
||||
@@ -16,8 +16,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
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"
|
||||
@@ -25,7 +23,8 @@ HOMEPAGE="http://opencbm.trikaliotis.net/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
||||
#KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
||||
KEYWORDS=""
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND="virtual/linux-sources
|
||||
@@ -34,7 +33,7 @@ DEPEND="virtual/linux-sources
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
dev-libs/libusb-compat"
|
||||
|
||||
S="${WORKDIR}"/opencbm-${PV//./_}
|
||||
S="${WORKDIR}"/OpenCBM-${PV//./_}
|
||||
|
||||
BUILD_PARAMS="KDIR=$KERNEL_DIR"
|
||||
MODULE_NAMES="cbm(misc:${S}/opencbm/sys/linux:${S}/opencbm/sys/linux)"
|
||||
@@ -47,8 +46,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="patch" \
|
||||
EPATCH_FORCE="yes" epatch
|
||||
eapply "${FILESDIR}/001_opencbm-0.4.99.98-ncurses6-1.patch"
|
||||
# sed correct path
|
||||
sed -e 's,^PREFIX.*,PREFIX = /usr,' \
|
||||
-e 's,/man/man1,/share/man/man1,g' \
|
||||
@@ -59,6 +57,7 @@ src_prepare() {
|
||||
-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
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
@@ -74,8 +73,8 @@ src_install() {
|
||||
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
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user