dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add new pacakges

Browse Source
This commit is contained in:
Mario Fetka
2022-02-23 19:17:30 +01:00
parent 123ebbf1df
commit de2b917a03
175 changed files with 1143 additions and 10915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app-emulation/opencbm/files/0.4.3_rc2/0001-Adjusted-autoconf.h-location-for-Linux-2.6.33.patch
View File

@@ -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)
--

37
app-emulation/opencbm/files/0.4.3_rc2/0002-Skip-various-targets-that-do-not-apply-to-this-Debia.patch
View File

@@ -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
--

47
app-emulation/opencbm/files/0.4.3_rc2/0003-Allow-invoking-the-module-Makefile-from-the-kernel-t.patch
View File

@@ -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
--

41
app-emulation/opencbm/files/0.4.3_rc2/0004-Flatten-the-module-source-tree.patch
View File

@@ -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
--

80
app-emulation/opencbm/files/0.4.3_rc2/0005-Rename-irq_count-to-cbm_irq_count-in-Linux-kernel-mo.patch
View File

@@ -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);
--

27
app-emulation/opencbm/files/0.4.3_rc2/0006-Explicitly-run-sbin-ldconfig-as-sbin-may-not-be-in-P.patch
View File

@@ -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)
--

55
app-emulation/opencbm/files/0.4.3_rc2/0007-Linux-module-Use-zu-when-printing-size_t-variables.patch
View File

@@ -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);
--

41
app-emulation/opencbm/files/0.4.3_rc2/0008-Linux-module-Use-.unlocked_ioctl-instead-of-.ioctl.patch
View File

@@ -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 */
};
--

23
app-emulation/opencbm/files/0.4.3_rc2/0009-Use-DEFINE_SPINLOCK-instead-of-SPIN_LOCK_UNLOCKED.patch
View File

@@ -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(&parallel_burst_lock, flags)
#define enable() spin_unlock_irqrestore(&parallel_burst_lock, flags)
#define printf(x) printk(x)
--

21
app-emulation/opencbm/files/0.4.99.94/001_opencbm-0.4.99.94-compat_destdir-1.patch
View File

@@ -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

30
app-emulation/opencbm/files/0.4.99.94/002_opencbm-0.4.99.94-udev-rules-1.patch
View File

@@ -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"

29
app-emulation/opencbm/files/0.4.99.98/002_opencbm_usb_USB_LE16_TO_CPU_le16toh.patch
View File

@@ -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 */

19
app-emulation/opencbm/files/0.4.99.99a/001_opencbm-0.4.99.98-ncurses6-1.patch
View File

@@ -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

58
app-emulation/opencbm/files/0.4.99.99a/002_opencbm-0.4.99.99a-cbm_module.patch
View File

@@ -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>

0
app-emulation/opencbm/files/0.4.99.98/001_opencbm-0.4.99.98-ncurses6-1.patch → app-emulation/opencbm/files/001_opencbm-0.4.99.98-ncurses6-1.patch
View File

19
app-emulation/opencbm/files/9999/001_opencbm-0.4.99.98-ncurses6-1.patch
View File

@@ -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