sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Merge commit 'f4320dd67f9681e24bcfbe112832cac2ceacebd0' into edison

This commit is contained in:
Holger Hans Peter Freyther 2012-08-15 09:17:29 +02:00
parent 50dba82586 f4320dd67f
commit 9805fb9f81
5 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-telephony/recipes-isdn/dahdi-linux/dahdi-linux.inc
View File

@ -31,11 +31,10 @@ http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR6
http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-vpmadt032-1.07.tar.gz\
"
SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-${PV}.tar.gz ${FIRMWARE_URI}"
# why does this not work?
#SRC_URI =+ "${FIRMWARE_URI}"
SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-${PV}.tar.gz "
SRC_URI =+ "${FIRMWARE_URI}"
INC_PR="r3"
INC_PR="r9"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a"
@ -47,6 +46,9 @@ do_configure() {
cp ${DL_DIR}/dahdi-fwload-*.tar.gz drivers/dahdi/firmware/
cp ${DL_DIR}/zaptel-fw-*.tar.gz drivers/dahdi/firmware/
cp ${DL_DIR}/dahdi-fw-*.tar.gz drivers/dahdi/firmware/
# Enable the mirror for pcap..
sed -i s,"\/\* #define CONFIG_DAHDI_MIRROR \*\/","#define CONFIG_DAHDI_MIRROR", ${S}/include/dahdi/dahdi_config.h
}
do_compile () {
@ -72,5 +74,5 @@ PACKAGES =+ "dahdi-firmware"
FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d"
FILES_dahdi-firmware = "${base_libdir}/firmware /usr/share/dahdi"
FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi"
PACKAGE_ARCH_dahdi-firmware = "all"

0
meta-telephony/recipes-isdn/dahdi-linux/dahdi-linux_2.5.0.1.bb → meta-telephony/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb
View File

27
meta-telephony/recipes-isdn/dahdi-tools/dahdi-tools.inc
View File

@ -1,17 +1,36 @@
DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers"
DEPENDS = "dahdi-linux libnewt"
DEPENDS = "dahdi-linux libnewt libpcap"
RDEPENDS += "perl perl-module-strict perl-module-file-basename perl-module-config \
perl-module-warnings perl-module-getopt perl-module-getopt-std \
perl-module-file perl-module-file-glob perl-module-xsloader \
perl-module-dynaloader perl-module-carp perl-module-errno"
HOMEPAGE = "http://www.asterisk.org"
LICENSE = "GPLv2"
SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz"
SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \
file://perl_install.patch "
INC_PR="r2"
INC_PR="r18"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \
file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09"
inherit autotools_stage pkgconfig
FILES_${PN} += "${datadir}/dahdi"
inherit autotools_stage pkgconfig perlnative cpan-base
do_configure() {
oe_runconf
}
do_compile() {
base_do_compile
oe_runmake dahdi_pcap
}
export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}"
do_install() {
autotools_do_install
install -m 755 ${S}/dahdi_pcap ${D}${sbindir}/
}

2
meta-telephony/recipes-isdn/dahdi-tools/dahdi-tools_2.5.0.1.bb → meta-telephony/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb
View File

@ -1,4 +1,4 @@
require ${PN}.inc
PR = "${INC_PR}.1"
PR = "${INC_PR}.2"

13
meta-telephony/recipes-isdn/dahdi-tools/files/perl_install.patch Executable file
View File

@ -0,0 +1,13 @@
Index: dahdi-tools-2.6.0/xpp/Makefile
===================================================================
--- dahdi-tools-2.6.0.orig/xpp/Makefile 2011-07-11 00:25:18.000000000 +0800
+++ dahdi-tools-2.6.0/xpp/Makefile 2012-07-21 23:30:58.244897984 +0800
@@ -28,7 +28,7 @@
DATADIR = $(datadir)/dahdi
MANDIR = $(mandir)/man8
HOTPLUG_USB_DIR = $(sysconfdir)/hotplug/usb
-PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
+PERLLIBDIR = $(DAHDI_PERLLIBDIR)
PERL_DIRS := $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs)
PERL_MODS_PAT := *.pm $(PERL_DIRS:%=%/*.pm)
PERL_MODS := $(shell cd perl_modules; echo $(PERL_MODS_PAT))