1 |
dilfridge 11/01/31 22:29:39 |
2 |
|
3 |
Added: linux-gpib-3.2.15-build.patch |
4 |
Log: |
5 |
New package, fixes bug 165399. Thanks to antonmx and Ben Schwartz for their work. Initially |
6 |
pmasked since the ebuild still needs a lot of QA cleanup (especially concerning the language |
7 |
bindings) and requires exotic hardware for testing. |
8 |
|
9 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: linux-gpib-3.2.15-build.patch |
18 |
=================================================================== |
19 |
diff -ruN linux-gpib-3.2.15-0-orig/drivers/Makefile.am linux-gpib-3.2.15/drivers/Makefile.am |
20 |
--- linux-gpib-3.2.15-0-orig/drivers/Makefile.am 2007-04-19 17:21:04.000000000 +0200 |
21 |
+++ linux-gpib-3.2.15/drivers/Makefile.am 2011-01-24 23:20:59.000000000 +0100 |
22 |
@@ -27,39 +27,13 @@ |
23 |
CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \ |
24 |
SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" |
25 |
|
26 |
-install-data-hook: device-file-check /etc/gpib.conf |
27 |
+install-data-hook: /etc/gpib.conf |
28 |
$(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\ |
29 |
CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \ |
30 |
SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib" |
31 |
- $(DEPMOD) -ae |
32 |
- |
33 |
-/dev/gpib0: |
34 |
- groupadd gpib || echo "group gpib exists" |
35 |
- for i in `seq 0 15`; \ |
36 |
- do \ |
37 |
- mknod -m u=rw,g=rw,o= /dev/gpib$${i} c $(IBMAJOR) $${i} || exit 1; \ |
38 |
- chown root:gpib /dev/gpib$${i}; \ |
39 |
- done |
40 |
- |
41 |
-.PHONY : device-file-check |
42 |
-device-file-check: /dev/gpib0 |
43 |
- @if [ ! -c /dev/gpib0 ]; then \ |
44 |
- if [ -a /dev/gpib0 ]; then \ |
45 |
- echo "A file or directory called /dev/gpib0 exists but it is not" \ |
46 |
- "a character device. Delete or move it and try again."; \ |
47 |
- exit 1; \ |
48 |
- fi; \ |
49 |
- fi |
50 |
- @ls -l /dev/gpib0 | grep -q "$(IBMAJOR)"; \ |
51 |
- if [ $$? != 0 ]; then \ |
52 |
- echo "/dev/gpib0 has the wrong major number. " \ |
53 |
- "Delete your /dev/gpibX files and try again."; \ |
54 |
- exit 1; \ |
55 |
- fi |
56 |
|
57 |
#should move this to util/templates Makefile.am when it exists |
58 |
/etc/gpib.conf: |
59 |
- $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf |
60 |
|
61 |
#make sure compiled files, etc don't make it into distribution tarballs |
62 |
dist-hook: |