Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib/files/
Date: Wed, 01 Feb 2017 22:42:00
Message-Id: 1485988856.76c4d2068dde37aada763ccf8c855adf5ca09d19.soap@gentoo
1 commit: 76c4d2068dde37aada763ccf8c855adf5ca09d19
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Jan 31 17:45:45 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 22:40:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c4d206
7
8 sci-libs/linux-gpib: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3740
11
12 .../linux-gpib/files/linux-gpib-3.2.15-build.patch | 44 ----------------------
13 1 file changed, 44 deletions(-)
14
15 diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch
16 deleted file mode 100644
17 index 14a1868..00000000
18 --- a/sci-libs/linux-gpib/files/linux-gpib-3.2.15-build.patch
19 +++ /dev/null
20 @@ -1,44 +0,0 @@
21 -diff -ruN linux-gpib-3.2.15-0-orig/drivers/Makefile.am linux-gpib-3.2.15/drivers/Makefile.am
22 ---- linux-gpib-3.2.15-0-orig/drivers/Makefile.am 2007-04-19 17:21:04.000000000 +0200
23 -+++ linux-gpib-3.2.15/drivers/Makefile.am 2011-01-24 23:20:59.000000000 +0100
24 -@@ -27,39 +27,13 @@
25 - CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
26 - SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
27 -
28 --install-data-hook: device-file-check /etc/gpib.conf
29 -+install-data-hook: /etc/gpib.conf
30 - $(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\
31 - CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \
32 - SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib"
33 -- $(DEPMOD) -ae
34 --
35 --/dev/gpib0:
36 -- groupadd gpib || echo "group gpib exists"
37 -- for i in `seq 0 15`; \
38 -- do \
39 -- mknod -m u=rw,g=rw,o= /dev/gpib$${i} c $(IBMAJOR) $${i} || exit 1; \
40 -- chown root:gpib /dev/gpib$${i}; \
41 -- done
42 --
43 --.PHONY : device-file-check
44 --device-file-check: /dev/gpib0
45 -- @if [ ! -c /dev/gpib0 ]; then \
46 -- if [ -a /dev/gpib0 ]; then \
47 -- echo "A file or directory called /dev/gpib0 exists but it is not" \
48 -- "a character device. Delete or move it and try again."; \
49 -- exit 1; \
50 -- fi; \
51 -- fi
52 -- @ls -l /dev/gpib0 | grep -q "$(IBMAJOR)"; \
53 -- if [ $$? != 0 ]; then \
54 -- echo "/dev/gpib0 has the wrong major number. " \
55 -- "Delete your /dev/gpibX files and try again."; \
56 -- exit 1; \
57 -- fi
58 -
59 - #should move this to util/templates Makefile.am when it exists
60 - /etc/gpib.conf:
61 -- $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf
62 -
63 - #make sure compiled files, etc don't make it into distribution tarballs
64 - dist-hook: