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

add skypeforlinux

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
app-emulation/opencbm/files/0.4.3_rc2/00_autoconf-2.6.33.diff → app-emulation/opencbm/files/0.4.3_rc2/0001-Adjusted-autoconf.h-location-for-Linux-2.6.33.patch
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)

11
app-emulation/opencbm/files/0.4.3_rc2/01_skip-targets.diff → app-emulation/opencbm/files/0.4.3_rc2/0002-Skip-various-targets-that-do-not-apply-to-this-Debia.patch
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)

9
app-emulation/opencbm/files/0.4.3_rc2/02_module_makefile.diff → app-emulation/opencbm/files/0.4.3_rc2/0003-Allow-invoking-the-module-Makefile-from-the-kernel-t.patch
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)

11
app-emulation/opencbm/files/0.4.3_rc2/03_module_flatten.diff → app-emulation/opencbm/files/0.4.3_rc2/0004-Flatten-the-module-source-tree.patch
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)

25
app-emulation/opencbm/files/0.4.3_rc2/04_irq_count.diff → app-emulation/opencbm/files/0.4.3_rc2/0005-Rename-irq_count-to-cbm_irq_count-in-Linux-kernel-mo.patch
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)

27
app-emulation/opencbm/files/0.4.3_rc2/0006-Explicitly-run-sbin-ldconfig-as-sbin-may-not-be-in-P.patch Normal file
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)
--

55
app-emulation/opencbm/files/0.4.3_rc2/0007-Linux-module-Use-zu-when-printing-size_t-variables.patch Normal file
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);
--

41
app-emulation/opencbm/files/0.4.3_rc2/0008-Linux-module-Use-.unlocked_ioctl-instead-of-.ioctl.patch Normal file
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 */
};
--

23
app-emulation/opencbm/files/0.4.3_rc2/0009-Use-DEFINE_SPINLOCK-instead-of-SPIN_LOCK_UNLOCKED.patch Normal file
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)
--

23
app-emulation/opencbm/files/0.4.3_rc2/05_-unolcked_ioctl.diff
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 */
};

21
app-emulation/opencbm/files/0.4.99.94/001_opencbm-0.4.99.94-compat_destdir-1.patch Normal file
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

30
app-emulation/opencbm/files/0.4.99.94/002_opencbm-0.4.99.94-udev-rules-1.patch Normal file
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"