Archives
Archives
| From: | "Tony Vroon (chainsaw)" <chainsaw@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-misc/dahdi-tools/files: dahdi-tools-2.2.0-no-hardware-fiddling.patch dahdi-tools-2.2.0-vendorlib.patch |
| Date: | Tue, 22 Dec 2009 12:31:17 |
| Message-Id: | E1NN3tS-0000xz-AY@stork.gentoo.org |
| 1 | chainsaw 09/12/22 12:31:14 |
| 2 | |
| 3 | Added: dahdi-tools-2.2.0-no-hardware-fiddling.patch |
| 4 | dahdi-tools-2.2.0-vendorlib.patch |
| 5 | Log: |
| 6 | Install in perl vendor directory, not site as per bug #295105. Explicitly block zaptel as per bug #295107 (both by Diego E. "Flameeyes" Pettenò). Work around Gentoo-specific broken linux headers, closes bug #290918 by Chí-Thanh Christopher Nguyễn. Do not fiddle with the hardware in the Makefile, closes bug #296359 by Jaco Kroon. |
| 7 | (Portage version: 2.1.7.15/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-no-hardware-fiddling.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: dahdi-tools-2.2.0-no-hardware-fiddling.patch |
| 16 | =================================================================== |
| 17 | diff -uNr dahdi-tools-2.2.0.ORIG/Makefile dahdi-tools-2.2.0/Makefile |
| 18 | --- dahdi-tools-2.2.0.ORIG/Makefile 2009-12-22 12:20:03.000000000 +0000 |
| 19 | +++ dahdi-tools-2.2.0/Makefile 2009-12-22 12:20:46.000000000 +0000 |
| 20 | @@ -293,18 +293,6 @@ |
| 21 | $(ADD_INITD) |
| 22 | endif |
| 23 | @echo "DAHDI has been configured." |
| 24 | - @echo "" |
| 25 | - @echo "List of detected DAHDI devices:" |
| 26 | - @echo "" |
| 27 | - @if [ `xpp/dahdi_hardware | tee /dev/stderr | wc -l` -eq 0 ]; then \ |
| 28 | - echo "No hardware found"; \ |
| 29 | - else \ |
| 30 | - echo ""; \ |
| 31 | - echo "run 'dahdi_genconf modules' to load support for only " ;\ |
| 32 | - echo "the DAHDI hardware installed in this system. By "; \ |
| 33 | - echo "default support for all DAHDI hardware is loaded at "; \ |
| 34 | - echo "DAHDI start. "; \ |
| 35 | - fi |
| 36 | |
| 37 | update: |
| 38 | @if [ -d .svn ]; then \ |
| 39 | |
| 40 | |
| 41 | |
| 42 | 1.1 net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch |
| 43 | |
| 44 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch?rev=1.1&view=markup |
| 45 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-vendorlib.patch?rev=1.1&content-type=text/plain |
| 46 | |
| 47 | Index: dahdi-tools-2.2.0-vendorlib.patch |
| 48 | =================================================================== |
| 49 | diff -uNr dahdi-tools-2.2.0.ORIG/xpp/Makefile dahdi-tools-2.2.0/xpp/Makefile |
| 50 | --- dahdi-tools-2.2.0.ORIG/xpp/Makefile 2009-12-22 11:31:02.000000000 +0000 |
| 51 | +++ dahdi-tools-2.2.0/xpp/Makefile 2009-12-22 11:32:59.000000000 +0000 |
| 52 | @@ -28,7 +28,7 @@ |
| 53 | DATADIR = $(datadir)/dahdi |
| 54 | MANDIR = $(mandir)/man8 |
| 55 | HOTPLUG_USB_DIR = /etc/hotplug/usb |
| 56 | -PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib") |
| 57 | +PERLLIBDIR := $(shell eval `perl -V:vendorlib`; echo "$$vendorlib") |
| 58 | PERL_DIRS := $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs) |
| 59 | PERL_MODS_PAT := *.pm $(PERL_DIRS:%=%/*.pm) |
| 60 | PERL_MODS := $(shell cd perl_modules; echo $(PERL_MODS_PAT)) |