From 60ee4cd50462acf591c3f79e06a63f1f440a8b27 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Nov 2011 21:26:06 +0800 Subject: [PATCH 001/200] Add existing sysmocom recipes --- README | 1 + recipes-isdn/dahdi-linux/dahdi-linux.inc | 76 ++++++++ .../dahdi-linux/dahdi-linux_2.5.0.1.bb | 5 + recipes-isdn/dahdi-tools/dahdi-tools.inc | 17 ++ .../dahdi-tools/dahdi-tools_2.5.0.1.bb | 4 + recipes-misc/libdbi/libdbi-drivers.inc | 32 ++++ recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb | 4 + recipes-misc/libdbi/libdbi.inc | 21 +++ recipes-misc/libdbi/libdbi_0.7.2.bb | 3 + recipes-misc/libdbi/libdbi_0.8.3.bb | 3 + .../files/0001-fix-unused-variables.patch | 75 ++++++++ recipes-misc/ortp/ortp.inc | 20 +++ recipes-misc/ortp/ortp_0.16.5.bb | 8 + recipes-osmocom/libosmo-abis/libosmo-abis.inc | 13 ++ .../libosmo-abis/libosmo-abis_0.0.6.bb | 11 ++ .../libosmo-abis/libosmo-abis_0.0.8.bb | 11 ++ .../libosmo-abis/libosmo-abis_0.1.0.bb | 11 ++ recipes-osmocom/libosmo-sccp/libosmo-sccp.inc | 12 ++ .../libosmo-sccp/libosmo-sccp_0.0.5.1.bb | 11 ++ .../libosmo-sccp/libosmo-sccp_0.0.6.1.bb | 11 ++ recipes-osmocom/libosmocore/libosmocore.inc | 10 ++ .../libosmocore/libosmocore_0.3.1.bb | 11 ++ .../libosmocore/libosmocore_0.3.10.bb | 11 ++ .../libosmocore/libosmocore_0.3.4+35.bb | 11 ++ .../libosmocore/libosmocore_0.3.4.bb | 11 ++ .../libosmocore/libosmocore_0.3.8.bb | 11 ++ .../libosmocore/libosmocore_0.3.9.bb | 11 ++ .../libosmocore/libosmocore_git.bb | 7 + recipes-osmocom/meta/meta-toolchain-osmo.bb | 6 + recipes-osmocom/openbsc/openbsc.inc | 69 +++++++ recipes-osmocom/openbsc/openbsc/osmo-bsc.init | 49 +++++ .../openbsc/openbsc/osmo-bsc_mgcp.init | 49 +++++ .../openbsc/openbsc/osmo-nitb.init | 49 +++++ recipes-osmocom/openbsc/openbsc_git.bb | 9 + recipes-osmocom/openggsn/files/ggsn.conf | 0 recipes-osmocom/openggsn/files/openggsn.init | 169 ++++++++++++++++++ recipes-osmocom/openggsn/openggsn_git.bb | 37 ++++ .../task-core-standalone-osmo-sdk-target.bb | 20 +++ recipes-osmocom/tasks/task-osmocom.bb | 12 ++ recipes-osmocom/tasks/task-sdk-osmo.inc | 10 ++ 40 files changed, 911 insertions(+) create mode 100644 README create mode 100644 recipes-isdn/dahdi-linux/dahdi-linux.inc create mode 100644 recipes-isdn/dahdi-linux/dahdi-linux_2.5.0.1.bb create mode 100644 recipes-isdn/dahdi-tools/dahdi-tools.inc create mode 100644 recipes-isdn/dahdi-tools/dahdi-tools_2.5.0.1.bb create mode 100644 recipes-misc/libdbi/libdbi-drivers.inc create mode 100644 recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb create mode 100644 recipes-misc/libdbi/libdbi.inc create mode 100644 recipes-misc/libdbi/libdbi_0.7.2.bb create mode 100644 recipes-misc/libdbi/libdbi_0.8.3.bb create mode 100644 recipes-misc/ortp/files/0001-fix-unused-variables.patch create mode 100644 recipes-misc/ortp/ortp.inc create mode 100644 recipes-misc/ortp/ortp_0.16.5.bb create mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis.inc create mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb create mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb create mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb create mode 100644 recipes-osmocom/libosmo-sccp/libosmo-sccp.inc create mode 100644 recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb create mode 100644 recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb create mode 100644 recipes-osmocom/libosmocore/libosmocore.inc create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.1.bb create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.10.bb create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.4.bb create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.8.bb create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.9.bb create mode 100644 recipes-osmocom/libosmocore/libosmocore_git.bb create mode 100644 recipes-osmocom/meta/meta-toolchain-osmo.bb create mode 100644 recipes-osmocom/openbsc/openbsc.inc create mode 100755 recipes-osmocom/openbsc/openbsc/osmo-bsc.init create mode 100755 recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init create mode 100755 recipes-osmocom/openbsc/openbsc/osmo-nitb.init create mode 100644 recipes-osmocom/openbsc/openbsc_git.bb create mode 100644 recipes-osmocom/openggsn/files/ggsn.conf create mode 100755 recipes-osmocom/openggsn/files/openggsn.init create mode 100644 recipes-osmocom/openggsn/openggsn_git.bb create mode 100644 recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb create mode 100644 recipes-osmocom/tasks/task-osmocom.bb create mode 100644 recipes-osmocom/tasks/task-sdk-osmo.inc diff --git a/README b/README new file mode 100644 index 0000000000..3caf92bfae --- /dev/null +++ b/README @@ -0,0 +1 @@ +This is a collection of OE recipes for Osmocom and things related to Osmocom diff --git a/recipes-isdn/dahdi-linux/dahdi-linux.inc b/recipes-isdn/dahdi-linux/dahdi-linux.inc new file mode 100644 index 0000000000..ebc2035f28 --- /dev/null +++ b/recipes-isdn/dahdi-linux/dahdi-linux.inc @@ -0,0 +1,76 @@ +DESCRITOPN = "Digium Asterisk Hardware Driver Interface - Linux kernel part" +SECTION = "base" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPL" +RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" +DEPENDS = "virtual/kernel" +RRECOMMENDS_${PN} = "dahdi-firmware" + +# those firmware images are normally downloaded as part of the 'make' +# process of dahdi-linux. In the context of OE, we want to list them +# here so they are part of the 'downloads' directory and thus don't need +# to be downloaded all the time. +FIRMWARE_URI = " \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.8.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.18.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.19.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.22.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR5.6.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR6.12.tar.gz \ +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}" + +INC_PR="r3" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a" + +inherit module + +do_configure() { + # make sure the extracted firmware.bin are where Makefile expects + mv ../dahdi-fw-*.bin ../zaptel-fw-*.bin drivers/dahdi/firmware/ + 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/ +} + +do_compile () { + do_make_scripts + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KSRC=${STAGING_KERNEL_DIR} \ + KVERS=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + ${MAKE_TARGETS} +} + +do_install () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo DESTDIR="${D}" \ + KSRC=${STAGING_KERNEL_DIR} \ + KVERS=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + install +} + +PACKAGES =+ "dahdi-firmware" + +FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" + +FILES_dahdi-firmware = "${base_libdir}/firmware /usr/share/dahdi" +PACKAGE_ARCH_dahdi-firmware = "all" diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.5.0.1.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.5.0.1.bb new file mode 100644 index 0000000000..3d429c7efd --- /dev/null +++ b/recipes-isdn/dahdi-linux/dahdi-linux_2.5.0.1.bb @@ -0,0 +1,5 @@ + +require ${PN}.inc + +PR = "${INC_PR}.1" + diff --git a/recipes-isdn/dahdi-tools/dahdi-tools.inc b/recipes-isdn/dahdi-tools/dahdi-tools.inc new file mode 100644 index 0000000000..2034163cf0 --- /dev/null +++ b/recipes-isdn/dahdi-tools/dahdi-tools.inc @@ -0,0 +1,17 @@ +DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" +DEPENDS = "dahdi-linux libnewt" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPL" + +SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz" + +INC_PR="r2" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ + file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09" + +inherit autotools_stage pkgconfig + +do_configure() { + oe_runconf +} diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.5.0.1.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.5.0.1.bb new file mode 100644 index 0000000000..d1e6987a27 --- /dev/null +++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.5.0.1.bb @@ -0,0 +1,4 @@ +require ${PN}.inc + +PR = "${INC_PR}.1" + diff --git a/recipes-misc/libdbi/libdbi-drivers.inc b/recipes-misc/libdbi/libdbi-drivers.inc new file mode 100644 index 0000000000..76a5702ac8 --- /dev/null +++ b/recipes-misc/libdbi/libdbi-drivers.inc @@ -0,0 +1,32 @@ +# libdbi-drivers OE build file +# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "Database Drivers for libdbi" +HOMEPAGE = "http://libdbi-drivers.sourceforge.net/" +LICENSE = "LGPL" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" +SECTION = "libs" + +PROVIDES = "libdbd-sqlite" +DEPENDS = "libdbi sqlite3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz" + +inherit autotools + +PACKAGES += "libdbd-sqlite3" + +EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \ + --with-dbi-libdir=${STAGING_LIBDIR} \ + --with-sqlite3 \ + --with-sqlite3-incdir=${STAGING_INCDIR} \ + --with-sqlite3-libdir=${STAGING_LIBDIR} \ + --disable-docs" + +FILES_${PN}-dbg += " ${libdir}/dbd/.debug/*.so" +FILES_${PN}-dev += " ${libdir}/dbd/*.la ${libdir}/dbd/*.a" + +DESCRIPTION_libdbd-sqlite3 = "SQLite3 database driver for libdbi" +FILES_libdbd-sqlite3 = "${libdir}/dbd/libdbdsqlite3.so" + diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb new file mode 100644 index 0000000000..796cefb1ae --- /dev/null +++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb @@ -0,0 +1,4 @@ +require ${PN}.inc +LICENSE = "LGPL" + +PR = "r1" diff --git a/recipes-misc/libdbi/libdbi.inc b/recipes-misc/libdbi/libdbi.inc new file mode 100644 index 0000000000..571e55b6fe --- /dev/null +++ b/recipes-misc/libdbi/libdbi.inc @@ -0,0 +1,21 @@ +# libdbi OE build file +# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "Database Independent Abstraction Layer for C" +HOMEPAGE = "http://libdbi.sourceforge.net/" +LICENSE = "LGPL" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" +SECTION = "libs" + +INC_PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi/libdbi-${PV}.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--disable-docs" + +do_configure () { + autotools_do_configure +} diff --git a/recipes-misc/libdbi/libdbi_0.7.2.bb b/recipes-misc/libdbi/libdbi_0.7.2.bb new file mode 100644 index 0000000000..d5803c0ec4 --- /dev/null +++ b/recipes-misc/libdbi/libdbi_0.7.2.bb @@ -0,0 +1,3 @@ +require ${PN}.inc + +PR = "${INC_PR}.0" diff --git a/recipes-misc/libdbi/libdbi_0.8.3.bb b/recipes-misc/libdbi/libdbi_0.8.3.bb new file mode 100644 index 0000000000..d5803c0ec4 --- /dev/null +++ b/recipes-misc/libdbi/libdbi_0.8.3.bb @@ -0,0 +1,3 @@ +require ${PN}.inc + +PR = "${INC_PR}.0" diff --git a/recipes-misc/ortp/files/0001-fix-unused-variables.patch b/recipes-misc/ortp/files/0001-fix-unused-variables.patch new file mode 100644 index 0000000000..a57eaff7ca --- /dev/null +++ b/recipes-misc/ortp/files/0001-fix-unused-variables.patch @@ -0,0 +1,75 @@ +From eb4f54377e2560a76a05f62a22c961edbce8f4c2 Mon Sep 17 00:00:00 2001 +From: Simon Morlat +Date: Tue, 31 May 2011 10:52:49 +0200 +Subject: [PATCH] fix unused variables + +--- + src/stun.c | 10 +++++----- + src/tests/rtprecv.c | 6 +++++- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/src/stun.c b/src/stun.c +index ccac58f..e0d7c80 100644 +--- a/src/stun.c ++++ b/src/stun.c +@@ -1993,7 +1993,6 @@ stunSendTest( Socket myFd, StunAddress4 *dest, + + bool_t changePort=FALSE; + bool_t changeIP=FALSE; +- bool_t discard=FALSE; + + StunMessage req; + char buf[STUN_MAX_MESSAGE_SIZE]; +@@ -2015,9 +2014,10 @@ stunSendTest( Socket myFd, StunAddress4 *dest, + case 4: + changeIP=TRUE; + break; +- case 5: ++ /* case 5: + discard=TRUE; + break; ++ */ + default: + ortp_error("stun: Test %i is unkown\n", testNum); + return ; /* error */ +@@ -2162,7 +2162,7 @@ stunNatType( StunAddress4 *dest, + + bool_t respTestI=FALSE; + bool_t isNat=TRUE; +- StunAddress4 testIchangedAddr; ++ /*StunAddress4 testIchangedAddr;*/ + StunAddress4 testImappedAddr; + bool_t respTestI2=FALSE; + bool_t mappedIpSame = TRUE; +@@ -2345,8 +2345,8 @@ stunNatType( StunAddress4 *dest, + if ( !respTestI ) + { + +- testIchangedAddr.addr = resp.changedAddress.ipv4.addr; +- testIchangedAddr.port = resp.changedAddress.ipv4.port; ++ /*testIchangedAddr.addr = resp.changedAddress.ipv4.addr; ++ testIchangedAddr.port = resp.changedAddress.ipv4.port;*/ + testImappedAddr.addr = resp.mappedAddress.ipv4.addr; + testImappedAddr.port = resp.mappedAddress.ipv4.port; + +diff --git a/src/tests/rtprecv.c b/src/tests/rtprecv.c +index 1861592..5eee649 100644 +--- a/src/tests/rtprecv.c ++++ b/src/tests/rtprecv.c +@@ -163,8 +163,12 @@ int main(int argc, char*argv[]) + /* this is to avoid to write to disk some silence before the first RTP packet is returned*/ + if ((stream_received) && (err>0)) { + size_t ret = fwrite(buffer,1,err,outfile); +- if (sound_fd>0) ++ if (sound_fd>0){ + ret = write(sound_fd,buffer,err); ++ if (ret==-1){ ++ fprintf(stderr,"write to sound card failed (%s)",strerror(errno)); ++ } ++ } + } + } + ts+=160; +-- +1.7.5.4 + diff --git a/recipes-misc/ortp/ortp.inc b/recipes-misc/ortp/ortp.inc new file mode 100644 index 0000000000..ef8bbc06ca --- /dev/null +++ b/recipes-misc/ortp/ortp.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "An LGPL implementation of RTP - RFC3550" +LICENSE = "LGPL" + +INC_PR = "r1" + +inherit autotools pkgconfig + +//SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz" +SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/linphone/${PN}/sources/${P}.tar.gz" + +LICENSE = "LGPL" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +do_compile_append() { + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + ortp.pc + +} + diff --git a/recipes-misc/ortp/ortp_0.16.5.bb b/recipes-misc/ortp/ortp_0.16.5.bb new file mode 100644 index 0000000000..55e945815f --- /dev/null +++ b/recipes-misc/ortp/ortp_0.16.5.bb @@ -0,0 +1,8 @@ +require ortp.inc +DEPENDS = "glib-2.0 " +PR = "${INC_PR}.0" + +SRC_URI += "file://0001-fix-unused-variables.patch;patch=1" + +SRC_URI[md5sum] = "94546901d14b85f97342f4ecf39489b1" +SRC_URI[sha256sum] = "3b655a79f9122afd298e9cd702e542908bbd6ea1337c02553110c57e0b3c5835" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc new file mode 100644 index 0000000000..0632247056 --- /dev/null +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -0,0 +1,13 @@ +DESCRITOPN = "An utility library for Open Source Mobile Communications" +DEPENDS = "libosmocore ortp" +DEPENDS_append_geode = "dahdi-linux" +HOMEPAGE = "http://openbsc.gnumonks.org" +LICENSE = "GPL" + +INC_PR="r2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +inherit autotools_stage pkgconfig + +ALLOW_EMPTY_libosmo-abis = "1" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb new file mode 100644 index 0000000000..362fc85281 --- /dev/null +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "346374a001ba42e8d3612fefd76a061f4d494a34" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +PR = "${INC_PR}.1" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb new file mode 100644 index 0000000000..d2a25b254b --- /dev/null +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "65a50893d5f9577c17dc4485d585c12d349c8e30" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +PR = "${INC_PR}.1" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb new file mode 100644 index 0000000000..74a8481da6 --- /dev/null +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "fe05cf5b3980bf4778a21b3d311a835b7e19a704" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +PR = "${INC_PR}.5" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc new file mode 100644 index 0000000000..6c9d8e21c8 --- /dev/null +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -0,0 +1,12 @@ +DESCRITOPN = "An utility library for Open Source Mobile Communications" +DEPENDS = "libosmocore" +HOMEPAGE = "http://openbsc.gnumonks.org" +LICENSE = "GPL" + +INC_PR="r1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +inherit autotools_stage pkgconfig + +ALLOW_EMPTY_libosmo-sccp = "1" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb new file mode 100644 index 0000000000..342c105342 --- /dev/null +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "8be06bc2885460d6a6ed7c9daa7df8ab8f02a2dc" +SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb new file mode 100644 index 0000000000..328a1709e1 --- /dev/null +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "ef8fc3bf28634d361adeec5490f807efb0ab3341" +SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" +PR = "${INC_PR}.1" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc new file mode 100644 index 0000000000..16b4882357 --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -0,0 +1,10 @@ +DESCRITOPN = "An utility library for Open Source Mobile Communications" +HOMEPAGE = "http://openbsc.gnumonks.org" +LICENSE = "GPL" + +INC_PR="r1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +inherit autotools_stage pkgconfig + diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb new file mode 100644 index 0000000000..8c4dce261a --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "ee50081daa3a80586f3044056517337a8e8fac9f" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb new file mode 100644 index 0000000000..bb16132bed --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "c7ddbe63da535e62f9a10444f8966bf0a6565a74" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.2" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb new file mode 100644 index 0000000000..55b8a1a4a0 --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "7e1a622124a6ca6c98e1f3170bf65649ad4321d9" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb new file mode 100644 index 0000000000..0f145474ea --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "8264e09ca2f3bd93eba5eefa342267f303085629" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb new file mode 100644 index 0000000000..18eb80a52a --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "ee876c91723267d913a12e76f46bd537700ab9e9" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb new file mode 100644 index 0000000000..22aaba5fb1 --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "d61d517a2e35f482519561bd325652ee7144679a" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb new file mode 100644 index 0000000000..f4d414cd06 --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "c7ddbe63da535e62f9a10444f8966bf0a6565a74" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PV = "0.3.10+gitr${SRCPV}" +PR = "1" diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb new file mode 100644 index 0000000000..a8cd442a5c --- /dev/null +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -0,0 +1,6 @@ +#TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg" +TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target" +TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" +TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" +PROVIDES = "meta-toolchain-sdk" +require ../../../meta/recipes-core/meta/meta-toolchain.bb diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc new file mode 100644 index 0000000000..44b093504e --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -0,0 +1,69 @@ +DESCRITOPN = "OpenBSC a Free Software GSM BaseStationController" +DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis openggsn" +HOMEPAGE = "http://openbsc.osmocom.org/" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +RDEPENDS_osmo-nitb = "libdbd-sqlite3" + +SRC_URI = "file://osmo-nitb.init \ + file://osmo-bsc_mgcp.init \ + file://osmo-bsc.init" +INC_PR = "r11" + + +EXTRA_OECONF += " --enable-nat --enable-osmo-bsc " + +inherit autotools update-rc.d + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} + +do_install_append() { + install -d ${D}${sysconfdir}/osmocom + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/rc5.d + install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg + install -m 0660 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/osmo-bsc.cfg + install -m 0660 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg + install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb + install -m 0775 ${WORKDIR}/osmo-bsc_mgcp.init ${D}${sysconfdir}/init.d/osmo-bsc-mgcp + install -m 0775 ${WORKDIR}/osmo-bsc.init ${D}${sysconfdir}/init.d/osmo-bsc + + install -d ${D}/var/lib/osmocom +} + +PACKAGES =+ "osmo-bsc osmo-nitb osmo-gbproxy osmo-gbproxy-dbg osmo-sgsn ipaccess-utils osmo-bsc-mgcp osmo-bsc-nat" + +INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb" + +CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg" +INITSCRIPT_NAME_osmo-bsc = "osmo-bsc" +INITSCRIPT_PARAMS_osmo-bsc = "defaults 30 30" +FILES_osmo-bsc = " ${bindir}/osmo-bsc \ + ${sysconfdir}/osmocom/osmo-bsc.cfg \ + ${sysconfdir}/init.d/osmo-bsc" + +CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" +INITSCRIPT_NAME_osmo-bsc-mgcp = "osmo-bsc-mgcp" +INITSCRIPT_PARAMS_osmo-bsc-mgcp = "defaults 30 30" +FILES_osmo-bsc-mgcp = " ${bindir}/bsc_mgcp \ + ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ + ${sysconfdir}/init.d/osmo-bsc-mgcp" + +CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" +INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" +INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" +FILES_osmo-nitb = " ${bindir}/osmo-nitb \ + /var/lib/osmocom \ + ${sysconfdir}/init.d/osmo-nitb \ + ${sysconfdir}/osmocom/osmo-nitb.cfg" + +FILES_osmo-sgsn = " ${bindir}/osmo-sgsn " +FILES_ipaccess-utils = " ${bindir}/ipaccess-find ${bindir}/ipaccess-config ${bindir}/ipaccess-proxy " +FILES_osmo-bsc-nat = " ${bindir}/osmo-bsc_nat " +FILES_osmo-gbproxy = " ${bindir}/osmo-gbproxy " +FILES_osmo-gbproxy-dbg = " ${bindir}/.debug/osmo-gbproxy " + diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc.init new file mode 100755 index 0000000000..dd0479a77c --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc.init @@ -0,0 +1,49 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: osmo-bsc +# Required-Start: $syslog $networking +# Required-Stop: $syslog +# Default-Start: 5 +# Default-Stop: 1 +# Short-Description: Osmocom GSM Base Station Controller +### END INIT INFO + +DAEMON=/usr/bin/osmo-bsc +NAME=osmo-bsc +DESC="Osmocom GSM Base Station Controller" +NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc.cfg" + +OSMOBTS_EXTRA_ARGS="" +NO_START=1 + +set -e + +test ! -r /etc/default/osmo-bsc || . /etc/default/osmo-bsc +test "$NO_START" = "0" || exit 0 +test -x "$DAEMON" || exit 0 + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon -S \ + -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -K -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon -K -x "$DAEMON" + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init new file mode 100755 index 0000000000..cf9c4516c4 --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init @@ -0,0 +1,49 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: osmo-bsc_mgcp +# Required-Start: $syslog $networking +# Required-Stop: $syslog +# Default-Start: 5 +# Default-Stop: 1 +# Short-Description: Osmocom GSM BSC MGCP proxy +### END INIT INFO + +DAEMON=/usr/bin/bsc_mgcp +NAME=osmo-bsc_mgcp +DESC="Osmocom GSM BSC MGCP proxy" +NORMAL_ARGS="-D -c /etc/osmocom/bsc_mgcp.cfg" + +OSMOBTS_EXTRA_ARGS="" +NO_START=1 + +set -e + +test ! -r /etc/default/osmo-bsc_mgcp || . /etc/default/osmo-bsc_mgcp +test "$NO_START" = "0" || exit 0 +test -x "$DAEMON" || exit 0 + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon -S \ + -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -K -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon -K -x "$DAEMON" + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init new file mode 100755 index 0000000000..86c7f757c9 --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init @@ -0,0 +1,49 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: osmo-nitb +# Required-Start: $syslog $networking +# Required-Stop: $syslog +# Default-Start: 5 +# Default-Stop: 1 +# Short-Description: Osmocom GSM Network in the Box +### END INIT INFO + +DAEMON=/usr/bin/osmo-nitb +NAME=osmo-nitb +DESC="Osmocom GSM Network in the Box" +NORMAL_ARGS="-D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" + +OSMOBTS_EXTRA_ARGS="" +NO_START=1 + +set -e + +test ! -r /etc/default/osmo-nitb || . /etc/default/osmo-nitb +test "$NO_START" = "0" || exit 0 +test -x "$DAEMON" || exit 0 + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon -S \ + -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -K -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon -K -x "$DAEMON" + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb new file mode 100644 index 0000000000..40fd1dcd50 --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -0,0 +1,9 @@ +require ${PN}.inc + +PV = "0.10.0+gitr${SRCPV}" +PR = "${INC_PR}.1" + +SRCREV = "670ffe32900c9932f5fb1f3e836f77145bee94b7" +SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" + +S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/openggsn/files/ggsn.conf b/recipes-osmocom/openggsn/files/ggsn.conf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes-osmocom/openggsn/files/openggsn.init b/recipes-osmocom/openggsn/files/openggsn.init new file mode 100755 index 0000000000..695a6cc930 --- /dev/null +++ b/recipes-osmocom/openggsn/files/openggsn.init @@ -0,0 +1,169 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: openggsn +# Required-Start: $network $local_fs +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Osmocom GSM network-in-a-box +# Description: A minimal implementation of the GSM Base Station Controller, +# Mobile Switching Center, Home Location regster and all other +# components to run a self-contained GSM network. +### END INIT INFO + +# Author: Harald Welte + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="OpenGGSN Gateway GPRS Support Node" +NAME=openggsn +DAEMON=/usr/bin/ggsn +DAEMON_ARGS="" # Arguments to run the daemon with +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +CONFIG_FILE=/etc/ggsn.conf + +# Exit if the package is not installed +[ -x $DAEMON ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +# . /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +# . /lib/lsb/init-functions + +DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE" + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + /sbin/modprobe tun + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + + # Check for runtime directory of nonvolatile data + if [ ! -d /var/lib/ggsn ]; then + mkdir /var/lib/ggsn + fi + + # Check for GTP restart counter + if [ ! -f /var/lib/ggsn/gsn_restart ]; then + echo 0 > /var/lib/ggsn/gsn_restart + fi + + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + #[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + #case "$?" in + # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + # esac + ;; + stop) + #[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + #case "$?" in + # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + #esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + #log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + #case "$?" in + # 0) log_end_msg 0 ;; + # 1) log_end_msg 1 ;; # Old process is still running + # *) log_end_msg 1 ;; # Failed to start + #esac + ;; + *) + # Failed to stop + #log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb new file mode 100644 index 0000000000..8cce5f18e9 --- /dev/null +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -0,0 +1,37 @@ +DESCRITOPN = "OpenGGSN a Free Software GGSN" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +PV = "0.91+gitr${SRCPV}" +PR = "r9" + +SRCREV = "fe5040967513616731d8151b22d26bdf74d65111" +SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \ + file://openggsn.init \ + file://ggsn.conf \ + " +S = "${WORKDIR}/git" + +PACKAGES =+ " libgtp libgtp-dev openggsn-sgsnemu" +RDEPENDS_${PN} += "kernel-module-tun" + +inherit autotools update-rc.d + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 0776 ${WORKDIR}/openggsn.init ${D}${sysconfdir}/init.d/openggsn + install -m 0660 ${WORKDIR}/ggsn.conf ${D}${sysconfdir}/ + + # copy the config? +} + +INITSCRIPT_PACKAGES = "openggsn" + +CONFFILES_openggsn = "${sysconfdir}/ggsn.conf" +INITSCRIPT_NAME_openggsn = "openggsn" +INITSCRIPT_PARAMS_openggsn = "defaults 29 29" +RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade" + +FILES_libgtp = "${libdir}/*${SOLIBS}" +FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a" + +FILES_openggsn-sgsnemu = "${bindir}/sgsnemu" diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb new file mode 100644 index 0000000000..e9f99956e9 --- /dev/null +++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -0,0 +1,20 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +DESCRIPTION = "Software Development Kit for Osmocom devices" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r1" + +ALLOW_EMPTY = "1" + +require task-sdk-osmo.inc + +PACKAGES = "${PN} ${PN}-dbg" + +RDEPENDS_${PN} = "\ + task-core-standalone-sdk-target \ + ${SDK-OSMO} \ + ${SDK-EXTRAS}" diff --git a/recipes-osmocom/tasks/task-osmocom.bb b/recipes-osmocom/tasks/task-osmocom.bb new file mode 100644 index 0000000000..de2efa0948 --- /dev/null +++ b/recipes-osmocom/tasks/task-osmocom.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Task for Osmocom tools and header files" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +DEPENDS = "virtual/kernel" +ALLOW_EMPTY = "1" +PR = "r1" + +RDEPENDS_task-osmocom = "\ + libosmocore \ + " + diff --git a/recipes-osmocom/tasks/task-sdk-osmo.inc b/recipes-osmocom/tasks/task-sdk-osmo.inc new file mode 100644 index 0000000000..45c37c754f --- /dev/null +++ b/recipes-osmocom/tasks/task-sdk-osmo.inc @@ -0,0 +1,10 @@ +SDK-OSMO = " \ + libosmocore-dev \ + libosmo-sccp-dev \ + " + +SDK-EXTRAS ?= "" +#SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev" +#SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev" +#SDK-EXTRAS_qemuppc ?= " lttng-ust-dev" +#SDK-EXTRAS_qemuarm ?= " lttng-ust-dev" From ba3023edbcfb5e2714f460372e8719d19b95ad87 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Nov 2011 21:29:47 +0800 Subject: [PATCH 002/200] ggsn: Remove the empty config file this should come from the machine integration The integrator should install a config as he can decide on the IP addresses and policy to be used. --- recipes-osmocom/openggsn/files/ggsn.conf | 0 recipes-osmocom/openggsn/openggsn_git.bb | 6 +----- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 recipes-osmocom/openggsn/files/ggsn.conf diff --git a/recipes-osmocom/openggsn/files/ggsn.conf b/recipes-osmocom/openggsn/files/ggsn.conf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index 8cce5f18e9..4ab6077459 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -2,12 +2,11 @@ DESCRITOPN = "OpenGGSN a Free Software GGSN" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" -PR = "r9" +PR = "r10" SRCREV = "fe5040967513616731d8151b22d26bdf74d65111" SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \ file://openggsn.init \ - file://ggsn.conf \ " S = "${WORKDIR}/git" @@ -19,9 +18,6 @@ inherit autotools update-rc.d do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0776 ${WORKDIR}/openggsn.init ${D}${sysconfdir}/init.d/openggsn - install -m 0660 ${WORKDIR}/ggsn.conf ${D}${sysconfdir}/ - - # copy the config? } INITSCRIPT_PACKAGES = "openggsn" From f52b4a6ba8a573f2d8bf74884e9f559ab08f06c9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Nov 2011 21:31:43 +0800 Subject: [PATCH 003/200] asterisk: Introduce asterisk recipe for 1.8.7.0 --- recipes-isdn/asterisk/asterisk_1.8.7.0.bb | 86 +++++++++++++++++++++++ recipes-isdn/asterisk/files/asterisk.init | 21 ++++++ recipes-isdn/asterisk/files/modules.conf | 2 + 3 files changed, 109 insertions(+) create mode 100644 recipes-isdn/asterisk/asterisk_1.8.7.0.bb create mode 100755 recipes-isdn/asterisk/files/asterisk.init create mode 100644 recipes-isdn/asterisk/files/modules.conf diff --git a/recipes-isdn/asterisk/asterisk_1.8.7.0.bb b/recipes-isdn/asterisk/asterisk_1.8.7.0.bb new file mode 100644 index 0000000000..e0a4d71401 --- /dev/null +++ b/recipes-isdn/asterisk/asterisk_1.8.7.0.bb @@ -0,0 +1,86 @@ +# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Copyright (C) 2011, sysmocom - systems for mobile communications GmbH +# Released under the MIT license (see packages/COPYING) +DESCRITOPN = "asterisk PBX" +DEPENDS = "openssl ncurses" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3c6764ffcbe996d1d8f919b393ccdd67" + +PR = "r2" + +SRC_URI = "http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${PV}.tar.gz \ + file://modules.conf \ + file://asterisk.init" + +EXTRA_OECONF = " \ + --without-curses \ + --with-sm=internal \ + --without-gtk \ + --without-gtk2 \ + --without-isdnnet \ + --without-kde \ + --without-misdn \ + --without-nbs \ + --with-ncurses \ + --without-netsnmp \ + --without-newt \ + --without-odbc \ + --without-ogg \ + --without-osptk \ + --without-popt \ + --without-pri \ + --without-qt \ + --without-radius \ + --without-sdl \ + --without-spandsp \ + --without-suppserv \ + --without-tds \ + --without-termcap \ + --without-tinfo \ + --without-vorbis \ + --without-vpb \ + --without-postgres \ + --without-openais \ + --without-lua \ + --disable-xmldoc" + +inherit autotools update-rc.d + +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" + +do_configure_prepend() { + # Due to menuselect below we want to save off these configures + mv ${S}/menuselect/configure ${S}/menuselect/configure.SAVE + mv ${S}/menuselect/mxml/configure ${S}/menuselect/mxml/configure.SAVE + mv ${S}/main/editline/configure ${S}/main/editline/configure.SAVE +} + +do_configure_append() { + # Put this back + mv ${S}/menuselect/configure.SAVE ${S}/menuselect/configure + mv ${S}/menuselect/mxml/configure.SAVE ${S}/menuselect/mxml/configure + mv ${S}/main/editline/configure.SAVE ${S}/main/editline/configure +} + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "asterisk" +INITSCRIPT_PARAMS_${PN} = "defaults 29 29" + +CONFFILES_${PN} = "${sysconfdir}/asterisk/extensions.conf \ + ${sysconfdir}/asterisk/modules.conf \ + ${sysconfdir}/asterisk/sip.conf" + +PACKAGES =+ "${PN}-moh" + +DESCRIPTION_${PN}-moh = "Asterisk MusicOnHold sound" +FILES_${PN}-moh = "${localstatedir}/lib/${PN}/moh" + + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/asterisk + + install -m 0775 ${WORKDIR}/asterisk.init ${D}${sysconfdir}/init.d/asterisk + install -m 0660 ${WORKDIR}/modules.conf ${D}${sysconfdir}/asterisk/ +} diff --git a/recipes-isdn/asterisk/files/asterisk.init b/recipes-isdn/asterisk/files/asterisk.init new file mode 100755 index 0000000000..8ef76aa2f6 --- /dev/null +++ b/recipes-isdn/asterisk/files/asterisk.init @@ -0,0 +1,21 @@ +#!/bin/sh + +NAME=asterisk + +set -e + +case "$1" in + start) + /usr/sbin/asterisk + echo "Forked asterisk" + ;; + stop) + echo "Can not stop it" + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 +esac + +exit 0 diff --git a/recipes-isdn/asterisk/files/modules.conf b/recipes-isdn/asterisk/files/modules.conf new file mode 100644 index 0000000000..68db67fbd9 --- /dev/null +++ b/recipes-isdn/asterisk/files/modules.conf @@ -0,0 +1,2 @@ +[modules] +autoload=yes From b49f5121bbcb0f10331e3ca82acfb95c597b4328 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Nov 2011 21:36:15 +0800 Subject: [PATCH 004/200] libgsm: Introduce libgsm-1.0.13 recipe for LCR/mISDN --- .../libgsm/libgsm-1.0.13/01_makefile.patch | 71 ++++++++ .../libgsm/libgsm-1.0.13/02_cplusplus.patch | 25 +++ .../libgsm/libgsm-1.0.13/03_config.patch | 154 ++++++++++++++++++ .../libgsm/libgsm-1.0.13/04_includes.patch | 43 +++++ .../libgsm-1.0.13/05_compiler_warnings.patch | 98 +++++++++++ recipes-isdn/libgsm/libgsm.inc | 34 ++++ recipes-isdn/libgsm/libgsm_1.0.13.bb | 8 + 7 files changed, 433 insertions(+) create mode 100644 recipes-isdn/libgsm/libgsm-1.0.13/01_makefile.patch create mode 100644 recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch create mode 100644 recipes-isdn/libgsm/libgsm-1.0.13/03_config.patch create mode 100644 recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch create mode 100644 recipes-isdn/libgsm/libgsm-1.0.13/05_compiler_warnings.patch create mode 100644 recipes-isdn/libgsm/libgsm.inc create mode 100644 recipes-isdn/libgsm/libgsm_1.0.13.bb diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/01_makefile.patch b/recipes-isdn/libgsm/libgsm-1.0.13/01_makefile.patch new file mode 100644 index 0000000000..947db37bfc --- /dev/null +++ b/recipes-isdn/libgsm/libgsm-1.0.13/01_makefile.patch @@ -0,0 +1,71 @@ +diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile +--- libgsm-1.0.12~/Makefile 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.12/Makefile 2007-11-01 15:43:06.000000000 +0100 +@@ -96,7 +96,7 @@ + # Other tools + + SHELL = /bin/sh +-LN = ln ++LN = ln -s + BASENAME = basename + AR = ar + ARFLAGS = cr +@@ -140,6 +140,7 @@ + # Targets + + LIBGSM = $(LIB)/libgsm.a ++LIBGSMSO= $(LIB)/libgsm.so + + TOAST = $(BIN)/toast + UNTOAST = $(BIN)/untoast +@@ -279,7 +280,7 @@ + + # Target rules + +-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) ++all: $(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) + @-echo $(ROOT): Done. + + tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result +@@ -299,6 +300,11 @@ + + # The basic API: libgsm + ++$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) ++ $(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc $(LDFLAGS) ++ ln -fs libgsm.so.1.0.12 lib/libgsm.so.1 ++ ln -fs libgsm.so.1.0.12 lib/libgsm.so ++ + $(LIBGSM): $(LIB) $(GSM_OBJECTS) + -rm $(RMFLAGS) $(LIBGSM) + $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) +@@ -308,15 +314,15 @@ + # Toast, Untoast and Tcat -- the compress-like frontends to gsm. + + $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) +- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) ++ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) + + $(UNTOAST): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(UNTOAST) +- $(LN) $(TOAST) $(UNTOAST) ++ $(LN) toast $(UNTOAST) + + $(TCAT): $(BIN) $(TOAST) + -rm $(RMFLAGS) $(TCAT) +- $(LN) $(TOAST) $(TCAT) ++ $(LN) toast $(TCAT) + + + # The local bin and lib directories +@@ -426,7 +432,9 @@ + + clean: semi-clean + -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ +- $(TOAST) $(TCAT) $(UNTOAST) \ ++ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.12 \ ++ $(LIB)libgsm.so.1 \ ++ $(TOAST) $(TCAT) $(UNTOAST) \ + $(ROOT)/gsm-1.0.tar.Z + + diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch b/recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch new file mode 100644 index 0000000000..a4bbb40674 --- /dev/null +++ b/recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch @@ -0,0 +1,25 @@ +diff -urNad libgsm-1.0.10~/inc/gsm.h libgsm-1.0.10/inc/gsm.h +--- libgsm-1.0.10~/inc/gsm.h 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/inc/gsm.h 2007-11-01 15:44:52.000000000 +0100 +@@ -54,6 +54,10 @@ + #define GSM_OPT_FRAME_INDEX 5 + #define GSM_OPT_FRAME_CHAIN 6 + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + extern gsm gsm_create GSM_P((void)); + extern void gsm_destroy GSM_P((gsm)); + +@@ -66,6 +70,10 @@ + extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *)); + extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *)); + ++#ifdef __cplusplus ++} ++#endif ++ + #undef GSM_P + + #endif /* GSM_H */ diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/03_config.patch b/recipes-isdn/libgsm/libgsm-1.0.13/03_config.patch new file mode 100644 index 0000000000..dad241e2bd --- /dev/null +++ b/recipes-isdn/libgsm/libgsm-1.0.13/03_config.patch @@ -0,0 +1,154 @@ +diff -urNad libgsm-1.0.10~/Makefile libgsm-1.0.10/Makefile +--- libgsm-1.0.10~/Makefile 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/Makefile 2007-11-01 15:48:02.000000000 +0100 +@@ -151,7 +151,7 @@ + + HEADERS = $(INC)/proto.h \ + $(INC)/unproto.h \ +- $(INC)/config.h \ ++ $(INC)/gsm_config.h \ + $(INC)/private.h \ + $(INC)/gsm.h \ + $(INC)/toast.h \ +diff -urNad libgsm-1.0.10~/inc/config.h libgsm-1.0.10/inc/config.h +--- libgsm-1.0.10~/inc/config.h 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/inc/config.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,37 +0,0 @@ +-/* +- * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische +- * Universitaet Berlin. See the accompanying file "COPYRIGHT" for +- * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. +- */ +- +-/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/ +- +-#ifndef CONFIG_H +-#define CONFIG_H +- +-/*efine SIGHANDLER_T int /* signal handlers are void */ +-/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ +- +-#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ +-#define HAS_LIMITS_H 1 /* /usr/include/limits.h */ +-#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ +-#define HAS_ERRNO_DECL 1 /* errno.h declares errno */ +- +-#define HAS_FSTAT 1 /* fstat syscall */ +-#define HAS_FCHMOD 1 /* fchmod syscall */ +-#define HAS_CHMOD 1 /* chmod syscall */ +-#define HAS_FCHOWN 1 /* fchown syscall */ +-#define HAS_CHOWN 1 /* chown syscall */ +-/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */ +- +-#define HAS_STRING_H 1 /* /usr/include/string.h */ +-/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ +- +-#define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ +-#define HAS_UTIME 1 /* POSIX utime(path, times) */ +-/*efine HAS_UTIMES 1 /* use utimes() syscall instead */ +-#define HAS_UTIME_H 1 /* UTIME header file */ +-#define HAS_UTIMBUF 1 /* struct utimbuf */ +-/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ +- +-#endif /* CONFIG_H */ +diff -urNad libgsm-1.0.10~/inc/gsm_config.h libgsm-1.0.10/inc/gsm_config.h +--- libgsm-1.0.10~/inc/gsm_config.h 1970-01-01 01:00:00.000000000 +0100 ++++ libgsm-1.0.10/inc/gsm_config.h 2007-11-01 15:46:19.000000000 +0100 +@@ -0,0 +1,37 @@ ++/* ++ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische ++ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for ++ * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. ++ */ ++ ++/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/ ++ ++#ifndef CONFIG_H ++#define CONFIG_H ++ ++/*efine SIGHANDLER_T int -* signal handlers are void */ ++/*efine HAS_SYSV_SIGNAL 1 -* sigs not blocked/reset? */ ++ ++#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ ++#define HAS_STDIO_H 1 /* /usr/include/stdio.h */ ++/*efine HAS_LIMITS_H 1 -* /usr/include/limits.h */ ++#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ ++ ++#define HAS_FSTAT 1 /* fstat syscall */ ++#define HAS_FCHMOD 1 /* fchmod syscall */ ++#define HAS_CHMOD 1 /* chmod syscall */ ++#define HAS_FCHOWN 1 /* fchown syscall */ ++#define HAS_CHOWN 1 /* chown syscall */ ++/*efine HAS__FSETMODE 1 -* _fsetmode -- set file mode */ ++ ++#define HAS_STRING_H 1 /* /usr/include/string.h */ ++/*efine HAS_STRINGS_H 1 -* /usr/include/strings.h */ ++ ++#define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ ++#define HAS_UTIME 1 /* POSIX utime(path, times) */ ++/*efine HAS_UTIMES 1 -* use utimes() syscall instead */ ++#define HAS_UTIME_H 1 /* UTIME header file */ ++/*efine HAS_UTIMBUF 1 -* struct utimbuf */ ++/*efine HAS_UTIMEUSEC 1 -* microseconds in utimbuf? */ ++ ++#endif /* CONFIG_H */ +diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h +--- libgsm-1.0.10~/inc/toast.h 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/inc/toast.h 2007-11-01 15:48:17.000000000 +0100 +@@ -9,7 +9,7 @@ + #ifndef TOAST_H + #define TOAST_H /* Guard against multiple includes */ + +-#include "config.h" ++#include "gsm_config.h" + + #include + #include +diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c +--- libgsm-1.0.10~/src/code.c 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/src/code.c 2007-11-01 15:48:34.000000000 +0100 +@@ -6,7 +6,7 @@ + + /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/code.c,v 1.3 1996/07/02 09:59:05 jutta Exp $ */ + +-#include "config.h" ++#include "gsm_config.h" + + + #ifdef HAS_STDLIB_H +diff -urNad libgsm-1.0.10~/src/gsm_create.c libgsm-1.0.10/src/gsm_create.c +--- libgsm-1.0.10~/src/gsm_create.c 1996-07-02 16:32:44.000000000 +0200 ++++ libgsm-1.0.10/src/gsm_create.c 2007-11-01 15:48:48.000000000 +0100 +@@ -6,7 +6,7 @@ + + static char const ident[] = "$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_create.c,v 1.4 1996/07/02 09:59:05 jutta Exp $"; + +-#include "config.h" ++#include "gsm_config.h" + + #ifdef HAS_STRING_H + #include +diff -urNad libgsm-1.0.10~/src/gsm_destroy.c libgsm-1.0.10/src/gsm_destroy.c +--- libgsm-1.0.10~/src/gsm_destroy.c 1996-07-02 16:32:39.000000000 +0200 ++++ libgsm-1.0.10/src/gsm_destroy.c 2007-11-01 15:48:57.000000000 +0100 +@@ -7,7 +7,7 @@ + /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_destroy.c,v 1.3 1994/11/28 19:52:25 jutta Exp $ */ + + #include "gsm.h" +-#include "config.h" ++#include "gsm_config.h" + #include "proto.h" + + #ifdef HAS_STDLIB_H +diff -urNad libgsm-1.0.10~/tls/taste.c libgsm-1.0.10/tls/taste.c +--- libgsm-1.0.10~/tls/taste.c 1996-07-02 16:33:05.000000000 +0200 ++++ libgsm-1.0.10/tls/taste.c 2007-11-01 15:49:54.000000000 +0100 +@@ -10,7 +10,7 @@ + #include + #include + +-#include "config.h" ++#include "gsm_config.h" + + #ifdef HAS_STDLIB_H + # include diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch b/recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch new file mode 100644 index 0000000000..2769b40b05 --- /dev/null +++ b/recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch @@ -0,0 +1,43 @@ +diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h +--- libgsm-1.0.10~/inc/toast.h 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/inc/toast.h 2007-11-01 15:52:33.000000000 +0100 +@@ -16,11 +16,12 @@ + + #include + #include ++#include + #include + + #include +-#ifndef HAS_ERRNO_DECL +- extern int errno; ++#ifndef errno ++ extern int errno; + #endif + + #ifdef HAS_LIMITS_H +@@ -37,6 +38,10 @@ + # endif + #endif + ++#ifdef HAS_STDIO_H ++# include ++#endif ++ + #include "gsm.h" + + #ifndef S_ISREG +diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c +--- libgsm-1.0.10~/src/code.c 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/src/code.c 2007-11-01 15:52:33.000000000 +0100 +@@ -9,8 +9,8 @@ + #include "config.h" + + +-#ifdef HAS_STDLIB_H +-#include ++#ifdef HAS_STRING_H ++#include + #else + # include "proto.h" + extern char * memcpy P((char *, char *, int)); diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/05_compiler_warnings.patch b/recipes-isdn/libgsm/libgsm-1.0.13/05_compiler_warnings.patch new file mode 100644 index 0000000000..c40100c922 --- /dev/null +++ b/recipes-isdn/libgsm/libgsm-1.0.13/05_compiler_warnings.patch @@ -0,0 +1,98 @@ +diff -urNad libgsm-1.0.10~/src/debug.c libgsm-1.0.10/src/debug.c +--- libgsm-1.0.10~/src/debug.c 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/src/debug.c 2007-11-01 15:53:42.000000000 +0100 +@@ -49,7 +49,7 @@ + fprintf( stderr, "%s [%d .. %d]: ", name, from, to ); + while (from <= to) { + +- fprintf(stderr, "%d ", ptr[ from ] ); ++ fprintf(stderr, "%ld ", ptr[ from ] ); + from++; + if (nprinted++ >= 7) { + nprinted = 0; +@@ -63,14 +63,14 @@ + char * name, + longword value ) + { +- fprintf(stderr, "%s: %d\n", name, (long)value ); ++ fprintf(stderr, "%s: %ld\n", name, (long)value ); + } + + void gsm_debug_word P2( (name, value), + char * name, + word value ) + { +- fprintf(stderr, "%s: %d\n", name, (long)value); ++ fprintf(stderr, "%s: %ld\n", name, (long)value); + } + + #endif +diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c +--- libgsm-1.0.10~/src/toast.c 2007-11-01 15:37:52.000000000 +0100 ++++ libgsm-1.0.10/src/toast.c 2007-11-01 15:53:42.000000000 +0100 +@@ -251,8 +251,8 @@ + { + char * s; + if (!(s = malloc(len))) { +- fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n", +- progname, len); ++ fprintf(stderr, "%s: failed to malloc %ld bytes -- abort\n", ++ progname, (long) len); + onintr(); + exit(1); + } +@@ -270,7 +270,7 @@ + maxlen = strlen(name) + 1 + strlen(want) + strlen(cut); + p = strcpy(emalloc(maxlen), name); + +- if (s = suffix(p, cut)) strcpy(s, want); ++ if ((s = suffix(p, cut))) strcpy(s, want); + else if (*want && !suffix(p, want)) strcat(p, want); + + return p; +@@ -386,7 +386,7 @@ + ut[0] = instat.st_atime; + ut[1] = instat.st_mtime; + +- (void) utime(outname, ut); ++ (void) utime(outname, (struct utimbuf *)ut); + + #endif /* UTIMBUF */ + } +@@ -416,7 +416,7 @@ + } + if (st->st_nlink > 1 && !f_cat && !f_precious) { + fprintf(stderr, +- "%s: \"%s\" has %s other link%s -- unchanged.\n", ++ "%s: \"%s\" has %d other link%s -- unchanged.\n", + progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2)); + return 0; + } +@@ -585,8 +585,8 @@ + + if (cc != sizeof(s)) { + if (cc >= 0) fprintf(stderr, +- "%s: incomplete frame (%d byte%s missing) from %s\n", +- progname, sizeof(s) - cc, ++ "%s: incomplete frame (%ld byte%s missing) from %s\n", ++ progname, (long) sizeof(s) - cc, + "s" + (sizeof(s) - cc == 1), + inname ? inname : "stdin" ); + gsm_destroy(r); +@@ -624,8 +624,6 @@ + + static int process P1((name), char * name) + { +- int step = 0; +- + out = (FILE *)0; + in = (FILE *)0; + +@@ -779,7 +777,6 @@ + case 'h': help(); exit(0); + + default: +- usage: + fprintf(stderr, + "Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n", + progname); diff --git a/recipes-isdn/libgsm/libgsm.inc b/recipes-isdn/libgsm/libgsm.inc new file mode 100644 index 0000000000..aa0386c31c --- /dev/null +++ b/recipes-isdn/libgsm/libgsm.inc @@ -0,0 +1,34 @@ +DESCRIPTION = "GSM Audio Library" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "libgsm" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5" + +INC_PR = "r2" + +SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \ + file://01_makefile.patch \ + file://02_cplusplus.patch \ + file://03_config.patch \ + file://04_includes.patch \ + file://05_compiler_warnings.patch \ + " + +CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc" + +PARALLEL_MAKE = "" + +do_compile() { + unset LD + oe_runmake CCFLAGS="${CFLAGS}" +} + +do_install() { + oe_libinstall -a -C lib libgsm ${D}${libdir} + oe_libinstall -so -C lib libgsm ${D}${libdir} + install -d ${D}${includedir}/gsm + install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/ + cd ${D}${includedir} + ln -s gsm/gsm.h gsm.h +} + diff --git a/recipes-isdn/libgsm/libgsm_1.0.13.bb b/recipes-isdn/libgsm/libgsm_1.0.13.bb new file mode 100644 index 0000000000..b26f587578 --- /dev/null +++ b/recipes-isdn/libgsm/libgsm_1.0.13.bb @@ -0,0 +1,8 @@ +require libgsm.inc + +PR = ${INC_PR}.0 + +S = "${WORKDIR}/gsm-1.0-pl13/" + +SRC_URI[md5sum] = "c1ba392ce61dc4aff1c29ea4e92f6df4" +SRC_URI[sha256sum] = "52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad" From 6fe3d672990da107909a20c9870c702b32dc20ce Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Nov 2011 21:37:15 +0800 Subject: [PATCH 005/200] misdn: Build the userspace library Apply a local patch to increase the the buffer size, on different platforms the kernel structs have holes that this calculation did not account for. --- recipes-isdn/misdn/files/misdn-ph-size.diff | 13 +++++++++++++ recipes-isdn/misdn/misdn-utils_git.bb | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 recipes-isdn/misdn/files/misdn-ph-size.diff create mode 100644 recipes-isdn/misdn/misdn-utils_git.bb diff --git a/recipes-isdn/misdn/files/misdn-ph-size.diff b/recipes-isdn/misdn/files/misdn-ph-size.diff new file mode 100644 index 0000000000..98bf866d26 --- /dev/null +++ b/recipes-isdn/misdn/files/misdn-ph-size.diff @@ -0,0 +1,13 @@ +diff --git a/include/mISDN/mbuffer.h b/include/mISDN/mbuffer.h +index 5e3dc96..8e6ed52 100644 +--- a/include/mISDN/mbuffer.h ++++ b/include/mISDN/mbuffer.h +@@ -54,7 +54,7 @@ struct mbuffer { + struct l3_msg l3; + } __attribute__((__may_alias__)); + +-#define MBUFFER_DATA_SIZE 280 ++#define MBUFFER_DATA_SIZE 400 + + /* + * init mbuffer caching diff --git a/recipes-isdn/misdn/misdn-utils_git.bb b/recipes-isdn/misdn/misdn-utils_git.bb new file mode 100644 index 0000000000..7e37837fd5 --- /dev/null +++ b/recipes-isdn/misdn/misdn-utils_git.bb @@ -0,0 +1,18 @@ +DESCRITOPN = "mISDNutils userspace library" +HOMEPAGE = "http://misdn.org" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" +PR = "r3" + +SRC_URI = "git://git.misdn.org/mISDNuser.git \ + file://misdn-ph-size.diff" +SRCREV = "609658c19630c01f82cbfb5687fc70a356fc6db5" +S = "${WORKDIR}/git" + +PACKAGES =+ "misdn-tools-dbg misdn-tools" + +inherit autotools + +FILES_misdn-tools = "${bindir} ${sbindir}" +FILES_misdn-tools-dbg = "${bindir}/.debug ${sbindir}/.debug" +RDEPENDS_misdn-tools-dbg = "${PN}-dbg" From 0b0ef8aae6dc7b065728211771862095ae3cc562 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Nov 2011 21:41:31 +0800 Subject: [PATCH 006/200] lcr: Introduce 1.10 of LCR with a custom start script for it. --- recipes-isdn/lcr/files/gsm-diff.patch | 44 +++++++++++++++++++++++++++ recipes-isdn/lcr/files/lcr.init | 21 +++++++++++++ recipes-isdn/lcr/lcr_git.bb | 41 +++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 recipes-isdn/lcr/files/gsm-diff.patch create mode 100644 recipes-isdn/lcr/files/lcr.init create mode 100644 recipes-isdn/lcr/lcr_git.bb diff --git a/recipes-isdn/lcr/files/gsm-diff.patch b/recipes-isdn/lcr/files/gsm-diff.patch new file mode 100644 index 0000000000..0a84cacdf1 --- /dev/null +++ b/recipes-isdn/lcr/files/gsm-diff.patch @@ -0,0 +1,44 @@ +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am 2011-10-14 00:53:48.245117239 +0800 ++++ git/Makefile.am 2011-10-14 00:53:48.633117240 +0800 +@@ -53,7 +53,7 @@ + + GSM_SOURCE += gsm_audio.c gsm.cpp + +-GSM_LIB += /usr/lib/libgsm.a ++GSM_LIB += -lgsm + + #gsm_audio.po: gsm_audio.c gsm_audio.h + # $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2011-10-14 00:53:48.257117239 +0800 ++++ git/configure.ac 2011-10-14 00:53:48.633117240 +0800 +@@ -178,12 +178,7 @@ + AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes") + + AS_IF([test "x$with_gsm_bs" == xyes -o "x$with_gsm_ms" == xyes], +- [AC_MSG_CHECKING(/usr/include/gsm/gsm.h) +- if test -e /usr/include/gsm/gsm.h; then +- AC_MSG_RESULT(yes) +- else +- AC_MSG_FAILURE([You have enabled GSM, but /usr/include/gsm/gsm.h not found! Please install the lossy GSM codec. Be sure to install it in /usr/ and not in /usr/local/. You will also find a copy on http://www.linux-call-router.de.]) +- fi ++ AC_MSG_RESULT(yes...why not use ac_check_headers...) + ]) + + # check for ss5 +Index: git/gsm_audio.c +=================================================================== +--- git.orig/gsm_audio.c 2011-10-14 00:53:48.000000000 +0800 ++++ git/gsm_audio.c 2011-10-14 00:55:12.929117386 +0800 +@@ -10,7 +10,7 @@ + \*****************************************************************************/ + + extern "C" { +-#include "/usr/include/gsm/gsm.h" ++#include + + + /* create gsm instance */ diff --git a/recipes-isdn/lcr/files/lcr.init b/recipes-isdn/lcr/files/lcr.init new file mode 100644 index 0000000000..f9924c5ebc --- /dev/null +++ b/recipes-isdn/lcr/files/lcr.init @@ -0,0 +1,21 @@ +#!/bin/sh + +NAME=lcr + +set -e + +case "$1" in + start) + /usr/sbin/lcr fork + echo "Forked asterisk" + ;; + stop) + echo "Can not stop it" + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 +esac + +exit 0 diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb new file mode 100644 index 0000000000..de820e6758 --- /dev/null +++ b/recipes-isdn/lcr/lcr_git.bb @@ -0,0 +1,41 @@ +DESCRITOPN = "Linux Call Router" +DEPENDS = "misdn-utils asterisk libgsm" +HOMEPAGE = "http://isdn.eversberg.eu/" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" + +PV = "1.10" +PR = "r10" + +SRCREV = "27ade6eeb9859a0702e77b27ca0abed63d298cda" +SRC_URI = "git://git.misdn.org/lcr.git \ + file://lcr.init \ + file://gsm-diff.patch" +S = "${WORKDIR}/git" + +EXTRA_OECONF = "--with-gsm-bs --with-asterisk" + +RDEPENDS_${PN} += "kernel-module-misdn-l1loop kernel-module-misdn-dsp" + +inherit autotools update-rc.d + +PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \ + ${PN}-tones-en ${PN}-vbox-en " + +FILES_${PN} += "/usr/local ${libdir}/asterisk/modules" +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" +CONFFILES_${PN} = "/usr/local/lcr/interface.conf /usr/local/lcr/routing.conf /usr/local/lcr/options.conf" +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "lcr" +INITSCRIPT_PARAMS_${PN} = "defaults 30 30" + +FILES_${PN}-tones-de = "/usr/local/lcr/tones_german" +FILES_${PN}-tones-en = "/usr/local/lcr/tones_american" +FILES_${PN}-vbox-de = "/usr/local/lcr/vbox_german" +FILES_${PN}-vbox-en = "/usr/local/lcr/vbox_english" + + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 0775 ${WORKDIR}/lcr.init ${D}${sysconfdir}/init.d/lcr +} From 1d9cbe012b089851abfcb4dcd207d4b032de5edc Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Nov 2011 22:15:00 +0800 Subject: [PATCH 007/200] libosmocore: Build the latest git version of libosmocore --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index f4d414cd06..2b6e20bacf 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c7ddbe63da535e62f9a10444f8966bf0a6565a74" +SRCREV = "3ec5047c6be00729f57da23f6d5de6d5a357ec7a" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.3.10+gitr${SRCPV}" PR = "1" From 8083eb0be3221e4849dcc3aca4bc71183def32e4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 14 Nov 2011 20:41:20 +0800 Subject: [PATCH 008/200] openggsn: Remove the ggsn.conf in CONFFILES as the file is not here --- recipes-osmocom/openggsn/openggsn_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index 4ab6077459..0867a14999 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -22,7 +22,6 @@ do_install_append() { INITSCRIPT_PACKAGES = "openggsn" -CONFFILES_openggsn = "${sysconfdir}/ggsn.conf" INITSCRIPT_NAME_openggsn = "openggsn" INITSCRIPT_PARAMS_openggsn = "defaults 29 29" RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade" From 447e9fa77d066266574450a90de7e596b1a71887 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 11 Dec 2011 15:19:18 +0100 Subject: [PATCH 009/200] conf: Introduce the conf/layer.conf to make it work as a layer --- conf/layer.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 conf/layer.conf diff --git a/conf/layer.conf b/conf/layer.conf new file mode 100644 index 0000000000..8162d1a773 --- /dev/null +++ b/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH := "${BBPATH}:${LAYERDIR}" + +# We have a packages directory, add to BBFILES +BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "telephony" +BBFILE_PATTERN_telephony := "^${LAYERDIR}/" +BBFILE_PRIORITY_telephony = "5" + From f75ebc3f4b46f7c0bebdd792f66a98b265148274 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 11 Dec 2011 15:20:51 +0100 Subject: [PATCH 010/200] meta-toolchain-osmo: Include without direct addresssing Use the BBPATH to find the recipe instead of assuming where this layer has been placed. --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index a8cd442a5c..336e95fdaa 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -3,4 +3,4 @@ TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" PROVIDES = "meta-toolchain-sdk" -require ../../../meta/recipes-core/meta/meta-toolchain.bb +require recipes-core/meta/meta-toolchain.bb From 9d9e971a87341c4406378daf2cb66b936bb98edd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 11 Dec 2011 17:36:35 +0100 Subject: [PATCH 011/200] task: Add a task to build everything in this layer Add a task to build test everything that is in this layer. --- recipes-telephony/tasks/task-telephony-all.bb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 recipes-telephony/tasks/task-telephony-all.bb diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb new file mode 100644 index 0000000000..7ee97ff1cd --- /dev/null +++ b/recipes-telephony/tasks/task-telephony-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Task for the meta-telephony layer. This is to build everything" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +ALLOW_EMPTY = "1" +PR = "r1" + +DEPENDS = "\ + libosmo-abis \ + libosmo-sccp \ + libosmocore \ + openbsc \ + task-osmocom \ + openggsn \ + misdn-utils \ + dahdi-linux \ + dahdi-tools \ + lcr \ + asterisk \ + libgsm \ + ortp \ + libdbi \ + libdbi-drivers \ + " + From f58538edcd7e452a48e683a759fe12cf7ff0ec3a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 11 Dec 2011 21:38:31 +0100 Subject: [PATCH 012/200] asterisk: Remove the CONFFILES that are not provided here --- recipes-isdn/asterisk/asterisk_1.8.7.0.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes-isdn/asterisk/asterisk_1.8.7.0.bb b/recipes-isdn/asterisk/asterisk_1.8.7.0.bb index e0a4d71401..72466158e3 100644 --- a/recipes-isdn/asterisk/asterisk_1.8.7.0.bb +++ b/recipes-isdn/asterisk/asterisk_1.8.7.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.asterisk.org" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=3c6764ffcbe996d1d8f919b393ccdd67" -PR = "r2" +PR = "r3" SRC_URI = "http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${PV}.tar.gz \ file://modules.conf \ @@ -67,10 +67,6 @@ INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME_${PN} = "asterisk" INITSCRIPT_PARAMS_${PN} = "defaults 29 29" -CONFFILES_${PN} = "${sysconfdir}/asterisk/extensions.conf \ - ${sysconfdir}/asterisk/modules.conf \ - ${sysconfdir}/asterisk/sip.conf" - PACKAGES =+ "${PN}-moh" DESCRIPTION_${PN}-moh = "Asterisk MusicOnHold sound" From dca725b36807d524ebe8bcff9f9bb6caf63bdb36 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 11 Dec 2011 22:08:19 +0100 Subject: [PATCH 013/200] osmocom: Introduce META_TELEPHONY_OSMO_INC to easily bump version For libosmocore updates we need a nice way to rebuild all libraries using it. This can be done using the META_TELEPHONY_OSMO_INC variable. --- conf/layer.conf | 1 + recipes-osmocom/libosmo-abis/libosmo-abis.inc | 2 +- recipes-osmocom/libosmo-sccp/libosmo-sccp.inc | 2 +- recipes-osmocom/libosmocore/libosmocore.inc | 2 +- recipes-osmocom/openbsc/openbsc.inc | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 8162d1a773..8d40b7bab4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,3 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony := "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" +META_TELEPHONY_OSMO_INC = "1" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index 0632247056..acfe526958 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -4,7 +4,7 @@ DEPENDS_append_geode = "dahdi-linux" HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPL" -INC_PR="r2" +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 6c9d8e21c8..0a8e6633e9 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,7 +3,7 @@ DEPENDS = "libosmocore" HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPL" -INC_PR="r1" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 16b4882357..6e091efbf1 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -2,7 +2,7 @@ DESCRITOPN = "An utility library for Open Source Mobile Communications" HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPL" -INC_PR="r1" +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 44b093504e..4fbb14b8b7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -9,7 +9,7 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc_mgcp.init \ file://osmo-bsc.init" -INC_PR = "r11" +INC_PR = "r11.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc " From 183d75b24d7fe7744b7ccdc1c62fef45f1852e40 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 11 Dec 2011 23:12:26 +0100 Subject: [PATCH 014/200] libosmocore: Add version 0.4.1 of libosmocore, force re-build --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_0.4.1.bb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.4.1.bb diff --git a/conf/layer.conf b/conf/layer.conf index 8d40b7bab4..5679e7ea9a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony := "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "1" +META_TELEPHONY_OSMO_INC = "3" diff --git a/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb b/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb new file mode 100644 index 0000000000..2541c0d568 --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "72bd4eb3b9e674d771d911e27cacb45468d51487" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} From 8946d523ed60b9fb703cef7c45afefb3fb9d331a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 11 Jan 2012 20:44:34 +0800 Subject: [PATCH 015/200] libosmocore: Update the git recipe to include latest LAPD fix --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 5679e7ea9a..0ddda0d069 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony := "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "3" +META_TELEPHONY_OSMO_INC = "4" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 2b6e20bacf..41fae845bf 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3ec5047c6be00729f57da23f6d5de6d5a357ec7a" +SRCREV = "301f01e938e72423079afe1a1836937053481fd6" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.3.10+gitr${SRCPV}" +PV = "0.4.1+gitr${SRCPV}" PR = "1" From c2d998c9b4719de43c41d226282f22909663617a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jan 2012 16:06:09 +0800 Subject: [PATCH 016/200] mISDN: Upgrade the mISDNuser library to post 2.0.5 --- recipes-isdn/misdn/misdn-utils_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-isdn/misdn/misdn-utils_git.bb b/recipes-isdn/misdn/misdn-utils_git.bb index 7e37837fd5..261bbed442 100644 --- a/recipes-isdn/misdn/misdn-utils_git.bb +++ b/recipes-isdn/misdn/misdn-utils_git.bb @@ -2,11 +2,11 @@ DESCRITOPN = "mISDNutils userspace library" HOMEPAGE = "http://misdn.org" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -PR = "r3" +PR = "r4" -SRC_URI = "git://git.misdn.org/mISDNuser.git \ +SRC_URI = "git://git.misdn.eu/mISDNuser.git \ file://misdn-ph-size.diff" -SRCREV = "609658c19630c01f82cbfb5687fc70a356fc6db5" +SRCREV = "fd246f6bbbf2f4692f507018bcd1a526fab16499" S = "${WORKDIR}/git" PACKAGES =+ "misdn-tools-dbg misdn-tools" From 956671540540dcc1993782aa52f5a75017c95a00 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jan 2012 16:07:56 +0800 Subject: [PATCH 017/200] asterisk: Upgrade from version 1.8.7.0 to 1.8.8.1 Move along the stable track. --- .../asterisk/{asterisk_1.8.7.0.bb => asterisk_1.8.8.1.bb} | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) rename recipes-isdn/asterisk/{asterisk_1.8.7.0.bb => asterisk_1.8.8.1.bb} (93%) diff --git a/recipes-isdn/asterisk/asterisk_1.8.7.0.bb b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb similarity index 93% rename from recipes-isdn/asterisk/asterisk_1.8.7.0.bb rename to recipes-isdn/asterisk/asterisk_1.8.8.1.bb index 72466158e3..869de251c6 100644 --- a/recipes-isdn/asterisk/asterisk_1.8.7.0.bb +++ b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb @@ -11,7 +11,11 @@ PR = "r3" SRC_URI = "http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${PV}.tar.gz \ file://modules.conf \ - file://asterisk.init" + file://asterisk.init " + +SRC_URI[md5sum] = "783b2da2036745edeea8885c62bbc8bf" +SRC_URI[sha256sum] = "ed98204f6261e1362c673e595823c668ae39b9833daec9127a4936cf9f4890e1" + EXTRA_OECONF = " \ --without-curses \ From e77df798a7b091d7157a57e19a0ed3469f22e022 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jan 2012 16:08:45 +0800 Subject: [PATCH 018/200] asterisk: Band aid for a crash on RTP RTCP message This might be a general TLS issue with Asterisk on ARM. I have not looked into why this is happening. Create a band-aid. Crash: (gdb) bt it crashed when formating/printing the &addr in the rtcp recv method ... RTCP: Packet generated from Ekiga 3.2.7 (Debian Unstable). Cause: Not very clear, maybe something with TLS handling of asterisk --- recipes-isdn/asterisk/asterisk_1.8.8.1.bb | 7 ++++--- recipes-isdn/asterisk/files/stop-crash.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 recipes-isdn/asterisk/files/stop-crash.patch diff --git a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb index 869de251c6..f31ae33f43 100644 --- a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb +++ b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb @@ -1,5 +1,5 @@ # Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved -# Copyright (C) 2011, sysmocom - systems for mobile communications GmbH +# Copyright (C) 2011-2012, sysmocom - systems for mobile communications GmbH # Released under the MIT license (see packages/COPYING) DESCRITOPN = "asterisk PBX" DEPENDS = "openssl ncurses" @@ -7,11 +7,12 @@ HOMEPAGE = "http://www.asterisk.org" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=3c6764ffcbe996d1d8f919b393ccdd67" -PR = "r3" +PR = "r4" SRC_URI = "http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${PV}.tar.gz \ file://modules.conf \ - file://asterisk.init " + file://asterisk.init \ + file://stop-crash.patch " SRC_URI[md5sum] = "783b2da2036745edeea8885c62bbc8bf" SRC_URI[sha256sum] = "ed98204f6261e1362c673e595823c668ae39b9833daec9127a4936cf9f4890e1" diff --git a/recipes-isdn/asterisk/files/stop-crash.patch b/recipes-isdn/asterisk/files/stop-crash.patch new file mode 100644 index 0000000000..3fe0d5e4a9 --- /dev/null +++ b/recipes-isdn/asterisk/files/stop-crash.patch @@ -0,0 +1,13 @@ +Index: asterisk-1.8.8.1/res/res_rtp_asterisk.c +=================================================================== +--- asterisk-1.8.8.1.orig/res/res_rtp_asterisk.c 2011-09-20 08:56:20.000000000 +0800 ++++ asterisk-1.8.8.1/res/res_rtp_asterisk.c 2012-01-16 02:45:57.227713136 +0800 +@@ -1902,7 +1902,7 @@ + "IAJitter: %u\r\n" + "LastSR: %lu.%010lu\r\n" + "DLSR: %4.4f(sec)\r\n", +- ast_sockaddr_stringify(&addr), ++ "NA" /*ast_sockaddr_stringify(&addr)*/, + pt, (pt == 200) ? "Sender Report" : (pt == 201) ? "Receiver Report" : (pt == 192) ? "H.261 FUR" : "Unknown", + rc, + rtcpheader[i + 1], From 8f3955af2047f4215f43f02009b0006a370b1711 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jan 2012 16:11:55 +0800 Subject: [PATCH 019/200] lcr: Upgrade to post 1.10 and build from my personal branch Update to 1.10 to work with newer osmo-nitb, including the version handshake that was introduced. --- recipes-isdn/lcr/files/gsm-diff.patch | 44 --------------------------- recipes-isdn/lcr/lcr_git.bb | 11 +++---- 2 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 recipes-isdn/lcr/files/gsm-diff.patch diff --git a/recipes-isdn/lcr/files/gsm-diff.patch b/recipes-isdn/lcr/files/gsm-diff.patch deleted file mode 100644 index 0a84cacdf1..0000000000 --- a/recipes-isdn/lcr/files/gsm-diff.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: git/Makefile.am -=================================================================== ---- git.orig/Makefile.am 2011-10-14 00:53:48.245117239 +0800 -+++ git/Makefile.am 2011-10-14 00:53:48.633117240 +0800 -@@ -53,7 +53,7 @@ - - GSM_SOURCE += gsm_audio.c gsm.cpp - --GSM_LIB += /usr/lib/libgsm.a -+GSM_LIB += -lgsm - - #gsm_audio.po: gsm_audio.c gsm_audio.h - # $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2011-10-14 00:53:48.257117239 +0800 -+++ git/configure.ac 2011-10-14 00:53:48.633117240 +0800 -@@ -178,12 +178,7 @@ - AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes") - - AS_IF([test "x$with_gsm_bs" == xyes -o "x$with_gsm_ms" == xyes], -- [AC_MSG_CHECKING(/usr/include/gsm/gsm.h) -- if test -e /usr/include/gsm/gsm.h; then -- AC_MSG_RESULT(yes) -- else -- AC_MSG_FAILURE([You have enabled GSM, but /usr/include/gsm/gsm.h not found! Please install the lossy GSM codec. Be sure to install it in /usr/ and not in /usr/local/. You will also find a copy on http://www.linux-call-router.de.]) -- fi -+ AC_MSG_RESULT(yes...why not use ac_check_headers...) - ]) - - # check for ss5 -Index: git/gsm_audio.c -=================================================================== ---- git.orig/gsm_audio.c 2011-10-14 00:53:48.000000000 +0800 -+++ git/gsm_audio.c 2011-10-14 00:55:12.929117386 +0800 -@@ -10,7 +10,7 @@ - \*****************************************************************************/ - - extern "C" { --#include "/usr/include/gsm/gsm.h" -+#include - - - /* create gsm instance */ diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index de820e6758..962c1be564 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -4,13 +4,12 @@ HOMEPAGE = "http://isdn.eversberg.eu/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" -PV = "1.10" -PR = "r10" +PV = "1.10+gitr${SRCPV}" +PR = "r14" -SRCREV = "27ade6eeb9859a0702e77b27ca0abed63d298cda" -SRC_URI = "git://git.misdn.org/lcr.git \ - file://lcr.init \ - file://gsm-diff.patch" +SRCREV = "cd2834a10ceb14f8d2e70334a89b531119b954d4" +SRC_URI = "git://git.misdn.eu/lcr.git \ + file://lcr.init " S = "${WORKDIR}/git" EXTRA_OECONF = "--with-gsm-bs --with-asterisk" From 6e64338f29150d39cd63cd1ac3c1db88a8da7b64 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jan 2012 16:13:42 +0800 Subject: [PATCH 020/200] libosmo-abis: Add recipe for upstream version 0.1.1 --- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb new file mode 100644 index 0000000000..358f1fbfc4 --- /dev/null +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "55467f0478e37b35cceec3051c645b8a407110bc" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} From 73bcd9a75c5e87dae6eec832057d42e93ab98d2e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jan 2012 16:14:43 +0800 Subject: [PATCH 021/200] libosmocore: Upgrade git to after the 0.4.1 release In this git version LAPDm is fixed in a way that it is working for the osmo-bts again. --- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 41fae845bf..d3428ece2c 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "301f01e938e72423079afe1a1836937053481fd6" +SRCREV = "3a5f08c221b32381623e50095de2751183e994c4" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.4.1+gitr${SRCPV}" -PR = "1" +PR = "0" From 23dbc00a4e8ccf92fef6ccb4bdcc23b2ae3c1303 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jan 2012 16:16:08 +0800 Subject: [PATCH 022/200] openbsc: Upgrade git version to track 0.10.1+ --- recipes-osmocom/openbsc/openbsc_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 40fd1dcd50..2c9bf0e934 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc -PV = "0.10.0+gitr${SRCPV}" +PV = "0.10.1+gitr${SRCPV}" PR = "${INC_PR}.1" -SRCREV = "670ffe32900c9932f5fb1f3e836f77145bee94b7" +SRCREV = "aa433d2d8418b73760fd1f9db1c9e84a05fe3551" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 75abc06f34752baf7001fb712be82466027fafe7 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 23 Jan 2012 02:25:15 +0800 Subject: [PATCH 023/200] lcr: Remove not installed files from the CONFFILES --- recipes-isdn/lcr/lcr_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 962c1be564..3f8d904cb4 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" PV = "1.10+gitr${SRCPV}" -PR = "r14" +PR = "r15" SRCREV = "cd2834a10ceb14f8d2e70334a89b531119b954d4" SRC_URI = "git://git.misdn.eu/lcr.git \ @@ -23,7 +23,7 @@ PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \ FILES_${PN} += "/usr/local ${libdir}/asterisk/modules" FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" -CONFFILES_${PN} = "/usr/local/lcr/interface.conf /usr/local/lcr/routing.conf /usr/local/lcr/options.conf" +CONFFILES_${PN} = "/usr/local/lcr/options.conf" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME_${PN} = "lcr" INITSCRIPT_PARAMS_${PN} = "defaults 30 30" From a56c10d89a4a8552f4326a693763e663da307930 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 23 Jan 2012 02:32:32 +0800 Subject: [PATCH 024/200] lcr: Clean out the default config files --- recipes-isdn/lcr/lcr_git.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 3f8d904cb4..60089bd600 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" PV = "1.10+gitr${SRCPV}" -PR = "r15" +PR = "r16" SRCREV = "cd2834a10ceb14f8d2e70334a89b531119b954d4" SRC_URI = "git://git.misdn.eu/lcr.git \ @@ -37,4 +37,7 @@ FILES_${PN}-vbox-en = "/usr/local/lcr/vbox_english" do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0775 ${WORKDIR}/lcr.init ${D}${sysconfdir}/init.d/lcr + + rm ${D}/usr/local/lcr/routing.conf + rm ${D}/usr/local/lcr/interface.conf } From 904300e21a57f3736503474ed2f63e01ec9ff677 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 16 Feb 2012 03:44:32 +0800 Subject: [PATCH 025/200] openggsn_git: Upgrade to the latest git revision This version includes a libgtp.pc that is required to compile the osmo-sgsn. --- recipes-osmocom/openggsn/openggsn_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index 0867a14999..9b15d9f731 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" PR = "r10" -SRCREV = "fe5040967513616731d8151b22d26bdf74d65111" +SRCREV = "95848bafcef145d776d70a73f7bdc3fe37e85724" SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \ file://openggsn.init \ " From e08238ed3d04ae10d88d5d12cf864914fc1e31e2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 5 Mar 2012 02:44:24 +0800 Subject: [PATCH 026/200] osmocom-tcpdump: Add a tcpdump wrapper that logs to finite space tcpdump can create a new log file every couple of bytes, it can also be asked to limit the number of logfiles and wraps the counter back to zero, and at least tcpdump 4.1 can also compress the log file with an external script. Create a start script around this feature to log to a given directory but not use more space than allowed to. The script was created by Jan Luebbe and then modified. --- .../osmocom-tcpdump/files/osmocom-tcpdump | 111 ++++++++++++++++++ .../osmocom-tcpdump/files/tcpdump-compress | 4 + .../osmocom-tcpdump/osmocom-tcpdump_1.0.bb | 25 ++++ 3 files changed, 140 insertions(+) create mode 100755 recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump create mode 100755 recipes-osmocom/osmocom-tcpdump/files/tcpdump-compress create mode 100644 recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb diff --git a/recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump b/recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump new file mode 100755 index 0000000000..5886c29c69 --- /dev/null +++ b/recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump @@ -0,0 +1,111 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: on-waves-capture +# Required-Start: $remote_fs $network +# Should-Start: udev +# Required-Stop: $remote_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Osmocom traffic capture" +NAME="tcpdump" +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/osmocom-tcpdump-$NAME.pid +SCRIPTNAME=/etc/init.d/osmocom-tcpdump + + +CAPTURE_ENABLED="0" +CAPTURE_LIMIT="8" +CAPTURE_SIZE="1" +CAPTURE_BASENAME="/tmp/tcpdump-capture-" +CAPTURE_COMPRESS="-z /usr/sbin/tcpdump-compress" + +if [ -e /etc/default/osmocom-tcpdump ]; then + . /etc/default/osmocom-tcpdump +fi + + +CAPTURE_OPTIONS="-pi $CAPTURE_DEVICE -s0 -w $CAPTURE_BASENAME -C $CAPTURE_SIZE -W $CAPTURE_LIMIT $CAPTURE_COMPRESS" + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + if [ -z "$CAPTURE_DEVICE" -o -z "$CAPTURE_FILTER" ]; then + echo "Unable to start $DESC" "$NAME" "(unconfigured)" + exit 2 + fi + if [ "$CAPTURE_ENABLED" != "1" ]; then + echo "Not starting $DESC" "$NAME" "(disabled)" + exit 0 + fi + #start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + # || return 1 + echo "Starting $DESC" "$NAME" + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \ + --background --make-pidfile -- $CAPTURE_OPTIONS $CAPTURE_FILTER \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + echo "Stopping $DESC" "$NAME" + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + do_start + exit $? + ;; + stop) + do_stop + exit $? + ;; + restart) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + do_stop + case "$?" in + 0|1) + do_start + exit $? + ;; + *) + # Failed to stop + exit 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2 + exit 3 + ;; +esac + +: diff --git a/recipes-osmocom/osmocom-tcpdump/files/tcpdump-compress b/recipes-osmocom/osmocom-tcpdump/files/tcpdump-compress new file mode 100755 index 0000000000..0a55605a5a --- /dev/null +++ b/recipes-osmocom/osmocom-tcpdump/files/tcpdump-compress @@ -0,0 +1,4 @@ +#!/bin/bash + +rm -f $1.pcap.gz || true +gzip -c $1 > $1.pcap.gz && rm -f $1 || true diff --git a/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb new file mode 100644 index 0000000000..b86c8e35e7 --- /dev/null +++ b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Osmocom round-robin tcpdump/capture" +LICENSE = "GPLv3+" +RDEPENDS = "tcpdump bash" +PR = "r10" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +SRC_URI = " \ + file://osmocom-tcpdump \ + file://tcpdump-compress \ +" + +do_install () { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default + install -d ${D}${sbindir} + + install -m 0755 ${WORKDIR}/osmocom-tcpdump ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/tcpdump-compress ${D}${sbindir}/ +} + +inherit update-rc.d + +INITSCRIPT_NAME = "osmocom-tcpdump" +INITSCRIPT_PARAMS = "defaults 21" From aeca0842f34c0d3b2d93ea833dbf90c95dd09e1e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 6 Apr 2012 21:00:44 +0800 Subject: [PATCH 027/200] osmocom-tcpdump: Correct the provides name in the start script --- recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump b/recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump index 5886c29c69..71478c9155 100755 --- a/recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump +++ b/recipes-osmocom/osmocom-tcpdump/files/osmocom-tcpdump @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: on-waves-capture +# Provides: osmocom-tcpdump # Required-Start: $remote_fs $network # Should-Start: udev # Required-Stop: $remote_fs $network From 9d939cbe6c55a1e928195ac533caf8ff516af03b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 7 Apr 2012 21:57:42 +0800 Subject: [PATCH 028/200] ortp: Move back to the savannah infrastructure mirror.its.uidaho.edu is not reachable anymore and savannah appears to be working again. --- recipes-misc/ortp/ortp.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-misc/ortp/ortp.inc b/recipes-misc/ortp/ortp.inc index ef8bbc06ca..3e77a0e928 100644 --- a/recipes-misc/ortp/ortp.inc +++ b/recipes-misc/ortp/ortp.inc @@ -5,8 +5,7 @@ INC_PR = "r1" inherit autotools pkgconfig -//SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz" -SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/linphone/${PN}/sources/${P}.tar.gz" +SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz" LICENSE = "LGPL" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" From fab01cc65755bf5d14a7e230d15e75e9405e66e9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 13 Apr 2012 03:21:01 +0800 Subject: [PATCH 029/200] osmocom: Upgrade libosmocore and openbsc to newer versions Build newer versions of libosmocore and openbsc. --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index d3428ece2c..e85f3e65c4 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3a5f08c221b32381623e50095de2751183e994c4" +SRCREV = "df90aedcc72e40bac9e87618dd9437e1e9b6d12a" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.4.1+gitr${SRCPV}" PR = "0" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 2c9bf0e934..f0c77df15b 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.10.1+gitr${SRCPV}" PR = "${INC_PR}.1" -SRCREV = "aa433d2d8418b73760fd1f9db1c9e84a05fe3551" +SRCREV = "09db1a44bc56e81780954555acfbc1bf2fb7cc81" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From e005f8d60e6c3319a9829ec7829a7c98c0a0d657 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 14 Apr 2012 19:39:29 +0800 Subject: [PATCH 030/200] openbsc: Fix the name of the MGCP MGW start script The binary was renamed in the master branch, catch up. --- recipes-osmocom/openbsc/openbsc.inc | 4 ++-- recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 4fbb14b8b7..f60da86cdc 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -9,7 +9,7 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc_mgcp.init \ file://osmo-bsc.init" -INC_PR = "r11.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r12.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc " @@ -49,7 +49,7 @@ FILES_osmo-bsc = " ${bindir}/osmo-bsc \ CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" INITSCRIPT_NAME_osmo-bsc-mgcp = "osmo-bsc-mgcp" INITSCRIPT_PARAMS_osmo-bsc-mgcp = "defaults 30 30" -FILES_osmo-bsc-mgcp = " ${bindir}/bsc_mgcp \ +FILES_osmo-bsc-mgcp = " ${bindir}/osmo-bsc_mgcp \ ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ ${sysconfdir}/init.d/osmo-bsc-mgcp" diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init index cf9c4516c4..bfddac962a 100755 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init +++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init @@ -8,7 +8,7 @@ # Short-Description: Osmocom GSM BSC MGCP proxy ### END INIT INFO -DAEMON=/usr/bin/bsc_mgcp +DAEMON=/usr/bin/osmo-bsc_mgcp NAME=osmo-bsc_mgcp DESC="Osmocom GSM BSC MGCP proxy" NORMAL_ARGS="-D -c /etc/osmocom/bsc_mgcp.cfg" From 96a864f527fb4e1cbcc6054ae4cca3556fa03091 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 28 Apr 2012 22:38:54 +0800 Subject: [PATCH 031/200] libosmocore: Upgrade to get GSM_LCHAN_PDTCH --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index e85f3e65c4..cbe4295253 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "df90aedcc72e40bac9e87618dd9437e1e9b6d12a" +SRCREV = "81cd54a0c36cd9cf2bedd97221658a276aa2d84c" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.4.1+gitr${SRCPV}" PR = "0" From d24c97d308fb5fb9b75c359085ad9803d0311eb4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 30 May 2012 17:50:06 +0800 Subject: [PATCH 032/200] osmocom: Fix the license of the libraries GPL is too unspecific, point to the right versions --- recipes-osmocom/libosmo-abis/libosmo-abis.inc | 2 +- recipes-osmocom/libosmo-sccp/libosmo-sccp.inc | 2 +- recipes-osmocom/libosmocore/libosmocore.inc | 2 +- recipes-osmocom/openbsc/openbsc.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index acfe526958..ddc1275c0b 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -2,7 +2,7 @@ DESCRITOPN = "An utility library for Open Source Mobile Communications" DEPENDS = "libosmocore ortp" DEPENDS_append_geode = "dahdi-linux" HOMEPAGE = "http://openbsc.gnumonks.org" -LICENSE = "GPL" +LICENSE = "AGPLv3" INC_PR="r2.${META_TELEPHONY_OSMO_INC}" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 0a8e6633e9..0b4ae81870 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -1,7 +1,7 @@ DESCRITOPN = "An utility library for Open Source Mobile Communications" DEPENDS = "libosmocore" HOMEPAGE = "http://openbsc.gnumonks.org" -LICENSE = "GPL" +LICENSE = "AGPLv3" INC_PR="r1.${META_TELEPHONY_OSMO_INC}" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 6e091efbf1..c0dba30f28 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -1,6 +1,6 @@ DESCRITOPN = "An utility library for Open Source Mobile Communications" HOMEPAGE = "http://openbsc.gnumonks.org" -LICENSE = "GPL" +LICENSE = "GPLv2+" INC_PR="r1.${META_TELEPHONY_OSMO_INC}" diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index f60da86cdc..1f71e4d6d8 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,7 +1,7 @@ DESCRITOPN = "OpenBSC a Free Software GSM BaseStationController" DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis openggsn" HOMEPAGE = "http://openbsc.osmocom.org/" -LICENSE = "AGPLv3" +LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" RDEPENDS_osmo-nitb = "libdbd-sqlite3" From 5a11d46c4ef33f7a8010bb8b5fc01d30661e81fe Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 30 May 2012 19:17:49 +0800 Subject: [PATCH 033/200] libdbi: Be more precise about the license of libdbi and libdbi-drivers --- recipes-misc/libdbi/libdbi-drivers.inc | 2 +- recipes-misc/libdbi/libdbi.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-misc/libdbi/libdbi-drivers.inc b/recipes-misc/libdbi/libdbi-drivers.inc index 76a5702ac8..555a6b697a 100644 --- a/recipes-misc/libdbi/libdbi-drivers.inc +++ b/recipes-misc/libdbi/libdbi-drivers.inc @@ -4,7 +4,7 @@ DESCRIPTION = "Database Drivers for libdbi" HOMEPAGE = "http://libdbi-drivers.sourceforge.net/" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SECTION = "libs" diff --git a/recipes-misc/libdbi/libdbi.inc b/recipes-misc/libdbi/libdbi.inc index 571e55b6fe..e77a5eec3c 100644 --- a/recipes-misc/libdbi/libdbi.inc +++ b/recipes-misc/libdbi/libdbi.inc @@ -4,7 +4,7 @@ DESCRIPTION = "Database Independent Abstraction Layer for C" HOMEPAGE = "http://libdbi.sourceforge.net/" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SECTION = "libs" From 8caa70df0a437f08c9d2f84e97345cfe6d1745af Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 30 May 2012 19:19:10 +0800 Subject: [PATCH 034/200] ortp: Be more specific about the version of the LGPL --- recipes-misc/ortp/ortp.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-misc/ortp/ortp.inc b/recipes-misc/ortp/ortp.inc index 3e77a0e928..2e75bcdc0d 100644 --- a/recipes-misc/ortp/ortp.inc +++ b/recipes-misc/ortp/ortp.inc @@ -1,5 +1,5 @@ DESCRIPTION = "An LGPL implementation of RTP - RFC3550" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1+" INC_PR = "r1" @@ -7,7 +7,6 @@ inherit autotools pkgconfig SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/${PN}/sources/${P}.tar.gz" -LICENSE = "LGPL" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" do_compile_append() { From 39b09a8849d4dec82f1cf4694da4afba5a840536 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 30 May 2012 19:21:39 +0800 Subject: [PATCH 035/200] dahdi: Be more specific about the version of GPL. --- recipes-isdn/dahdi-linux/dahdi-linux.inc | 2 +- recipes-isdn/dahdi-tools/dahdi-tools.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-isdn/dahdi-linux/dahdi-linux.inc b/recipes-isdn/dahdi-linux/dahdi-linux.inc index ebc2035f28..506c4f9a66 100644 --- a/recipes-isdn/dahdi-linux/dahdi-linux.inc +++ b/recipes-isdn/dahdi-linux/dahdi-linux.inc @@ -1,7 +1,7 @@ DESCRITOPN = "Digium Asterisk Hardware Driver Interface - Linux kernel part" SECTION = "base" HOMEPAGE = "http://www.asterisk.org" -LICENSE = "GPL" +LICENSE = "GPLv2" RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" RRECOMMENDS_${PN} = "dahdi-firmware" diff --git a/recipes-isdn/dahdi-tools/dahdi-tools.inc b/recipes-isdn/dahdi-tools/dahdi-tools.inc index 2034163cf0..6d0f462ddc 100644 --- a/recipes-isdn/dahdi-tools/dahdi-tools.inc +++ b/recipes-isdn/dahdi-tools/dahdi-tools.inc @@ -1,7 +1,7 @@ DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" DEPENDS = "dahdi-linux libnewt" HOMEPAGE = "http://www.asterisk.org" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz" From 1e224b39ae241636eb01e9c9ea41520d67ba376c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 30 May 2012 19:23:22 +0800 Subject: [PATCH 036/200] libdbi-drivers: Remove redundant LICENSE assignment --- recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb index 796cefb1ae..a4897d0190 100644 --- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb +++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb @@ -1,4 +1,3 @@ require ${PN}.inc -LICENSE = "LGPL" PR = "r1" From 242922ceaefc6d09daa3f5217761dc8594306fcd Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 31 May 2012 17:46:54 +0200 Subject: [PATCH 037/200] SDK: make sure to include libosmo-abis, libdbi and libgtp headers This enables the SDK to do a full openbsc build. --- recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb | 2 +- recipes-osmocom/tasks/task-sdk-osmo.inc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb index e9f99956e9..b591b66ae0 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Software Development Kit for Osmocom devices" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r1" +PR = "r2" ALLOW_EMPTY = "1" diff --git a/recipes-osmocom/tasks/task-sdk-osmo.inc b/recipes-osmocom/tasks/task-sdk-osmo.inc index 45c37c754f..0eac22ad58 100644 --- a/recipes-osmocom/tasks/task-sdk-osmo.inc +++ b/recipes-osmocom/tasks/task-sdk-osmo.inc @@ -1,6 +1,9 @@ SDK-OSMO = " \ libosmocore-dev \ libosmo-sccp-dev \ + libosmo-abis-dev \ + libgtp-dev \ + libdbi-dev \ " SDK-EXTRAS ?= "" From 9f86fa35a232e629eb9d3d4f58de98e9831d0b07 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 10 Jun 2012 04:53:33 +0800 Subject: [PATCH 038/200] openmoko-gsmd: Add the Openmoko GSMD recipe This is based on the gsmd recipe from OE classic. There will be some more tweaking for respawn and the cell log utility. --- recipes-openmoko/openmoko-gsmd/files/default | 54 ++++++++++++ recipes-openmoko/openmoko-gsmd/files/gsmd | 47 +++++++++++ .../openmoko-gsmd/openmoko-gsmd_git.bb | 83 +++++++++++++++++++ 3 files changed, 184 insertions(+) create mode 100644 recipes-openmoko/openmoko-gsmd/files/default create mode 100644 recipes-openmoko/openmoko-gsmd/files/gsmd create mode 100644 recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb diff --git a/recipes-openmoko/openmoko-gsmd/files/default b/recipes-openmoko/openmoko-gsmd/files/default new file mode 100644 index 0000000000..cf36460fac --- /dev/null +++ b/recipes-openmoko/openmoko-gsmd/files/default @@ -0,0 +1,54 @@ +# gsmd This shell script configures for the gsmd init script. + +. /etc/init.d/functions + +case `machine_id` in + "gta01"|"gta02") + GSMD_OPTS="-s 115200 -F" + if [ -d '/sys/bus/platform/devices/gta01-pm-gsm.0' ] ; then + GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" + else + GSM_POW="/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on" + GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset" + fi + GSM_DEV="/dev/ttySAC0" + GSM_DL="/sys/devices/platform/neo1973-pm-gsm.0/download" + ;; + "htc_apache"|"htc_blueangel"|"htc_universal") + GSMD_OPTS="-s 115200 -F" + GSM_DEV="/dev/ttyS0" + ;; + "htc_himalaya") + GSMD_OPTS="-s 115200 -F" + GSM_DEV="/dev/ttyS2" + ;; + "htc_magician") + GSMD_OPTS="-s 115200 -F" + GSM_DEV="/dev/ttyS1" + ;; + "palm_treo_650") + GSMD_OPTS="-s 460800 -F -w 1" + GSM_DEV="/dev/ttyS0" + ;; + "motorola_ezx_platform") + GSMD_OPTS="-s 115200 -F -v ti" + GSM_DEV="/dev/mux0" + ;; + *) + # Unknown board + + # If you must specify special options, uncomment and modify the next line + #GSMD_OPTS="-s 115200 -F" + + # If your GSM device needs to be powered up, uncomment and modify the next line + #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + + # If your GSM device then needs to be reset, uncomment and modify the next line + #GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" + + # This should be in a common /etc/default/serial, together with + # BT_DEV and IR_DEV for devices that have those on a serial port + #GSM_DEV="/dev/ttyS1" + ;; +esac diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd b/recipes-openmoko/openmoko-gsmd/files/gsmd new file mode 100644 index 0000000000..dc10e63098 --- /dev/null +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd @@ -0,0 +1,47 @@ +#! /bin/sh +# +# gsmd This shell script starts and stops gsmd. +# +# chkconfig: 345 90 40 +# description: Gsmd manages access to a serial- or USB-connected GSM +# processname: gsmd + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +[ -f /etc/default/rcS ] && . /etc/default/rcS +[ -f /etc/default/gsmd ] && . /etc/default/gsmd + +case "$1" in + start) + [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) + [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) + [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) + [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) + + echo -n "Starting GSM daemon: " + start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -d -l syslog + + if [ $? = 0 ]; then + echo "gsmd." + else + echo "(failed.)" + fi + ;; + stop) + [ -n "$GSM_POW" ] && echo "0" >$GSM_POW + + echo -n "Stopping GSM daemon: " + start-stop-daemon -K -x /usr/sbin/gsmd + echo "gsmd." + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb new file mode 100644 index 0000000000..dce93febf6 --- /dev/null +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -0,0 +1,83 @@ +DESCRIPTION = "GSM libraries and daemons implementing the ETSI 07.10 specification" +HOMEPAGE = "http://www.openmoko.org" +SECTION = "telephony" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.library;md5=2d5025d4aa3495befef8f17206a5b0a1 " + +# Fork with wavecom support +SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ + file://gsmd \ + file://default" +SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92" +S = "${WORKDIR}/git" + +PR = "r7" + +inherit autotools pkgconfig update-rc.d + + +# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on +# anything but gsmd + +INITSCRIPT_NAME = "gsmd" +INITSCRIPT_PARAMS = "defaults 35" + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/default + install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd +} + +PACKAGES =+ "\ + ${PN}-tools \ + ${PN}-plugins \ + ${PN}-plugin-machine-generic \ + ${PN}-plugin-machine-tihtc \ + ${PN}-plugin-machine-gta01 \ + ${PN}-plugin-machine-telit \ + ${PN}-plugin-vendor-bcm \ + ${PN}-plugin-vendor-qc \ + ${PN}-plugin-vendor-telit \ + ${PN}-plugin-vendor-ti \ + ${PN}-plugin-vendor-tihtc \ + ${PN}-plugin-vendor-wavecom \ +" + +RDEPENDS_${PN}-plugins = "\ + ${PN}-plugin-machine-generic \ + ${PN}-plugin-machine-tihtc \ + ${PN}-plugin-machine-gta01 \ + ${PN}-plugin-machine-telit \ + ${PN}-plugin-vendor-bcm \ + ${PN}-plugin-vendor-qc \ + ${PN}-plugin-vendor-telit \ + ${PN}-plugin-vendor-ti \ + ${PN}-plugin-vendor-tihtc \ + ${PN}-plugin-vendor-wavecom \ +" + +RDEPENDS_${PN} += "update-rc.d" + +FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*" +FILES_${PN}-tools = "${bindir}/*" +FILES_${PN}-plugins = "" +FILES_${PN}-dev += " ${libdir}/gsmd/*.la " +FILES_${PN}-staticdev += " ${libdir}/gsmd/*.a" +FILES_${PN}-plugin-machine-generic = "${libdir}/gsmd/libgsmd-machine_generic.so*" +FILES_${PN}-plugin-machine-tihtc = "${libdir}/gsmd/libgsmd-machine_tihtc.so*" +FILES_${PN}-plugin-machine-gta01 = "${libdir}/gsmd/libgsmd-machine_gta01.so*" +FILES_${PN}-plugin-machine-telit = "${libdir}/gsmd/libgsmd-machine_telit.so*" +FILES_${PN}-plugin-vendor-qc = "${libdir}/gsmd/libgsmd-vendor_qc.so*" +FILES_${PN}-plugin-vendor-bcm = "${libdir}/gsmd/libgsmd-vendor_bcm.so*" +FILES_${PN}-plugin-vendor-telit = "${libdir}/gsmd/libgsmd-vendor_telit.so*" +FILES_${PN}-plugin-vendor-ti = "${libdir}/gsmd/libgsmd-vendor_ti.so*" +FILES_${PN}-plugin-vendor-tihtc = "${libdir}/gsmd/libgsmd-vendor_tihtc.so*" +FILES_${PN}-plugin-vendor-wavecom = "${libdir}/gsmd/libgsmd-vendor_wavecom.so*" + +PACKAGES_DYNAMIC = "lib${PN}* ${PN}" + +ALLOW_EMPTY_${PN}-plugins = "1" + From 4fed144378a38115805f986c56d883763f6dab79 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 11 Jun 2012 08:38:52 +0200 Subject: [PATCH 039/200] openmoko-gsmd: Add support for the sysmobts_v2 with a modem daughterboard --- recipes-openmoko/openmoko-gsmd/files/default | 4 ++++ recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-openmoko/openmoko-gsmd/files/default b/recipes-openmoko/openmoko-gsmd/files/default index cf36460fac..e7c536ba1f 100644 --- a/recipes-openmoko/openmoko-gsmd/files/default +++ b/recipes-openmoko/openmoko-gsmd/files/default @@ -35,6 +35,10 @@ case `machine_id` in GSMD_OPTS="-s 115200 -F -v ti" GSM_DEV="/dev/mux0" ;; + "sysmocom_sysmobts_v2") + GSMD_OPTS="-v wavecom" + GSM_DEV="/dev/ttyS0" + ;; *) # Unknown board diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index dce93febf6..68477bca8f 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92" S = "${WORKDIR}/git" -PR = "r7" +PR = "r8" inherit autotools pkgconfig update-rc.d From c1625ee2848ee500d0fa2655876fdb16ddaf5dd3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 13 Jun 2012 16:47:51 +0800 Subject: [PATCH 040/200] openmoko-gsmd: Package the cell_log separately and respawn --- recipes-openmoko/openmoko-gsmd/files/cell-log | 37 +++++++++++++++++++ recipes-openmoko/openmoko-gsmd/files/gsmd | 2 +- .../openmoko-gsmd/files/gsmd-respawn.sh | 9 +++++ .../openmoko-gsmd/openmoko-gsmd_git.bb | 17 +++++++-- 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 recipes-openmoko/openmoko-gsmd/files/cell-log create mode 100644 recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh diff --git a/recipes-openmoko/openmoko-gsmd/files/cell-log b/recipes-openmoko/openmoko-gsmd/files/cell-log new file mode 100644 index 0000000000..0da23a6d46 --- /dev/null +++ b/recipes-openmoko/openmoko-gsmd/files/cell-log @@ -0,0 +1,37 @@ +#! /bin/sh +# +# cell-log This shell script starts and stops cell-log. +# +# chkconfig: 345 90 40 +# description: Cell-log monitors cell in the neighborhood. +# processname: cell_log + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +case "$1" in + start) + echo -n "Starting cell-log: " + start-stop-daemon -S -b -x /etc/gsmd-respawn.sh /usr/bin/cell_log + + if [ $? = 0 ]; then + echo "cell-log" + else + echo "(failed.)" + fi + ;; + stop) + echo -n "Stopping GSM daemon: " + start-stop-daemon -K -x /usr/bin/cell_log + echo "cell-log." + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/cell-log {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd b/recipes-openmoko/openmoko-gsmd/files/gsmd index dc10e63098..c135e1f2a5 100644 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd @@ -19,7 +19,7 @@ case "$1" in [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) echo -n "Starting GSM daemon: " - start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -d -l syslog + start-stop-daemon -S -b -x /etc/gsmd-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog if [ $? = 0 ]; then echo "gsmd." diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh new file mode 100644 index 0000000000..d85dbb2a68 --- /dev/null +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +while true; +do + echo "Restarting not dealing well with spaces.." + (exec $*) || true + sleep 10s +done + diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 68477bca8f..a2479cbd79 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -9,11 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ # Fork with wavecom support SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://gsmd \ + file://cell-log \ + file://gsmd-respawn.sh \ file://default" SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92" S = "${WORKDIR}/git" -PR = "r8" +PR = "r11.2" inherit autotools pkgconfig update-rc.d @@ -21,17 +23,24 @@ inherit autotools pkgconfig update-rc.d # handle update-rc.d RDEPENDS_${PN} manually, we don't need it on # anything but gsmd -INITSCRIPT_NAME = "gsmd" -INITSCRIPT_PARAMS = "defaults 35" +INITSCRIPT_PACKAGES = "${PN} ${PN}-tools-cell-log" +INITSCRIPT_NAME_${PN} = "gsmd" +INITSCRIPT_PARAMS_${PN} = "defaults 35" + +INITSCRIPT_NAME_${PN}-tools-cell-log = "cell-log" +INITSCRIPT_PARAMS_${PN}-tools-cell-log = "defaults 40" do_install_append() { install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/cell-log ${D}/${sysconfdir}/init.d/ install -d ${D}/${sysconfdir}/default install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd + install -m 0755 ${WORKDIR}/gsmd-respawn.sh ${D}/${sysconfdir}/ } PACKAGES =+ "\ + ${PN}-tools-cell-log \ ${PN}-tools \ ${PN}-plugins \ ${PN}-plugin-machine-generic \ @@ -60,8 +69,10 @@ RDEPENDS_${PN}-plugins = "\ " RDEPENDS_${PN} += "update-rc.d" +RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN}" FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*" +FILES_${PN}-tools-cell-log = "${bindir}/cell_log ${sysconfdir}/cell-log" FILES_${PN}-tools = "${bindir}/*" FILES_${PN}-plugins = "" FILES_${PN}-dev += " ${libdir}/gsmd/*.la " From d1d9f99eb641be83d048a486fa174d27cd1fab62 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jul 2012 16:30:34 +0800 Subject: [PATCH 041/200] libosmo-abis: Add 0.1.3 with buildsystem changes and minor bugfixes --- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb new file mode 100644 index 0000000000..a83e502fea --- /dev/null +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "e5ae7f52175411a498ed30560624d0abed0feed7" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} From 794c0e73e6d8be92aab9b8457ecc7c6673ea3502 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jul 2012 16:31:13 +0800 Subject: [PATCH 042/200] libosmocore: Upgrade to version 0.5.2 for the libgb split libosmocore gained a new GPRS helper library. --- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index cbe4295253..ccc6999d8c 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "81cd54a0c36cd9cf2bedd97221658a276aa2d84c" +SRCREV = "c5f055f9e5aa58548b484345bd3bdc914e640d6c" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.4.1+gitr${SRCPV}" +PV = "0.5.2+gitr${SRCPV}" PR = "0" From 33fe48f3b792563ad99d575750e36dffc9ac808a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jul 2012 16:32:47 +0800 Subject: [PATCH 043/200] openbsc: Upgrade to version v0.12.0 of OpenBSC This has split out the GPRS library and some bugfixes. --- recipes-osmocom/openbsc/openbsc_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index f0c77df15b..e661f9ca0e 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc -PV = "0.10.1+gitr${SRCPV}" +PV = "0.12.0+gitr${SRCPV}" PR = "${INC_PR}.1" -SRCREV = "09db1a44bc56e81780954555acfbc1bf2fb7cc81" +SRCREV = "019f913ca383bda9256e273c06327041b1761330" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From fe53a9d4aa2ccacbfdc5ebfa22ce6d41373cccfa Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 21 Jul 2012 19:05:33 +0800 Subject: [PATCH 044/200] dahdi: Upgrade from 2.5.0.1 to 2.6.0 --- .../dahdi-linux/{dahdi-linux_2.5.0.1.bb => dahdi-linux_2.6.0.bb} | 0 .../dahdi-tools/{dahdi-tools_2.5.0.1.bb => dahdi-tools_2.6.0.bb} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename recipes-isdn/dahdi-linux/{dahdi-linux_2.5.0.1.bb => dahdi-linux_2.6.0.bb} (100%) rename recipes-isdn/dahdi-tools/{dahdi-tools_2.5.0.1.bb => dahdi-tools_2.6.0.bb} (100%) diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.5.0.1.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb similarity index 100% rename from recipes-isdn/dahdi-linux/dahdi-linux_2.5.0.1.bb rename to recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.5.0.1.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb similarity index 100% rename from recipes-isdn/dahdi-tools/dahdi-tools_2.5.0.1.bb rename to recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb From 1f717355169d3ea3c1065582d8c30ad5e643c457 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 21 Jul 2012 23:01:30 +0800 Subject: [PATCH 045/200] dahdi-linux: Enable the mirror mode required for dahdi_pcap, cleanups Enable the mirror mode to be able to use the dahdi_pcap utility of dahdi_tools. --- recipes-isdn/dahdi-linux/dahdi-linux.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes-isdn/dahdi-linux/dahdi-linux.inc b/recipes-isdn/dahdi-linux/dahdi-linux.inc index 506c4f9a66..3633a0e481 100644 --- a/recipes-isdn/dahdi-linux/dahdi-linux.inc +++ b/recipes-isdn/dahdi-linux/dahdi-linux.inc @@ -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" From f4320dd67f9681e24bcfbe112832cac2ceacebd0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 21 Jul 2012 23:46:45 +0800 Subject: [PATCH 046/200] dahdi-tools: Build dahdi_pcap and fix the installation of the perl modules --- recipes-isdn/dahdi-tools/dahdi-tools.inc | 27 ++++++++++++++++--- recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb | 2 +- .../dahdi-tools/files/perl_install.patch | 13 +++++++++ 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100755 recipes-isdn/dahdi-tools/files/perl_install.patch diff --git a/recipes-isdn/dahdi-tools/dahdi-tools.inc b/recipes-isdn/dahdi-tools/dahdi-tools.inc index 6d0f462ddc..61280ea0ad 100644 --- a/recipes-isdn/dahdi-tools/dahdi-tools.inc +++ b/recipes-isdn/dahdi-tools/dahdi-tools.inc @@ -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}/ +} diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb index d1e6987a27..35132e4b8a 100644 --- a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb +++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb @@ -1,4 +1,4 @@ require ${PN}.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" diff --git a/recipes-isdn/dahdi-tools/files/perl_install.patch b/recipes-isdn/dahdi-tools/files/perl_install.patch new file mode 100755 index 0000000000..adcda2be96 --- /dev/null +++ b/recipes-isdn/dahdi-tools/files/perl_install.patch @@ -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)) From 73295758f984ce59a68f1d7ad620ef96fd192bf7 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 7 Aug 2012 17:33:33 +0200 Subject: [PATCH 047/200] libosmocore: update to more recent version including a BSSGP fix --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index ccc6999d8c..9ed5a16a63 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c5f055f9e5aa58548b484345bd3bdc914e640d6c" +SRCREV = "aa5d0e88944fe3258260aedfbce9101301e35b44" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.5.2+gitr${SRCPV}" PR = "0" From 8479f83f3974eeb199607111af38ca2db7a07a20 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 Aug 2012 16:26:29 +0200 Subject: [PATCH 048/200] libosmocore: Introduce 0.5.3 and bump the META_TELEPHONY_OSMO_INC META_TELEPHONY_OSMO_INC functions as kind of a reverse dependency, packages using libosmocore will now rebuild and link to the newer soversion of the libraries. Upgrade OpenBSC due an ABI change in the GPRS/GB code. --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_0.5.3.bb | 11 +++++++++++ recipes-osmocom/openbsc/openbsc_git.bb | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 recipes-osmocom/libosmocore/libosmocore_0.5.3.bb diff --git a/conf/layer.conf b/conf/layer.conf index 0ddda0d069..f428ace73a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony := "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "4" +META_TELEPHONY_OSMO_INC = "5" diff --git a/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb b/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb new file mode 100644 index 0000000000..d7b84d8de2 --- /dev/null +++ b/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb @@ -0,0 +1,11 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "335aedabf204ac025a79801c15c8488d35cc9981" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +PR = "${INC_PR}.0" + +# because "${WORKDIR}/git" is not a git repo, it can't figure out the version +do_configure_prepend() { + echo "${PV}" > ${S}/.tarball-version +} diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index e661f9ca0e..7b20795539 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc PV = "0.12.0+gitr${SRCPV}" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" -SRCREV = "019f913ca383bda9256e273c06327041b1761330" +SRCREV = "df49a983e2523b94bb62fec3076259355fe0b52b" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From f88c9a6fbd1f32b7dfb27d2499b9f45dff596c74 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 Aug 2012 17:09:28 +0200 Subject: [PATCH 049/200] libosmocore: Build a 0.5.3+ version and force rebuild The behavior of the OSMO_MIN/OSMO_MAX has been fixed. Update the library and force the rebuild. --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index f428ace73a..11f708973a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony := "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "5" +META_TELEPHONY_OSMO_INC = "6" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 9ed5a16a63..1b96f39223 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "aa5d0e88944fe3258260aedfbce9101301e35b44" +SRCREV = "08b286277b1d1c16ce3a615c5de07cefcbd6acf6" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.5.2+gitr${SRCPV}" +PV = "0.5.3+gitr${SRCPV}" PR = "0" From 138ac3bc4595d6f8e5f0908ee3d538b4da9ef73e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 20 Aug 2012 21:26:19 +0200 Subject: [PATCH 050/200] libgsm_1.0.13: Add necessary " for the variable assignment Newer versions of BitBake are more picky about it. Add the quotes. --- recipes-isdn/libgsm/libgsm_1.0.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-isdn/libgsm/libgsm_1.0.13.bb b/recipes-isdn/libgsm/libgsm_1.0.13.bb index b26f587578..e6bf9baf60 100644 --- a/recipes-isdn/libgsm/libgsm_1.0.13.bb +++ b/recipes-isdn/libgsm/libgsm_1.0.13.bb @@ -1,6 +1,6 @@ require libgsm.inc -PR = ${INC_PR}.0 +PR = "${INC_PR}.0" S = "${WORKDIR}/gsm-1.0-pl13/" From c0cbc30d4c47cadbb431c962aed8f41ef5411620 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 3 Sep 2012 12:18:54 +0200 Subject: [PATCH 051/200] libdbi: Add checksums for version 0.8.3 --- recipes-misc/libdbi/libdbi_0.8.3.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-misc/libdbi/libdbi_0.8.3.bb b/recipes-misc/libdbi/libdbi_0.8.3.bb index d5803c0ec4..ec1628539a 100644 --- a/recipes-misc/libdbi/libdbi_0.8.3.bb +++ b/recipes-misc/libdbi/libdbi_0.8.3.bb @@ -1,3 +1,7 @@ require ${PN}.inc PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "ca66db78d479cbfa727cf3245b5864ae" +SRC_URI[sha256sum] = "72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3" + From 1579cdf0fe6f944c745167bcc73aa889fa819d61 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 3 Sep 2012 13:37:41 +0200 Subject: [PATCH 052/200] libdbi-drivers: Add checksums for version 0.8.3 --- recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb index a4897d0190..86b8e2cdb3 100644 --- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb +++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb @@ -1,3 +1,6 @@ require ${PN}.inc PR = "r1" + +SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd" +SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72" From 25a726eea517f0884fb526382661b7309910992c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 4 Sep 2012 14:06:23 +0200 Subject: [PATCH 053/200] libdbi-drivers: Package the *.a into a new -staticdev package --- recipes-misc/libdbi/libdbi-drivers.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-misc/libdbi/libdbi-drivers.inc b/recipes-misc/libdbi/libdbi-drivers.inc index 555a6b697a..04187b06ad 100644 --- a/recipes-misc/libdbi/libdbi-drivers.inc +++ b/recipes-misc/libdbi/libdbi-drivers.inc @@ -25,7 +25,8 @@ EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \ --disable-docs" FILES_${PN}-dbg += " ${libdir}/dbd/.debug/*.so" -FILES_${PN}-dev += " ${libdir}/dbd/*.la ${libdir}/dbd/*.a" +FILES_${PN}-dev += " ${libdir}/dbd/*.la " +FILES_${PN}-staticdev += " ${libdir}/dbd/*.a" DESCRIPTION_libdbd-sqlite3 = "SQLite3 database driver for libdbi" FILES_libdbd-sqlite3 = "${libdir}/dbd/libdbdsqlite3.so" From a6cbcf75d53c3e7b790d1fafa3fbaa4b1aeca2d2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 4 Sep 2012 14:07:17 +0200 Subject: [PATCH 054/200] libdbi-drivers: Introduce INC_PR for this recipe --- recipes-misc/libdbi/libdbi-drivers.inc | 2 ++ recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-misc/libdbi/libdbi-drivers.inc b/recipes-misc/libdbi/libdbi-drivers.inc index 04187b06ad..2fe0da7ce5 100644 --- a/recipes-misc/libdbi/libdbi-drivers.inc +++ b/recipes-misc/libdbi/libdbi-drivers.inc @@ -11,6 +11,8 @@ SECTION = "libs" PROVIDES = "libdbd-sqlite" DEPENDS = "libdbi sqlite3" +INC_PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz" inherit autotools diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb index 86b8e2cdb3..2f2e39df79 100644 --- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb +++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r1" +PR = "${INC_PR}.0" SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd" SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72" From 4f61482461ba0079d74a2de782559bcd979e7656 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 4 Sep 2012 14:08:36 +0200 Subject: [PATCH 055/200] openggsn: Package the *.a into a new -staticdev package --- recipes-osmocom/openggsn/openggsn_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index 9b15d9f731..8aaaf8d496 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -2,7 +2,7 @@ DESCRITOPN = "OpenGGSN a Free Software GGSN" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" -PR = "r10" +PR = "r11" SRCREV = "95848bafcef145d776d70a73f7bdc3fe37e85724" SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \ @@ -10,7 +10,7 @@ SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \ " S = "${WORKDIR}/git" -PACKAGES =+ " libgtp libgtp-dev openggsn-sgsnemu" +PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev openggsn-sgsnemu" RDEPENDS_${PN} += "kernel-module-tun" inherit autotools update-rc.d @@ -27,6 +27,7 @@ INITSCRIPT_PARAMS_openggsn = "defaults 29 29" RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade" FILES_libgtp = "${libdir}/*${SOLIBS}" -FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a" +FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" +FILES_libgtp-staticdev = "${libdir}/*.a" FILES_openggsn-sgsnemu = "${bindir}/sgsnemu" From aeb390d1cf1a7e46dbed06f0fe8fe47c7bf57c71 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 13 Sep 2012 21:20:19 +0200 Subject: [PATCH 056/200] libosmocore: Upgrade to newer version with libosmovty improvements --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 11f708973a..145b809f9b 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony := "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "6" +META_TELEPHONY_OSMO_INC = "7" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 1b96f39223..55b38b3eec 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "08b286277b1d1c16ce3a615c5de07cefcbd6acf6" +SRCREV = "eacba189b1a03c6a213b76df07dd766697017438" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.5.3+gitr${SRCPV}" PR = "0" From 2ae26ee3fa453c514bf280dfa726211757b1906c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 15 Sep 2012 16:34:21 +0200 Subject: [PATCH 057/200] openbsc: Improve the init scripts, do not write counters Make the start/stop of the NITB, BSC and MGCP HW work, remove the force-reload option as it didn't do anything and omit writing counters into the database. --- recipes-osmocom/openbsc/openbsc.inc | 2 +- recipes-osmocom/openbsc/openbsc/osmo-bsc.init | 9 ++++----- recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init | 9 ++++----- recipes-osmocom/openbsc/openbsc/osmo-nitb.init | 9 ++++----- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 1f71e4d6d8..a372005753 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -9,7 +9,7 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc_mgcp.init \ file://osmo-bsc.init" -INC_PR = "r12.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r13.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc " diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc.init index dd0479a77c..c75e2db946 100755 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc.init +++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc.init @@ -34,14 +34,13 @@ case "$1" in start-stop-daemon -K -x "$DAEMON" echo "$NAME." ;; - restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." + restart) + $0 stop + $0 start ;; *) N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 + echo "Usage: $N {start|stop|restart}" >&2 exit 1 ;; esac diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init index bfddac962a..badd954f07 100755 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init +++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init @@ -34,14 +34,13 @@ case "$1" in start-stop-daemon -K -x "$DAEMON" echo "$NAME." ;; - restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." + restart) + $0 stop + $0 start ;; *) N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 + echo "Usage: $N {start|stop|restart}" >&2 exit 1 ;; esac diff --git a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init index 86c7f757c9..bd74cc0607 100755 --- a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init +++ b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init @@ -11,7 +11,7 @@ DAEMON=/usr/bin/osmo-nitb NAME=osmo-nitb DESC="Osmocom GSM Network in the Box" -NORMAL_ARGS="-D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" +NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3" OSMOBTS_EXTRA_ARGS="" NO_START=1 @@ -35,13 +35,12 @@ case "$1" in echo "$NAME." ;; restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon -K -x "$DAEMON" - echo "$NAME." + $0 stop + $0 start ;; *) N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 + echo "Usage: $N {start|stop|restart}" >&2 exit 1 ;; esac From d07870af73aa22b8357dc8d9dfdcf0ed224de34b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 18 Oct 2012 19:25:45 +0200 Subject: [PATCH 058/200] update libosmocore and openbsc --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 55b38b3eec..35e6eb31ac 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "eacba189b1a03c6a213b76df07dd766697017438" +SRCREV = "b8d18f32a1676f05d73bc9d94eadeaf5cc43c9a5" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.5.3+gitr${SRCPV}" PR = "0" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 7b20795539..12c3ca20a4 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.12.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "df49a983e2523b94bb62fec3076259355fe0b52b" +SRCREV = "94c2b0578b4827e5535296477c3cd1d39d8f4814" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 6ae5eefa93571d01dca6814e56f28c9f6fbca070 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 25 Oct 2012 15:17:00 +0200 Subject: [PATCH 059/200] update libosmocore_git to 8ec7f901bb1843b7c29335d5ea0531e7a1527210 this includes a fix for the nasty missing "logging filter" while writing the config bug. --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 35e6eb31ac..3392d2b5a2 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "b8d18f32a1676f05d73bc9d94eadeaf5cc43c9a5" +SRCREV = "8ec7f901bb1843b7c29335d5ea0531e7a1527210" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.5.3+gitr${SRCPV}" PR = "0" From d1e0a1f78d10728d904349a6bf7846e2357fe1d4 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 25 Oct 2012 15:32:39 +0200 Subject: [PATCH 060/200] gsmd: Use /dev/ttyS2 on sysmobts v2 only the first prototype board (on the v2B mainboard) was using ttyS0, messing up console access. This has been fixed in v2.x of the db9 daughterboard for the v2C mainboards. --- recipes-openmoko/openmoko-gsmd/files/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-openmoko/openmoko-gsmd/files/default b/recipes-openmoko/openmoko-gsmd/files/default index e7c536ba1f..766b38955a 100644 --- a/recipes-openmoko/openmoko-gsmd/files/default +++ b/recipes-openmoko/openmoko-gsmd/files/default @@ -37,7 +37,7 @@ case `machine_id` in ;; "sysmocom_sysmobts_v2") GSMD_OPTS="-v wavecom" - GSM_DEV="/dev/ttyS0" + GSM_DEV="/dev/ttyS2" ;; *) # Unknown board From 6f54e1b374e81f64c900322cda94558684c72288 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 2 Nov 2012 18:28:40 +0800 Subject: [PATCH 061/200] gsmd: Increase the PR after changing the default file --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index a2479cbd79..3d98c8e390 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -15,7 +15,7 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92" S = "${WORKDIR}/git" -PR = "r11.2" +PR = "r11.4" inherit autotools pkgconfig update-rc.d From 3279c6791f12ccdad2121ff1337473a6ffd46b2c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 2 Nov 2012 20:42:14 +0800 Subject: [PATCH 062/200] libosmo-abis: Build a git version of libosmo-abis for a leak fix Build new unreleased version of libosmo-abis for a memory leak fix. --- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_git.bb diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb new file mode 100644 index 0000000000..de77cab64c --- /dev/null +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "a49c24d9657471deb90a9425cabdb8d3d56f36df" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +PV = "0.1.3+gitr${SRCPV}" +PR = "${INC_PR}.1" From 9e130f1ac1cdd6dc155a77795dc6eea3b3a89f43 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 8 Nov 2012 08:23:38 +0800 Subject: [PATCH 063/200] libsmpp34: Add the C Open SMPP34 implementation --- recipes-misc/libsmpp/libsmpp34_1.10.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 recipes-misc/libsmpp/libsmpp34_1.10.bb diff --git a/recipes-misc/libsmpp/libsmpp34_1.10.bb b/recipes-misc/libsmpp/libsmpp34_1.10.bb new file mode 100644 index 0000000000..949754e091 --- /dev/null +++ b/recipes-misc/libsmpp/libsmpp34_1.10.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "C Open SMPP library" +HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/"" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +SECTION = "libs" +DEPENDS = "libxml2" + +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/c-open-smpp-34/c-open-smpp-34/libsmpp34-1.10%20%28LGPL%29/libsmpp34-${PV}.tar.gz" +SRC_URI[md5sum] = "fbc428bffa12a2cbe449005c0378fa64" +SRC_URI[sha256sum] = "7c4d7e30f1a0c10a282f3360adf25c6681bcc578ddaffc6a7d790d1637305a1f" + +PARALLEL_MAKE = "" + +inherit autotools + +PACKAGES =+ "${PN}-apps" +FILES_${PN}-apps = "${bindir}/*" + + From 12a1b8ea4bb636a3b862c1c2c7d2da5c71a2e8cd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 9 Nov 2012 18:32:23 +0800 Subject: [PATCH 064/200] libsmpp34: Switch to the osmocom fork, apps are not installed anymore --- recipes-misc/libsmpp/libsmpp34_1.10.bb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/recipes-misc/libsmpp/libsmpp34_1.10.bb b/recipes-misc/libsmpp/libsmpp34_1.10.bb index 949754e091..d6eae471ea 100644 --- a/recipes-misc/libsmpp/libsmpp34_1.10.bb +++ b/recipes-misc/libsmpp/libsmpp34_1.10.bb @@ -5,17 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SECTION = "libs" DEPENDS = "libxml2" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/c-open-smpp-34/c-open-smpp-34/libsmpp34-1.10%20%28LGPL%29/libsmpp34-${PV}.tar.gz" -SRC_URI[md5sum] = "fbc428bffa12a2cbe449005c0378fa64" -SRC_URI[sha256sum] = "7c4d7e30f1a0c10a282f3360adf25c6681bcc578ddaffc6a7d790d1637305a1f" +SRC_URI = "git://git.osmocom.org/${PN}" +SRCREV = "9288d59cfdc452fa3a92728149537372ee5c6c56" +S = "${WORKDIR}/git" PARALLEL_MAKE = "" inherit autotools -PACKAGES =+ "${PN}-apps" -FILES_${PN}-apps = "${bindir}/*" - From 3e4ffca0b369300813e90a17ffe5b1768142d5f9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Dec 2012 18:43:56 +0100 Subject: [PATCH 065/200] libosmocore: Upgrade for the tlvp_val16.. code This code has an ABI incompatible change, bump the meta-telephony version to force a rebuild of downstream. --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 145b809f9b..f208e42496 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony := "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "7" +META_TELEPHONY_OSMO_INC = "8" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 3392d2b5a2..07d31e438b 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "8ec7f901bb1843b7c29335d5ea0531e7a1527210" +SRCREV = "0167596c2bf19102eac8a69f5066eedbae72a167" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.5.3+gitr${SRCPV}" PR = "0" From a02d4dfabf5271138bd44aaf18b5bb92bde531b6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Dec 2012 18:52:32 +0100 Subject: [PATCH 066/200] openbsc: Upgrade the OpenBSC code for the new libosmocore --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 12c3ca20a4..b2accbe8b6 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.12.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "94c2b0578b4827e5535296477c3cd1d39d8f4814" +SRCREV = "25b70cea9d9521b081ea0cc524f5d157a1b89baf" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 0f9b8cb7e60db99427b561195521d73fc2b12725 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 27 Dec 2012 00:29:06 +0100 Subject: [PATCH 067/200] libosmocore: Upgrade for some LAPDm fixes --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 07d31e438b..034088c408 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "0167596c2bf19102eac8a69f5066eedbae72a167" +SRCREV = "13bb169d71a7eff694b8a2ba24497ee08c73a090" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.5.3+gitr${SRCPV}" PR = "0" From 8c573644521b282a1bb74ab21dd2952bb7fc8535 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 11 Jan 2013 17:44:46 +0100 Subject: [PATCH 068/200] update libosmocore to current de6e4983e7f83794e45af5a70b036ed9f4437ab5 this introduces tlvp_val16_unal() and friends. --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 034088c408..9816c98338 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "13bb169d71a7eff694b8a2ba24497ee08c73a090" +SRCREV = "de6e4983e7f83794e45af5a70b036ed9f4437ab5" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.5.3+gitr${SRCPV}" PR = "0" From d8a23bc0087e898e19cee22f7b37fc44f33fc28d Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 14 Jan 2013 01:17:41 +0100 Subject: [PATCH 069/200] add recipe for libsmpp34 from git.osmocom.org this is our local version of libsmpp34 with some fixes/extensions, mostly related to the build system. --- recipes-misc/libsmpp/libsmpp34_git.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 recipes-misc/libsmpp/libsmpp34_git.bb diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb new file mode 100644 index 0000000000..ead05d2465 --- /dev/null +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "C Open SMPP library" +HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/"" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +SECTION = "libs" +DEPENDS = "libxml2" + +S = "${WORKDIR}/git" +SRCREV = "a18bad989696b5047fab20e579a6e5a886a4904f" +SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" +PV = "1.10+gitr${SRCPV}" +PR = "0" + +PARALLEL_MAKE = "" + +inherit autotools_stage pkgconfig + +PACKAGES =+ "${PN}-apps" +FILES_${PN}-apps = "${bindir}/*" + From c88a4fb4c42419fabcabdb212c4ec0a5e99f076b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 20 Jan 2013 20:16:30 +0100 Subject: [PATCH 070/200] openmoko-gsmd: Add a cell-log patch to use the RF Ctrl interface --- .../openmoko-gsmd/files/cell-log.patch | 114 ++++++++++++++++++ .../openmoko-gsmd/openmoko-gsmd_git.bb | 3 +- 2 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 recipes-openmoko/openmoko-gsmd/files/cell-log.patch diff --git a/recipes-openmoko/openmoko-gsmd/files/cell-log.patch b/recipes-openmoko/openmoko-gsmd/files/cell-log.patch new file mode 100644 index 0000000000..d038ca67d8 --- /dev/null +++ b/recipes-openmoko/openmoko-gsmd/files/cell-log.patch @@ -0,0 +1,114 @@ +From bde45e2f168597c8f4b2bb0599d58125fd24deb6 Mon Sep 17 00:00:00 2001 +From: Holger Hans Peter Freyther +Date: Wed, 13 Jun 2012 11:17:33 +0200 +Subject: [PATCH] cell_log: Use the RF-Lock handling to unlock the GSM network + +This is missing the reason of why and when something is unlocked. +--- + src/util/cell_log.c | 65 ++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 54 insertions(+), 11 deletions(-) + +diff --git a/src/util/cell_log.c b/src/util/cell_log.c +index 59d8942..7a280aa 100644 +--- a/src/util/cell_log.c ++++ b/src/util/cell_log.c +@@ -27,10 +27,14 @@ + #include + #include + #include ++#include + + #include ++#include + #include + ++#include ++ + #include + #include + #include +@@ -58,31 +62,70 @@ static int pending_responses = 0; + #define MIN_NO_NET_SECS 60 + #define OUR_MCC 901 + #define OUR_MNC 99 +-#define LOCK_PATH "/var/lock/bts_rf_lock" + + static time_t last_network_seen; + unsigned int rf_lock_active = 0; + + static void bts_rf_lock(int on) + { +- int fd; ++ int fd, rc; ++ ++ static const uint8_t rf_lock[] = { ++ 0x00, 0x23, 0xEE, 0x00, 0x53, 0x45, 0x54, 0x20, ++ 0x31, 0x20, 0x6E, 0x65, 0x74, 0x2E, 0x72, 0x66, ++ 0x5F, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x67, 0x73, ++ 0x6D, 0x2C, 0x6C, 0x6F, 0x63, 0x6B, 0x2C, 0x6E, ++ 0x2F, 0x61, 0x2C, 0x6E, 0x2F, 0x61, ++ }; ++ ++ static const uint8_t rf_unlock[] = { ++ 0x00, 0x25, 0xEE, 0x00, 0x53, 0x45, 0x54, 0x20, ++ 0x31, 0x20, 0x6E, 0x65, 0x74, 0x2E, 0x72, 0x66, ++ 0x5F, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x67, 0x73, ++ 0x6D, 0x2C, 0x75, 0x6E, 0x6C, 0x6F, 0x63, 0x6B, ++ 0x2C, 0x6E, 0x2F, 0x61, 0x2C, 0x6E, 0x2F, 0x61, ++ }; + + /* only print message on status change */ + if (rf_lock_active != on) + syslog(LOG_NOTICE, "RF_LOCK: %sabling lock\n", on ? "En" : "Dis"); + +- /* for safety, always update the actual file on disk */ ++ fd = socket(AF_INET, SOCK_STREAM, 0); ++ if (fd == -1) { ++ syslog(LOG_ERR, "RF_LOCK: socket creation failed: %d\n", errno); ++ return; ++ } ++ ++ struct sockaddr_in addr; ++ memset(&addr, 0, sizeof(addr)); ++ addr.sin_family = AF_INET; ++ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ++ addr.sin_port = htons(4249); ++ rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr)); ++ if (rc != 0) { ++ syslog(LOG_ERR, "RF_Lock: socket connect failed: %d\n", errno); ++ close(fd); ++ return; ++ } ++ + if (on == 1) { +- struct stat st; +- if (stat(LOCK_PATH, &st) != 0) { +- fd = open(LOCK_PATH, O_WRONLY|O_CREAT, 0664); +- if (fd >= 0) +- close(fd); +- } +- } else +- unlink(LOCK_PATH); ++ rc = write(fd, rf_lock, sizeof(rf_lock)); ++ if (rc != sizeof(rf_lock)) ++ goto error; ++ } else { ++ rc = write(fd, rf_unlock, sizeof(rf_unlock)); ++ if (rc != sizeof(rf_unlock)) ++ goto error; ++ } + ++ close(fd); + rf_lock_active = on; ++ return; ++ ++error: ++ close(fd); ++ syslog(LOG_ERR, "RF_Lock: failed to send the message: %d\n", errno); ++ return; + } + + +-- +1.7.10.4 + diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 3d98c8e390..fc8891a1ad 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ # Fork with wavecom support SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ + file://cell-log.patch \ file://gsmd \ file://cell-log \ file://gsmd-respawn.sh \ @@ -15,7 +16,7 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92" S = "${WORKDIR}/git" -PR = "r11.4" +PR = "r11.5" inherit autotools pkgconfig update-rc.d From 4aad63620b77a150fa3580a9e696d5b99cd543f5 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 29 Jan 2013 19:54:07 +0100 Subject: [PATCH 071/200] openbsc: Add config file and init script for SGSN --- recipes-osmocom/openbsc/openbsc.inc | 15 ++++-- .../openbsc/openbsc/osmo-sgsn.init | 48 +++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100755 recipes-osmocom/openbsc/openbsc/osmo-sgsn.init diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index a372005753..6d6366eae5 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -8,8 +8,9 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3" SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc_mgcp.init \ - file://osmo-bsc.init" -INC_PR = "r13.${META_TELEPHONY_OSMO_INC}" + file://osmo-bsc.init \ + file://osmo-sgsn.init" +INC_PR = "r14.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc " @@ -28,9 +29,11 @@ do_install_append() { install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/osmo-bsc.cfg install -m 0660 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg + install -m 0660 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/osmo-sgsn.cfg install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb install -m 0775 ${WORKDIR}/osmo-bsc_mgcp.init ${D}${sysconfdir}/init.d/osmo-bsc-mgcp install -m 0775 ${WORKDIR}/osmo-bsc.init ${D}${sysconfdir}/init.d/osmo-bsc + install -m 0775 ${WORKDIR}/osmo-sgsn.init ${D}${sysconfdir}/init.d/osmo-sgsn install -d ${D}/var/lib/osmocom } @@ -61,7 +64,13 @@ FILES_osmo-nitb = " ${bindir}/osmo-nitb \ ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg" -FILES_osmo-sgsn = " ${bindir}/osmo-sgsn " +CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" +INITSCRIPT_NAME_osmo-sgsn = "osmo-sgsn" +INITSCRIPT_PARAMS_osmo-sgsn = "defaults 30 30" +FILES_osmo-sgsn = " ${bindir}/osmo-sgsn \ + ${sysconfdir}/init.d/osmo-sgsn \ + ${sysconfdir}/osmocom/osmo-sgsn.cfg" + FILES_ipaccess-utils = " ${bindir}/ipaccess-find ${bindir}/ipaccess-config ${bindir}/ipaccess-proxy " FILES_osmo-bsc-nat = " ${bindir}/osmo-bsc_nat " FILES_osmo-gbproxy = " ${bindir}/osmo-gbproxy " diff --git a/recipes-osmocom/openbsc/openbsc/osmo-sgsn.init b/recipes-osmocom/openbsc/openbsc/osmo-sgsn.init new file mode 100755 index 0000000000..44811351e1 --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/osmo-sgsn.init @@ -0,0 +1,48 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: osmo-sgsn +# Required-Start: $syslog $networking +# Required-Stop: $syslog +# Default-Start: 5 +# Default-Stop: 1 +# Short-Description: Osmocom Serving GPRS Support Node +### END INIT INFO + +DAEMON=/usr/bin/osmo-sgsn +NAME=osmo-sgsn +DESC="Osmocom Serving GPRS Support Node" +NORMAL_ARGS="-D -c /etc/osmocom/osmo-sgsn.cfg" + +OSMOSGSN_EXTRA_ARGS="" +NO_START=0 + +set -e + +test ! -r /etc/default/osmo-sgsn || . /etc/default/osmo-sgsn +test "$NO_START" = "0" || exit 0 +test -x "$DAEMON" || exit 0 + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon -S \ + -x "$DAEMON" -- $NORMAL_ARGS $OSMOSGSN_EXTRA_ARGS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -K -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart}" >&2 + exit 1 + ;; +esac + +exit 0 From 73b77fe9bab246e196595aeb6338ffa3a28a3235 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 6 Feb 2013 15:45:02 +0100 Subject: [PATCH 072/200] libsmpp: Fix the parsing error by removing trailing " --- recipes-misc/libsmpp/libsmpp34_1.10.bb | 2 +- recipes-misc/libsmpp/libsmpp34_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-misc/libsmpp/libsmpp34_1.10.bb b/recipes-misc/libsmpp/libsmpp34_1.10.bb index d6eae471ea..dbd4f5c10a 100644 --- a/recipes-misc/libsmpp/libsmpp34_1.10.bb +++ b/recipes-misc/libsmpp/libsmpp34_1.10.bb @@ -1,5 +1,5 @@ DESCRIPTION = "C Open SMPP library" -HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/"" +HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SECTION = "libs" diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index ead05d2465..89df3556af 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "C Open SMPP library" -HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/"" +HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" SECTION = "libs" From 7a9a2ddecbb2aa91b9c8ecd934299324becac1e6 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 7 Feb 2013 15:04:24 +0100 Subject: [PATCH 073/200] update openbsc to current git master, including DB revision 3 --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index b2accbe8b6..67afb722b3 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.12.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "25b70cea9d9521b081ea0cc524f5d157a1b89baf" +SRCREV = "ce1d742f27b54b5a05d4cd351641f4da1d2e9524" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 0925b23f069d7d5786a36f90d81d2fbf3f34a20e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 9 Feb 2013 12:20:01 +0100 Subject: [PATCH 074/200] update libosmo-abis to include connect() / getaddrinfo() fix --- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index de77cab64c..0e521bd84c 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a49c24d9657471deb90a9425cabdb8d3d56f36df" +SRCREV = "d426d458ca96ba29793e35b1b2a73fbcb3b2c888" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" PV = "0.1.3+gitr${SRCPV}" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" From ad495228e2df597fe627a465f1b7c5e00e040910 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 2 Mar 2013 15:20:58 +0100 Subject: [PATCH 075/200] update gsmd to current master, MCC fix in cell log as well as GPS/AIS FWD --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index fc8891a1ad..20eb527136 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -13,10 +13,10 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://cell-log \ file://gsmd-respawn.sh \ file://default" -SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92" +SRCREV = "06253f362045c792baaf1430200c8964885d13a5" S = "${WORKDIR}/git" -PR = "r11.5" +PR = "r11.6" inherit autotools pkgconfig update-rc.d From b1be0d97022c6dd9ef2fbb4b6694aa240df3221a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 12 Mar 2013 14:01:30 +0100 Subject: [PATCH 076/200] openbsc: update to 8b29180cad875b396288a22fb252e158fa2a060a --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 67afb722b3..a3fad0d89c 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.12.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "ce1d742f27b54b5a05d4cd351641f4da1d2e9524" +SRCREV = "8b29180cad875b396288a22fb252e158fa2a060a" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 2b21fe5ad90b34af488d6af8526eebb1c89e07e2 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 13 Mar 2013 15:33:18 +0100 Subject: [PATCH 077/200] update libosmocore to 0.6.0 and openbsc to 0.13.0 this includes the Osmocom SMPP extensions --- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- recipes-osmocom/openbsc/openbsc_git.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 9816c98338..d782e9b157 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "de6e4983e7f83794e45af5a70b036ed9f4437ab5" +SRCREV = "533f63f15aa584eec73044802e0a8bc798a313fe" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.5.3+gitr${SRCPV}" +PV = "0.6.0+gitr${SRCPV}" PR = "0" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index a3fad0d89c..af935f7b2d 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc -PV = "0.12.0+gitr${SRCPV}" +PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "8b29180cad875b396288a22fb252e158fa2a060a" +SRCREV = "3f786003464fe0ff32eea263cb8b8cb4c3e981ea" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From b7d4da72b6f60726231025bf1417d40a9b7c76c7 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 13 Mar 2013 15:41:02 +0100 Subject: [PATCH 078/200] openbsc: Use git revision without SMPP build problem --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index af935f7b2d..d7454186e0 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "3f786003464fe0ff32eea263cb8b8cb4c3e981ea" +SRCREV = "7159e8bea3e39bf74ec26356f7317df5d540b77a" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 29263f162526c96b7fbc7a30d31f385df289dd34 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 13 Mar 2013 15:54:58 +0100 Subject: [PATCH 079/200] Build openbsc with SMPP interface --- recipes-osmocom/openbsc/openbsc.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 6d6366eae5..658fb55cc0 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,5 +1,5 @@ DESCRITOPN = "OpenBSC a Free Software GSM BaseStationController" -DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis openggsn" +DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis openggsn libsmpp34" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" @@ -10,10 +10,10 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc_mgcp.init \ file://osmo-bsc.init \ file://osmo-sgsn.init" -INC_PR = "r14.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r15.${META_TELEPHONY_OSMO_INC}" -EXTRA_OECONF += " --enable-nat --enable-osmo-bsc " +EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp" inherit autotools update-rc.d From 6c31e6c557980ec17b21e10978d3c258b7425355 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 14 Mar 2013 20:56:51 +0100 Subject: [PATCH 080/200] update gsmd to current master for GPS/AIS UDP forward support --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 20eb527136..0c1b4b4691 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -13,10 +13,10 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://cell-log \ file://gsmd-respawn.sh \ file://default" -SRCREV = "06253f362045c792baaf1430200c8964885d13a5" +SRCREV = "cf9ad6fe4dda247c47d0df10ef95fcaa45d87558" S = "${WORKDIR}/git" -PR = "r11.6" +PR = "r12.0" inherit autotools pkgconfig update-rc.d From fc1c332a7e7dfeea79cecb9448673660d3d76e0f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 15 Mar 2013 10:29:56 +0100 Subject: [PATCH 081/200] add libsmpp32-dev and gpsd-dev to osmocom SDK/toolchain libsmpp34 is needed for OsmoNITB SMPP support, and some of our systems now run gpsd, thus people might wnat to compile applications against libgps. --- recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb | 2 +- recipes-osmocom/tasks/task-sdk-osmo.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb index b591b66ae0..21193ad84b 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Software Development Kit for Osmocom devices" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r2" +PR = "r3" ALLOW_EMPTY = "1" diff --git a/recipes-osmocom/tasks/task-sdk-osmo.inc b/recipes-osmocom/tasks/task-sdk-osmo.inc index 0eac22ad58..6f9ba8d209 100644 --- a/recipes-osmocom/tasks/task-sdk-osmo.inc +++ b/recipes-osmocom/tasks/task-sdk-osmo.inc @@ -4,6 +4,8 @@ SDK-OSMO = " \ libosmo-abis-dev \ libgtp-dev \ libdbi-dev \ + libsmpp34-dev \ + gpsd-dev \ " SDK-EXTRAS ?= "" From 35ff59937b441bd0e4a1a24c34ad5bd81123404a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 15 Mar 2013 13:05:04 +0100 Subject: [PATCH 082/200] openmoko-gsmd: Update to git master * reset modem at gsmd startup * include CME ERROR 515 workaround * include runtime loglevel setting --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 0c1b4b4691..cafe8dc611 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://cell-log \ file://gsmd-respawn.sh \ file://default" -SRCREV = "cf9ad6fe4dda247c47d0df10ef95fcaa45d87558" +SRCREV = "da770f8f34662a298647a75698a718705047d3dc" S = "${WORKDIR}/git" PR = "r12.0" From 7aa59c430eedbd2ac0f6ca5a5b87aa6052e8d233 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 15 Mar 2013 22:34:50 +0100 Subject: [PATCH 083/200] gsmd: Work on stopping the respawn script and children This is using some brute force. Make the shell script write a PID file and on stop kill the respawn script and then all process names that are spawned. For the stop we need to know that this is a bash script. --- recipes-openmoko/openmoko-gsmd/files/cell-log | 6 ++++-- recipes-openmoko/openmoko-gsmd/files/gsmd | 6 ++++-- recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/files/cell-log b/recipes-openmoko/openmoko-gsmd/files/cell-log index 0da23a6d46..74c1d683bf 100644 --- a/recipes-openmoko/openmoko-gsmd/files/cell-log +++ b/recipes-openmoko/openmoko-gsmd/files/cell-log @@ -7,11 +7,13 @@ # processname: cell_log PATH=/bin:/usr/bin:/sbin:/usr/sbin +PIDFILE=/var/run/cell_log.pid case "$1" in start) echo -n "Starting cell-log: " - start-stop-daemon -S -b -x /etc/gsmd-respawn.sh /usr/bin/cell_log + start-stop-daemon -S -b -p $PIDFILE \ + -x /etc/gsmd-respawn.sh /usr/bin/cell_log if [ $? = 0 ]; then echo "cell-log" @@ -21,7 +23,7 @@ case "$1" in ;; stop) echo -n "Stopping GSM daemon: " - start-stop-daemon -K -x /usr/bin/cell_log + start-stop-daemon -K -x bash -p $PIDFILE echo "cell-log." ;; restart|force-reload) diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd b/recipes-openmoko/openmoko-gsmd/files/gsmd index c135e1f2a5..35017164b2 100644 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd @@ -7,6 +7,7 @@ # processname: gsmd PATH=/bin:/usr/bin:/sbin:/usr/sbin +PIDFILE=/var/run/gsmd.pid [ -f /etc/default/rcS ] && . /etc/default/rcS [ -f /etc/default/gsmd ] && . /etc/default/gsmd @@ -19,7 +20,8 @@ case "$1" in [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) echo -n "Starting GSM daemon: " - start-stop-daemon -S -b -x /etc/gsmd-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog + start-stop-daemon -S -p $PIDFILE -b \ + -x /etc/gsmd-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog if [ $? = 0 ]; then echo "gsmd." @@ -31,7 +33,7 @@ case "$1" in [ -n "$GSM_POW" ] && echo "0" >$GSM_POW echo -n "Stopping GSM daemon: " - start-stop-daemon -K -x /usr/sbin/gsmd + start-stop-daemon -K -x bash -p $PIDFILE echo "gsmd." ;; restart|force-reload) diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh index d85dbb2a68..3714d2e9ed 100644 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh @@ -1,5 +1,12 @@ #!/usr/bin/env bash +NAME=`basename $1` +PIDFILE="/var/run/$NAME.pid" +PID=$$ +echo "$PID" > $PIDFILE + +trap "{ rm -f $PIDFILE ; killall -9 $NAME; }" EXIT + while true; do echo "Restarting not dealing well with spaces.." From 90d152fcff21f2795a4ec4dc24ca19e585ffd327 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 15 Mar 2013 22:52:16 +0100 Subject: [PATCH 084/200] gsmd: Simplify killing of the children Kill the entire process group by sending it to pid 0. Found while searching for better exec examples. --- recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh index 3714d2e9ed..b1fe134326 100644 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh @@ -5,7 +5,7 @@ PIDFILE="/var/run/$NAME.pid" PID=$$ echo "$PID" > $PIDFILE -trap "{ rm -f $PIDFILE ; killall -9 $NAME; }" EXIT +trap "{ rm -f $PIDFILE ; kill 0; }" EXIT while true; do From 3e7dbdcdba6431d57c24864c3fb96882a3383e52 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 15 Mar 2013 23:21:22 +0100 Subject: [PATCH 085/200] gsmd: Adjust the oom score of the monitor process Adjust the score for the monitor process. The issue is that the score is inherited by the process. Right now the score of the child is adjusted _after_ the process has been spawned. This is obviously a race condition. --- recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh index b1fe134326..99435ed966 100644 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh @@ -4,13 +4,17 @@ NAME=`basename $1` PIDFILE="/var/run/$NAME.pid" PID=$$ echo "$PID" > $PIDFILE +echo "-1000" > /proc/$PID/oom_score_adj trap "{ rm -f $PIDFILE ; kill 0; }" EXIT while true; do echo "Restarting not dealing well with spaces.." - (exec $*) || true + exec $* & + LAST_PID=$! + echo "0" > /proc/$LAST_PID/oom_score_adj + wait $LAST_PID sleep 10s done From a7c614b3ddb230566cecfea29351cb20449fa323 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 15 Mar 2013 23:27:55 +0100 Subject: [PATCH 086/200] gsmd: This appears to be a race-free oom adjustment Use the "() &" syntax to adjust the score before executing the new command. This is removing the reace from the previous commit. Update the PR to force rebuilding new packages. --- recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh | 3 +-- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh index 99435ed966..df40ac0a91 100644 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh @@ -11,9 +11,8 @@ trap "{ rm -f $PIDFILE ; kill 0; }" EXIT while true; do echo "Restarting not dealing well with spaces.." - exec $* & + (echo "0" > /proc/self/oom_score_adj && exec $*) & LAST_PID=$! - echo "0" > /proc/$LAST_PID/oom_score_adj wait $LAST_PID sleep 10s done diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index cafe8dc611..b2aab057f9 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -16,7 +16,7 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ SRCREV = "da770f8f34662a298647a75698a718705047d3dc" S = "${WORKDIR}/git" -PR = "r12.0" +PR = "r13.0" inherit autotools pkgconfig update-rc.d From 675a2f814f37de15e2b1ffaa84de016e06931878 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 11:09:59 +0100 Subject: [PATCH 087/200] gsmd: Fix the name of the script as it was copied from the gsmd one --- recipes-openmoko/openmoko-gsmd/files/cell-log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-openmoko/openmoko-gsmd/files/cell-log b/recipes-openmoko/openmoko-gsmd/files/cell-log index 74c1d683bf..aa234240d2 100644 --- a/recipes-openmoko/openmoko-gsmd/files/cell-log +++ b/recipes-openmoko/openmoko-gsmd/files/cell-log @@ -22,7 +22,7 @@ case "$1" in fi ;; stop) - echo -n "Stopping GSM daemon: " + echo -n "Stopping cell-log daemon: " start-stop-daemon -K -x bash -p $PIDFILE echo "cell-log." ;; From 85d5ea4aaedf64f3a34889b000f687926604d74f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 11:25:39 +0100 Subject: [PATCH 088/200] openbsc: Fix a typo in the variable name --- recipes-osmocom/openbsc/openbsc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 658fb55cc0..235c087134 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,4 +1,4 @@ -DESCRITOPN = "OpenBSC a Free Software GSM BaseStationController" +DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController" DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis openggsn libsmpp34" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" From 1b7bb4ae95080069fac8b226569d424f1393e1b7 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 11:25:49 +0100 Subject: [PATCH 089/200] osmo-service-respawn: Add a shell script that spawns and respawns services Adjust the oom_score_adj of the shell script to avoid ever beeing killed. Adjust the score of the child and nice it. Sleep a given interval before respawning it. This script creates a .pid file so it can be used by a sysv init script to stop the respawner and the client. --- .../files/osmo-service-respawn.sh | 19 +++++++++++++++++++ .../osmo-service-respawn_1.0.bb | 13 +++++++++++++ 2 files changed, 32 insertions(+) create mode 100755 recipes-osmocom/osmo-service-respawn/files/osmo-service-respawn.sh create mode 100644 recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb diff --git a/recipes-osmocom/osmo-service-respawn/files/osmo-service-respawn.sh b/recipes-osmocom/osmo-service-respawn/files/osmo-service-respawn.sh new file mode 100755 index 0000000000..e7274d4f30 --- /dev/null +++ b/recipes-osmocom/osmo-service-respawn/files/osmo-service-respawn.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +NAME=`basename $1` +PIDFILE="/var/run/$NAME.pid" +PID=$$ +echo "$PID" > $PIDFILE +echo "-1000" > /proc/$PID/oom_score_adj + +trap "{ rm -f $PIDFILE ; kill 0; }" EXIT + +while true; +do + echo "Restarting not dealing well with spaces.." + (echo "0" > /proc/self/oom_score_adj && exec $@) & + LAST_PID=$! + wait $LAST_PID + sleep 10s +done + diff --git a/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb b/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb new file mode 100644 index 0000000000..8779f34fd9 --- /dev/null +++ b/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Shell script to start, nice and respawn services" +HOMEPAGE = "http://openbsc.osmocom.org/" +LICENSE = "AGPLv3+" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +SRC_URI = "file://osmo-service-respawn.sh" + +RDEPENDS_${PN} = "bash" + +do_install() { + install -d ${D}${bindir} + install -m 0775 ${WORKDIR}/osmo-service-respawn.sh ${D}${bindir} +} From ec29824f843e969a14742724b791fdd553dc1be9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 11:49:22 +0100 Subject: [PATCH 090/200] openmoko-gsmd: Use the shared osmo-service-respawn start script * The shared script is compatible to the one currently used but it has the benefit of being used by more applications. --- recipes-openmoko/openmoko-gsmd/files/cell-log | 2 +- recipes-openmoko/openmoko-gsmd/files/gsmd | 2 +- .../openmoko-gsmd/files/gsmd-respawn.sh | 19 ------------------- .../openmoko-gsmd/openmoko-gsmd_git.bb | 8 +++----- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh diff --git a/recipes-openmoko/openmoko-gsmd/files/cell-log b/recipes-openmoko/openmoko-gsmd/files/cell-log index aa234240d2..cb913dd839 100644 --- a/recipes-openmoko/openmoko-gsmd/files/cell-log +++ b/recipes-openmoko/openmoko-gsmd/files/cell-log @@ -13,7 +13,7 @@ case "$1" in start) echo -n "Starting cell-log: " start-stop-daemon -S -b -p $PIDFILE \ - -x /etc/gsmd-respawn.sh /usr/bin/cell_log + -x /usr/bin/osmo-service-respawn.sh /usr/bin/cell_log if [ $? = 0 ]; then echo "cell-log" diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd b/recipes-openmoko/openmoko-gsmd/files/gsmd index 35017164b2..d6ac135c09 100644 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd +++ b/recipes-openmoko/openmoko-gsmd/files/gsmd @@ -21,7 +21,7 @@ case "$1" in echo -n "Starting GSM daemon: " start-stop-daemon -S -p $PIDFILE -b \ - -x /etc/gsmd-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog + -x /usr/bin/osmo-service-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog if [ $? = 0 ]; then echo "gsmd." diff --git a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh b/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh deleted file mode 100644 index df40ac0a91..0000000000 --- a/recipes-openmoko/openmoko-gsmd/files/gsmd-respawn.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -NAME=`basename $1` -PIDFILE="/var/run/$NAME.pid" -PID=$$ -echo "$PID" > $PIDFILE -echo "-1000" > /proc/$PID/oom_score_adj - -trap "{ rm -f $PIDFILE ; kill 0; }" EXIT - -while true; -do - echo "Restarting not dealing well with spaces.." - (echo "0" > /proc/self/oom_score_adj && exec $*) & - LAST_PID=$! - wait $LAST_PID - sleep 10s -done - diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index b2aab057f9..d198e52596 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -11,12 +11,11 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://cell-log.patch \ file://gsmd \ file://cell-log \ - file://gsmd-respawn.sh \ file://default" SRCREV = "da770f8f34662a298647a75698a718705047d3dc" S = "${WORKDIR}/git" -PR = "r13.0" +PR = "r14.0" inherit autotools pkgconfig update-rc.d @@ -37,7 +36,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/cell-log ${D}/${sysconfdir}/init.d/ install -d ${D}/${sysconfdir}/default install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd - install -m 0755 ${WORKDIR}/gsmd-respawn.sh ${D}/${sysconfdir}/ } PACKAGES =+ "\ @@ -69,8 +67,8 @@ RDEPENDS_${PN}-plugins = "\ ${PN}-plugin-vendor-wavecom \ " -RDEPENDS_${PN} += "update-rc.d" -RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN}" +RDEPENDS_${PN} += "update-rc.d osmo-service-respawn" +RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN} osmo-service-respawn" FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*" FILES_${PN}-tools-cell-log = "${bindir}/cell_log ${sysconfdir}/cell-log" From a5d6d983ecd7fb15131e60506e25e9aeb1d3a71e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 14:51:03 +0100 Subject: [PATCH 091/200] openmoko-gsmd: Build a new version with log level changes of the syslog * The patch is now included in a temporary branch * LOGL_NOTICE is now used instead og the LOGL_INFO level which will be ignored by default on sysmocom systems. --- .../openmoko-gsmd/files/cell-log.patch | 114 ------------------ .../openmoko-gsmd/openmoko-gsmd_git.bb | 5 +- 2 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 recipes-openmoko/openmoko-gsmd/files/cell-log.patch diff --git a/recipes-openmoko/openmoko-gsmd/files/cell-log.patch b/recipes-openmoko/openmoko-gsmd/files/cell-log.patch deleted file mode 100644 index d038ca67d8..0000000000 --- a/recipes-openmoko/openmoko-gsmd/files/cell-log.patch +++ /dev/null @@ -1,114 +0,0 @@ -From bde45e2f168597c8f4b2bb0599d58125fd24deb6 Mon Sep 17 00:00:00 2001 -From: Holger Hans Peter Freyther -Date: Wed, 13 Jun 2012 11:17:33 +0200 -Subject: [PATCH] cell_log: Use the RF-Lock handling to unlock the GSM network - -This is missing the reason of why and when something is unlocked. ---- - src/util/cell_log.c | 65 ++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 54 insertions(+), 11 deletions(-) - -diff --git a/src/util/cell_log.c b/src/util/cell_log.c -index 59d8942..7a280aa 100644 ---- a/src/util/cell_log.c -+++ b/src/util/cell_log.c -@@ -27,10 +27,14 @@ - #include - #include - #include -+#include - - #include -+#include - #include - -+#include -+ - #include - #include - #include -@@ -58,31 +62,70 @@ static int pending_responses = 0; - #define MIN_NO_NET_SECS 60 - #define OUR_MCC 901 - #define OUR_MNC 99 --#define LOCK_PATH "/var/lock/bts_rf_lock" - - static time_t last_network_seen; - unsigned int rf_lock_active = 0; - - static void bts_rf_lock(int on) - { -- int fd; -+ int fd, rc; -+ -+ static const uint8_t rf_lock[] = { -+ 0x00, 0x23, 0xEE, 0x00, 0x53, 0x45, 0x54, 0x20, -+ 0x31, 0x20, 0x6E, 0x65, 0x74, 0x2E, 0x72, 0x66, -+ 0x5F, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x67, 0x73, -+ 0x6D, 0x2C, 0x6C, 0x6F, 0x63, 0x6B, 0x2C, 0x6E, -+ 0x2F, 0x61, 0x2C, 0x6E, 0x2F, 0x61, -+ }; -+ -+ static const uint8_t rf_unlock[] = { -+ 0x00, 0x25, 0xEE, 0x00, 0x53, 0x45, 0x54, 0x20, -+ 0x31, 0x20, 0x6E, 0x65, 0x74, 0x2E, 0x72, 0x66, -+ 0x5F, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x67, 0x73, -+ 0x6D, 0x2C, 0x75, 0x6E, 0x6C, 0x6F, 0x63, 0x6B, -+ 0x2C, 0x6E, 0x2F, 0x61, 0x2C, 0x6E, 0x2F, 0x61, -+ }; - - /* only print message on status change */ - if (rf_lock_active != on) - syslog(LOG_NOTICE, "RF_LOCK: %sabling lock\n", on ? "En" : "Dis"); - -- /* for safety, always update the actual file on disk */ -+ fd = socket(AF_INET, SOCK_STREAM, 0); -+ if (fd == -1) { -+ syslog(LOG_ERR, "RF_LOCK: socket creation failed: %d\n", errno); -+ return; -+ } -+ -+ struct sockaddr_in addr; -+ memset(&addr, 0, sizeof(addr)); -+ addr.sin_family = AF_INET; -+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); -+ addr.sin_port = htons(4249); -+ rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr)); -+ if (rc != 0) { -+ syslog(LOG_ERR, "RF_Lock: socket connect failed: %d\n", errno); -+ close(fd); -+ return; -+ } -+ - if (on == 1) { -- struct stat st; -- if (stat(LOCK_PATH, &st) != 0) { -- fd = open(LOCK_PATH, O_WRONLY|O_CREAT, 0664); -- if (fd >= 0) -- close(fd); -- } -- } else -- unlink(LOCK_PATH); -+ rc = write(fd, rf_lock, sizeof(rf_lock)); -+ if (rc != sizeof(rf_lock)) -+ goto error; -+ } else { -+ rc = write(fd, rf_unlock, sizeof(rf_unlock)); -+ if (rc != sizeof(rf_unlock)) -+ goto error; -+ } - -+ close(fd); - rf_lock_active = on; -+ return; -+ -+error: -+ close(fd); -+ syslog(LOG_ERR, "RF_Lock: failed to send the message: %d\n", errno); -+ return; - } - - --- -1.7.10.4 - diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index d198e52596..369c7270d3 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -8,14 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ # Fork with wavecom support SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ - file://cell-log.patch \ file://gsmd \ file://cell-log \ file://default" -SRCREV = "da770f8f34662a298647a75698a718705047d3dc" +SRCREV = "dca4654acdd4e08dd14cad0ded265d5fc6fdd872" S = "${WORKDIR}/git" -PR = "r14.0" +PR = "r15.0" inherit autotools pkgconfig update-rc.d From 63085244df78bfc710188f6c739f92f0416349e3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 22:26:33 +0100 Subject: [PATCH 092/200] openmoko-gsmd: Update gsmd/wavecom vendor to fix an unaligned memory access gsmd/wavecom created unaligned memory access due making a 32bit store to a 16bit location. The code is now using %hx to avoid this. --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 369c7270d3..5ff92f033f 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -11,10 +11,10 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://gsmd \ file://cell-log \ file://default" -SRCREV = "dca4654acdd4e08dd14cad0ded265d5fc6fdd872" +SRCREV = "67c96104a0fff1a6725eb4b3ab52b8bc95356311" S = "${WORKDIR}/git" -PR = "r15.0" +PR = "r16.0" inherit autotools pkgconfig update-rc.d From 23689a489f904e167cfeaadb4a07672951fd85c0 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 17 Mar 2013 14:46:32 +0100 Subject: [PATCH 093/200] update gsmd to current master --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 5ff92f033f..ba974d2f71 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -11,10 +11,10 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://gsmd \ file://cell-log \ file://default" -SRCREV = "67c96104a0fff1a6725eb4b3ab52b8bc95356311" +SRCREV = "de8f1175dcb07f65dde26b42a3f12f9993746c84" S = "${WORKDIR}/git" -PR = "r16.0" +PR = "r17.0" inherit autotools pkgconfig update-rc.d From 6e5e1f8b9e77abd1d3d49d29908d836ce287b691 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 18 Mar 2013 19:38:47 +0100 Subject: [PATCH 094/200] meta-toolchain-osmo: Include the builddate in the toolchain When updating libosmocore and other libraries we would like to know which toolchain version is used. Add the datetime to the filename. --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index 336e95fdaa..3d4a00a7a4 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -1,6 +1,6 @@ #TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg" TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" -TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" +TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}-${DATETIME}" PROVIDES = "meta-toolchain-sdk" require recipes-core/meta/meta-toolchain.bb From 27edfb7481c1b1cd698fc52cd657d1140271253a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 19 Mar 2013 10:18:02 +0100 Subject: [PATCH 095/200] libosmocore: update to git master (log level everything fix) --- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index d782e9b157..71a9d0fe18 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "533f63f15aa584eec73044802e0a8bc798a313fe" +SRCREV = "54c5ed1518b5856e282fd3f7bba02c27ea9d879d" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.6.0+gitr${SRCPV}" -PR = "0" +PR = "1" From 3cf0f9d33896c36877d2fa28dcf2e0398c66745b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 19 Mar 2013 10:39:40 +0100 Subject: [PATCH 096/200] update libosmocore --- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 71a9d0fe18..f35cf4f2da 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "54c5ed1518b5856e282fd3f7bba02c27ea9d879d" +SRCREV = "1a02cfc24d2c812ba13e5aa936588be447bb24af" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.6.0+gitr${SRCPV}" -PR = "1" +PR = "2" From 3a01a4f2bc8e3e4cd4e52396767741aa4a062bba Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 18 Mar 2013 19:34:45 -0700 Subject: [PATCH 097/200] layer.conf: avoid unnecessary early expansion with := bitbake handles immediate expansions of LAYERDIR for us automatically. Signed-off-by: Christopher Larson --- conf/layer.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index f208e42496..ada915b121 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,12 +1,12 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "telephony" -BBFILE_PATTERN_telephony := "^${LAYERDIR}/" +BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" META_TELEPHONY_OSMO_INC = "8" From 558d76a4123fb7e3689ebc30f9d58e3ec1fae043 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 24 Mar 2013 09:07:25 +0100 Subject: [PATCH 098/200] openggsn: Add patch to reduce queue depth / memory usage --- .../openggsn/files/libgtp-queue_depth_32.patch | 13 +++++++++++++ recipes-osmocom/openggsn/openggsn_git.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 recipes-osmocom/openggsn/files/libgtp-queue_depth_32.patch diff --git a/recipes-osmocom/openggsn/files/libgtp-queue_depth_32.patch b/recipes-osmocom/openggsn/files/libgtp-queue_depth_32.patch new file mode 100644 index 0000000000..52bc37bcac --- /dev/null +++ b/recipes-osmocom/openggsn/files/libgtp-queue_depth_32.patch @@ -0,0 +1,13 @@ +diff --git a/gtp/queue.h b/gtp/queue.h +index 556b6ef..d59a1a3 100644 +--- a/gtp/queue.h ++++ b/gtp/queue.h +@@ -19,7 +19,7 @@ + + #define QUEUE_DEBUG 0 /* Print debug information */ + +-#define QUEUE_SIZE 1024 /* Size of retransmission queue */ ++#define QUEUE_SIZE 32 /* Size of retransmission queue */ + #define QUEUE_HASH_SIZE 65536 /* Size of hash table (2^16) */ + + struct qmsg_t { /* Holder for queued packets */ diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index 8aaaf8d496..ebcfee6f3c 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -2,11 +2,12 @@ DESCRITOPN = "OpenGGSN a Free Software GGSN" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" -PR = "r11" +PR = "r12" SRCREV = "95848bafcef145d776d70a73f7bdc3fe37e85724" SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \ file://openggsn.init \ + file://libgtp-queue_depth_32.patch \ " S = "${WORKDIR}/git" From 7782174da7784da9a7fd3a16773f05f64138e5af Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 11:10:54 +0100 Subject: [PATCH 099/200] misc: Fix warnings in OE-core master to be included in the future --- recipes-isdn/dahdi-tools/dahdi-tools.inc | 4 ++-- recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb | 4 ++-- .../tasks/task-core-standalone-osmo-sdk-target.bb | 6 +++++- recipes-osmocom/tasks/task-osmocom.bb | 4 ++-- recipes-telephony/tasks/task-telephony-all.bb | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/recipes-isdn/dahdi-tools/dahdi-tools.inc b/recipes-isdn/dahdi-tools/dahdi-tools.inc index 61280ea0ad..06ef35cf23 100644 --- a/recipes-isdn/dahdi-tools/dahdi-tools.inc +++ b/recipes-isdn/dahdi-tools/dahdi-tools.inc @@ -1,6 +1,6 @@ DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" DEPENDS = "dahdi-linux libnewt libpcap" -RDEPENDS += "perl perl-module-strict perl-module-file-basename perl-module-config \ +RDEPENDS_${PN} += "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" @@ -11,7 +11,7 @@ LICENSE = "GPLv2" SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \ file://perl_install.patch " -INC_PR="r18" +INC_PR="r19" LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09" diff --git a/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb index b86c8e35e7..da0e1050b2 100644 --- a/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb +++ b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Osmocom round-robin tcpdump/capture" LICENSE = "GPLv3+" -RDEPENDS = "tcpdump bash" -PR = "r10" +RDEPENDS_${PN} = "tcpdump bash" +PR = "r11" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb index 21193ad84b..4af2f55851 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -8,7 +8,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r3" -ALLOW_EMPTY = "1" +ALLOW_EMPTY_${PN} = "1" + +# TODO: We need to rename this task to packagegroup but for now we +# will need to skip this test. +INSANE_SKIP_${PN} += "dev-deps" require task-sdk-osmo.inc diff --git a/recipes-osmocom/tasks/task-osmocom.bb b/recipes-osmocom/tasks/task-osmocom.bb index de2efa0948..eb6216d729 100644 --- a/recipes-osmocom/tasks/task-osmocom.bb +++ b/recipes-osmocom/tasks/task-osmocom.bb @@ -3,8 +3,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" -PR = "r1" +ALLOW_EMPTY_${PN} = "1" +PR = "r2" RDEPENDS_task-osmocom = "\ libosmocore \ diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb index 7ee97ff1cd..1899a9cbcb 100644 --- a/recipes-telephony/tasks/task-telephony-all.bb +++ b/recipes-telephony/tasks/task-telephony-all.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Task for the meta-telephony layer. This is to build everything" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -ALLOW_EMPTY = "1" -PR = "r1" +ALLOW_EMPTY_${PN} = "1" +PR = "r2" DEPENDS = "\ libosmo-abis \ From 4a35eb9273e30a4429f1ece885802bff161c7839 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 7 Apr 2013 09:59:36 +0200 Subject: [PATCH 100/200] openbsc: Build a newer version with a linker fix for newer gcc/binutils --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index d7454186e0..8a739fb08b 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "7159e8bea3e39bf74ec26356f7317df5d540b77a" +SRCREV = "1c0c31709462af26bb1a1176c3e8b3491a26d429" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 4214e03720bcea3776400843ac041916463b7784 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 16 Mar 2013 11:10:54 +0100 Subject: [PATCH 101/200] misc: Bump PR after fixing warnings in OE-core master --- recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb index 4af2f55851..83a571f042 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Software Development Kit for Osmocom devices" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r3" +PR = "r4" ALLOW_EMPTY_${PN} = "1" From 286a9a90cfd9ca7c8db489d5942676c8e177b751 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 13 Jun 2013 19:30:15 +0200 Subject: [PATCH 102/200] openbsc: Update the OpenBSC SRCREV * Added NAT MGCP Statistic collection * SMPP fixes * BTS type sysmobts is working now --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 8a739fb08b..02d45cba48 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "1c0c31709462af26bb1a1176c3e8b3491a26d429" +SRCREV = "b0bf1da4c87f1ab3f9367bbeea615dc86d13131c" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 1a9dd62e22bd913517ff2304481f8a094c63eebe Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 10 Jul 2013 12:55:12 +0200 Subject: [PATCH 103/200] ortp: gcc 4.8 fails to compile this module because of a wrong memset --- .../ortp/files/compile-fixes-newer-gcc.diff | 13 +++++++++++++ recipes-misc/ortp/ortp_0.16.5.bb | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 recipes-misc/ortp/files/compile-fixes-newer-gcc.diff diff --git a/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff b/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff new file mode 100644 index 0000000000..94ddde0bf8 --- /dev/null +++ b/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff @@ -0,0 +1,13 @@ +Index: ortp-0.16.5/src/stun.c +=================================================================== +--- ortp-0.16.5.orig/src/stun.c ++++ ortp-0.16.5/src/stun.c +@@ -399,7 +399,7 @@ stunParseMessage( char* buf, unsigned in + char* body; + unsigned int size; + ortp_debug("stun: Received stun message: %i bytes\n", bufLen); +- memset(msg, 0, sizeof(msg)); ++ memset(msg, 0, sizeof(*msg)); + + if (sizeof(StunMsgHdr) > bufLen) + { diff --git a/recipes-misc/ortp/ortp_0.16.5.bb b/recipes-misc/ortp/ortp_0.16.5.bb index 55e945815f..79996a20ce 100644 --- a/recipes-misc/ortp/ortp_0.16.5.bb +++ b/recipes-misc/ortp/ortp_0.16.5.bb @@ -1,8 +1,9 @@ require ortp.inc DEPENDS = "glib-2.0 " -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" -SRC_URI += "file://0001-fix-unused-variables.patch;patch=1" +SRC_URI += "file://0001-fix-unused-variables.patch;patch=1 \ + file://compile-fixes-newer-gcc.diff" SRC_URI[md5sum] = "94546901d14b85f97342f4ecf39489b1" SRC_URI[sha256sum] = "3b655a79f9122afd298e9cd702e542908bbd6ea1337c02553110c57e0b3c5835" From f608e7e4f9bb45905839f4313a7e63b4de7e7b32 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 1 Aug 2013 19:38:32 +0200 Subject: [PATCH 104/200] libosmocore/libosmo-abis: Update libosmo-abis to an experimental branch Update libosmocore to 0.6.2+git and the libosmo-abis to a branch useful for the osmo-bts. --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index ada915b121..30dfe59761 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "8" +META_TELEPHONY_OSMO_INC = "9" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 0e521bd84c..ab184df03a 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d426d458ca96ba29793e35b1b2a73fbcb3b2c888" +SRCREV = "f1febda826b87ac78a4cc33504159cc7821e3190" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" PV = "0.1.3+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index f35cf4f2da..68c64bd752 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1a02cfc24d2c812ba13e5aa936588be447bb24af" +SRCREV = "a652abc5bf75435ba7f1c96ed914cf5805fc326f" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.6.0+gitr${SRCPV}" +PV = "0.6.2+gitr${SRCPV}" PR = "2" From 0b2ae79dad71e76ebddc24d8f505724dc4ad1a45 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 6 Oct 2013 17:05:19 +0200 Subject: [PATCH 105/200] libosmo-abis: Upgrade git version with semantic/abi changes --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 30dfe59761..cfe218085b 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "9" +META_TELEPHONY_OSMO_INC = "10" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index ab184df03a..db5da2b3b0 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f1febda826b87ac78a4cc33504159cc7821e3190" +SRCREV = "e58d33153dd2bed3629b9a09fd6add58f296bd6a" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" PV = "0.1.3+gitr${SRCPV}" PR = "${INC_PR}.2" From 079a2cad84fe79c67678a4765961be8a02d80270 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 7 Oct 2013 18:10:15 +0200 Subject: [PATCH 106/200] openbsc: Big update needed after the upgrade of libosmo-abis --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 02d45cba48..b849fd3cf5 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.2" -SRCREV = "b0bf1da4c87f1ab3f9367bbeea615dc86d13131c" +SRCREV = "caa98d51b64e16bbe6d4933d9052b617432e5e22" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 32d4a2691feb4e6c49519f9a1f28002cd4c94c25 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 13 Oct 2013 20:13:49 +0200 Subject: [PATCH 107/200] =?UTF-8?q?update=20openmoko-gsmd=20to=20include?= =?UTF-8?q?=20AT@COPS=3D=3F=20command=20support?= --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index ba974d2f71..594cac2ef6 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -11,10 +11,10 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://gsmd \ file://cell-log \ file://default" -SRCREV = "de8f1175dcb07f65dde26b42a3f12f9993746c84" +SRCREV = "8781da796c22dc883985bb80d1e1d11fbdaa2135" S = "${WORKDIR}/git" -PR = "r17.0" +PR = "r18.0" inherit autotools pkgconfig update-rc.d From 145410f478b1ab3d87957c365ad38486db04d47a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 14 Oct 2013 19:52:58 +0200 Subject: [PATCH 108/200] update gsmd to include latest AT@COPS fix --- recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb index 594cac2ef6..1aeb49fb42 100644 --- a/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb +++ b/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb @@ -11,10 +11,10 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \ file://gsmd \ file://cell-log \ file://default" -SRCREV = "8781da796c22dc883985bb80d1e1d11fbdaa2135" +SRCREV = "ea175de97e6ecf87129a7412a67ce3146f56b5d1" S = "${WORKDIR}/git" -PR = "r18.0" +PR = "r19.0" inherit autotools pkgconfig update-rc.d From af181bf461e35445f2828314166c6f9a6f4f3048 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 2 Dec 2013 20:41:39 +0100 Subject: [PATCH 109/200] add recipe for libopencore-amr --- .../libopencore-amr/libopencore-amr_0.1.3.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes-misc/libopencore-amr/libopencore-amr_0.1.3.bb diff --git a/recipes-misc/libopencore-amr/libopencore-amr_0.1.3.bb b/recipes-misc/libopencore-amr/libopencore-amr_0.1.3.bb new file mode 100644 index 0000000000..34304b7b72 --- /dev/null +++ b/recipes-misc/libopencore-amr/libopencore-amr_0.1.3.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "OpenCORE AMR decoder library" +SECTION = "libs" +LICENSE="Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=dd2c2486aca02190153cf399e508c7e7" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/opencore-amr/opencore-amr-${PV}.tar.gz" +S = "${WORKDIR}/opencore-amr-${PV}" + +inherit autotools + +SRC_URI[md5sum] = "09d2c5dfb43a9f6e9fec8b1ae678e725" +SRC_URI[sha256sum] = "106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385" From 6d1fc80b264f03422b2033a08e68b4c753e47b5f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 2 Dec 2013 20:52:14 +0100 Subject: [PATCH 110/200] add recipe for sofia-sip (SIP client library) required by lcr --- recipes-misc/sofia-sip/sofia-sip.inc | 19 +++++++++++++++++++ recipes-misc/sofia-sip/sofia-sip_1.12.11.bb | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 recipes-misc/sofia-sip/sofia-sip.inc create mode 100644 recipes-misc/sofia-sip/sofia-sip_1.12.11.bb diff --git a/recipes-misc/sofia-sip/sofia-sip.inc b/recipes-misc/sofia-sip/sofia-sip.inc new file mode 100644 index 0000000000..cd987faa6d --- /dev/null +++ b/recipes-misc/sofia-sip/sofia-sip.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification." +HOMEPAGE = "http://sofia-sip.sourceforge.net/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=03068f550c635f6520e0f0252da412fc" +SECTION = "libs" +DEPENDS = "glib-2.0 openssl" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" + +inherit autotools pkgconfig + +PACKAGES += " ${PN}-bin ${PN}-glib" + +FILES_${PN}-bin = "${bindir}" +FILES_${PN} = "${libdir}/libsofia-sip-ua.so.*" +FILES_${PN}-dev += "${datadir}/sofia-sip/*.awk" +FILES_${PN}-glib = "${libdir}/libsofia-sip-ua-glib.so.*" + +LEAD_SONAME = "libsofia-sip-ua.so" diff --git a/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb b/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb new file mode 100644 index 0000000000..4c3eff14df --- /dev/null +++ b/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb @@ -0,0 +1,3 @@ +require sofia-sip.inc + +PR = "r1" From dde93d16d67fdb8214c7c6f64cd6386afe545170 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 2 Dec 2013 21:56:26 +0100 Subject: [PATCH 111/200] update lcr to 1.13 + current git --- recipes-isdn/lcr/files/lcr-disable-gsmfr.diff | 36 +++++++++++++++++++ recipes-isdn/lcr/lcr_git.bb | 34 +++++++++--------- 2 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 recipes-isdn/lcr/files/lcr-disable-gsmfr.diff diff --git a/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff b/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff new file mode 100644 index 0000000000..ff968af312 --- /dev/null +++ b/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index b1fab38..053f26e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -61,15 +61,8 @@ GSM_LIB = + + if ENABLE_GSM + +-#if ENABLE_GSMFR +- + GSM_INCLUDE += -DWITH_GSMFR +- +-GSM_LIB += libgsmfr/lib/libgsm.a +- +-SUBDIRS += libgsmfr +- +-#endif ++GSM_LIB += -lgsm + + if ENABLE_GSMHR + +@@ -205,14 +198,6 @@ TONEDIRS = tones_american tones_efi tones_german vbox_english vbox_german + EXTRA_DIST = default debian $(TONEDIRS) + + install-data-hook: +- @fns='strcpy strncpy strcat strncat sprintf snprintf' ; \ +- files=$$( find $(srcdir) -type f -name "*.c*" \ +- | $(GREP) -v -e chan_lcr.c -e callerid.c ) ; \ +- test -z "$$files" || { for fn in $$fns ; do \ +- $(GREP) -n $$fn $$files ; if test $$? = 0 ; then \ +- ( echo "dont use $$fn, use makro instead." ; exit -1 ) ; \ +- fi ; \ +- done ; } + mkdir -p '$(DESTDIR)$(CONFIGdir)' + mkdir -p '$(DESTDIR)$(SHAREdir)' + mkdir -p '$(DESTDIR)$(LOGdir)' diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 60089bd600..4dbcd95c47 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -1,43 +1,43 @@ DESCRITOPN = "Linux Call Router" -DEPENDS = "misdn-utils asterisk libgsm" +DEPENDS = "asterisk libgsm libopencore-amr sofia-sip" HOMEPAGE = "http://isdn.eversberg.eu/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" -PV = "1.10+gitr${SRCPV}" -PR = "r16" +PV = "1.13+gitr${SRCPV}" +PR = "r1" -SRCREV = "cd2834a10ceb14f8d2e70334a89b531119b954d4" +SRCREV = "f3b94bf3a9599359805eaf20f3b036272c7af522" SRC_URI = "git://git.misdn.eu/lcr.git \ + file://lcr-disable-gsmfr.diff \ file://lcr.init " S = "${WORKDIR}/git" -EXTRA_OECONF = "--with-gsm-bs --with-asterisk" - -RDEPENDS_${PN} += "kernel-module-misdn-l1loop kernel-module-misdn-dsp" +EXTRA_OECONF = "--with-gsm-bs --with-asterisk --without-misdn --with-sip" inherit autotools update-rc.d PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \ - ${PN}-tones-en ${PN}-vbox-en " + ${PN}-tones-en ${PN}-vbox-en \ + ${PN}-asterisk" -FILES_${PN} += "/usr/local ${libdir}/asterisk/modules" -FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" -CONFFILES_${PN} = "/usr/local/lcr/options.conf" +CONFFILES_${PN} = "${sysconfdir}/lcr/options.conf" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME_${PN} = "lcr" INITSCRIPT_PARAMS_${PN} = "defaults 30 30" -FILES_${PN}-tones-de = "/usr/local/lcr/tones_german" -FILES_${PN}-tones-en = "/usr/local/lcr/tones_american" -FILES_${PN}-vbox-de = "/usr/local/lcr/vbox_german" -FILES_${PN}-vbox-en = "/usr/local/lcr/vbox_english" +FILES_${PN}-tones-de = "/usr/share/lcr/tones_german" +FILES_${PN}-tones-en = "/usr/share/lcr/tones_american" +FILES_${PN}-vbox-de = "/usr/share/lcr/vbox_german" +FILES_${PN}-vbox-en = "/usr/share/lcr/vbox_english" +FILES_${PN}-asterisk = "/usr/lib/asterisk/modules/chan_lcr.so" do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0775 ${WORKDIR}/lcr.init ${D}${sysconfdir}/init.d/lcr - rm ${D}/usr/local/lcr/routing.conf - rm ${D}/usr/local/lcr/interface.conf + rm ${D}${sysconfdir}/lcr/routing.conf + rm ${D}${sysconfdir}/lcr/interface.conf + rm ${D}${sysconfdir}/lcr/directory.list } From 068f2d676a8fcdf37c67fc64d993cde85a6b78f4 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 4 Dec 2013 16:28:31 +0100 Subject: [PATCH 112/200] lcr: disable AMR support for now, to force GSM FR to be used. --- recipes-isdn/lcr/files/lcr-disable-gsmfr.diff | 14 +++++++++++--- recipes-isdn/lcr/lcr_git.bb | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff b/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff index ff968af312..1c94c6569a 100644 --- a/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff +++ b/recipes-isdn/lcr/files/lcr-disable-gsmfr.diff @@ -1,8 +1,16 @@ diff --git a/Makefile.am b/Makefile.am -index b1fab38..053f26e 100644 +index b1fab38..df19a20 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -61,15 +61,8 @@ GSM_LIB = +@@ -53,23 +53,14 @@ MISDN_LIB = -lmisdn + + endif + +-SUBDIRS = +- + GSM_INCLUDE = + GSM_SOURCE = + GSM_LIB = if ENABLE_GSM @@ -19,7 +27,7 @@ index b1fab38..053f26e 100644 if ENABLE_GSMHR -@@ -205,14 +198,6 @@ TONEDIRS = tones_american tones_efi tones_german vbox_english vbox_german +@@ -205,14 +196,6 @@ TONEDIRS = tones_american tones_efi tones_german vbox_english vbox_german EXTRA_DIST = default debian $(TONEDIRS) install-data-hook: diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 4dbcd95c47..7e90a19116 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -5,11 +5,12 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" PV = "1.13+gitr${SRCPV}" -PR = "r1" +PR = "r2" SRCREV = "f3b94bf3a9599359805eaf20f3b036272c7af522" SRC_URI = "git://git.misdn.eu/lcr.git \ file://lcr-disable-gsmfr.diff \ + file://lcr-no_amr.diff \ file://lcr.init " S = "${WORKDIR}/git" From 66a294731534e7d70aaad339e31ebdb1a34761d5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 17 Jan 2014 15:30:31 +0100 Subject: [PATCH 113/200] sdk: Use the staticdev packet for libosmo-sccp libosmo-sccp does not install any dynamically shared libraries so let us install/depend on the staticdev package installing the .a files and the -dev package. --- recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb | 2 +- recipes-osmocom/tasks/task-sdk-osmo.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb index 83a571f042..6eb5d21b38 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Software Development Kit for Osmocom devices" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r4" +PR = "r5" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-osmocom/tasks/task-sdk-osmo.inc b/recipes-osmocom/tasks/task-sdk-osmo.inc index 6f9ba8d209..29f3ad98ce 100644 --- a/recipes-osmocom/tasks/task-sdk-osmo.inc +++ b/recipes-osmocom/tasks/task-sdk-osmo.inc @@ -1,6 +1,6 @@ SDK-OSMO = " \ libosmocore-dev \ - libosmo-sccp-dev \ + libosmo-sccp-staticdev \ libosmo-abis-dev \ libgtp-dev \ libdbi-dev \ From b4d863a61c51181a4b73cd532fb40a3c7a2b6082 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 20 Jan 2014 11:21:06 +0100 Subject: [PATCH 114/200] libosmocore/libosmo-abis: Upgrade the two libraries including ABI changes The two libraires moved forward and are updated to the latest releases now. --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 4 ++-- recipes-osmocom/libosmocore/libosmocore_git.bb | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index cfe218085b..3490fd1d82 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "10" +META_TELEPHONY_OSMO_INC = "11" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index db5da2b3b0..4bc295a87a 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e58d33153dd2bed3629b9a09fd6add58f296bd6a" +SRCREV = "f6415ea5a6bfd796c854dc0bace326de26bf26f1" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.1.3+gitr${SRCPV}" +PV = "0.1.6+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 68c64bd752..dfe3ea0204 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a652abc5bf75435ba7f1c96ed914cf5805fc326f" +SRCREV = "050e9c4a1c785ca87043b606b80ad9b253a9eb12" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.6.2+gitr${SRCPV}" -PR = "2" +PV = "0.6.5+gitr${SRCPV}" +PR = "r0" From fc6794fe40464066b747ae37d65d2389417e2c64 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 14 Feb 2014 17:42:38 +0100 Subject: [PATCH 115/200] openbsc: Enable the RF handling interface in osmo-bsc --- recipes-osmocom/openbsc/openbsc/osmo-bsc.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc.init index c75e2db946..c793a0b2c6 100755 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc.init +++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc.init @@ -11,7 +11,7 @@ DAEMON=/usr/bin/osmo-bsc NAME=osmo-bsc DESC="Osmocom GSM Base Station Controller" -NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc.cfg" +NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc.cfg -r /var/run/openbsc.ctl" OSMOBTS_EXTRA_ARGS="" NO_START=1 From bcc815560a4fe4ce40061ec090aca0f5be38b8e5 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 18 Feb 2014 17:41:56 +0100 Subject: [PATCH 116/200] openbsc: package systemd-files for nitb, osmo-bsc-mgcp and osmo-bsc * services are not enabled by default --- recipes-osmocom/openbsc/openbsc.inc | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 235c087134..e1a93ee81c 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -10,7 +10,8 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc_mgcp.init \ file://osmo-bsc.init \ file://osmo-sgsn.init" -INC_PR = "r15.${META_TELEPHONY_OSMO_INC}" + +INC_PR = "r16.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp" @@ -24,17 +25,25 @@ do_configure_prepend() { do_install_append() { install -d ${D}${sysconfdir}/osmocom - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rc5.d install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/osmo-bsc.cfg install -m 0660 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg install -m 0660 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/osmo-sgsn.cfg + + # Install sysv-init files + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/rc5.d install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb install -m 0775 ${WORKDIR}/osmo-bsc_mgcp.init ${D}${sysconfdir}/init.d/osmo-bsc-mgcp install -m 0775 ${WORKDIR}/osmo-bsc.init ${D}${sysconfdir}/init.d/osmo-bsc install -m 0775 ${WORKDIR}/osmo-sgsn.init ${D}${sysconfdir}/init.d/osmo-sgsn + # Install systemd files and enable on sysinit + install -d ${D}${systemd_unitdir}/system + for i in `ls ${S}/contrib/systemd`; do + install -m 0644 ${S}/contrib/systemd/$i ${D}${systemd_unitdir}/system/ + done + install -d ${D}/var/lib/osmocom } @@ -47,14 +56,18 @@ INITSCRIPT_NAME_osmo-bsc = "osmo-bsc" INITSCRIPT_PARAMS_osmo-bsc = "defaults 30 30" FILES_osmo-bsc = " ${bindir}/osmo-bsc \ ${sysconfdir}/osmocom/osmo-bsc.cfg \ - ${sysconfdir}/init.d/osmo-bsc" + ${sysconfdir}/init.d/osmo-bsc \ + ${systemd_unitdir}/system/osmo-bsc.service \ + " CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg" INITSCRIPT_NAME_osmo-bsc-mgcp = "osmo-bsc-mgcp" INITSCRIPT_PARAMS_osmo-bsc-mgcp = "defaults 30 30" FILES_osmo-bsc-mgcp = " ${bindir}/osmo-bsc_mgcp \ ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \ - ${sysconfdir}/init.d/osmo-bsc-mgcp" + ${sysconfdir}/init.d/osmo-bsc-mgcp \ + ${systemd_unitdir}/system/osmo-bsc-mgcp.service \ + " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" @@ -62,7 +75,9 @@ INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ ${sysconfdir}/init.d/osmo-nitb \ - ${sysconfdir}/osmocom/osmo-nitb.cfg" + ${sysconfdir}/osmocom/osmo-nitb.cfg \ + ${systemd_unitdir}/system/osmo-nitb.service \ + " CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" INITSCRIPT_NAME_osmo-sgsn = "osmo-sgsn" From 12ffb5bffe5b1d85cb8b3dc6d97a6e91b4643425 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 13 Mar 2014 16:43:48 +0100 Subject: [PATCH 117/200] libosmocore: Build newer version with LAPDm fixes by jacob --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index dfe3ea0204..f85b89e8d3 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "050e9c4a1c785ca87043b606b80ad9b253a9eb12" +SRCREV = "e47523874da2e79e79f149f433d6a53f230dc30c" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.6.5+gitr${SRCPV}" PR = "r0" From d496a8d59b0534fddbf2807e3474d9e7bea1308b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 18:32:49 +0100 Subject: [PATCH 118/200] openbsc: Build a lot newer version and install sgsn script --- recipes-osmocom/openbsc/openbsc.inc | 4 +++- recipes-osmocom/openbsc/openbsc_git.bb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index e1a93ee81c..5d5e89a4f8 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -84,7 +84,9 @@ INITSCRIPT_NAME_osmo-sgsn = "osmo-sgsn" INITSCRIPT_PARAMS_osmo-sgsn = "defaults 30 30" FILES_osmo-sgsn = " ${bindir}/osmo-sgsn \ ${sysconfdir}/init.d/osmo-sgsn \ - ${sysconfdir}/osmocom/osmo-sgsn.cfg" + ${sysconfdir}/osmocom/osmo-sgsn.cfg \ + ${systemd_unitdir}/system/osmo-sgsn.service \ + " FILES_ipaccess-utils = " ${bindir}/ipaccess-find ${bindir}/ipaccess-config ${bindir}/ipaccess-proxy " FILES_osmo-bsc-nat = " ${bindir}/osmo-bsc_nat " diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index b849fd3cf5..9c0ce3671d 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" -SRCREV = "caa98d51b64e16bbe6d4933d9052b617432e5e22" +SRCREV = "ebe55aa95a11bff56779e1354cf8f6640a1a7a9e" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From cedace00ed848433a728cc449e1f58207fa9c5ba Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 21 Mar 2014 18:45:56 +0100 Subject: [PATCH 119/200] openggsn: Update and install systemd service file This might require to rebuild the freshly built openggsn to fix the libgtp0 depedency. I had this issue on Dora without a PRServer. I am not sure it applies to edison or other configs. Bump the PR of OpenBSC to force a rebuild of the SGSN. Fixes: SYS#176 --- recipes-osmocom/openbsc/openbsc.inc | 2 +- recipes-osmocom/openggsn/openggsn_git.bb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 5d5e89a4f8..06c0d97bff 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -11,7 +11,7 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc.init \ file://osmo-sgsn.init" -INC_PR = "r16.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r17.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp" diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index ebcfee6f3c..4da39ef8bb 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" PR = "r12" -SRCREV = "95848bafcef145d776d70a73f7bdc3fe37e85724" -SRC_URI = "git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn \ +SRCREV = "4afb44a25ebe9d33886531c0a1c549d70da198bd" +SRC_URI = "git://git.osmocom.org/openggsn \ file://openggsn.init \ file://libgtp-queue_depth_32.patch \ " @@ -18,7 +18,10 @@ inherit autotools update-rc.d do_install_append() { install -d ${D}${sysconfdir}/init.d + install -d ${D}${systemd_unitdir}/system + install -m 0776 ${WORKDIR}/openggsn.init ${D}${sysconfdir}/init.d/openggsn + install -m 0644 ${S}/contrib/openggsn.service ${D}${systemd_unitdir}/system/ } INITSCRIPT_PACKAGES = "openggsn" @@ -32,3 +35,4 @@ FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" FILES_libgtp-staticdev = "${libdir}/*.a" FILES_openggsn-sgsnemu = "${bindir}/sgsnemu" +FILES_${PN} += "${systemd_unitdir}/system/*" From 29bf1c64dace2eb9b1dc3c55c90d595f20f60f3e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 23 Mar 2014 10:35:21 +0100 Subject: [PATCH 120/200] openggsn: Update with a version supporting the logfile command --- recipes-osmocom/openggsn/openggsn_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index 4da39ef8bb..f87b24ce79 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" PR = "r12" -SRCREV = "4afb44a25ebe9d33886531c0a1c549d70da198bd" +SRCREV = "9c0ff4fafe4276396125a52c89d36967566fe08c" SRC_URI = "git://git.osmocom.org/openggsn \ file://openggsn.init \ file://libgtp-queue_depth_32.patch \ From b694ffd3331f4d3bd84fcea1a7b40bbd50f94724 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 23 Mar 2014 18:47:39 +0100 Subject: [PATCH 121/200] openbsc: Update OpenBSC with new NITB/SGSN Control commands --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 9c0ce3671d..2f9984685b 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.3" -SRCREV = "ebe55aa95a11bff56779e1354cf8f6640a1a7a9e" +SRCREV = "a27303094ab8bedb0a3b3bfe771daeed10a2e0a9" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 369cbe01e5b02a772b2d8bac2bba9c7124d31d6b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 27 Mar 2014 08:01:49 +0100 Subject: [PATCH 122/200] openbsc: Apply max_power_reduction changes This version will apply the max_power_reduction when it is changed through the control interface. --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 2f9984685b..1bf7bb39dd 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.3" -SRCREV = "a27303094ab8bedb0a3b3bfe771daeed10a2e0a9" +SRCREV = "8a158bb1ea36d0f88da18d0f034884b30f09fda2" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" From 507dc57c51981dc7016b49582a99cdabbe68d1df Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 8 Apr 2014 19:30:51 +0200 Subject: [PATCH 123/200] libosmocore/libosmo-abis: Upgrade to 0.6.6 and 0.2.0 Upgrade to versions 0.6.6 and 0.2.0. These change the SO version of the libraries and provide stability and reliability fixes. --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 4 ++-- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 3490fd1d82..b143ff16d7 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "11" +META_TELEPHONY_OSMO_INC = "12" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 4bc295a87a..cd398930e0 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f6415ea5a6bfd796c854dc0bace326de26bf26f1" +SRCREV = "ecd0a36ce8d468985ec296214e3ecced8da487cc" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.1.6+gitr${SRCPV}" +PV = "0.2.0+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index f85b89e8d3..a5b695a556 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "e47523874da2e79e79f149f433d6a53f230dc30c" +SRCREV = "0c50b17a2636a4a9d471ebbaf2cdb9396390e4cd" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.6.5+gitr${SRCPV}" +PV = "0.6.6+gitr${SRCPV}" PR = "r0" From 0eafd5637d31f98fc7946854156ded059b0a7ad2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 8 Apr 2014 19:43:14 +0200 Subject: [PATCH 124/200] libdbi-drivers: Add fixes for out-of-bounds write in the sqlite3 driver While working on the OpenBSC/NITB schema migration I experienced crashes and traced it down to libdbi-drivers. It was possible that a special string quote each character and then adding '"\0' would result in out of bounds write. --- .../libdbi/files/memory-corruption-fixes.patch | 17 +++++++++++++++++ recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 recipes-misc/libdbi/files/memory-corruption-fixes.patch diff --git a/recipes-misc/libdbi/files/memory-corruption-fixes.patch b/recipes-misc/libdbi/files/memory-corruption-fixes.patch new file mode 100644 index 0000000000..ff42752a44 --- /dev/null +++ b/recipes-misc/libdbi/files/memory-corruption-fixes.patch @@ -0,0 +1,17 @@ +This is a backport of a fix from Holger Freyther to the +libdbd sqlite3 driver. + +Index: libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c +=================================================================== +--- libdbi-drivers-0.8.3-1.orig/drivers/sqlite3/dbd_sqlite3.c ++++ libdbi-drivers-0.8.3-1/drivers/sqlite3/dbd_sqlite3.c +@@ -502,7 +502,8 @@ size_t dbd_quote_binary(dbi_conn_t *conn + unsigned char *temp; + size_t len; + +- if ((temp = malloc(from_length*2)) == NULL) { ++ /* allocate an extra byte for NULL and two for the quotes */ ++ if ((temp = malloc(2*from_length+1+2)) == NULL) { + return 0; + } + diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb index 2f2e39df79..deeb56ec3d 100644 --- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb +++ b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb @@ -1,6 +1,8 @@ require ${PN}.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd" SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72" + +SRC_URI += "file://memory-corruption-fixes.patch" From 4da2963d82e7bee3045f73448d17395f78f1caf0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 22 Apr 2014 22:09:48 +0200 Subject: [PATCH 125/200] openbsc: Decrease the version number of MNCC to 2 again Currently OpenBSC and LCR are not compatible with each other. So far we have only included patches that add new defines and do not change the wire format of messages. Just revert it so we can have LCR talk to OpenBSC --- .../openbsc/openbsc/revert-mncc-version.patch | 19 +++++++++++++++++++ recipes-osmocom/openbsc/openbsc_git.bb | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch diff --git a/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch b/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch new file mode 100644 index 0000000000..c4c2ee8a46 --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch @@ -0,0 +1,19 @@ +OpenBSC has bumped the version from 2 to 4 but only introduced +new defines so the actual wire protocol has not been changed +yet. This is why we can just turn the version back. At least I +hope so. + + +Index: openbsc/include/openbsc/mncc.h +=================================================================== +--- openbsc.orig/include/openbsc/mncc.h ++++ openbsc/include/openbsc/mncc.h +@@ -163,7 +163,7 @@ struct gsm_data_frame { + unsigned char data[0]; + }; + +-#define MNCC_SOCK_VERSION 4 ++#define MNCC_SOCK_VERSION 2 + struct gsm_mncc_hello { + uint32_t msg_type; + uint32_t version; diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 1bf7bb39dd..7d395ca382 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,10 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRCREV = "8a158bb1ea36d0f88da18d0f034884b30f09fda2" -SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" +SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ + file://revert-mncc-version.patch" S = "${WORKDIR}/git/openbsc" From f71f5ea031d96a5a84bde4531974542ae49f8bee Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 23 Apr 2014 11:46:05 +0200 Subject: [PATCH 126/200] openbsc: Correct the OpenBSC MGCP GW configuration file --- recipes-osmocom/openbsc/openbsc.inc | 2 +- recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 06c0d97bff..7c27ecc5bf 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -11,7 +11,7 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc.init \ file://osmo-sgsn.init" -INC_PR = "r17.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r18.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp" diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init index badd954f07..f41758880a 100755 --- a/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init +++ b/recipes-osmocom/openbsc/openbsc/osmo-bsc_mgcp.init @@ -11,7 +11,7 @@ DAEMON=/usr/bin/osmo-bsc_mgcp NAME=osmo-bsc_mgcp DESC="Osmocom GSM BSC MGCP proxy" -NORMAL_ARGS="-D -c /etc/osmocom/bsc_mgcp.cfg" +NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-mgcp.cfg" OSMOBTS_EXTRA_ARGS="" NO_START=1 From ea7e6ec76396aa3fc99531de82d68e3ede59f2bf Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 18 May 2014 11:06:04 +0200 Subject: [PATCH 127/200] add missing lcr-no_amr.diff from 068f2d676a8fcdf37c67fc64d993cde85a6b78f4 --- recipes-isdn/lcr/files/lcr-no_amr.diff | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes-isdn/lcr/files/lcr-no_amr.diff diff --git a/recipes-isdn/lcr/files/lcr-no_amr.diff b/recipes-isdn/lcr/files/lcr-no_amr.diff new file mode 100644 index 0000000000..b5b85f0c50 --- /dev/null +++ b/recipes-isdn/lcr/files/lcr-no_amr.diff @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 1911187..c395ee2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -185,8 +185,8 @@ AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" ) + AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes") + + # check for opencore-amrnb for AMR and EFR decoding +-found_opencore_amrnb=yes +-PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no) ++found_opencore_amrnb=no ++#PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no) + AM_CONDITIONAL(ENABLE_GSMAMR, test "$found_opencore_amrnb" = "yes") + if test "$found_opencore_amrnb" = yes; then + AC_DEFINE(HAVE_OPENCORE_AMRNB, 1, [Define to 1 if OpenCore AMR-NB library is available]) From eff76c2d8c5485d22057bb107d46eb7672646c70 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 19 May 2014 11:32:16 +0200 Subject: [PATCH 128/200] lcr: update to current master; re-introduce AMR support Update to current master of lcr, which includes support for AMR and RTP-bridge. Master openbsc doesn't support RTP-bridge yet, but it will work with a transcoding LCR getting all TCH frames in all codecs (HR/FR/EFR/AMR) via MNCC. --- recipes-isdn/lcr/files/lcr-no_amr.diff | 15 --------------- recipes-isdn/lcr/lcr_git.bb | 5 ++--- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 recipes-isdn/lcr/files/lcr-no_amr.diff diff --git a/recipes-isdn/lcr/files/lcr-no_amr.diff b/recipes-isdn/lcr/files/lcr-no_amr.diff deleted file mode 100644 index b5b85f0c50..0000000000 --- a/recipes-isdn/lcr/files/lcr-no_amr.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1911187..c395ee2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -185,8 +185,8 @@ AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" ) - AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes") - - # check for opencore-amrnb for AMR and EFR decoding --found_opencore_amrnb=yes --PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no) -+found_opencore_amrnb=no -+#PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no) - AM_CONDITIONAL(ENABLE_GSMAMR, test "$found_opencore_amrnb" = "yes") - if test "$found_opencore_amrnb" = yes; then - AC_DEFINE(HAVE_OPENCORE_AMRNB, 1, [Define to 1 if OpenCore AMR-NB library is available]) diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 7e90a19116..ab0837563e 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -4,13 +4,12 @@ HOMEPAGE = "http://isdn.eversberg.eu/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" -PV = "1.13+gitr${SRCPV}" +PV = "1.14+gitr${SRCPV}" PR = "r2" -SRCREV = "f3b94bf3a9599359805eaf20f3b036272c7af522" +SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c" SRC_URI = "git://git.misdn.eu/lcr.git \ file://lcr-disable-gsmfr.diff \ - file://lcr-no_amr.diff \ file://lcr.init " S = "${WORKDIR}/git" From ba7830e7e195031326ed32471ac323455238cd34 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 19 May 2014 11:43:07 +0200 Subject: [PATCH 129/200] openbsc: update to current master for MNCC-AMR and TCH/H support --- .../openbsc/openbsc/upgrade-mncc-version.patch | 17 +++++++++++++++++ recipes-osmocom/openbsc/openbsc_git.bb | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch diff --git a/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch b/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch new file mode 100644 index 0000000000..b856cc3ce3 --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch @@ -0,0 +1,17 @@ +lcr uses MNCC_SOCK_VERSION 5, but this is binary compatible to +what openbsc thinks is version 4. The only difference is the added +RTP related commands, which are optional. + +Index: openbsc/include/openbsc/mncc.h +=================================================================== +--- openbsc.orig/include/openbsc/mncc.h ++++ openbsc/include/openbsc/mncc.h +@@ -163,7 +163,7 @@ struct gsm_data_frame { + unsigned char data[0]; + }; + +-#define MNCC_SOCK_VERSION 4 ++#define MNCC_SOCK_VERSION 5 + struct gsm_mncc_hello { + uint32_t msg_type; + uint32_t version; diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 7d395ca382..7fe8988642 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,8 +3,8 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.4" -SRCREV = "8a158bb1ea36d0f88da18d0f034884b30f09fda2" +SRCREV = "a4c63b0cdba82a453875d9208d9dad0b9b530d56" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ - file://revert-mncc-version.patch" + file://upgrade-mncc-version.patch" S = "${WORKDIR}/git/openbsc" From 26199eb66bd2fdb8bcdd7a79f6c9a5f31fd08f47 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 22 May 2014 18:03:32 +0200 Subject: [PATCH 130/200] libosmo-netif: Add new recipe for the osmux library --- recipes-osmocom/libosmo-netif/libosmo-netif.inc | 10 ++++++++++ recipes-osmocom/libosmo-netif/libosmo-netif_git.bb | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 recipes-osmocom/libosmo-netif/libosmo-netif.inc create mode 100644 recipes-osmocom/libosmo-netif/libosmo-netif_git.bb diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc new file mode 100644 index 0000000000..4284a6afb7 --- /dev/null +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -0,0 +1,10 @@ +DESCRITOPN = "Osmux utility classes" +DEPENDS = "libosmo-abis" +HOMEPAGE = "http://git.osmocom.org" +LICENSE = "GPLv2+" + +INC_PR="r2.${META_TELEPHONY_OSMO_INC}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +inherit autotools_stage pkgconfig diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb new file mode 100644 index 0000000000..691425a3ce --- /dev/null +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "153f5856607b75ca76c540288cd6b4df144290ff" +SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" +PV = "0.3.0+gitr${SRCPV}" +PR = "${INC_PR}.2" From e673cd68aec1cc6dc6ade6704bc7021cc864b933 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 9 Jun 2014 19:29:13 +0200 Subject: [PATCH 131/200] openbsc: Add osmo-sgsn to the INITSCRIPT_PACKAGES osmo-sgsn was installing a sysvinit script but it wasn't inside the INITSCRIPT_PACKAGES so it would not be started by default. Use the already existing INITSCRIPT_PARAMS/INITSCRIPT_NAME variables for the osmo-sgsn. Fixes: SYS#366 --- recipes-osmocom/openbsc/openbsc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 7c27ecc5bf..558dfa2e21 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -11,7 +11,7 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc.init \ file://osmo-sgsn.init" -INC_PR = "r18.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r19.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp" @@ -49,7 +49,7 @@ do_install_append() { PACKAGES =+ "osmo-bsc osmo-nitb osmo-gbproxy osmo-gbproxy-dbg osmo-sgsn ipaccess-utils osmo-bsc-mgcp osmo-bsc-nat" -INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb" +INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb osmo-sgsn" CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg" INITSCRIPT_NAME_osmo-bsc = "osmo-bsc" From 723ace723605667edaa95bd30c63d494d9eb7f86 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jun 2014 17:52:06 +0200 Subject: [PATCH 132/200] bcg729: Add the BCG729, a transcoding library used by linphone --- recipes-misc/bcg729/bcg729_git.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 recipes-misc/bcg729/bcg729_git.bb diff --git a/recipes-misc/bcg729/bcg729_git.bb b/recipes-misc/bcg729/bcg729_git.bb new file mode 100644 index 0000000000..2be5942ac1 --- /dev/null +++ b/recipes-misc/bcg729/bcg729_git.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "G729 codec library" +HOMEPAGE = "http://www.linphone.org/eng/documentation/dev/bcg729.html" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://git.linphone.org/bcg729.git" +SRCREV = "2e36a5d4bc6e992c654eee6b0a8db729da7b1d31" +PV = "0+gitr${SRCPV}" + +S = "${WORKDIR}/git" + +inherit autotools From 023ca5da04c53ef93ce7c933c2d362ad901ad45e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 16 Jun 2014 18:16:02 +0200 Subject: [PATCH 133/200] openbsc: Build newer version of OpenBSC and enable transcoding * Build MGCP with osmux support * Merged the MGCP transcoding patches * Fix double RF Channel Release handling --- recipes-osmocom/openbsc/openbsc.inc | 6 +++--- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 558dfa2e21..830429cae2 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,5 +1,5 @@ DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController" -DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis openggsn libsmpp34" +DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" @@ -11,10 +11,10 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc.init \ file://osmo-sgsn.init" -INC_PR = "r19.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r20.${META_TELEPHONY_OSMO_INC}" -EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp" +EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" inherit autotools update-rc.d diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 7fe8988642..d515bf8cb5 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.4" -SRCREV = "a4c63b0cdba82a453875d9208d9dad0b9b530d56" +SRCREV = "421365eeaa104a9781214f9e12c55023c1099bf8" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" From 831475bbfb9c080afbf0d5b2d849558fba20f8d5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 21 Aug 2014 13:23:09 +0200 Subject: [PATCH 134/200] openbsc: Fix the systemd files to allow easy "systemctl enable" --- ...Add-Install-section-to-service-files.patch | 61 +++++++++++++++++++ recipes-osmocom/openbsc/openbsc_git.bb | 5 +- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch diff --git a/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch b/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch new file mode 100644 index 0000000000..b078b2832d --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch @@ -0,0 +1,61 @@ +From 0e167fc9740793cf4a3c82747919146073255486 Mon Sep 17 00:00:00 2001 +From: Daniel Willmann +Date: Wed, 20 Aug 2014 15:13:56 +0200 +Subject: [PATCH] systemd: Add Install section to service files + +That way the services can be enabled with +> systemctl enable +--- + contrib/systemd/osmo-bsc-mgcp.service | 3 +++ + contrib/systemd/osmo-bsc.service | 3 +++ + contrib/systemd/osmo-nitb.service | 3 +++ + contrib/systemd/osmo-sgsn.service | 3 +++ + 4 files changed, 12 insertions(+) + +diff --git a/contrib/systemd/osmo-bsc-mgcp.service b/contrib/systemd/osmo-bsc-mgcp.service +index 7fa2ec0..c040e60 100644 +--- a/contrib/systemd/osmo-bsc-mgcp.service ++++ b/contrib/systemd/osmo-bsc-mgcp.service +@@ -6,3 +6,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-bsc_mgcp -s -c /etc/osmocom/osmo-bsc-mgcp.cfg + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/contrib/systemd/osmo-bsc.service b/contrib/systemd/osmo-bsc.service +index deaf123..eb6cacb 100644 +--- a/contrib/systemd/osmo-bsc.service ++++ b/contrib/systemd/osmo-bsc.service +@@ -7,3 +7,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-bsc -c /etc/osmocom/osmo-bsc.cfg -s + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/contrib/systemd/osmo-nitb.service b/contrib/systemd/osmo-nitb.service +index a9d5d8c..377497e 100644 +--- a/contrib/systemd/osmo-nitb.service ++++ b/contrib/systemd/osmo-nitb.service +@@ -6,3 +6,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-nitb -s -C -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3 + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/contrib/systemd/osmo-sgsn.service b/contrib/systemd/osmo-sgsn.service +index afd0f40..674d786 100644 +--- a/contrib/systemd/osmo-sgsn.service ++++ b/contrib/systemd/osmo-sgsn.service +@@ -6,3 +6,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-sgsn -c /etc/osmocom/osmo-sgsn.cfg + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +-- +2.1.0.rc1 + diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index d515bf8cb5..39f57137bc 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,11 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SRCREV = "421365eeaa104a9781214f9e12c55023c1099bf8" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ - file://upgrade-mncc-version.patch" + file://upgrade-mncc-version.patch \ + file://0001-systemd-Add-Install-section-to-service-files.patch" S = "${WORKDIR}/git/openbsc" From 1e059eb7d83878c78126be44a56d483c37eccb26 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 21 Aug 2014 13:29:06 +0200 Subject: [PATCH 135/200] openggsn: Build newer version with updated ggsn service file --- recipes-osmocom/openggsn/openggsn_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index f87b24ce79..fedcb1730e 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -2,9 +2,9 @@ DESCRITOPN = "OpenGGSN a Free Software GGSN" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" -PR = "r12" +PR = "r13" -SRCREV = "9c0ff4fafe4276396125a52c89d36967566fe08c" +SRCREV = "5816bcfaff8dce35345fa0955082d8c761618017" SRC_URI = "git://git.osmocom.org/openggsn \ file://openggsn.init \ file://libgtp-queue_depth_32.patch \ From 1e73b53323b919bcf171df4df573dcb3d6d546bb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 21 Aug 2014 16:40:19 +0200 Subject: [PATCH 136/200] openggsn: Build the version with the .service file fix --- recipes-osmocom/openggsn/openggsn_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index fedcb1730e..e39f6681d1 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -2,9 +2,9 @@ DESCRITOPN = "OpenGGSN a Free Software GGSN" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" -PR = "r13" +PR = "r14" -SRCREV = "5816bcfaff8dce35345fa0955082d8c761618017" +SRCREV = "c190896437b332d3fa2093b3f489810b48e3c90c" SRC_URI = "git://git.osmocom.org/openggsn \ file://openggsn.init \ file://libgtp-queue_depth_32.patch \ From d9a5b19a0a420270b31c5f90afc6ede38340ab29 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 25 Aug 2014 08:19:02 +0200 Subject: [PATCH 137/200] libosmocore/libosmo-abis/openbsc: Move control interface around The control interface has been moved to libosmocore and a new library has been created for it. The ipaccess code has moved from libosmo-abis to libosmocore and new defines for the VTY and CTRL ports are now available inside libosmocore --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 10 +++++++--- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index b143ff16d7..2a7f7a58be 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "12" +META_TELEPHONY_OSMO_INC = "13" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index cd398930e0..32d40e3a08 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "ecd0a36ce8d468985ec296214e3ecced8da487cc" +SRCREV = "c9295ea2dd1f52931f8670e706a7b0d4b3ac536b" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" PV = "0.2.0+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index a5b695a556..ae3e300337 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,11 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "0c50b17a2636a4a9d471ebbaf2cdb9396390e4cd" +SRCREV = "276ca4b1722df573f9af7735820712bcaf32b800" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.6.6+gitr${SRCPV}" -PR = "r0" +PV = "0.7.0+gitr${SRCPV}" +PR = "r2" + +PACKAGES =+ "libosmoctrl" + +FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 39f57137bc..66c4605b02 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.5" -SRCREV = "421365eeaa104a9781214f9e12c55023c1099bf8" +SRCREV = "5160996d4a24fdb9faf0317c489689b5c31eebee" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch \ file://0001-systemd-Add-Install-section-to-service-files.patch" From fa6475f559b2daacb68c2989aa94cbd55f39b349 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 25 Aug 2014 08:43:42 +0200 Subject: [PATCH 138/200] openbsc: The patch is not needed anymore, remove it --- ...Add-Install-section-to-service-files.patch | 61 ------------------- recipes-osmocom/openbsc/openbsc_git.bb | 5 +- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch diff --git a/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch b/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch deleted file mode 100644 index b078b2832d..0000000000 --- a/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0e167fc9740793cf4a3c82747919146073255486 Mon Sep 17 00:00:00 2001 -From: Daniel Willmann -Date: Wed, 20 Aug 2014 15:13:56 +0200 -Subject: [PATCH] systemd: Add Install section to service files - -That way the services can be enabled with -> systemctl enable ---- - contrib/systemd/osmo-bsc-mgcp.service | 3 +++ - contrib/systemd/osmo-bsc.service | 3 +++ - contrib/systemd/osmo-nitb.service | 3 +++ - contrib/systemd/osmo-sgsn.service | 3 +++ - 4 files changed, 12 insertions(+) - -diff --git a/contrib/systemd/osmo-bsc-mgcp.service b/contrib/systemd/osmo-bsc-mgcp.service -index 7fa2ec0..c040e60 100644 ---- a/contrib/systemd/osmo-bsc-mgcp.service -+++ b/contrib/systemd/osmo-bsc-mgcp.service -@@ -6,3 +6,6 @@ Type=simple - Restart=always - ExecStart=/usr/bin/osmo-bsc_mgcp -s -c /etc/osmocom/osmo-bsc-mgcp.cfg - RestartSec=2 -+ -+[Install] -+WantedBy=multi-user.target -diff --git a/contrib/systemd/osmo-bsc.service b/contrib/systemd/osmo-bsc.service -index deaf123..eb6cacb 100644 ---- a/contrib/systemd/osmo-bsc.service -+++ b/contrib/systemd/osmo-bsc.service -@@ -7,3 +7,6 @@ Type=simple - Restart=always - ExecStart=/usr/bin/osmo-bsc -c /etc/osmocom/osmo-bsc.cfg -s - RestartSec=2 -+ -+[Install] -+WantedBy=multi-user.target -diff --git a/contrib/systemd/osmo-nitb.service b/contrib/systemd/osmo-nitb.service -index a9d5d8c..377497e 100644 ---- a/contrib/systemd/osmo-nitb.service -+++ b/contrib/systemd/osmo-nitb.service -@@ -6,3 +6,6 @@ Type=simple - Restart=always - ExecStart=/usr/bin/osmo-nitb -s -C -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3 - RestartSec=2 -+ -+[Install] -+WantedBy=multi-user.target -diff --git a/contrib/systemd/osmo-sgsn.service b/contrib/systemd/osmo-sgsn.service -index afd0f40..674d786 100644 ---- a/contrib/systemd/osmo-sgsn.service -+++ b/contrib/systemd/osmo-sgsn.service -@@ -6,3 +6,6 @@ Type=simple - Restart=always - ExecStart=/usr/bin/osmo-sgsn -c /etc/osmocom/osmo-sgsn.cfg - RestartSec=2 -+ -+[Install] -+WantedBy=multi-user.target --- -2.1.0.rc1 - diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 66c4605b02..ce0227b417 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,11 +1,10 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" SRCREV = "5160996d4a24fdb9faf0317c489689b5c31eebee" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ - file://upgrade-mncc-version.patch \ - file://0001-systemd-Add-Install-section-to-service-files.patch" + file://upgrade-mncc-version.patch" S = "${WORKDIR}/git/openbsc" From 76bc1af6c675d77984b7ef832d9ace20c8f92f23 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 15:33:25 +0200 Subject: [PATCH 139/200] sofia-sip: Add missing checksums needed for dora and later --- recipes-misc/sofia-sip/sofia-sip_1.12.11.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb b/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb index 4c3eff14df..7d8bb85ec4 100644 --- a/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb +++ b/recipes-misc/sofia-sip/sofia-sip_1.12.11.bb @@ -1,3 +1,6 @@ require sofia-sip.inc PR = "r1" + +SRC_URI[md5sum] = "f3582c62080eeecd3fa4cd5d4ccb4225" +SRC_URI[sha256sum] = "2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81" From c2f0b660efca0f13ba3d662efdd9303ad5bdb576 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 15:34:38 +0200 Subject: [PATCH 140/200] libosmo-abis/libosmocore/libosmo-sccp: Kill old releases These are ancient versions and I don't think anybody is using them anymore. In general we are building the latest version from git. --- recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb | 11 ----------- recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb | 11 ----------- recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.1.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.10.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.4.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.8.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.3.9.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.4.1.bb | 11 ----------- recipes-osmocom/libosmocore/libosmocore_0.5.3.bb | 11 ----------- 14 files changed, 154 deletions(-) delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb delete mode 100644 recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb delete mode 100644 recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.1.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.10.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.4.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.8.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.3.9.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.4.1.bb delete mode 100644 recipes-osmocom/libosmocore/libosmocore_0.5.3.bb diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb deleted file mode 100644 index 362fc85281..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "346374a001ba42e8d3612fefd76a061f4d494a34" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.1" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb deleted file mode 100644 index d2a25b254b..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.0.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "65a50893d5f9577c17dc4485d585c12d349c8e30" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.1" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb deleted file mode 100644 index 74a8481da6..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "fe05cf5b3980bf4778a21b3d311a835b7e19a704" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.5" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb deleted file mode 100644 index 358f1fbfc4..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "55467f0478e37b35cceec3051c645b8a407110bc" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb deleted file mode 100644 index a83e502fea..0000000000 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_0.1.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "e5ae7f52175411a498ed30560624d0abed0feed7" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb deleted file mode 100644 index 342c105342..0000000000 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.5.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "8be06bc2885460d6a6ed7c9daa7df8ab8f02a2dc" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb deleted file mode 100644 index 8c4dce261a..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "ee50081daa3a80586f3044056517337a8e8fac9f" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb deleted file mode 100644 index bb16132bed..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.10.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "c7ddbe63da535e62f9a10444f8966bf0a6565a74" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.2" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb deleted file mode 100644 index 55b8a1a4a0..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.4+35.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "7e1a622124a6ca6c98e1f3170bf65649ad4321d9" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb deleted file mode 100644 index 0f145474ea..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "8264e09ca2f3bd93eba5eefa342267f303085629" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb deleted file mode 100644 index 18eb80a52a..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "ee876c91723267d913a12e76f46bd537700ab9e9" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb b/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb deleted file mode 100644 index 22aaba5fb1..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.3.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "d61d517a2e35f482519561bd325652ee7144679a" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb b/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb deleted file mode 100644 index 2541c0d568..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.4.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "72bd4eb3b9e674d771d911e27cacb45468d51487" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} diff --git a/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb b/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb deleted file mode 100644 index d7b84d8de2..0000000000 --- a/recipes-osmocom/libosmocore/libosmocore_0.5.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "335aedabf204ac025a79801c15c8488d35cc9981" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PR = "${INC_PR}.0" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} From 4539293919faa9e9fbbf0509198dcd59f1156c7a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 16:22:05 +0200 Subject: [PATCH 141/200] lcr: Remove directory as it ends in /run when being packaged ERROR: QA Issue: asterisk: Files/directories were installed but not shipped /run /run/asterisk --- recipes-isdn/asterisk/asterisk_1.8.8.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb index f31ae33f43..5162853881 100644 --- a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb +++ b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb @@ -84,4 +84,6 @@ do_install_append() { install -m 0775 ${WORKDIR}/asterisk.init ${D}${sysconfdir}/init.d/asterisk install -m 0660 ${WORKDIR}/modules.conf ${D}${sysconfdir}/asterisk/ + + rm -rf ${D}/var/run } From 84edb39d87f0b13ae27c92a3fe8635a3051d26a5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Sep 2014 17:25:56 +0200 Subject: [PATCH 142/200] lcr: Fix the packaging on dora The asterisk package should not include debug symbols --- recipes-isdn/lcr/lcr_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index ab0837563e..a5d71e42fb 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" PV = "1.14+gitr${SRCPV}" -PR = "r2" +PR = "r3" SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c" SRC_URI = "git://git.misdn.eu/lcr.git \ @@ -19,7 +19,7 @@ inherit autotools update-rc.d PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \ ${PN}-tones-en ${PN}-vbox-en \ - ${PN}-asterisk" + ${PN}-asterisk-dbg ${PN}-asterisk" CONFFILES_${PN} = "${sysconfdir}/lcr/options.conf" INITSCRIPT_PACKAGES = "${PN}" @@ -31,6 +31,7 @@ FILES_${PN}-tones-en = "/usr/share/lcr/tones_american" FILES_${PN}-vbox-de = "/usr/share/lcr/vbox_german" FILES_${PN}-vbox-en = "/usr/share/lcr/vbox_english" FILES_${PN}-asterisk = "/usr/lib/asterisk/modules/chan_lcr.so" +FILES_${PN}-asterisk-dbg = "/usr/lib/asterisk/modules/.debug/chan_lcr.so" do_install_append() { From 592c8ab37410727460313631074dbabb3831e63d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Sep 2014 19:55:19 +0200 Subject: [PATCH 143/200] bcg729: Inherit pkgconfig to have PKG_CHECK_MODULES expand Make sure pkgconfig-native is staged as otherwise autoconf can not replace the PKG_CHECK_MODULES variable. --- recipes-misc/bcg729/bcg729_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-misc/bcg729/bcg729_git.bb b/recipes-misc/bcg729/bcg729_git.bb index 2be5942ac1..27b2b755bf 100644 --- a/recipes-misc/bcg729/bcg729_git.bb +++ b/recipes-misc/bcg729/bcg729_git.bb @@ -9,4 +9,4 @@ PV = "0+gitr${SRCPV}" S = "${WORKDIR}/git" -inherit autotools +inherit autotools pkgconfig From 3884c62b79127b1d439c9cc8696ab82f90f32c64 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Sep 2014 20:16:28 +0200 Subject: [PATCH 144/200] openbsc: We are using pkg-config and need to inherit the bbclass Without this the configure step will fail on dizzy. --- recipes-osmocom/openbsc/openbsc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 830429cae2..df597ec5d6 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -16,7 +16,7 @@ INC_PR = "r20.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" -inherit autotools update-rc.d +inherit autotools update-rc.d pkgconfig # because "${WORKDIR}/git" is not a git repo, it can't figure out the version do_configure_prepend() { From 1cafeaaa86f55db61472c2fd22d138210cc69102 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Sep 2014 20:15:30 +0200 Subject: [PATCH 145/200] libsmpp34: Fix build with srcdir!=builddir for dizzy Fix the build by using a newer version and change the PR to be a proper version number. I havent' checked if upgrading is possible but is not a big concern right now. --- recipes-misc/libsmpp/libsmpp34_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index 89df3556af..ed2e48bd21 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,10 +6,10 @@ SECTION = "libs" DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "a18bad989696b5047fab20e579a6e5a886a4904f" +SRCREV = "84f2905c5bfed2e1f5bae52a2bb9bc771fd8b895" SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" PV = "1.10+gitr${SRCPV}" -PR = "0" +PR = "r1" PARALLEL_MAKE = "" From 65238f85305f3179491e5e4be8152ea35454ac84 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 25 Sep 2014 17:08:51 +0200 Subject: [PATCH 146/200] Osmocom: Upgrade to latest master versions of the software Build a new ABI release, build the latest libosmo-abis and libosmo-netif versions and upgrade to OpenBSC master --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 6 +++--- recipes-osmocom/libosmo-netif/libosmo-netif_git.bb | 4 ++-- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 2a7f7a58be..6d8a52c3fe 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "13" +META_TELEPHONY_OSMO_INC = "14" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 32d40e3a08..52c7c98c16 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c9295ea2dd1f52931f8670e706a7b0d4b3ac536b" +SRCREV = "d9d1b5c19f40515cb7c660acda7265bbddbb73d6" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.2.0+gitr${SRCPV}" -PR = "${INC_PR}.2" +PV = "0.3.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 691425a3ce..f82d7ba0c9 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "153f5856607b75ca76c540288cd6b4df144290ff" +SRCREV = "603f6c40d55b87f81fbd8ff1ad7b9568f3b962ff" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.3.0+gitr${SRCPV}" +PV = "0.4.0+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index ae3e300337..c080c9d933 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "276ca4b1722df573f9af7735820712bcaf32b800" +SRCREV = "96af78650d1de134ebb37ddb829508cf0bd30c51" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.7.0+gitr${SRCPV}" PR = "r2" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index ce0227b417..b643bdc863 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.6" -SRCREV = "5160996d4a24fdb9faf0317c489689b5c31eebee" +SRCREV = "f8070f4793a748cad6deefeb1e38fe7f8a193293" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" From 5e186d3d1f467eb4ea95bc27475fdf20a8db5ee9 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 30 Sep 2014 19:16:59 +0200 Subject: [PATCH 147/200] meta-toolchain-osmo: create symlink similar to images --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index 3d4a00a7a4..566ec26726 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -1,6 +1,18 @@ #TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg" TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" -TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}-${DATETIME}" +TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" +TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}" PROVIDES = "meta-toolchain-sdk" require recipes-core/meta/meta-toolchain.bb + +do_populate_sdk_append() { + bb.build.exec_func("create_symlink", d) +} + + +create_symlink() { + cd ${SDK_DEPLOY}/ + rm -f ${TOOLCHAIN_OUTPUT_BASENAME}.sh + ln -s ${TOOLCHAIN_OUTPUTNAME}.sh ${TOOLCHAIN_OUTPUT_BASENAME}.sh +} From b28405e6a0706fe560bb29efc2691df9e22d092b Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 2 Oct 2014 18:51:14 +0200 Subject: [PATCH 148/200] libosmo-abis: Revert parts of the multi-TRX support in libosmo-abis The line doesn't have the signalling type set yet. It will be set _after_ the rsl connection is considered up. This is addressing RSL Connection failures like: <0001> oml.c:1026 Rx IPA RSL CONNECT IP=1.2.3.4 PORT=3003 STREAM=0x00 <000f> input/ipaccess.c:921 cannot create RSL BTS link: trx_nr (0) does not refer to a signalling link <0001> oml.c:1030 Error in abis_open(RSL): -22 <0001> oml.c:341 Sending FOM NACK with cause Message cannot be performed. --- .../libosmo-abis/files/fix-rsl-connect.patch | 21 +++++++++++++++++++ .../libosmo-abis/libosmo-abis_git.bb | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch diff --git a/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch b/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch new file mode 100644 index 0000000000..63c505251c --- /dev/null +++ b/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch @@ -0,0 +1,21 @@ +The line is not initiliazed to E1INP_TS_TYPE_SIGN by default + +diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c +index 145e471..49424e7 100644 +--- a/src/input/ipaccess.c ++++ b/src/input/ipaccess.c +@@ -915,12 +915,14 @@ int e1inp_ipa_bts_rsl_connect_n(struct e1inp_line *line, + "trx_nr (%d) out of range\n", trx_nr); + return -EINVAL; + } ++/* + if (line->ts[E1INP_SIGN_RSL+trx_nr-1].type != E1INP_TS_TYPE_SIGN) { + LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: " + "trx_nr (%d) does not refer to a signalling link\n", + trx_nr); + return -EINVAL; + } ++*/ + + rsl_link = ipa_client_conn_create(tall_ipa_ctx, + &line->ts[E1INP_SIGN_RSL+trx_nr-1], diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 52c7c98c16..fd8e8fda42 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -2,6 +2,7 @@ require ${PN}.inc S = "${WORKDIR}/git" SRCREV = "d9d1b5c19f40515cb7c660acda7265bbddbb73d6" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git \ + file://fix-rsl-connect.patch " PV = "0.3.0+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" From e292b907610659f13261a7e4cf9f426128b364ce Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 29 Oct 2014 10:21:39 +0100 Subject: [PATCH 149/200] openbsc: Upgrade with SGSN, GBproxy and BSC ping/pong changes Related: SYS#713 --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index b643bdc863..17e897a6ec 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.6" -SRCREV = "f8070f4793a748cad6deefeb1e38fe7f8a193293" +SRCREV = "db64f2e45adf7ac95070361f5b7ec76a44e084fb" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" From 563dd4e6e3f8a819d9c275fbbdc129c93a0af1b5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Nov 2014 09:44:50 +0100 Subject: [PATCH 150/200] misc: poky/LICENSE has changed.. reference a hopefully more stable file Only reference the COPYING.MIT as it is unlikely to change in the next upgrade. --- .../osmo-service-respawn/osmo-service-respawn_1.0.bb | 2 +- recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb | 2 +- recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb | 3 +-- recipes-osmocom/tasks/task-osmocom.bb | 3 +-- recipes-telephony/tasks/task-telephony-all.bb | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb b/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb index 8779f34fd9..52d1031ccc 100644 --- a/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb +++ b/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Shell script to start, nice and respawn services" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://osmo-service-respawn.sh" diff --git a/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb index da0e1050b2..a1e9558aa5 100644 --- a/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb +++ b/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv3+" RDEPENDS_${PN} = "tcpdump bash" PR = "r11" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = " \ file://osmocom-tcpdump \ diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb index 6eb5d21b38..41a95b120a 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -4,8 +4,7 @@ DESCRIPTION = "Software Development Kit for Osmocom devices" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r5" ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-osmocom/tasks/task-osmocom.bb b/recipes-osmocom/tasks/task-osmocom.bb index eb6216d729..1cec91fe59 100644 --- a/recipes-osmocom/tasks/task-osmocom.bb +++ b/recipes-osmocom/tasks/task-osmocom.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Task for Osmocom tools and header files" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" PR = "r2" diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb index 1899a9cbcb..ebef4fa10e 100644 --- a/recipes-telephony/tasks/task-telephony-all.bb +++ b/recipes-telephony/tasks/task-telephony-all.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for the meta-telephony layer. This is to build everything" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" PR = "r2" From b2daa5e888c2b307db4859db19058128fa22f399 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Nov 2014 11:04:21 +0100 Subject: [PATCH 151/200] asterisk: Drop the very old version from meta-telephony We used asterisk to be able to speak SIP with the outside. LCR has gained this capability in the past and we haven't used asterisk in more than two years. Asterisk doesn't seem to compile with master/dizzy and there is little point in figuring out why. --- recipes-isdn/asterisk/asterisk_1.8.8.1.bb | 89 ------------------- recipes-isdn/asterisk/files/asterisk.init | 21 ----- recipes-isdn/asterisk/files/modules.conf | 2 - recipes-isdn/asterisk/files/stop-crash.patch | 13 --- recipes-isdn/lcr/files/lcr.init | 2 +- recipes-isdn/lcr/lcr_git.bb | 11 +-- recipes-telephony/tasks/task-telephony-all.bb | 3 +- 7 files changed, 6 insertions(+), 135 deletions(-) delete mode 100644 recipes-isdn/asterisk/asterisk_1.8.8.1.bb delete mode 100755 recipes-isdn/asterisk/files/asterisk.init delete mode 100644 recipes-isdn/asterisk/files/modules.conf delete mode 100644 recipes-isdn/asterisk/files/stop-crash.patch diff --git a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb deleted file mode 100644 index 5162853881..0000000000 --- a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved -# Copyright (C) 2011-2012, sysmocom - systems for mobile communications GmbH -# Released under the MIT license (see packages/COPYING) -DESCRITOPN = "asterisk PBX" -DEPENDS = "openssl ncurses" -HOMEPAGE = "http://www.asterisk.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c6764ffcbe996d1d8f919b393ccdd67" - -PR = "r4" - -SRC_URI = "http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${PV}.tar.gz \ - file://modules.conf \ - file://asterisk.init \ - file://stop-crash.patch " - -SRC_URI[md5sum] = "783b2da2036745edeea8885c62bbc8bf" -SRC_URI[sha256sum] = "ed98204f6261e1362c673e595823c668ae39b9833daec9127a4936cf9f4890e1" - - -EXTRA_OECONF = " \ - --without-curses \ - --with-sm=internal \ - --without-gtk \ - --without-gtk2 \ - --without-isdnnet \ - --without-kde \ - --without-misdn \ - --without-nbs \ - --with-ncurses \ - --without-netsnmp \ - --without-newt \ - --without-odbc \ - --without-ogg \ - --without-osptk \ - --without-popt \ - --without-pri \ - --without-qt \ - --without-radius \ - --without-sdl \ - --without-spandsp \ - --without-suppserv \ - --without-tds \ - --without-termcap \ - --without-tinfo \ - --without-vorbis \ - --without-vpb \ - --without-postgres \ - --without-openais \ - --without-lua \ - --disable-xmldoc" - -inherit autotools update-rc.d - -FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" - -do_configure_prepend() { - # Due to menuselect below we want to save off these configures - mv ${S}/menuselect/configure ${S}/menuselect/configure.SAVE - mv ${S}/menuselect/mxml/configure ${S}/menuselect/mxml/configure.SAVE - mv ${S}/main/editline/configure ${S}/main/editline/configure.SAVE -} - -do_configure_append() { - # Put this back - mv ${S}/menuselect/configure.SAVE ${S}/menuselect/configure - mv ${S}/menuselect/mxml/configure.SAVE ${S}/menuselect/mxml/configure - mv ${S}/main/editline/configure.SAVE ${S}/main/editline/configure -} - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "asterisk" -INITSCRIPT_PARAMS_${PN} = "defaults 29 29" - -PACKAGES =+ "${PN}-moh" - -DESCRIPTION_${PN}-moh = "Asterisk MusicOnHold sound" -FILES_${PN}-moh = "${localstatedir}/lib/${PN}/moh" - - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/asterisk - - install -m 0775 ${WORKDIR}/asterisk.init ${D}${sysconfdir}/init.d/asterisk - install -m 0660 ${WORKDIR}/modules.conf ${D}${sysconfdir}/asterisk/ - - rm -rf ${D}/var/run -} diff --git a/recipes-isdn/asterisk/files/asterisk.init b/recipes-isdn/asterisk/files/asterisk.init deleted file mode 100755 index 8ef76aa2f6..0000000000 --- a/recipes-isdn/asterisk/files/asterisk.init +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -NAME=asterisk - -set -e - -case "$1" in - start) - /usr/sbin/asterisk - echo "Forked asterisk" - ;; - stop) - echo "Can not stop it" - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 -esac - -exit 0 diff --git a/recipes-isdn/asterisk/files/modules.conf b/recipes-isdn/asterisk/files/modules.conf deleted file mode 100644 index 68db67fbd9..0000000000 --- a/recipes-isdn/asterisk/files/modules.conf +++ /dev/null @@ -1,2 +0,0 @@ -[modules] -autoload=yes diff --git a/recipes-isdn/asterisk/files/stop-crash.patch b/recipes-isdn/asterisk/files/stop-crash.patch deleted file mode 100644 index 3fe0d5e4a9..0000000000 --- a/recipes-isdn/asterisk/files/stop-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: asterisk-1.8.8.1/res/res_rtp_asterisk.c -=================================================================== ---- asterisk-1.8.8.1.orig/res/res_rtp_asterisk.c 2011-09-20 08:56:20.000000000 +0800 -+++ asterisk-1.8.8.1/res/res_rtp_asterisk.c 2012-01-16 02:45:57.227713136 +0800 -@@ -1902,7 +1902,7 @@ - "IAJitter: %u\r\n" - "LastSR: %lu.%010lu\r\n" - "DLSR: %4.4f(sec)\r\n", -- ast_sockaddr_stringify(&addr), -+ "NA" /*ast_sockaddr_stringify(&addr)*/, - pt, (pt == 200) ? "Sender Report" : (pt == 201) ? "Receiver Report" : (pt == 192) ? "H.261 FUR" : "Unknown", - rc, - rtcpheader[i + 1], diff --git a/recipes-isdn/lcr/files/lcr.init b/recipes-isdn/lcr/files/lcr.init index f9924c5ebc..3bf79809ab 100644 --- a/recipes-isdn/lcr/files/lcr.init +++ b/recipes-isdn/lcr/files/lcr.init @@ -7,7 +7,7 @@ set -e case "$1" in start) /usr/sbin/lcr fork - echo "Forked asterisk" + echo "Forked LCR" ;; stop) echo "Can not stop it" diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index a5d71e42fb..58ad482280 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -1,11 +1,11 @@ DESCRITOPN = "Linux Call Router" -DEPENDS = "asterisk libgsm libopencore-amr sofia-sip" +DEPENDS = "libgsm libopencore-amr sofia-sip" HOMEPAGE = "http://isdn.eversberg.eu/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996" PV = "1.14+gitr${SRCPV}" -PR = "r3" +PR = "r4" SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c" SRC_URI = "git://git.misdn.eu/lcr.git \ @@ -13,13 +13,12 @@ SRC_URI = "git://git.misdn.eu/lcr.git \ file://lcr.init " S = "${WORKDIR}/git" -EXTRA_OECONF = "--with-gsm-bs --with-asterisk --without-misdn --with-sip" +EXTRA_OECONF = "--with-gsm-bs --without-asterisk --without-misdn --with-sip" inherit autotools update-rc.d PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \ - ${PN}-tones-en ${PN}-vbox-en \ - ${PN}-asterisk-dbg ${PN}-asterisk" + ${PN}-tones-en ${PN}-vbox-en" CONFFILES_${PN} = "${sysconfdir}/lcr/options.conf" INITSCRIPT_PACKAGES = "${PN}" @@ -30,8 +29,6 @@ FILES_${PN}-tones-de = "/usr/share/lcr/tones_german" FILES_${PN}-tones-en = "/usr/share/lcr/tones_american" FILES_${PN}-vbox-de = "/usr/share/lcr/vbox_german" FILES_${PN}-vbox-en = "/usr/share/lcr/vbox_english" -FILES_${PN}-asterisk = "/usr/lib/asterisk/modules/chan_lcr.so" -FILES_${PN}-asterisk-dbg = "/usr/lib/asterisk/modules/.debug/chan_lcr.so" do_install_append() { diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb index ebef4fa10e..284d66904b 100644 --- a/recipes-telephony/tasks/task-telephony-all.bb +++ b/recipes-telephony/tasks/task-telephony-all.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r2" +PR = "r3" DEPENDS = "\ libosmo-abis \ @@ -16,7 +16,6 @@ DEPENDS = "\ dahdi-linux \ dahdi-tools \ lcr \ - asterisk \ libgsm \ ortp \ libdbi \ From c665acff46c8dd8e3ac5ed44b5bda676d2584559 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Nov 2014 11:58:22 +0100 Subject: [PATCH 152/200] lcr: inherit pkgconfig to have autoreconf have PKG_CHECK_MODULES lcr/1.14+gitrAUTOINC+38fce218f8-r4/git/configure: line 16440: `PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no)' --- recipes-isdn/lcr/lcr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index 58ad482280..d08dbf11a4 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" EXTRA_OECONF = "--with-gsm-bs --without-asterisk --without-misdn --with-sip" -inherit autotools update-rc.d +inherit autotools update-rc.d pkgconfig PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \ ${PN}-tones-en ${PN}-vbox-en" From 07c37e9902a278779a0312b4ac2b2437424ec38d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 3 Nov 2014 08:03:13 +0100 Subject: [PATCH 153/200] ortp: Fix DEPENDS based on QA issue WARNING: QA Issue: ortp rdepends on libcrypto, but it isn't a build dependency? [build-deps] WARNING: QA Issue: ortp rdepends on libssl, but it isn't a build dependency? [build-deps] --- recipes-misc/ortp/ortp_0.16.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-misc/ortp/ortp_0.16.5.bb b/recipes-misc/ortp/ortp_0.16.5.bb index 79996a20ce..919405fdfb 100644 --- a/recipes-misc/ortp/ortp_0.16.5.bb +++ b/recipes-misc/ortp/ortp_0.16.5.bb @@ -1,5 +1,5 @@ require ortp.inc -DEPENDS = "glib-2.0 " +DEPENDS = "glib-2.0 openssl" PR = "${INC_PR}.1" SRC_URI += "file://0001-fix-unused-variables.patch;patch=1 \ From bef17822a767b74449baf7cf69e7cb09e7f0ebd1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 14 Nov 2014 14:11:35 +0100 Subject: [PATCH 154/200] misc: Modernize and call it packagegroup- The notion of task- has been deprecated a long time ago. Call it packagegroup now and for "packagegroup-osmocom" provide the compability. This has not been compile tested. The edison build will require a bbappend to provide packagegroup now but I will do this once I need to build for Edison again. --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 3 +-- .../packagegroup-core-standalone-osmo-sdk-target.bb} | 4 ++-- .../packagegroup-osmocom.bb} | 7 ++++++- .../packagegroup-sdk-osmo.inc} | 0 recipes-telephony/tasks/task-telephony-all.bb | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) rename recipes-osmocom/{tasks/task-core-standalone-osmo-sdk-target.bb => packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb} (85%) rename recipes-osmocom/{tasks/task-osmocom.bb => packagegroup/packagegroup-osmocom.bb} (60%) rename recipes-osmocom/{tasks/task-sdk-osmo.inc => packagegroup/packagegroup-sdk-osmo.inc} (100%) diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index 566ec26726..6755fb693e 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -1,5 +1,4 @@ -#TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg" -TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target" +TOOLCHAIN_TARGET_OSMOTASK ?= "packagegroup-core-standalone-osmo-sdk-target" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}" diff --git a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb similarity index 85% rename from recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb rename to recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb index 41a95b120a..dd5072b5be 100644 --- a/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/recipes-osmocom/packagegroup/packagegroup-core-standalone-osmo-sdk-target.bb @@ -13,11 +13,11 @@ ALLOW_EMPTY_${PN} = "1" # will need to skip this test. INSANE_SKIP_${PN} += "dev-deps" -require task-sdk-osmo.inc +require packagegroup-sdk-osmo.inc PACKAGES = "${PN} ${PN}-dbg" RDEPENDS_${PN} = "\ - task-core-standalone-sdk-target \ + packagegroup-core-standalone-sdk-target \ ${SDK-OSMO} \ ${SDK-EXTRAS}" diff --git a/recipes-osmocom/tasks/task-osmocom.bb b/recipes-osmocom/packagegroup/packagegroup-osmocom.bb similarity index 60% rename from recipes-osmocom/tasks/task-osmocom.bb rename to recipes-osmocom/packagegroup/packagegroup-osmocom.bb index 1cec91fe59..d95d76fd8e 100644 --- a/recipes-osmocom/tasks/task-osmocom.bb +++ b/recipes-osmocom/packagegroup/packagegroup-osmocom.bb @@ -5,7 +5,12 @@ DEPENDS = "virtual/kernel" ALLOW_EMPTY_${PN} = "1" PR = "r2" -RDEPENDS_task-osmocom = "\ +# For backwards compatibility after rename +RPROVIDES_${PN} = "task-osmocom" +RREPLACES_${PN} = "task-osmocom" +RCONFLICTS_${PN} = "task-osmocom" + +RDEPENDS_${PN} = "\ libosmocore \ " diff --git a/recipes-osmocom/tasks/task-sdk-osmo.inc b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc similarity index 100% rename from recipes-osmocom/tasks/task-sdk-osmo.inc rename to recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb index 284d66904b..cc1ca0b010 100644 --- a/recipes-telephony/tasks/task-telephony-all.bb +++ b/recipes-telephony/tasks/task-telephony-all.bb @@ -3,14 +3,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r3" +PR = "r4" DEPENDS = "\ libosmo-abis \ libosmo-sccp \ libosmocore \ openbsc \ - task-osmocom \ + packagegroup-osmocom \ openggsn \ misdn-utils \ dahdi-linux \ From 60ade1ce5680486e33ee110786b60cbf83a311af Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 19 Nov 2014 16:24:23 +0100 Subject: [PATCH 155/200] openbsc: Upgrade for AudioCodes workaround Mostly SGSN fixes, one OML correctness fix. The reason for the upgrade is the audio codes work around we added. --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 17e897a6ec..944867e5a6 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.6" -SRCREV = "db64f2e45adf7ac95070361f5b7ec76a44e084fb" +SRCREV = "619b014d3aacea1b33b70432af01e80eb2252af0" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" From 2c75d4a418b168bfe4f90bad5cbec2803ea909fa Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Nov 2014 23:20:44 +0100 Subject: [PATCH 156/200] openbsc: Fix the non-confirming SDP file There must be a session name inside the SDP file, build a newer version of OpenBSC to fix that. --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 944867e5a6..ba8bd0b30b 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.6" -SRCREV = "619b014d3aacea1b33b70432af01e80eb2252af0" +SRCREV = "b1edf7b64f6c05932c83b4d31b1127f2a833601e" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" From f244a25089098d0728bdf899f7109deaeac19853 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Dec 2014 15:24:57 +0100 Subject: [PATCH 157/200] openbsc: Do not enable any of the services by default We don't want to enable any of these services by default. E.g. specially with the BSC/NITB selection we want someone else to take that decision. --- recipes-osmocom/openbsc/openbsc.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index df597ec5d6..faa0208e35 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -11,7 +11,7 @@ SRC_URI = "file://osmo-nitb.init \ file://osmo-bsc.init \ file://osmo-sgsn.init" -INC_PR = "r20.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r21.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += " --enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" @@ -51,6 +51,9 @@ PACKAGES =+ "osmo-bsc osmo-nitb osmo-gbproxy osmo-gbproxy-dbg osmo-sgsn ipaccess INITSCRIPT_PACKAGES = "osmo-bsc osmo-bsc-mgcp osmo-nitb osmo-sgsn" +# Do not start any of the services by default +SYSTEMD_AUTO_ENABLE = "disable" + CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg" INITSCRIPT_NAME_osmo-bsc = "osmo-bsc" INITSCRIPT_PARAMS_osmo-bsc = "defaults 30 30" From 873ae51925a67a267f42301140387ce5b854f66f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 30 Dec 2014 12:07:58 +0100 Subject: [PATCH 158/200] libosmocore: Bump version for cell broadcast This is not a new release but the ABI has changed, force a re-build of all dependend packages. --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 6d8a52c3fe..944a712a3e 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "14" +META_TELEPHONY_OSMO_INC = "15" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index c080c9d933..1a9f515322 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "96af78650d1de134ebb37ddb829508cf0bd30c51" +SRCREV = "be4bbeb01b85cbe38c70e0f272e59e4c57f13aa2" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.7.0+gitr${SRCPV}" PR = "r2" From 70922d86dec59a530fd3c7c5fe827d582b15a171 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 30 Dec 2014 12:20:41 +0100 Subject: [PATCH 159/200] libosmocore: Disable PC/SC dependency inside libosmocore --- recipes-osmocom/libosmocore/libosmocore_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 1a9f515322..becb5d56eb 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -7,5 +7,6 @@ PV = "0.7.0+gitr${SRCPV}" PR = "r2" PACKAGES =+ "libosmoctrl" - FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" + +EXTRA_OECONF += "--disable-pcsc" From cc7705489c8342c8c2c9f168fa404553ee1f9040 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 6 Jan 2015 19:31:40 +0100 Subject: [PATCH 160/200] libosmocore: Update with CBCH defines needed for osmo-bts --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index becb5d56eb..ad8d836329 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "be4bbeb01b85cbe38c70e0f272e59e4c57f13aa2" +SRCREV = "419684e30c2fe12d3e3441cfa9fea21f1c4de959" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" PV = "0.7.0+gitr${SRCPV}" PR = "r2" From c48a0a0a4d1811710259b66c86bc30fd29162083 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 9 Jan 2015 21:29:26 +0100 Subject: [PATCH 161/200] openbsc: Build with HO fixes and dependency Allow to have two BTS depend on each other. This is currently needed for the sysmoBTS2050 and clocking. --- recipes-osmocom/openbsc/openbsc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index ba8bd0b30b..58cd1b3db5 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -3,7 +3,7 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" PR = "${INC_PR}.6" -SRCREV = "b1edf7b64f6c05932c83b4d31b1127f2a833601e" +SRCREV = "22fd3cd0de098de3816d687e41d42fe551412a33" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" From d91abc18f1a1d0003fe946c5dce173f1946b9712 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 12 Feb 2015 14:06:49 +0100 Subject: [PATCH 162/200] libosmo-abis: Use the latest upstream release for libosmo-abis --- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index fd8e8fda42..c2dbd44b23 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,8 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d9d1b5c19f40515cb7c660acda7265bbddbb73d6" -SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git \ - file://fix-rsl-connect.patch " -PV = "0.3.0+gitr${SRCPV}" +SRCREV = "2f0dd0c01930fbc0dbf0c86946dd0a429f3cd6e2" +SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" +PV = "0.3.1+gitr${SRCPV}" PR = "${INC_PR}.1" From 80b3fe86f67516c6297a6c6a18db87a7b43e69f0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 12 Feb 2015 14:10:53 +0100 Subject: [PATCH 163/200] openbsc: Build newer version for extended rf lock commands Upgrade the SRCREV, bump the PV and require libpcap as the measurement code includes pcap/pcap.h --- recipes-osmocom/openbsc/openbsc.inc | 2 +- recipes-osmocom/openbsc/openbsc_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index faa0208e35..aa5f7a7e6e 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,5 +1,5 @@ DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController" -DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm" +DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm libpcap" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 58cd1b3db5..611d2c78e4 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc -PV = "0.13.0+gitr${SRCPV}" +PV = "0.14.0+gitr${SRCPV}" PR = "${INC_PR}.6" -SRCREV = "22fd3cd0de098de3816d687e41d42fe551412a33" +SRCREV = "66105fd3dc043e0f8011e1fa47864611936dd6aa" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" From f44fee44be75a06deb85248b6e82c21a52bf34a7 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 31 Mar 2015 20:13:45 +0200 Subject: [PATCH 164/200] libosmocore: Build libosmocore 0.8.0+git --- conf/layer.conf | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 944a712a3e..bfcd10c122 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "15" +META_TELEPHONY_OSMO_INC = "16" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index ad8d836329..367fefb178 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "419684e30c2fe12d3e3441cfa9fea21f1c4de959" +SRCREV = "f8699ca51eeb4f3d34336501abcaf071b4a95a47" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.7.0+gitr${SRCPV}" +PV = "0.8.0+gitr${SRCPV}" PR = "r2" PACKAGES =+ "libosmoctrl" From 6a7ee08532e4c5e69a5ba8eb637e6448b76f346a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 09:39:36 +0200 Subject: [PATCH 165/200] Big Osmocom update to the latest code * Update libosmocore with GB fixes and endian.h work * Update libosmo-netif for rtp header changes * Update OpenGGSN that now has libosmocore logging * Update OpenBSC with many new features, subscriber queue rework and more --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 2 +- recipes-osmocom/libosmo-netif/libosmo-netif_git.bb | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 4 ++-- recipes-osmocom/openbsc/openbsc_git.bb | 3 ++- recipes-osmocom/openggsn/openggsn_git.bb | 4 +++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index bfcd10c122..d67459b3e6 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "16" +META_TELEPHONY_OSMO_INC = "17" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index c2dbd44b23..8ea0c0527d 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "2f0dd0c01930fbc0dbf0c86946dd0a429f3cd6e2" +SRCREV = "3a580f263a24e0ce7d3ed544af0373c22ae9eeac" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" PV = "0.3.1+gitr${SRCPV}" PR = "${INC_PR}.1" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index f82d7ba0c9..073f0abef8 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "603f6c40d55b87f81fbd8ff1ad7b9568f3b962ff" +SRCREV = "c55d867508c8ddb93a822c018b5ce5a9a72006aa" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" PV = "0.4.0+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 367fefb178..c22076ccfe 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f8699ca51eeb4f3d34336501abcaf071b4a95a47" +SRCREV = "c1cb75eff5b060da9e6d43521e4913a8bf4e74fc" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.8.0+gitr${SRCPV}" +PV = "0.8.1+gitr${SRCPV}" PR = "r2" PACKAGES =+ "libosmoctrl" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 611d2c78e4..920ba341bc 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,9 +1,10 @@ require ${PN}.inc PV = "0.14.0+gitr${SRCPV}" +PRINC = "0" PR = "${INC_PR}.6" -SRCREV = "66105fd3dc043e0f8011e1fa47864611936dd6aa" +SRCREV = "57ee78078905c7499bd4e6857f8981d22badfcac" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ file://upgrade-mncc-version.patch" diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index e39f6681d1..5ac807fad5 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -4,13 +4,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" PR = "r14" -SRCREV = "c190896437b332d3fa2093b3f489810b48e3c90c" +SRCREV = "b07d07072e70ac4f920be9dfdf45615193b4ec2d" SRC_URI = "git://git.osmocom.org/openggsn \ file://openggsn.init \ file://libgtp-queue_depth_32.patch \ " S = "${WORKDIR}/git" +DEPENDS = "libosmocore" + PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev openggsn-sgsnemu" RDEPENDS_${PN} += "kernel-module-tun" From ce5e874f31cb4f041500caddb2833b3c0892c674 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 09:59:25 +0200 Subject: [PATCH 166/200] libosmo-sccp: Update as well for new function used by OpenBSC --- recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb index 328a1709e1..7e8b92f83c 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "ef8fc3bf28634d361adeec5490f807efb0ab3341" +SRCREV = "2d2d885bd124b8ae2d3a04f3583a756029820dc0" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" PR = "${INC_PR}.1" From 210921f81dd8ec3bc2068ecbf47c03a6d5e51768 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 10:19:50 +0200 Subject: [PATCH 167/200] c-ares: Import from meta-intel-iot-middleware Needed by OpenBSC http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/c-ares/c-ares_1.10.0.bb --- recipes-misc/c-ares/c-ares_1.10.0.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes-misc/c-ares/c-ares_1.10.0.bb diff --git a/recipes-misc/c-ares/c-ares_1.10.0.bb b/recipes-misc/c-ares/c-ares_1.10.0.bb new file mode 100644 index 0000000000..0d1ef9d62b --- /dev/null +++ b/recipes-misc/c-ares/c-ares_1.10.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "C library for asynchronous DNS requests (including name resolves)" +HOMEPAGE = "http://c-ares.haxx.se/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README;beginline=17;endline=23;md5=d08205a43bc63c12cf394ac1d2cce7c3" + +PR = "r0" + +SRC_URI = "http://c-ares.haxx.se/download/c-ares-${PV}.tar.gz" + +SRC_URI[md5sum] = "1196067641411a75d3cbebe074fd36d8" +SRC_URI[sha256sum] = "3d701674615d1158e56a59aaede7891f2dde3da0f46a6d3c684e0ae70f52d3db" + +inherit autotools From 7b41ee80ec30db8d218ce900bf0df5d2333e42c1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 10:20:40 +0200 Subject: [PATCH 168/200] openbsc: Require c-ares for the SGSN now --- recipes-osmocom/openbsc/openbsc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index aa5f7a7e6e..b8eaca58cd 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -1,5 +1,5 @@ DESCRIPTION = "OpenBSC a Free Software GSM BaseStationController" -DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm libpcap" +DEPENDS = "libdbi libosmocore libosmo-sccp libosmo-abis libosmo-netif openggsn libsmpp34 bcg729 libgsm libpcap c-ares" HOMEPAGE = "http://openbsc.osmocom.org/" LICENSE = "AGPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" From 97676796f729efd1c847ff65da9a5076ab0a8cbb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 26 Jun 2015 21:31:38 +0200 Subject: [PATCH 169/200] openggsn: Inherit pkgconfig as it is by configure --- recipes-osmocom/openggsn/openggsn_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index 5ac807fad5..790bf56fa1 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -16,7 +16,7 @@ DEPENDS = "libosmocore" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev openggsn-sgsnemu" RDEPENDS_${PN} += "kernel-module-tun" -inherit autotools update-rc.d +inherit autotools update-rc.d pkgconfig do_install_append() { install -d ${D}${sysconfdir}/init.d From 1464800759840509d5b2094b6b408575a6de59fb Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 30 Sep 2015 21:29:34 -0300 Subject: [PATCH 170/200] asterisk: Add recipe Asterisk is an Open Source PBX and telephony toolkit. Signed-off-by: Fabio Berton --- recipes-asterisk/asterisk/asterisk_13.5.0.bb | 155 ++++++++++++++++++ .../0001-Use-pkgconfig-to-find-sdl.patch | 26 +++ .../0002-Use-pkgconfig-to-find-libxml2.patch | 73 +++++++++ .../asterisk/files/asterisk.init.d | 150 +++++++++++++++++ 4 files changed, 404 insertions(+) create mode 100644 recipes-asterisk/asterisk/asterisk_13.5.0.bb create mode 100644 recipes-asterisk/asterisk/files/0001-Use-pkgconfig-to-find-sdl.patch create mode 100644 recipes-asterisk/asterisk/files/0002-Use-pkgconfig-to-find-libxml2.patch create mode 100644 recipes-asterisk/asterisk/files/asterisk.init.d diff --git a/recipes-asterisk/asterisk/asterisk_13.5.0.bb b/recipes-asterisk/asterisk/asterisk_13.5.0.bb new file mode 100644 index 0000000000..c912b3d1dd --- /dev/null +++ b/recipes-asterisk/asterisk/asterisk_13.5.0.bb @@ -0,0 +1,155 @@ +DESCRIPTION = "Asterisk is an Open Source PBX and telephony toolkit." +HOMEPAGE = "http://www.asterisk.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3aa955c628d43053f8ba9569d173105a" + +DEPENDS += "jansson sqlite3 libedit alsa-lib util-linux" + +SRC_URI = "\ + http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${PV}.tar.gz \ + file://0001-Use-pkgconfig-to-find-sdl.patch \ + file://0002-Use-pkgconfig-to-find-libxml2.patch \ + file://asterisk.init.d \ +" + +SRC_URI[md5sum] = "2fb7d247aacdbb9736c82b133053dfdf" +SRC_URI[sha256sum] = "e8b8d071f783edea82de510194dd272070ffbb7cdb2f5f6b020be5d15b67e8b9" + +S = "${WORKDIR}/asterisk-${PV}" + +inherit autotools-brokensep pkgconfig useradd update-rc.d + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system -g asterisk --shell /bin/false asterisk" +GROUPADD_PARAM_${PN} = "--system asterisk" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)}" +# Optional features +PACKAGECONFIG[dev-mode] = "--enable-dev-mode,--disable-dev-mode" +PACKAGECONFIG[coverage] = "--enable-coverage,--disable-coverage" +PACKAGECONFIG[xmldoc] = "--enable-xmldoc,--disable-xmldoc" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile" +PACKAGECONFIG[internal-poll] = "--enable-internal-poll,--disable-internal-poll" +PACKAGECONFIG[asteriskssl] = "--enable-asteriskssl,--disable-asteriskssl,openssl" +PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath" +# Optional packages +PACKAGECONFIG[bfd] = "--with-bfd,--without-bfd" +PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,bluez5" +PACKAGECONFIG[backtrace] = "--with-execinfo,--without-execinfo" +PACKAGECONFIG[cap] = "--with-cap,--without-cap,libcap" +PACKAGECONFIG[corosync] = "--with-cpg,--without-cpg,corosync" +PACKAGECONFIG[curses] = "--with-curses,--without-curses,ncurses" +PACKAGECONFIG[crypt] = "--with-crypt,--without-crypt" +PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto" +PACKAGECONFIG[dahdi] = "--with-dahdi,--without-dahdi,dahdi-tools" +# To enable FFMPEG add LICENSE_FLAGS_WHITELIST = "commercial" to your local.conf +PACKAGECONFIG[ffmpeg] = "--with-avcodec,--without-avcodec,libav" +PACKAGECONFIG[gsm] = "--with-gsm,--without-gsm,libgsm" +PACKAGECONFIG[ilbc] = "--with-ilbc,--without-ilbc" +PACKAGECONFIG[gtk2] = "--with-gtk2,--without-gtk2,gtk+" +PACKAGECONFIG[gmime] = "--with-gmime,--without-gmime" +PACKAGECONFIG[openh323] = "--with-h323,--without-h323" +PACKAGECONFIG[hoard] = "--with-hoard,--without-hoard" +PACKAGECONFIG[ical] = "--with-ical,--without-ical" +PACKAGECONFIG[iconv] = "--with-iconv,--without-iconv,libiconv" +PACKAGECONFIG[iksemel] = "--with-iksemel,--without-iksemel,iksemel" +PACKAGECONFIG[imap_tk] = "--with-imap,--without-imap,uw-imap" +PACKAGECONFIG[inotify] = "--with-inotify,--without-inotify" +PACKAGECONFIG[iodbc] = "--with-iodbc,--without-iodbc" +PACKAGECONFIG[isdnnet] = "--with-isdnnet,--without-isdnnet" +# Jack depends on kqeueu +PACKAGECONFIG[jack] = "--with-jack,--without-jack,jack" +PACKAGECONFIG[uriparser] = "--with-uriparser,--without-uriparser" +PACKAGECONFIG[kqueue] = "--with-kqueue,--without-kqueue" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[libcurl] = "--with-libcurl,--without-libcurl,curl" +PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" +PACKAGECONFIG[libxslt] = "--with-libxslt,--without-libxslt,libxslt" +PACKAGECONFIG[ltdl] = "--with-ltdl,--without-ltdl,libtool" +PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" +PACKAGECONFIG[misdn] = "--with-misdn,--without-misdn,misdn-utils" +PACKAGECONFIG[mysqlclient] = "--with-mysqlclient,--without-mysqlclient,mariadb" +PACKAGECONFIG[nbs] = "--with-nbs,--without-nbs" +PACKAGECONFIG[ncurses] = "--with-curses,--without-curses,ncurses" +PACKAGECONFIG[neon] = "--with-neon,--without-neon,neon" +PACKAGECONFIG[netsnmp] = "--with-netsnmp,--without-netsnmp,net-snmp" +PACKAGECONFIG[newt] = "--with-newt,--without-newt,libnewt" +PACKAGECONFIG[ogg] = "--with-ogg,--without-ogg,libogg" +PACKAGECONFIG[openr2] = "--with-openr2,--without-openr2" +PACKAGECONFIG[opus] = "--with-opus,--without-opus,libopus" +PACKAGECONFIG[osptk] = "--with-osptk,--without-osptk" +PACKAGECONFIG[oss] = "--with-oss,--without-oss,alsa-oss" +PACKAGECONFIG[pgsql] = "--with-postgres,--without-postgres,postgresql" +PACKAGECONFIG[pjproject] = "--with-pjproject,--without-pjproject,pjproject" +PACKAGECONFIG[popt] = "--with-popt,--without-popt,popt" +PACKAGECONFIG[portaudio] = "--with-portaudio,--without-portaudio,portaudio-v19" +PACKAGECONFIG[pri] = "--with-pri,--without-pri,misdn-utils" +PACKAGECONFIG[pwlib] = "--with-pwlib,--without-pwlib,pwlib" +PACKAGECONFIG[radius] = "--with-radius,--without-radius,radiusclient-ng" +PACKAGECONFIG[resample] = "--with-resample,--without-resample,ncurses" +# Need to enable sdl_images to use sdl +PACKAGECONFIG[sdl] = "--with-sdl,--without-sdl,libsdl" +PACKAGECONFIG[sdl_image] = "--with-SDL_image,--without-SDL_image,libsdl-image" +PACKAGECONFIG[sounds-cache] = "--with-sounds-cache,--without-sounds-cache" +PACKAGECONFIG[spandsp] = "--with-spandsp,--without-spandsp" +PACKAGECONFIG[ss7] = "--with-ss7,--without-ss7" +PACKAGECONFIG[speex] = "--with-speex,--without-speex,speex" +PACKAGECONFIG[speexdsp] = "--with-speexdsp,--without-speexdsp,speexdsp" +PACKAGECONFIG[srtp] = "--with-srtp,--without-srtp" +PACKAGECONFIG[openssl] = "--with-ssl,--without-ssl,openssl" +PACKAGECONFIG[suppserv] = "--with-suppserv,--without-suppserv,misdn-utils" +PACKAGECONFIG[freetds] = "--with-tds,--without-tds" +PACKAGECONFIG[termcap] = "--with-termcap,--without-termcap,libcap" +PACKAGECONFIG[timerfd] = "--with-timerfd,--without-timerfd" +PACKAGECONFIG[tinfo] = "--with-tinfo,--without-tinfo,ncurses" +PACKAGECONFIG[tonezone] = "--with-tonezone,--without-tonezone" +PACKAGECONFIG[unixodbc] = "--with-unixodbc,--without-unixodbc,libodbc" +PACKAGECONFIG[vorbis] = "--with-vorbis,--without-vorbis,libvorbis" +PACKAGECONFIG[vpb] = "--with-vpb,--without-vpb" +PACKAGECONFIG[x11] = "--with-x11,--without-x11,libx11" +PACKAGECONFIG[zlib] = "--with-z,--without-z,zlib" + +EXTRA_OECONF += " \ + --with-libedit=${STAGING_INCDIR} \ +" + +INITSCRIPT_NAME = "asterisk" +INITSCRIPT_PARAMS = "defaults" + +do_configure_append() { + echo "Regenerate the configure scripts" + for d in ${S}/menuselect; do + echo " - $d" + (cd $d; autoreconf -I ${S}/autoconf) + done + + echo "Starting the build of menuselect" + cd ${B}/menuselect + CC="${HOST_CC}" \ + CXX="${HOST_CXX}" \ + LD="" \ + AR="" \ + RANLIB="" \ + CFLAGS="${HOST_CFLAGS}" \ + LDFLAGS="${HOST_LDFLAGS}" \ + ./configure +} + +do_install_append() { + oe_runmake DESTDIR=${D} samples + install -Dm 0755 ${WORKDIR}/asterisk.init.d ${D}${sysconfdir}/init.d/asterisk + # Set file permissions and ownerships + chown -R root:asterisk ${D}${sysconfdir}/asterisk + chmod -R u=rwX,g=rwX,o= ${D}${sysconfdir}/asterisk + for x in spool run lib log; do + chown -R asterisk:asterisk ${D}${localstatedir}/${x}/asterisk + chmod -R u=rwX,g=rwX,o= ${D}${localstatedir}/${x}/asterisk + done +} + +FILES_${PN} += "\ + /run/asterisk \ + ${datadir}/dahdi/* \ + ${libdir}/hotplug/firmware \ +" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" diff --git a/recipes-asterisk/asterisk/files/0001-Use-pkgconfig-to-find-sdl.patch b/recipes-asterisk/asterisk/files/0001-Use-pkgconfig-to-find-sdl.patch new file mode 100644 index 0000000000..a0cc4b2510 --- /dev/null +++ b/recipes-asterisk/asterisk/files/0001-Use-pkgconfig-to-find-sdl.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +Subject: [PATCH 1/2] Use pkgconfig to find sdl +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 971f9bf..c371d19 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2427,7 +2427,7 @@ AC_SUBST(PBX_IXJUSER) + AST_C_DEFINE_CHECK([MSG_NOSIGNAL], [MSG_NOSIGNAL], [sys/socket.h]) + AST_C_DEFINE_CHECK([SO_NOSIGPIPE], [SO_NOSIGPIPE], [sys/socket.h]) + +-AST_EXT_TOOL_CHECK([SDL], [sdl-config]) ++AST_PKG_CONFIG_CHECK([SDL], [sdl]) + AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}]) + AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [${PTHREAD_LIBS} -lz -lm], [${PTHREAD_CFLAGS}]) + +-- +2.1.4 + diff --git a/recipes-asterisk/asterisk/files/0002-Use-pkgconfig-to-find-libxml2.patch b/recipes-asterisk/asterisk/files/0002-Use-pkgconfig-to-find-libxml2.patch new file mode 100644 index 0000000000..f5c8d260d9 --- /dev/null +++ b/recipes-asterisk/asterisk/files/0002-Use-pkgconfig-to-find-libxml2.patch @@ -0,0 +1,73 @@ +Upstream-Status: Pending + +Subject: [PATCH 2/2] Use pkgconfig to find libxml2 +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + configure.ac | 12 +----------- + menuselect/configure.ac | 11 +++-------- + 2 files changed, 4 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c371d19..17f0d2d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -575,17 +575,6 @@ if test "x$JANSSON_LIB" == "x"; then + AC_MSG_ERROR([*** JSON support not found (this typically means the libjansson development package is missing)]) + fi + +-AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , , +- [#include +- #include ], +- [LIBXML_TEST_VERSION]) +- +-if test "${PBX_LIBXML2}" != 1; then +- AC_MSG_NOTICE(*** The Asterisk menuselect tool requires the 'libxml2' development package.) +- AC_MSG_NOTICE(*** Please install the 'libxml2' development package.) +- exit 1 +-fi +- + AST_EXT_LIB_CHECK([URIPARSER], [uriparser], [uriParseUriA], [uriparser/Uri.h]) + + # Another mandatory item (unless it's explicitly disabled) +@@ -1280,6 +1269,7 @@ PKG_PROG_PKG_CONFIG() + + + # do the package library checks now ++AST_PKG_CONFIG_CHECK([LIBXML2], [libxml-2.0]) + + AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl]) + +diff --git a/menuselect/configure.ac b/menuselect/configure.ac +index 5989f5c..675113b 100644 +--- a/menuselect/configure.ac ++++ b/menuselect/configure.ac +@@ -125,14 +125,6 @@ AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2]) + AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) + AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h]) + AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h]) +-AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , , +- [#include +- #include ], +- [LIBXML_TEST_VERSION]) +- +-if test "${PBX_LIBXML2}" != 1; then +- AC_MSG_ERROR([Could not find required 'Libxml2' development package]) +-fi + + PBX_GTK2=0 + AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) +@@ -146,6 +138,9 @@ AC_SUBST(PBX_GTK2) + AC_SUBST(GTK2_INCLUDE) + AC_SUBST(GTK2_LIB) + ++PKG_PROG_PKG_CONFIG() ++AST_PKG_CONFIG_CHECK([LIBXML2], [libxml-2.0]) ++ + test "$silent"=yes && ac_sub_configure_args="${ac_sub_configure_args} --silent" + + AC_CONFIG_FILES([makeopts]) +-- +2.1.4 + diff --git a/recipes-asterisk/asterisk/files/asterisk.init.d b/recipes-asterisk/asterisk/files/asterisk.init.d new file mode 100644 index 0000000000..631ce1d808 --- /dev/null +++ b/recipes-asterisk/asterisk/files/asterisk.init.d @@ -0,0 +1,150 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: asterisk +# Required-Start: $network $syslog $named $local_fs $remote_fs +# Required-Stop: $network $syslog $named $local_fs $remote_fs +# Should-Start: dahdi misdn lcr wanrouter mysql postgresql +# Should-Stop: dahdi misdn lcr wanrouter mysql postgresql +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Asterisk PBX +# Description: Asterisk Open Source PBX +### END INIT INFO + +# Do NOT "set -e" + +log_daemon_msg() { + echo $* +} + +log_end_msg() { + if [ $1 -eq 0 ]; then + success $* + else + failure $* + fi +} + +log_failure_msg() { + echo $* +} + +log_success_msg() { + echo $* +} + + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Asterisk PBX" +NAME=asterisk +DAEMON=/usr/sbin/$NAME +DAEMON_ARGS="" +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +CHROOT=/var/run/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# LSB log_* functions +. /etc/init.d/functions + +do_start() +{ + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +do_stop() +{ + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" +} + +do_reload() { + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +# +# Function that shows the daemon/service status +# +status_of_proc () { + local pid status + + status=0 + # pidof output null when no program is running, so no "2>/dev/null". + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "$DESC is running ($pid)." + exit 0 + ;; + *) + echo "$DESC is not running." >&2 + exit $status + ;; + esac +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + reload) + log_daemon_msg "Reloading $DESC" "$NAME" + do_reload + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + status) + status_of_proc $DAEMON $NAME -p $PIDFILE && exit 0 || exit $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2 + exit 3 + ;; +esac + +: + From f6234c4d326ec622456ddbc55c6d57e53e87da6c Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Mon, 26 Oct 2015 13:12:01 -0200 Subject: [PATCH 171/200] libgsm: Drop libgsm.inc Move all code to bb file. Signed-off-by: Fabio Berton --- recipes-isdn/libgsm/libgsm.inc | 34 ---------------------------- recipes-isdn/libgsm/libgsm_1.0.13.bb | 34 ++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 36 deletions(-) delete mode 100644 recipes-isdn/libgsm/libgsm.inc diff --git a/recipes-isdn/libgsm/libgsm.inc b/recipes-isdn/libgsm/libgsm.inc deleted file mode 100644 index aa0386c31c..0000000000 --- a/recipes-isdn/libgsm/libgsm.inc +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "GSM Audio Library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "libgsm" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5" - -INC_PR = "r2" - -SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \ - file://01_makefile.patch \ - file://02_cplusplus.patch \ - file://03_config.patch \ - file://04_includes.patch \ - file://05_compiler_warnings.patch \ - " - -CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc" - -PARALLEL_MAKE = "" - -do_compile() { - unset LD - oe_runmake CCFLAGS="${CFLAGS}" -} - -do_install() { - oe_libinstall -a -C lib libgsm ${D}${libdir} - oe_libinstall -so -C lib libgsm ${D}${libdir} - install -d ${D}${includedir}/gsm - install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/ - cd ${D}${includedir} - ln -s gsm/gsm.h gsm.h -} - diff --git a/recipes-isdn/libgsm/libgsm_1.0.13.bb b/recipes-isdn/libgsm/libgsm_1.0.13.bb index e6bf9baf60..38e7e1134e 100644 --- a/recipes-isdn/libgsm/libgsm_1.0.13.bb +++ b/recipes-isdn/libgsm/libgsm_1.0.13.bb @@ -1,8 +1,38 @@ -require libgsm.inc +DESCRIPTION = "GSM Audio Library" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "libgsm" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5" -PR = "${INC_PR}.0" +INC_PR = "r2" + +SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \ + file://01_makefile.patch \ + file://02_cplusplus.patch \ + file://03_config.patch \ + file://04_includes.patch \ + file://05_compiler_warnings.patch \ + " S = "${WORKDIR}/gsm-1.0-pl13/" SRC_URI[md5sum] = "c1ba392ce61dc4aff1c29ea4e92f6df4" SRC_URI[sha256sum] = "52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad" + +CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc" + +PARALLEL_MAKE = "" + +do_compile() { + unset LD + oe_runmake CCFLAGS="${CFLAGS}" +} + +do_install() { + oe_libinstall -a -C lib libgsm ${D}${libdir} + oe_libinstall -so -C lib libgsm ${D}${libdir} + install -d ${D}${includedir}/gsm + install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/ + cd ${D}${includedir} + ln -s gsm/gsm.h gsm.h +} From ee5e6c4c53d553b4ccd8a58bc0f6662aba68e41b Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Mon, 26 Oct 2015 13:17:41 -0200 Subject: [PATCH 172/200] libgsm: Organize recipe Fix indentations and style issues. Signed-off-by: Fabio Berton --- recipes-isdn/libgsm/libgsm_1.0.13.bb | 37 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/recipes-isdn/libgsm/libgsm_1.0.13.bb b/recipes-isdn/libgsm/libgsm_1.0.13.bb index 38e7e1134e..fb16037f06 100644 --- a/recipes-isdn/libgsm/libgsm_1.0.13.bb +++ b/recipes-isdn/libgsm/libgsm_1.0.13.bb @@ -4,15 +4,14 @@ PRIORITY = "optional" LICENSE = "libgsm" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5" -INC_PR = "r2" - -SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \ - file://01_makefile.patch \ - file://02_cplusplus.patch \ - file://03_config.patch \ - file://04_includes.patch \ - file://05_compiler_warnings.patch \ - " +SRC_URI = "\ + http://www.quut.com/gsm/gsm-${PV}.tar.gz \ + file://01_makefile.patch \ + file://02_cplusplus.patch \ + file://03_config.patch \ + file://04_includes.patch \ + file://05_compiler_warnings.patch \ +" S = "${WORKDIR}/gsm-1.0-pl13/" @@ -23,16 +22,16 @@ CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes PARALLEL_MAKE = "" -do_compile() { - unset LD - oe_runmake CCFLAGS="${CFLAGS}" +do_compile(){ + unset LD + oe_runmake CCFLAGS="${CFLAGS}" } -do_install() { - oe_libinstall -a -C lib libgsm ${D}${libdir} - oe_libinstall -so -C lib libgsm ${D}${libdir} - install -d ${D}${includedir}/gsm - install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/ - cd ${D}${includedir} - ln -s gsm/gsm.h gsm.h +do_install(){ + oe_libinstall -a -C lib libgsm ${D}${libdir} + oe_libinstall -so -C lib libgsm ${D}${libdir} + install -d ${D}${includedir}/gsm + install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/ + cd ${D}${includedir} + ln -s gsm/gsm.h gsm.h } From efa5849c453ec48dd27631b624573fbf1bb5d06b Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Mon, 26 Oct 2015 13:22:07 -0200 Subject: [PATCH 173/200] libgsm: Update to version 1.0.14 Signed-off-by: Fabio Berton --- .../0001-Configure-Makefile.patch} | 34 +++++--- .../libgsm/files/0002-Add-defines-to-c.patch | 39 +++++++++ ..._config.-header-instead-of-config.h.patch} | 84 +++++++++++++------ .../libgsm/files/0004-Add-includes.patch | 41 +++++++++ .../0005-Change-compiler-warnings.patch} | 46 ++++++---- .../libgsm/libgsm-1.0.13/02_cplusplus.patch | 25 ------ .../libgsm/libgsm-1.0.13/04_includes.patch | 43 ---------- .../{libgsm_1.0.13.bb => libgsm_1.0.14.bb} | 18 ++-- 8 files changed, 202 insertions(+), 128 deletions(-) rename recipes-isdn/libgsm/{libgsm-1.0.13/01_makefile.patch => files/0001-Configure-Makefile.patch} (67%) create mode 100644 recipes-isdn/libgsm/files/0002-Add-defines-to-c.patch rename recipes-isdn/libgsm/{libgsm-1.0.13/03_config.patch => files/0003-Use-gsm_config.-header-instead-of-config.h.patch} (70%) create mode 100644 recipes-isdn/libgsm/files/0004-Add-includes.patch rename recipes-isdn/libgsm/{libgsm-1.0.13/05_compiler_warnings.patch => files/0005-Change-compiler-warnings.patch} (64%) delete mode 100644 recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch delete mode 100644 recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch rename recipes-isdn/libgsm/{libgsm_1.0.13.bb => libgsm_1.0.14.bb} (60%) diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/01_makefile.patch b/recipes-isdn/libgsm/files/0001-Configure-Makefile.patch similarity index 67% rename from recipes-isdn/libgsm/libgsm-1.0.13/01_makefile.patch rename to recipes-isdn/libgsm/files/0001-Configure-Makefile.patch index 947db37bfc..60aa78d660 100644 --- a/recipes-isdn/libgsm/libgsm-1.0.13/01_makefile.patch +++ b/recipes-isdn/libgsm/files/0001-Configure-Makefile.patch @@ -1,7 +1,18 @@ -diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile ---- libgsm-1.0.12~/Makefile 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.12/Makefile 2007-11-01 15:43:06.000000000 +0100 -@@ -96,7 +96,7 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH 1/5] Configure Makefile +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + Makefile | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index cfab74f..410d3f6 100644 +--- a/Makefile ++++ b/Makefile +@@ -96,7 +96,7 @@ TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1 # Other tools SHELL = /bin/sh @@ -10,15 +21,15 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile BASENAME = basename AR = ar ARFLAGS = cr -@@ -140,6 +140,7 @@ +@@ -140,6 +140,7 @@ LFLAGS = $(LDFLAGS) $(LDINC) # Targets LIBGSM = $(LIB)/libgsm.a -+LIBGSMSO= $(LIB)/libgsm.so ++LIBGSMSO = $(LIB)/libgsm.so TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast -@@ -279,7 +280,7 @@ +@@ -279,7 +280,7 @@ TOAST_INSTALL_TARGETS = \ # Target rules @@ -27,7 +38,7 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile @-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,6 +300,11 @@ +@@ -299,6 +300,11 @@ install: toastinstall gsminstall # The basic API: libgsm @@ -39,7 +50,7 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile $(LIBGSM): $(LIB) $(GSM_OBJECTS) -rm $(RMFLAGS) $(LIBGSM) $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) -@@ -308,15 +314,15 @@ +@@ -308,15 +314,15 @@ $(LIBGSM): $(LIB) $(GSM_OBJECTS) # Toast, Untoast and Tcat -- the compress-like frontends to gsm. $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) @@ -58,7 +69,7 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile # The local bin and lib directories -@@ -426,7 +432,9 @@ +@@ -426,7 +432,9 @@ semi-clean: clean: semi-clean -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ @@ -69,3 +80,6 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile $(ROOT)/gsm-1.0.tar.Z +-- +2.1.4 + diff --git a/recipes-isdn/libgsm/files/0002-Add-defines-to-c.patch b/recipes-isdn/libgsm/files/0002-Add-defines-to-c.patch new file mode 100644 index 0000000000..70f34f2a59 --- /dev/null +++ b/recipes-isdn/libgsm/files/0002-Add-defines-to-c.patch @@ -0,0 +1,39 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH 2/5] Add defines to c++ +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + inc/gsm.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/inc/gsm.h b/inc/gsm.h +index 4714ab6..eb2d5e7 100644 +--- a/inc/gsm.h ++++ b/inc/gsm.h +@@ -54,6 +54,10 @@ typedef gsm_byte gsm_frame[33]; /* 33 * 8 bits */ + #define GSM_OPT_FRAME_INDEX 5 + #define GSM_OPT_FRAME_CHAIN 6 + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + extern gsm gsm_create GSM_P((void)); + extern void gsm_destroy GSM_P((gsm)); + +@@ -66,6 +70,10 @@ extern int gsm_decode GSM_P((gsm, gsm_byte *, gsm_signal *)); + extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *)); + extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *)); + ++#ifdef __cplusplus ++} ++#endif ++ + #undef GSM_P + + #endif /* GSM_H */ +-- +2.1.4 + diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/03_config.patch b/recipes-isdn/libgsm/files/0003-Use-gsm_config.-header-instead-of-config.h.patch similarity index 70% rename from recipes-isdn/libgsm/libgsm-1.0.13/03_config.patch rename to recipes-isdn/libgsm/files/0003-Use-gsm_config.-header-instead-of-config.h.patch index dad241e2bd..675512456a 100644 --- a/recipes-isdn/libgsm/libgsm-1.0.13/03_config.patch +++ b/recipes-isdn/libgsm/files/0003-Use-gsm_config.-header-instead-of-config.h.patch @@ -1,7 +1,27 @@ -diff -urNad libgsm-1.0.10~/Makefile libgsm-1.0.10/Makefile ---- libgsm-1.0.10~/Makefile 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/Makefile 2007-11-01 15:48:02.000000000 +0100 -@@ -151,7 +151,7 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH 3/5] Use gsm_config. header instead of config.h +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + Makefile | 2 +- + inc/config.h | 37 ------------------------------------- + inc/gsm_config.h | 37 +++++++++++++++++++++++++++++++++++++ + inc/toast.h | 2 +- + src/code.c | 2 +- + src/gsm_create.c | 2 +- + src/gsm_destroy.c | 2 +- + tls/taste.c | 2 +- + 8 files changed, 43 insertions(+), 43 deletions(-) + delete mode 100644 inc/config.h + create mode 100644 inc/gsm_config.h + +diff --git a/Makefile b/Makefile +index 410d3f6..c8c5b58 100644 +--- a/Makefile ++++ b/Makefile +@@ -152,7 +152,7 @@ GSM_HEADERS = $(INC)/gsm.h HEADERS = $(INC)/proto.h \ $(INC)/unproto.h \ @@ -10,9 +30,11 @@ diff -urNad libgsm-1.0.10~/Makefile libgsm-1.0.10/Makefile $(INC)/private.h \ $(INC)/gsm.h \ $(INC)/toast.h \ -diff -urNad libgsm-1.0.10~/inc/config.h libgsm-1.0.10/inc/config.h ---- libgsm-1.0.10~/inc/config.h 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/inc/config.h 1970-01-01 01:00:00.000000000 +0100 +diff --git a/inc/config.h b/inc/config.h +deleted file mode 100644 +index dfb1ead..0000000 +--- a/inc/config.h ++++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische @@ -51,9 +73,11 @@ diff -urNad libgsm-1.0.10~/inc/config.h libgsm-1.0.10/inc/config.h -/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ - -#endif /* CONFIG_H */ -diff -urNad libgsm-1.0.10~/inc/gsm_config.h libgsm-1.0.10/inc/gsm_config.h ---- libgsm-1.0.10~/inc/gsm_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ libgsm-1.0.10/inc/gsm_config.h 2007-11-01 15:46:19.000000000 +0100 +diff --git a/inc/gsm_config.h b/inc/gsm_config.h +new file mode 100644 +index 0000000..28cee6d +--- /dev/null ++++ b/inc/gsm_config.h @@ -0,0 +1,37 @@ +/* + * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische @@ -92,9 +116,10 @@ diff -urNad libgsm-1.0.10~/inc/gsm_config.h libgsm-1.0.10/inc/gsm_config.h +/*efine HAS_UTIMEUSEC 1 -* microseconds in utimbuf? */ + +#endif /* CONFIG_H */ -diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h ---- libgsm-1.0.10~/inc/toast.h 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/inc/toast.h 2007-11-01 15:48:17.000000000 +0100 +diff --git a/inc/toast.h b/inc/toast.h +index b42d9ae..911769d 100644 +--- a/inc/toast.h ++++ b/inc/toast.h @@ -9,7 +9,7 @@ #ifndef TOAST_H #define TOAST_H /* Guard against multiple includes */ @@ -104,9 +129,10 @@ diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h #include #include -diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c ---- libgsm-1.0.10~/src/code.c 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/src/code.c 2007-11-01 15:48:34.000000000 +0100 +diff --git a/src/code.c b/src/code.c +index 402f614..5222727 100644 +--- a/src/code.c ++++ b/src/code.c @@ -6,7 +6,7 @@ /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/code.c,v 1.3 1996/07/02 09:59:05 jutta Exp $ */ @@ -115,10 +141,11 @@ diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c +#include "gsm_config.h" - #ifdef HAS_STDLIB_H -diff -urNad libgsm-1.0.10~/src/gsm_create.c libgsm-1.0.10/src/gsm_create.c ---- libgsm-1.0.10~/src/gsm_create.c 1996-07-02 16:32:44.000000000 +0200 -+++ libgsm-1.0.10/src/gsm_create.c 2007-11-01 15:48:48.000000000 +0100 + #ifdef HAS_STRING_H +diff --git a/src/gsm_create.c b/src/gsm_create.c +index a0bf634..9cc2670 100644 +--- a/src/gsm_create.c ++++ b/src/gsm_create.c @@ -6,7 +6,7 @@ static char const ident[] = "$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_create.c,v 1.4 1996/07/02 09:59:05 jutta Exp $"; @@ -128,9 +155,10 @@ diff -urNad libgsm-1.0.10~/src/gsm_create.c libgsm-1.0.10/src/gsm_create.c #ifdef HAS_STRING_H #include -diff -urNad libgsm-1.0.10~/src/gsm_destroy.c libgsm-1.0.10/src/gsm_destroy.c ---- libgsm-1.0.10~/src/gsm_destroy.c 1996-07-02 16:32:39.000000000 +0200 -+++ libgsm-1.0.10/src/gsm_destroy.c 2007-11-01 15:48:57.000000000 +0100 +diff --git a/src/gsm_destroy.c b/src/gsm_destroy.c +index 03c8659..274dc4c 100644 +--- a/src/gsm_destroy.c ++++ b/src/gsm_destroy.c @@ -7,7 +7,7 @@ /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_destroy.c,v 1.3 1994/11/28 19:52:25 jutta Exp $ */ @@ -140,9 +168,10 @@ diff -urNad libgsm-1.0.10~/src/gsm_destroy.c libgsm-1.0.10/src/gsm_destroy.c #include "proto.h" #ifdef HAS_STDLIB_H -diff -urNad libgsm-1.0.10~/tls/taste.c libgsm-1.0.10/tls/taste.c ---- libgsm-1.0.10~/tls/taste.c 1996-07-02 16:33:05.000000000 +0200 -+++ libgsm-1.0.10/tls/taste.c 2007-11-01 15:49:54.000000000 +0100 +diff --git a/tls/taste.c b/tls/taste.c +index 4bc84ad..56d1a93 100644 +--- a/tls/taste.c ++++ b/tls/taste.c @@ -10,7 +10,7 @@ #include #include @@ -152,3 +181,6 @@ diff -urNad libgsm-1.0.10~/tls/taste.c libgsm-1.0.10/tls/taste.c #ifdef HAS_STDLIB_H # include +-- +2.1.4 + diff --git a/recipes-isdn/libgsm/files/0004-Add-includes.patch b/recipes-isdn/libgsm/files/0004-Add-includes.patch new file mode 100644 index 0000000000..efb113358e --- /dev/null +++ b/recipes-isdn/libgsm/files/0004-Add-includes.patch @@ -0,0 +1,41 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH 4/5] Add includes +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + inc/toast.h | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/inc/toast.h b/inc/toast.h +index 911769d..3e710d0 100644 +--- a/inc/toast.h ++++ b/inc/toast.h +@@ -16,10 +16,11 @@ + + #include + #include ++#include + #include + + #include +-#ifndef HAS_ERRNO_DECL ++#ifndef errno + extern int errno; + #endif + +@@ -37,6 +38,10 @@ + # endif + #endif + ++#ifdef HAS_STDIO_H ++# include ++#endif ++ + #include "gsm.h" + + #ifndef S_ISREG +-- +2.1.4 + diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/05_compiler_warnings.patch b/recipes-isdn/libgsm/files/0005-Change-compiler-warnings.patch similarity index 64% rename from recipes-isdn/libgsm/libgsm-1.0.13/05_compiler_warnings.patch rename to recipes-isdn/libgsm/files/0005-Change-compiler-warnings.patch index c40100c922..126d4ff5a0 100644 --- a/recipes-isdn/libgsm/libgsm-1.0.13/05_compiler_warnings.patch +++ b/recipes-isdn/libgsm/files/0005-Change-compiler-warnings.patch @@ -1,7 +1,19 @@ -diff -urNad libgsm-1.0.10~/src/debug.c libgsm-1.0.10/src/debug.c ---- libgsm-1.0.10~/src/debug.c 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/src/debug.c 2007-11-01 15:53:42.000000000 +0100 -@@ -49,7 +49,7 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH 5/5] Change compiler warnings +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + src/debug.c | 6 +++--- + src/toast.c | 17 +++++++---------- + 2 files changed, 10 insertions(+), 13 deletions(-) + +diff --git a/src/debug.c b/src/debug.c +index 04c3907..a2a5136 100644 +--- a/src/debug.c ++++ b/src/debug.c +@@ -49,7 +49,7 @@ void gsm_debug_longwords P4( (name, from, to, ptr), fprintf( stderr, "%s [%d .. %d]: ", name, from, to ); while (from <= to) { @@ -10,7 +22,7 @@ diff -urNad libgsm-1.0.10~/src/debug.c libgsm-1.0.10/src/debug.c from++; if (nprinted++ >= 7) { nprinted = 0; -@@ -63,14 +63,14 @@ +@@ -63,14 +63,14 @@ void gsm_debug_longword P2( (name, value), char * name, longword value ) { @@ -27,10 +39,11 @@ diff -urNad libgsm-1.0.10~/src/debug.c libgsm-1.0.10/src/debug.c } #endif -diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c ---- libgsm-1.0.10~/src/toast.c 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/src/toast.c 2007-11-01 15:53:42.000000000 +0100 -@@ -251,8 +251,8 @@ +diff --git a/src/toast.c b/src/toast.c +index 9823642..55606d7 100644 +--- a/src/toast.c ++++ b/src/toast.c +@@ -251,8 +251,8 @@ static char * emalloc P1((len), size_t len) { char * s; if (!(s = malloc(len))) { @@ -41,7 +54,7 @@ diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c onintr(); exit(1); } -@@ -270,7 +270,7 @@ +@@ -270,7 +270,7 @@ static char* normalname P3((name, want, cut), char *name, char *want,char *cut) maxlen = strlen(name) + 1 + strlen(want) + strlen(cut); p = strcpy(emalloc(maxlen), name); @@ -50,7 +63,7 @@ diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c else if (*want && !suffix(p, want)) strcat(p, want); return p; -@@ -386,7 +386,7 @@ +@@ -386,7 +386,7 @@ static void update_times P0() ut[0] = instat.st_atime; ut[1] = instat.st_mtime; @@ -59,7 +72,7 @@ diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c #endif /* UTIMBUF */ } -@@ -416,7 +416,7 @@ +@@ -416,7 +416,7 @@ static int okay_as_input P3((name,f,st), char* name, FILE* f, struct stat * st) } if (st->st_nlink > 1 && !f_cat && !f_precious) { fprintf(stderr, @@ -68,7 +81,7 @@ diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2)); return 0; } -@@ -585,8 +585,8 @@ +@@ -585,8 +585,8 @@ static int process_decode P0() if (cc != sizeof(s)) { if (cc >= 0) fprintf(stderr, @@ -79,7 +92,7 @@ diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c "s" + (sizeof(s) - cc == 1), inname ? inname : "stdin" ); gsm_destroy(r); -@@ -624,8 +624,6 @@ +@@ -624,8 +624,6 @@ static int process_decode P0() static int process P1((name), char * name) { @@ -88,7 +101,7 @@ diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c out = (FILE *)0; in = (FILE *)0; -@@ -779,7 +777,6 @@ +@@ -779,7 +777,6 @@ int main P2((ac, av), int ac, char **av) case 'h': help(); exit(0); default: @@ -96,3 +109,6 @@ diff -urNad libgsm-1.0.10~/src/toast.c libgsm-1.0.10/src/toast.c fprintf(stderr, "Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n", progname); +-- +2.1.4 + diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch b/recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch deleted file mode 100644 index a4bbb40674..0000000000 --- a/recipes-isdn/libgsm/libgsm-1.0.13/02_cplusplus.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urNad libgsm-1.0.10~/inc/gsm.h libgsm-1.0.10/inc/gsm.h ---- libgsm-1.0.10~/inc/gsm.h 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/inc/gsm.h 2007-11-01 15:44:52.000000000 +0100 -@@ -54,6 +54,10 @@ - #define GSM_OPT_FRAME_INDEX 5 - #define GSM_OPT_FRAME_CHAIN 6 - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - extern gsm gsm_create GSM_P((void)); - extern void gsm_destroy GSM_P((gsm)); - -@@ -66,6 +70,10 @@ - extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *)); - extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *)); - -+#ifdef __cplusplus -+} -+#endif -+ - #undef GSM_P - - #endif /* GSM_H */ diff --git a/recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch b/recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch deleted file mode 100644 index 2769b40b05..0000000000 --- a/recipes-isdn/libgsm/libgsm-1.0.13/04_includes.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -urNad libgsm-1.0.10~/inc/toast.h libgsm-1.0.10/inc/toast.h ---- libgsm-1.0.10~/inc/toast.h 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/inc/toast.h 2007-11-01 15:52:33.000000000 +0100 -@@ -16,11 +16,12 @@ - - #include - #include -+#include - #include - - #include --#ifndef HAS_ERRNO_DECL -- extern int errno; -+#ifndef errno -+ extern int errno; - #endif - - #ifdef HAS_LIMITS_H -@@ -37,6 +38,10 @@ - # endif - #endif - -+#ifdef HAS_STDIO_H -+# include -+#endif -+ - #include "gsm.h" - - #ifndef S_ISREG -diff -urNad libgsm-1.0.10~/src/code.c libgsm-1.0.10/src/code.c ---- libgsm-1.0.10~/src/code.c 2007-11-01 15:37:52.000000000 +0100 -+++ libgsm-1.0.10/src/code.c 2007-11-01 15:52:33.000000000 +0100 -@@ -9,8 +9,8 @@ - #include "config.h" - - --#ifdef HAS_STDLIB_H --#include -+#ifdef HAS_STRING_H -+#include - #else - # include "proto.h" - extern char * memcpy P((char *, char *, int)); diff --git a/recipes-isdn/libgsm/libgsm_1.0.13.bb b/recipes-isdn/libgsm/libgsm_1.0.14.bb similarity index 60% rename from recipes-isdn/libgsm/libgsm_1.0.13.bb rename to recipes-isdn/libgsm/libgsm_1.0.14.bb index fb16037f06..8d90ffcc89 100644 --- a/recipes-isdn/libgsm/libgsm_1.0.13.bb +++ b/recipes-isdn/libgsm/libgsm_1.0.14.bb @@ -1,22 +1,22 @@ DESCRIPTION = "GSM Audio Library" SECTION = "libs" PRIORITY = "optional" -LICENSE = "libgsm" +LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5" SRC_URI = "\ http://www.quut.com/gsm/gsm-${PV}.tar.gz \ - file://01_makefile.patch \ - file://02_cplusplus.patch \ - file://03_config.patch \ - file://04_includes.patch \ - file://05_compiler_warnings.patch \ + file://0001-Configure-Makefile.patch \ + file://0002-Add-defines-to-c.patch \ + file://0003-Use-gsm_config.-header-instead-of-config.h.patch \ + file://0004-Add-includes.patch \ + file://0005-Change-compiler-warnings.patch \ " -S = "${WORKDIR}/gsm-1.0-pl13/" +SRC_URI[md5sum] = "4cbb4e7b73842de3d12d30b0d74200d4" +SRC_URI[sha256sum] = "5814a16a30b3c026871b3739812dc4a2a84299331182c987da1c212c93e9352c" -SRC_URI[md5sum] = "c1ba392ce61dc4aff1c29ea4e92f6df4" -SRC_URI[sha256sum] = "52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad" +S = "${WORKDIR}/gsm-1.0-pl14/" CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc" From 4a63c7c73eb8073a69cdf078b6c5ddf97887e66b Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 14:17:20 -0300 Subject: [PATCH 174/200] misdn-utils: Organize recipe Fix indentations and style issues. Signed-off-by: Fabio Berton --- recipes-isdn/misdn/misdn-utils_git.bb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/recipes-isdn/misdn/misdn-utils_git.bb b/recipes-isdn/misdn/misdn-utils_git.bb index 261bbed442..9e08090120 100644 --- a/recipes-isdn/misdn/misdn-utils_git.bb +++ b/recipes-isdn/misdn/misdn-utils_git.bb @@ -2,17 +2,20 @@ DESCRITOPN = "mISDNutils userspace library" HOMEPAGE = "http://misdn.org" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -PR = "r4" -SRC_URI = "git://git.misdn.eu/mISDNuser.git \ - file://misdn-ph-size.diff" +SRC_URI = "\ + git://git.misdn.eu/mISDNuser.git \ + file://misdn-ph-size.diff \ +" + SRCREV = "fd246f6bbbf2f4692f507018bcd1a526fab16499" S = "${WORKDIR}/git" -PACKAGES =+ "misdn-tools-dbg misdn-tools" - inherit autotools +PACKAGES =+ "misdn-tools-dbg misdn-tools" + FILES_misdn-tools = "${bindir} ${sbindir}" FILES_misdn-tools-dbg = "${bindir}/.debug ${sbindir}/.debug" + RDEPENDS_misdn-tools-dbg = "${PN}-dbg" From a354c4242e5734c3b12968ed8bf8033cf73fa343 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 14:21:48 -0300 Subject: [PATCH 175/200] misdn-utils: Update to version 2.0.19 Signed-off-by: Fabio Berton --- .../misdn/files/0001-mbuffer-data-size.patch | 26 +++++++++++++++++++ recipes-isdn/misdn/files/misdn-ph-size.diff | 13 ---------- recipes-isdn/misdn/misdn-utils_git.bb | 7 ++--- 3 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 recipes-isdn/misdn/files/0001-mbuffer-data-size.patch delete mode 100644 recipes-isdn/misdn/files/misdn-ph-size.diff diff --git a/recipes-isdn/misdn/files/0001-mbuffer-data-size.patch b/recipes-isdn/misdn/files/0001-mbuffer-data-size.patch new file mode 100644 index 0000000000..1160fe4a0b --- /dev/null +++ b/recipes-isdn/misdn/files/0001-mbuffer-data-size.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +Subject: [PATCH] mbuffer data size +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + include/mISDN/mbuffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/mISDN/mbuffer.h b/include/mISDN/mbuffer.h +index 96afa5e..fe1a1e9 100644 +--- a/include/mISDN/mbuffer.h ++++ b/include/mISDN/mbuffer.h +@@ -72,7 +72,7 @@ struct mbuffer { + #endif + } __attribute__((__may_alias__)); + +-#define MBUFFER_DATA_SIZE 280 ++#define MBUFFER_DATA_SIZE 400 + + /* + * init mbuffer caching +-- +2.1.4 + diff --git a/recipes-isdn/misdn/files/misdn-ph-size.diff b/recipes-isdn/misdn/files/misdn-ph-size.diff deleted file mode 100644 index 98bf866d26..0000000000 --- a/recipes-isdn/misdn/files/misdn-ph-size.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/mISDN/mbuffer.h b/include/mISDN/mbuffer.h -index 5e3dc96..8e6ed52 100644 ---- a/include/mISDN/mbuffer.h -+++ b/include/mISDN/mbuffer.h -@@ -54,7 +54,7 @@ struct mbuffer { - struct l3_msg l3; - } __attribute__((__may_alias__)); - --#define MBUFFER_DATA_SIZE 280 -+#define MBUFFER_DATA_SIZE 400 - - /* - * init mbuffer caching diff --git a/recipes-isdn/misdn/misdn-utils_git.bb b/recipes-isdn/misdn/misdn-utils_git.bb index 9e08090120..1d9f0f2ecc 100644 --- a/recipes-isdn/misdn/misdn-utils_git.bb +++ b/recipes-isdn/misdn/misdn-utils_git.bb @@ -4,11 +4,12 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" SRC_URI = "\ - git://git.misdn.eu/mISDNuser.git \ - file://misdn-ph-size.diff \ + git://git.misdn.eu/mISDNuser.git;branch=socket \ + file://0001-mbuffer-data-size.patch \ " +# Release v2.0.19 +SRCREV = "3638cf36df506b96015e1f37ce3bb36ec94a01fb" -SRCREV = "fd246f6bbbf2f4692f507018bcd1a526fab16499" S = "${WORKDIR}/git" inherit autotools From 425322314af07cfc7dcabfd44d4c2d23211ff893 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 14:26:18 -0300 Subject: [PATCH 176/200] dahdi-linux: Drop dahdi-linux.inc Move all code to bb file. Signed-off-by: Fabio Berton --- recipes-isdn/dahdi-linux/dahdi-linux.inc | 78 ------------------- recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb | 78 ++++++++++++++++++- 2 files changed, 76 insertions(+), 80 deletions(-) delete mode 100644 recipes-isdn/dahdi-linux/dahdi-linux.inc diff --git a/recipes-isdn/dahdi-linux/dahdi-linux.inc b/recipes-isdn/dahdi-linux/dahdi-linux.inc deleted file mode 100644 index 3633a0e481..0000000000 --- a/recipes-isdn/dahdi-linux/dahdi-linux.inc +++ /dev/null @@ -1,78 +0,0 @@ -DESCRITOPN = "Digium Asterisk Hardware Driver Interface - Linux kernel part" -SECTION = "base" -HOMEPAGE = "http://www.asterisk.org" -LICENSE = "GPLv2" -RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" -DEPENDS = "virtual/kernel" -RRECOMMENDS_${PN} = "dahdi-firmware" - -# those firmware images are normally downloaded as part of the 'make' -# process of dahdi-linux. In the context of OE, we want to list them -# here so they are part of the 'downloads' directory and thus don't need -# to be downloaded all the time. -FIRMWARE_URI = " \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.8.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.18.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.19.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.22.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR5.6.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR6.12.tar.gz \ -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 " -SRC_URI =+ "${FIRMWARE_URI}" - -INC_PR="r9" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a" - -inherit module - -do_configure() { - # make sure the extracted firmware.bin are where Makefile expects - mv ../dahdi-fw-*.bin ../zaptel-fw-*.bin drivers/dahdi/firmware/ - 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 () { - do_make_scripts - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KSRC=${STAGING_KERNEL_DIR} \ - KVERS=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" \ - ${MAKE_TARGETS} -} - -do_install () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake DEPMOD=echo DESTDIR="${D}" \ - KSRC=${STAGING_KERNEL_DIR} \ - KVERS=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - install -} - -PACKAGES =+ "dahdi-firmware" - -FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" - -FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi" -PACKAGE_ARCH_dahdi-firmware = "all" diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb index 3d429c7efd..4ed7b2028d 100644 --- a/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb +++ b/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb @@ -1,5 +1,79 @@ +DESCRITOPN = "Digium Asterisk Hardware Driver Interface - Linux kernel part" +SECTION = "base" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPLv2" +RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" +DEPENDS = "virtual/kernel" +RRECOMMENDS_${PN} = "dahdi-firmware" -require ${PN}.inc +# those firmware images are normally downloaded as part of the 'make' +# process of dahdi-linux. In the context of OE, we want to list them +# here so they are part of the 'downloads' directory and thus don't need +# to be downloaded all the time. +FIRMWARE_URI = " \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.8.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.18.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.19.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.22.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR5.6.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR6.12.tar.gz \ +http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-vpmadt032-1.07.tar.gz\ + " -PR = "${INC_PR}.1" +SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-${PV}.tar.gz " +SRC_URI =+ "${FIRMWARE_URI}" + +INC_PR="r9" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a" + +inherit module + +do_configure() { + # make sure the extracted firmware.bin are where Makefile expects + mv ../dahdi-fw-*.bin ../zaptel-fw-*.bin drivers/dahdi/firmware/ + 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 () { + do_make_scripts + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KSRC=${STAGING_KERNEL_DIR} \ + KVERS=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + ${MAKE_TARGETS} +} + +do_install () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo DESTDIR="${D}" \ + KSRC=${STAGING_KERNEL_DIR} \ + KVERS=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + install +} + +PACKAGES =+ "dahdi-firmware" + +FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" + +FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi" +PACKAGE_ARCH_dahdi-firmware = "all" From f6bd02dc6848b2cac1bd168fd2a4359c896fd631 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 14:34:19 -0300 Subject: [PATCH 177/200] dahdi-linux: Organize recipe Fix indentations and style issues. Signed-off-by: Fabio Berton --- recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb | 94 +++++++++---------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb index 4ed7b2028d..1db3d0e51e 100644 --- a/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb +++ b/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb @@ -2,78 +2,74 @@ DESCRITOPN = "Digium Asterisk Hardware Driver Interface - Linux kernel part" SECTION = "base" HOMEPAGE = "http://www.asterisk.org" LICENSE = "GPLv2" -RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a" + DEPENDS = "virtual/kernel" -RRECOMMENDS_${PN} = "dahdi-firmware" # those firmware images are normally downloaded as part of the 'make' # process of dahdi-linux. In the context of OE, we want to list them # here so they are part of the 'downloads' directory and thus don't need # to be downloaded all the time. -FIRMWARE_URI = " \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.8.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.18.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.19.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.22.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR5.6.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR6.12.tar.gz \ -http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-vpmadt032-1.07.tar.gz\ - " +FIRMWARE_URI = "\ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.8.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.18.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.19.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.22.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR5.6.tar.gz \ + http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR6.12.tar.gz \ + 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 " SRC_URI =+ "${FIRMWARE_URI}" -INC_PR="r9" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a" - inherit module do_configure() { - # make sure the extracted firmware.bin are where Makefile expects - mv ../dahdi-fw-*.bin ../zaptel-fw-*.bin drivers/dahdi/firmware/ - 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 + # make sure the extracted firmware.bin are where Makefile expects + mv ../dahdi-fw-*.bin ../zaptel-fw-*.bin drivers/dahdi/firmware/ + 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 () { - do_make_scripts - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KSRC=${STAGING_KERNEL_DIR} \ - KVERS=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" \ - ${MAKE_TARGETS} + do_make_scripts + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake KSRC=${STAGING_KERNEL_DIR} \ + KVERS=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + AR="${KERNEL_AR}" \ + ${MAKE_TARGETS} } do_install () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake DEPMOD=echo DESTDIR="${D}" \ - KSRC=${STAGING_KERNEL_DIR} \ - KVERS=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - install + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo DESTDIR="${D}" \ + KSRC=${STAGING_KERNEL_DIR} \ + KVERS=${KERNEL_VERSION} \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + install } +PACKAGE_ARCH_dahdi-firmware = "all" PACKAGES =+ "dahdi-firmware" FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" - FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi" -PACKAGE_ARCH_dahdi-firmware = "all" +RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" +RRECOMMENDS_${PN} = "dahdi-firmware" From 988c11d3ddca8732821c913175a9259c6dd798ec Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 14:45:08 -0300 Subject: [PATCH 178/200] dahdi-linux: Update to version 2.10.2 Signed-off-by: Fabio Berton --- .../dahdi-linux/dahdi-linux_2.10.2.bb | 141 ++++++++++++++++++ recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb | 75 ---------- .../0001-Use-objcopy-from-toolchain.patch | 39 +++++ 3 files changed, 180 insertions(+), 75 deletions(-) create mode 100644 recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb delete mode 100644 recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb create mode 100644 recipes-isdn/dahdi-linux/files/0001-Use-objcopy-from-toolchain.patch diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb new file mode 100644 index 0000000000..59825718d6 --- /dev/null +++ b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb @@ -0,0 +1,141 @@ +DESCRITOPN = "Digium Asterisk Hardware Driver Interface - Linux kernel part" +SECTION = "base" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a" + +DEPENDS = "virtual/kernel" + +# those firmware images are normally downloaded as part of the 'make' +# process of dahdi-linux. In the context of OE, we want to list them +# here so they are part of the 'downloads' directory and thus don't need +# to be downloaded all the time. +FIRMWARE_URI = "\ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz;name=dahdi-fw-a4a-a0017 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz;name=dahdi-fw-a4b-d001e \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz;name=dahdi-fw-a8a-1d0017 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz;name=dahdi-fw-a8b-1f001e \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz;name=dahdi-fw-hx8 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz;name=dahdi-fw-oct6114-032 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz;name=dahdi-fw-oct6114-064 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz;name=dahdi-fw-oct6114-128 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz;name=dahdi-fw-oct6114-256 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz;name=dahdi-fw-tc400m-MR6 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz;name=dahdi-fw-te133-7a001e \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz;name=dahdi-fw-te134-780017 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz;name=dahdi-fw-te435-13001e \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz;name=dahdi-fw-te436-10017 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz;name=dahdi-fw-te820-1.76 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz;name=dahdi-fw-vpmoct032 \ + http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz;name=dahdi-fwload-vpmadt032 \ +" + +SRC_URI[dahdi-fw-a4a-a0017.md5sum] = "7fab377be2dff23188e234475bc044f9" +SRC_URI[dahdi-fw-a4a-a0017.sha256sum] = "d5b6ab6851e431afcfec2ecc39d95fa88fe3939ffdb2e3d4f28a43cabf30e95b" +SRC_URI[dahdi-fw-a4b-d001e.md5sum] = "f16247c3d92d9b1d183de28230fa85b1" +SRC_URI[dahdi-fw-a4b-d001e.sha256sum] = "e039af8bec36407b74e1dd9ebdd49ba077469eda79d4e6093721ed2836d4536f" +SRC_URI[dahdi-fw-a8a-1d0017.md5sum] = "1e771e250721105013cbdb6b6e66f9dc" +SRC_URI[dahdi-fw-a8a-1d0017.sha256sum] = "5064f9877b8aec99b19fd57988216fe1a9c0b7c07853dd3b32b5a55ab7b418e6" +SRC_URI[dahdi-fw-a8b-1f001e.md5sum] = "014b46ac0b04cd93327908a082304dd0" +SRC_URI[dahdi-fw-a8b-1f001e.sha256sum] = "09a8992786309e025aa60b400a2c7d21226ac9bb6f1b66f562a5e7e9dc892b03" +SRC_URI[dahdi-fw-hx8.md5sum] = "a7f3886942bb3e9fed349a41b3390c9f" +SRC_URI[dahdi-fw-hx8.sha256sum] = "449ab3fd03d55d808e999efb7677cd04de202b92c9fcb039539a7e48a39a80f5" +SRC_URI[dahdi-fw-oct6114-032.md5sum] = "5e0b48da8a9912f2a40a0e0508c96948" +SRC_URI[dahdi-fw-oct6114-032.sha256sum] = "7a006073202d67e45f1d5ff1e9c6e8663e6056cef9dc4c5abae86a1018db349c" +SRC_URI[dahdi-fw-oct6114-064.md5sum] = "88db9b7a07d8392736171b1b3e6bcc66" +SRC_URI[dahdi-fw-oct6114-064.sha256sum] = "56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91" +SRC_URI[dahdi-fw-oct6114-128.md5sum] = "c1f1a18d3e20d283f42c71e580a64b5a" +SRC_URI[dahdi-fw-oct6114-128.sha256sum] = "e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775" +SRC_URI[dahdi-fw-oct6114-256.md5sum] = "4b3b763fc89f81d569a42da7c9ef0eee" +SRC_URI[dahdi-fw-oct6114-256.sha256sum] = "5fe5036a2766cf0e8a968b0c58b700507d86e1cde9296ca437170cc626a9c79c" +SRC_URI[dahdi-fw-tc400m-MR6.md5sum] = "2ea860bb8a9d8ede2858b9557b74ee3c" +SRC_URI[dahdi-fw-tc400m-MR6.sha256sum] = "11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774" +SRC_URI[dahdi-fw-te133-7a001e.md5sum] = "74f0ca211d31dc6683126cfaf399de91" +SRC_URI[dahdi-fw-te133-7a001e.sha256sum] = "511c1966295a20df673bb87af30245f0ad165efd6ccb92b4d8ed535ca7f5ac65" +SRC_URI[dahdi-fw-te134-780017.md5sum] = "71eda5003be050e9cd2f9ecea4fc898b" +SRC_URI[dahdi-fw-te134-780017.sha256sum] = "99f7c410bf47d2a5ae687d717e51448ce5b52aca902830bf39bffe683150fa2d" +SRC_URI[dahdi-fw-te435-13001e.md5sum] = "19bd5ac1ac886c38258d7079ff18ca83" +SRC_URI[dahdi-fw-te435-13001e.sha256sum] = "c8f55d57cc0bf332e8d96cdf9ff6dd0e322f33581e1efc24c2b9a0e0c5eb7ee4" +SRC_URI[dahdi-fw-te436-10017.md5sum] = "44b5a653aeab6f0e1e73348195c04a58" +SRC_URI[dahdi-fw-te436-10017.sha256sum] = "0980f4a8d191c6872aa27d971758046f0e7827ac161549f2cc1b0eeab0ae9333" +SRC_URI[dahdi-fw-te820-1.76.md5sum] = "07b389e2a4f2a2513240187f1c295626" +SRC_URI[dahdi-fw-te820-1.76.sha256sum] = "5b823e25828e2c1c6548886ad408b2e31dbc8cd17170c52592792d9c754a199c" +SRC_URI[dahdi-fw-vpmoct032.md5sum] = "2c7d5b17c23c34624158ee640818043b" +SRC_URI[dahdi-fw-vpmoct032.sha256sum] = "6b199cf836f150f9cb35f763f0f502fb52cfa2724a449b500429c746973904ad" +SRC_URI[dahdi-fwload-vpmadt032.md5sum] = "19a660c2073749641072ca644e983cbc" +SRC_URI[dahdi-fwload-vpmadt032.sha256sum] = "3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1" + +SRC_URI = "\ + http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-${PV}.tar.gz;name=dahdi-linux \ + file://0001-Use-objcopy-from-toolchain.patch \ +" +SRC_URI[dahdi-linux.md5sum] = "0281de245f4fa056f765ae2a6e1f1a4b" +SRC_URI[dahdi-linux.sha256sum] = "6270444cb9b345941267b162038cc45f5ef4485139176e88e2c4d22fa35a2c59" + +SRC_URI =+ "${FIRMWARE_URI}" + +inherit module + +export TARGET_SYS +EXTRA_OEMAKE += "KSRC=${STAGING_KERNEL_BUILDDIR}" + +do_configure() { + # make sure the extracted firmware.bin are where Makefile expects + cp ../*.bin drivers/dahdi/firmware/ + cp ${DL_DIR}/dahdi-fwload-*.tar.gz drivers/dahdi/firmware/ + cp ${DL_DIR}/dahdi-fw-*.tar.gz drivers/dahdi/firmware/ +} + +do_install() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake DEPMOD=echo DESTDIR="${D}" \ + CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ + O=${STAGING_KERNEL_BUILDDIR} \ + install +} + +DAHDI_KERNEL_MODULE = "\ + kernel-module-oct612x \ + kernel-module-dahdi-echocan-jpah \ + kernel-module-dahdi \ + kernel-module-xpd-fxo \ + kernel-module-wctdm \ + kernel-module-dahdi-dynamic-loc \ + kernel-module-xpp-usb \ + kernel-module-xpp \ + kernel-module-wcb4xxp \ + kernel-module-wcte43x \ + kernel-module-wctdm24xxp \ + kernel-module-pciradio \ + kernel-module-wcte12xp \ + kernel-module-dahdi-voicebus \ + kernel-module-dahdi-dynamic-ethmf \ + kernel-module-dahdi-dynamic \ + kernel-module-wctc4xxp \ + kernel-module-dahdi-echocan-sec2 \ + kernel-module-xpd-bri \ + kernel-module-wcaxx \ + kernel-module-dahdi-transcode \ + kernel-module-wcte11xp \ + kernel-module-dahdi-echocan-kb1 \ + kernel-module-wcte13xp \ + kernel-module-dahdi-dynamic-eth \ + kernel-module-dahdi-echocan-mg2 \ + kernel-module-wct1xx \ + kernel-module-wct4xxp \ + kernel-module-tor2 \ + kernel-module-xpd-pri \ + kernel-module-wct1xxp \ + kernel-module-wcfxo \ + kernel-module-dahdi-echocan-sec \ + kernel-module-xpd-echo \ + kernel-module-xpd-fxs \ +" + +PACKAGE_ARCH_dahdi-firmware = "all" +PACKAGES =+ "dahdi-firmware ${DAHDI_KERNEL_MODULE}" + +FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" +FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi" + +RRECOMMENDS_${PN} = "dahdi-firmware" diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb deleted file mode 100644 index 1db3d0e51e..0000000000 --- a/recipes-isdn/dahdi-linux/dahdi-linux_2.6.0.bb +++ /dev/null @@ -1,75 +0,0 @@ -DESCRITOPN = "Digium Asterisk Hardware Driver Interface - Linux kernel part" -SECTION = "base" -HOMEPAGE = "http://www.asterisk.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a" - -DEPENDS = "virtual/kernel" - -# those firmware images are normally downloaded as part of the 'make' -# process of dahdi-linux. In the context of OE, we want to list them -# here so they are part of the 'downloads' directory and thus don't need -# to be downloaded all the time. -FIRMWARE_URI = "\ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.11.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.8.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.17.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.18.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.19.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.22.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-064-1.05.01.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-oct6114-128-1.05.01.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR5.6.tar.gz \ - http://downloads.digium.com/pub/telephony/firmware/releases/zaptel-fw-tc400m-MR6.12.tar.gz \ - 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 " -SRC_URI =+ "${FIRMWARE_URI}" - -inherit module - -do_configure() { - # make sure the extracted firmware.bin are where Makefile expects - mv ../dahdi-fw-*.bin ../zaptel-fw-*.bin drivers/dahdi/firmware/ - 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 () { - do_make_scripts - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KSRC=${STAGING_KERNEL_DIR} \ - KVERS=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - AR="${KERNEL_AR}" \ - ${MAKE_TARGETS} -} - -do_install () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake DEPMOD=echo DESTDIR="${D}" \ - KSRC=${STAGING_KERNEL_DIR} \ - KVERS=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - install -} - -PACKAGE_ARCH_dahdi-firmware = "all" -PACKAGES =+ "dahdi-firmware" - -FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" -FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi" - -RDEPENDS_${PN} = "kernel (${KERNEL_VERSION})" -RRECOMMENDS_${PN} = "dahdi-firmware" diff --git a/recipes-isdn/dahdi-linux/files/0001-Use-objcopy-from-toolchain.patch b/recipes-isdn/dahdi-linux/files/0001-Use-objcopy-from-toolchain.patch new file mode 100644 index 0000000000..a6a199379a --- /dev/null +++ b/recipes-isdn/dahdi-linux/files/0001-Use-objcopy-from-toolchain.patch @@ -0,0 +1,39 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH] Use objcopy from toolchain +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + drivers/dahdi/firmware/Makefile | 4 ++-- + drivers/dahdi/firmware/make_firmware_object.in | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/dahdi/firmware/Makefile b/drivers/dahdi/firmware/Makefile +index fbd6582..1f9ce7f 100644 +--- a/drivers/dahdi/firmware/Makefile ++++ b/drivers/dahdi/firmware/Makefile +@@ -158,8 +158,8 @@ hotplug-uninstall: + fi + + make_firmware_object: make_firmware_object.in ../dahdi-base.o +- @export BFDNAME=`LANG=C objdump -f ../dahdi-base.o | grep -e "dahdi-base.o:" | sed "s/.*file format \(.*\)/\1/"`; \ +- export BFDARCH=`LANG=C objdump -f ../dahdi-base.o | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`; \ ++ @export BFDNAME=`LANG=C ${TARGET_SYS}-objdump -f ../dahdi-base.o | grep -e "dahdi-base.o:" | sed "s/.*file format \(.*\)/\1/"`; \ ++ export BFDARCH=`LANG=C ${TARGET_SYS}-objdump -f ../dahdi-base.o | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`; \ + sed -e s/BFDNAME/$${BFDNAME}/ -e s/BFDARCH/$${BFDARCH}/ $< > $@ + @chmod +x $@ + +diff --git a/drivers/dahdi/firmware/make_firmware_object.in b/drivers/dahdi/firmware/make_firmware_object.in +index 0effb32..6fe232a 100644 +--- a/drivers/dahdi/firmware/make_firmware_object.in ++++ b/drivers/dahdi/firmware/make_firmware_object.in +@@ -5,4 +5,4 @@ + # 1 - firmware file + # 2 - output file + +-objcopy -I binary ${1} -B BFDARCH -O BFDNAME ${2} --rename-section .data=.rodata,alloc,load,data,contents,readonly ++${TARGET_SYS}-objcopy -I binary ${1} -B BFDARCH -O BFDNAME ${2} --rename-section .data=.rodata,alloc,load,data,contents,readonly +-- +2.1.4 + From a1debd963cd2a0d24eaaddc661c109ab02ed3cba Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 14:47:54 -0300 Subject: [PATCH 179/200] dahdi-tools: Drop dahdi-tools.inc Move all code to bb file. Signed-off-by: Fabio Berton --- recipes-isdn/dahdi-tools/dahdi-tools.inc | 36 ------------------- recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb | 36 +++++++++++++++++-- 2 files changed, 34 insertions(+), 38 deletions(-) delete mode 100644 recipes-isdn/dahdi-tools/dahdi-tools.inc diff --git a/recipes-isdn/dahdi-tools/dahdi-tools.inc b/recipes-isdn/dahdi-tools/dahdi-tools.inc deleted file mode 100644 index 06ef35cf23..0000000000 --- a/recipes-isdn/dahdi-tools/dahdi-tools.inc +++ /dev/null @@ -1,36 +0,0 @@ -DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" -DEPENDS = "dahdi-linux libnewt libpcap" -RDEPENDS_${PN} += "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 \ - file://perl_install.patch " - -INC_PR="r19" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ - file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09" - -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}/ -} diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb index 35132e4b8a..06ef35cf23 100644 --- a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb +++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb @@ -1,4 +1,36 @@ -require ${PN}.inc +DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" +DEPENDS = "dahdi-linux libnewt libpcap" +RDEPENDS_${PN} += "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" -PR = "${INC_PR}.2" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPLv2" +SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \ + file://perl_install.patch " + +INC_PR="r19" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ + file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09" + +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}/ +} From 23399a4592d7bbfe2c9361ff3bef899709eba4bf Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 14:56:07 -0300 Subject: [PATCH 180/200] dahdi-tools: Organize recipe Fix indentations and style issues. Signed-off-by: Fabio Berton --- recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb index 06ef35cf23..2b26b273de 100644 --- a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb +++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb @@ -1,36 +1,41 @@ DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" -DEPENDS = "dahdi-linux libnewt libpcap" -RDEPENDS_${PN} += "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" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ + file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09 \ +" -SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \ - file://perl_install.patch " +DEPENDS = "dahdi-linux libnewt libpcap" -INC_PR="r19" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ - file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09" - -FILES_${PN} += "${datadir}/dahdi" +SRC_URI = "\ + http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \ + file://perl_install.patch \ +" inherit autotools_stage pkgconfig perlnative cpan-base +export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}" + do_configure() { - oe_runconf + oe_runconf } do_compile() { - base_do_compile - oe_runmake dahdi_pcap + 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}/ + autotools_do_install + install -m 755 ${S}/dahdi_pcap ${D}${sbindir}/ } + +FILES_${PN} += "${datadir}/dahdi" + +RDEPENDS_${PN} += "\ + 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 \ +" From a066f13e756a05781677171b57d838896d15daca Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Thu, 15 Oct 2015 15:11:46 -0300 Subject: [PATCH 181/200] dahdi-tools: Update to version 2.10.2 * libpcap is no longer a dependence. * libusb is needed for building fpga_load, needed for firmware loading of the Xorcom Astribank. * do_configure, do_compile and do_install were removed to use functions provided by autotools class. Signed-off-by: Fabio Berton --- .../dahdi-tools/dahdi-tools_2.10.2.bb | 44 +++ recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb | 41 --- .../files/0001-Set-perllibdir.patch | 26 ++ .../files/0002-Use-sh-not-bash.patch | 23 ++ .../0003-Remove-Werror-from-Makefile.patch | 42 +++ recipes-isdn/dahdi-tools/files/dahdi.init.d | 343 ++++++++++++++++++ .../dahdi-tools/files/perl_install.patch | 13 - 7 files changed, 478 insertions(+), 54 deletions(-) create mode 100644 recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb delete mode 100644 recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb create mode 100644 recipes-isdn/dahdi-tools/files/0001-Set-perllibdir.patch create mode 100644 recipes-isdn/dahdi-tools/files/0002-Use-sh-not-bash.patch create mode 100644 recipes-isdn/dahdi-tools/files/0003-Remove-Werror-from-Makefile.patch create mode 100644 recipes-isdn/dahdi-tools/files/dahdi.init.d delete mode 100755 recipes-isdn/dahdi-tools/files/perl_install.patch diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb new file mode 100644 index 0000000000..337186dfbd --- /dev/null +++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb @@ -0,0 +1,44 @@ +DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ + file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09 \ +" + +DEPENDS = "dahdi-linux libnewt libusb" + +SRC_URI = "\ + http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \ + file://0001-Set-perllibdir.patch \ + file://0002-Use-sh-not-bash.patch \ + file://0003-Remove-Werror-from-Makefile.patch \ + file://dahdi.init.d \ +" + +SRC_URI[md5sum] = "6928cdf6f7710299ecbcacbac20d5c92" +SRC_URI[sha256sum] = "9e904815dedab231084c542d2d7d5dcc832ebec4b5d5d999a5d757df8b2d571a" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools-brokensep pkgconfig perlnative cpan-base update-rc.d + +export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}" + +INITSCRIPT_NAME = "dahdi" +INITSCRIPT_PARAMS = "defaults" + +do_install_append(){ + oe_runmake DESTDIR=${D} config + install -Dm 0755 ${WORKDIR}/dahdi.init.d ${D}${sysconfdir}/init.d/dahdi + chown -R root:root ${D}${datadir}/dahdi/ +} + +FILES_${PN} += "${datadir}/dahdi" + +RDEPENDS_${PN} += "\ + perl perl-module-strict perl-module-file-basename perl-module-config \ + perl-module-warnings perl-module-getopt-std perl-module-file-glob \ + perl-module-xsloader perl-module-dynaloader perl-module-carp \ + perl-module-errno perl-module-file-basename dahdi-linux \ +" diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb deleted file mode 100644 index 2b26b273de..0000000000 --- a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers" -HOMEPAGE = "http://www.asterisk.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \ - file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09 \ -" - -DEPENDS = "dahdi-linux libnewt libpcap" - -SRC_URI = "\ - http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \ - file://perl_install.patch \ -" - -inherit autotools_stage pkgconfig perlnative cpan-base - -export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}" - -do_configure() { - oe_runconf -} - -do_compile() { - base_do_compile - oe_runmake dahdi_pcap -} - -do_install() { - autotools_do_install - install -m 755 ${S}/dahdi_pcap ${D}${sbindir}/ -} - -FILES_${PN} += "${datadir}/dahdi" - -RDEPENDS_${PN} += "\ - 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 \ -" diff --git a/recipes-isdn/dahdi-tools/files/0001-Set-perllibdir.patch b/recipes-isdn/dahdi-tools/files/0001-Set-perllibdir.patch new file mode 100644 index 0000000000..6bf46af1fa --- /dev/null +++ b/recipes-isdn/dahdi-tools/files/0001-Set-perllibdir.patch @@ -0,0 +1,26 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH 1/3] Set perllibdir +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + xpp/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xpp/Makefile b/xpp/Makefile +index 12909f2..8e8b6c9 100644 +--- a/xpp/Makefile ++++ b/xpp/Makefile +@@ -30,7 +30,7 @@ SBINDIR = $(prefix)/sbin + 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)) +-- +2.1.4 + diff --git a/recipes-isdn/dahdi-tools/files/0002-Use-sh-not-bash.patch b/recipes-isdn/dahdi-tools/files/0002-Use-sh-not-bash.patch new file mode 100644 index 0000000000..e6d15b5d7c --- /dev/null +++ b/recipes-isdn/dahdi-tools/files/0002-Use-sh-not-bash.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Subject: [PATCH 2/3] Use sh not bash +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + xpp/xpp_fxloader | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader +index 5135ebf..8598004 100644 +--- a/xpp/xpp_fxloader ++++ b/xpp/xpp_fxloader +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # xpp_fxloader: load Xorcom Astribank (XPP) firmware + # $Id$ +-- +2.1.4 + diff --git a/recipes-isdn/dahdi-tools/files/0003-Remove-Werror-from-Makefile.patch b/recipes-isdn/dahdi-tools/files/0003-Remove-Werror-from-Makefile.patch new file mode 100644 index 0000000000..9c1f9fa25a --- /dev/null +++ b/recipes-isdn/dahdi-tools/files/0003-Remove-Werror-from-Makefile.patch @@ -0,0 +1,42 @@ +Upstream-Status: Pending + +Fix error: "cc1: all warnings being treated as errors" + +Subject: [PATCH 3/3] Remove Werror from Makefile +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Fabio Berton +--- + Makefile | 2 +- + xpp/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 69741e6..1a5eefc 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,7 @@ CFLAGS+=-m64 + endif + + ifeq ($(DAHDI_DEVMODE),yes) +- CFLAGS+=-Werror -Wunused -Wundef $(DAHDI_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2 ++ CFLAGS+= -Wunused -Wundef $(DAHDI_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2 + endif + + ROOT_PREFIX= +diff --git a/xpp/Makefile b/xpp/Makefile +index 8e8b6c9..001e476 100644 +--- a/xpp/Makefile ++++ b/xpp/Makefile +@@ -146,7 +146,7 @@ ifneq (,$(PERLLIBDIR)) + done + endif + +-CFLAGS += -I. -Ixtalk -Wall -Werror ++CFLAGS += -I. -Ixtalk -Wall + + astribank_hexload: $(ABHEXLOAD_OBJS) + astribank_hexload: LIBS+=$(EXTRA_LIBS) $(USB_LIB) +-- +2.1.4 + diff --git a/recipes-isdn/dahdi-tools/files/dahdi.init.d b/recipes-isdn/dahdi-tools/files/dahdi.init.d new file mode 100644 index 0000000000..87b57d5db1 --- /dev/null +++ b/recipes-isdn/dahdi-tools/files/dahdi.init.d @@ -0,0 +1,343 @@ +#!/bin/sh +# +# dahdi This shell script takes care of loading and unloading \ +# DAHDI Telephony interfaces +# chkconfig: 2345 9 92 +# description: The DAHDI drivers allow you to use your linux \ +# computer to accept incoming data and voice interfaces +# +# config: /etc/dahdi/init.conf + +### BEGIN INIT INFO +# Provides: dahdi +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Should-Start: $network $syslog +# Should-Stop: $network $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: DAHDI kernel modules +# Description: dahdi - load and configure DAHDI modules +### END INIT INFO + +initdir=/etc/init.d + +# Don't edit the following values. Edit /etc/dahdi/init.conf instead. + +DAHDI_CFG=/usr/sbin/dahdi_cfg +DAHDI_CFG_CMD=${DAHDI_CFG_CMD:-"$DAHDI_CFG"} # e.g: for a custom system.conf location + +FXOTUNE=/usr/sbin/fxotune + +# The default syncer Astribank. Usually set automatically to a sane +# value by xpp_sync(1) if you have an Astribank. You can set this to an +# explicit Astribank (e.g: 01). +XPP_SYNC=auto + +# The maximal timeout (seconds) to wait for udevd to finish generating +# device nodes after the modules have loaded and before running dahdi_cfg. +DAHDI_DEV_TIMEOUT=20 + +# A list of modules to unload when stopping. +# All of their dependencies will be unloaded as well. +DAHDI_UNLOAD_MODULES="dahdi" + +# +# Determine which kind of configuration we're using +# +system=debian # assume debian +if [ -f /etc/debian_version ]; then + system=debian +fi + +if [ -f /etc/gentoo-release ]; then + system=debian +fi + +if [ -f /etc/SuSE-release -o -f /etc/novell-release ] +then + system=debian +fi + +# Source function library. +if [ $system = debian ]; then + . $initdir/functions || exit 0 +fi + +DAHDI_MODULES_FILE="/etc/dahdi/modules" + +[ -r /etc/dahdi/init.conf ] && . /etc/dahdi/init.conf + +if [ $system = redhat ]; then + LOCKFILE=/var/lock/subsys/dahdi +fi + +# recursively unload a module and its dependencies, if possible. +# where's modprobe -r when you need it? +# inputs: module to unload. +# returns: the result from +unload_module() { + module="$1" + line=`lsmod 2>/dev/null | grep "^$1 "` + if [ "$line" = '' ]; then return; fi # module was not loaded + + set -- $line + # $1: the original module, $2: size, $3: refcount, $4: deps list + mods=`echo $4 | tr , ' '` + ec_modules="" + # xpp_usb keeps the xpds below busy if an xpp hardware is + # connected. Hence must be removed before them: + case "$module" in xpd_*) mods="xpp_usb $mods";; esac + + for mod in $mods; do + case "$mod" in + dahdi_echocan_*) + ec_modules="$mod $ec_modules" + ;; + *) + # run in a subshell, so it won't step over our vars: + (unload_module $mod) + ;; + esac + done + # Now that all the other dependencies are unloaded, we can unload the + # dahdi_echocan modules. The drivers that register spans may keep + # references on the echocan modules before they are unloaded. + for mod in $ec_modules; do + (unload_module $mod) + done + rmmod $module +} + +unload_modules() { + for module in $DAHDI_UNLOAD_MODULES; do + unload_module $module + done +} + +# In (xpp) hotplug mode, the init script is also executed from the +# hotplug hook. In that case it should not attempt to loade modules. +# +# This function only retunrs false (1) if we're in hotplug mode and +# coming from the hotplug hook script. +hotplug_should_load_modules() { + if [ "$XPP_HOTPLUG_DAHDI" = yes -a "$CALLED_FROM_ATRIBANK_HOOK" != '' ] + then + return 1 + fi + return 0 +} + +# In (xpp) hotplug mode: quit after we loaded modules. +# +# In hotplug mode, the main run should end here, whereas the rest of the +# script should be finished by the instance running from the hook. +# Note that we only get here if there are actually Astribanks on the +# system (otherwise noone will trigger the run of the hotplug hook +# script). +hotplug_exit_after_load() { + if [ "$XPP_HOTPLUG_DAHDI" = yes -a "$CALLED_FROM_ATRIBANK_HOOK" = '' ] + then + exit 0 + fi +} + +# Initialize the Xorcom Astribank (xpp/) using perl utiliites: +xpp_startup() { + if [ "$ASTERISK_SUPPORTS_DAHDI_HOTPLUG" = yes ]; then + aas_param='/sys/module/dahdi/parameters/auto_assign_spans' + aas=`cat "$aas_param" 2>/dev/null` + if [ "$aas" = 0 ]; then + echo 1>&2 "Don't wait for Astribanks (use Asterisk hotplug-support)" + return 0 + fi + fi + # do nothing if there are no astribank devices: + if ! /usr/share/dahdi/waitfor_xpds; then return 0; fi + + hotplug_exit_after_load +} + + +hpec_start() { + # HPEC license found + if ! echo /var/lib/digium/licenses/HPEC-*.lic | grep -v '\*' | grep -q .; then + return + fi + + # dahdihpec_enable not installed in /usr/sbin + if [ ! -f /usr/sbin/dahdihpec_enable ]; then + echo -n "Running dahdihpec_enable: Failed" + echo -n "." + echo " The dahdihpec_enable binary is not installed in /usr/sbin." + return + fi + + # dahdihpec_enable not set executable + if [ ! -x /usr/sbin/dahdihpec_enable ]; then + echo -n "Running dahdihpec_enable: Failed" + echo -n "." + echo " /usr/sbin/dahdihpec_enable is not set as executable." + return + fi + + # dahdihpec_enable properly installed + if [ $system = debian ]; then + echo -n "Running dahdihpec_enable: " + /usr/sbin/dahdihpec_enable 2> /dev/null + elif [ $system = redhat ]; then + action "Running dahdihpec_enable: " /usr/sbin/dahdihpec_enable + fi + if [ $? = 0 ]; then + echo -n "done" + echo "." + else + echo -n "Failed" + echo -n "." + echo " This can be caused if you had already run dahdihpec_enable, or if your HPEC license is no longer valid." + fi +} + +shutdown_dynamic() { + if ! grep -q ' DYN/' /proc/dahdi/* 2>/dev/null; then return; fi + + # we should only get here if we have dynamic spans. Right? + $DAHDI_CFG_CMD -s +} + +load_modules() { + # Some systems, e.g. Debian Lenny, add here -b, which will break + # loading of modules blacklisted in modprobe.d/* + unset MODPROBE_OPTIONS + modules=`sed -e 's/#.*$//' $DAHDI_MODULES_FILE 2>/dev/null` + #if [ "$modules" = '' ]; then + # what? + #fi + echo "Loading DAHDI hardware modules:" + modprobe dahdi + for line in $modules; do + if [ $system = debian ]; then + echo -n " ${line}: " + if modprobe $line 2> /dev/null; then + echo -n "done" + else + echo -n "error" + fi + elif [ $system = redhat ]; then + action " ${line}: " modprobe $line + fi + done + echo "" +} + +# Make sure that either dahdi is loaded or modprobe-able +dahdi_modules_loadable() { + modinfo dahdi >/dev/null 2>&1 || lsmod | grep -q -w ^dahdi +} + +if [ ! -x "$DAHDI_CFG" ]; then + echo "dahdi_cfg not executable" + exit 0 +fi + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + if ! dahdi_modules_loadable; then + echo "No DAHDI modules on the system. Not starting" + exit 0 + fi + if hotplug_should_load_modules; then + load_modules + fi + + TMOUT=$DAHDI_DEV_TIMEOUT # max secs to wait + + while [ ! -d /dev/dahdi ] ; do + sleep 1 + TMOUT=`expr $TMOUT - 1` + if [ $TMOUT -eq 0 ] ; then + echo "Error: missing /dev/dahdi!" + exit 1 + fi + done + + xpp_startup + + # Assign all spans that weren't handled via udev + /etc/dahdi/assigned-spans.conf + /usr/share/dahdi/dahdi_auto_assign_compat + + if [ $system = debian ]; then + echo -n "Running dahdi_cfg: " + $DAHDI_CFG_CMD 2> /dev/null && echo -n "done" + echo "." + elif [ $system = redhat ]; then + action "Running dahdi_cfg: " $DAHDI_CFG_CMD + fi + RETVAL=$? + + if [ "$LOCKFILE" != '' ]; then + [ $RETVAL -eq 0 ] && touch $LOCKFILE + fi + + if [ -x "$FXOTUNE" ] && [ -r /etc/fxotune.conf ]; then + # Allowed to fail if e.g. Asterisk already uses channels: + $FXOTUNE -s || : + fi + + # Do not try to call xpp_sync if there are no Astribank devices + # installed. + if test -e /sys/bus/astribanks; then + # Set the right Astribanks ticker: + LC_ALL=C xpp_sync "$XPP_SYNC" + fi + + hpec_start + ;; + stop) + # Unload drivers + #shutdown_dynamic # FIXME: needs test from someone with dynamic spans + echo -n "Unloading DAHDI hardware modules: " + if unload_modules; then + echo "done" + else + echo "error" + fi + if [ "$LOCKFILE" != '' ]; then + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE + fi + ;; + unload) + unload_modules + ;; + restart|force-reload) + $0 stop + $0 start + ;; + reload) + if [ $system = debian ]; then + echo -n "Rerunning dahdi_cfg: " + $DAHDI_CFG_CMD 2> /dev/null && echo -n "done" + echo "." + elif [ $system = redhat ]; then + action "Rerunning dahdi_cfg: " $DAHDI_CFG_CMD + fi + RETVAL=$? + ;; + status) + if [ -d /proc/dahdi ]; then + /usr/sbin/lsdahdi + RETVAL=0 + else + RETVAL=3 + fi + ;; + *) + echo "Usage: dahdi {start|stop|restart|status|reload|unload}" + exit 1 +esac + +exit $RETVAL + diff --git a/recipes-isdn/dahdi-tools/files/perl_install.patch b/recipes-isdn/dahdi-tools/files/perl_install.patch deleted file mode 100755 index adcda2be96..0000000000 --- a/recipes-isdn/dahdi-tools/files/perl_install.patch +++ /dev/null @@ -1,13 +0,0 @@ -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)) From 9b6c17ad0172ec88bd8ea684b39bd2d38702894e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 1 Nov 2015 22:46:11 +0100 Subject: [PATCH 182/200] asterisk/dahdi-tools: Make it parsable on dora systems In dora we do not have autotools-brokensep. Do it the old way and set the B variable directly. At sysmocom we still use this layer for the very old Dora release. --- recipes-asterisk/asterisk/asterisk_13.5.0.bb | 5 ++++- recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes-asterisk/asterisk/asterisk_13.5.0.bb b/recipes-asterisk/asterisk/asterisk_13.5.0.bb index c912b3d1dd..ff71607cb9 100644 --- a/recipes-asterisk/asterisk/asterisk_13.5.0.bb +++ b/recipes-asterisk/asterisk/asterisk_13.5.0.bb @@ -17,7 +17,10 @@ SRC_URI[sha256sum] = "e8b8d071f783edea82de510194dd272070ffbb7cdb2f5f6b020be5d15b S = "${WORKDIR}/asterisk-${PV}" -inherit autotools-brokensep pkgconfig useradd update-rc.d +inherit autotools pkgconfig useradd update-rc.d + +# dora doesn't have autotools-brokensep. Still needed for sysmocom +B = "${S}" USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system -g asterisk --shell /bin/false asterisk" diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb index 337186dfbd..7dec897f87 100644 --- a/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb +++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.10.2.bb @@ -21,7 +21,9 @@ SRC_URI[sha256sum] = "9e904815dedab231084c542d2d7d5dcc832ebec4b5d5d999a5d757df8b S = "${WORKDIR}/${PN}-${PV}" -inherit autotools-brokensep pkgconfig perlnative cpan-base update-rc.d +inherit autotools pkgconfig perlnative cpan-base update-rc.d +# dora doesn't have autotools-brokensep. Still needed for sysmocom +B = "${S}" export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}" From 2c54ce9af5f7c76fa9842ea51e535ff7472e111c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 7 Dec 2015 13:22:37 +0100 Subject: [PATCH 183/200] libosmo-abis: Build newer release for osmo-bts This adds RTP statistics support to libosmotrau. --- recipes-osmocom/libosmo-abis/libosmo-abis_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 8ea0c0527d..8010389286 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "3a580f263a24e0ce7d3ed544af0373c22ae9eeac" +SRCREV = "3cef39b03cb46de4a7aba65137d724a000b184cb" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.3.1+gitr${SRCPV}" +PV = "0.3.2+gitr${SRCPV}" PR = "${INC_PR}.1" From a715416731955e0454fc88d439709c94afb4b1af Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 26 Dec 2015 18:48:41 +0100 Subject: [PATCH 184/200] libosmocore/libosmo-netif: Bump version needed for osmo-pcu --- conf/layer.conf | 2 +- recipes-osmocom/libosmo-netif/libosmo-netif_git.bb | 2 +- recipes-osmocom/libosmocore/libosmocore_git.bb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index d67459b3e6..da1f278dac 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "telephony" BBFILE_PATTERN_telephony = "^${LAYERDIR}/" BBFILE_PRIORITY_telephony = "5" -META_TELEPHONY_OSMO_INC = "17" +META_TELEPHONY_OSMO_INC = "18" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 073f0abef8..bbfa7c07b9 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c55d867508c8ddb93a822c018b5ce5a9a72006aa" +SRCREV = "efb9af4dada5e2426e69d670f4549f8fec3c9cb2" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" PV = "0.4.0+gitr${SRCPV}" PR = "${INC_PR}.2" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index c22076ccfe..e8db2bc99a 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "c1cb75eff5b060da9e6d43521e4913a8bf4e74fc" +SRCREV = "70fcbda6dd733a503e9a046e01986d8bfc2e2bb2" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" -PV = "0.8.1+gitr${SRCPV}" -PR = "r2" +PV = "0.9.0+gitr${SRCPV}" +PR = "r0" PACKAGES =+ "libosmoctrl" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" From 5428bbd10afac21eb11fdaacf73adb4977279dc8 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 26 Dec 2015 22:14:39 +0100 Subject: [PATCH 185/200] libosmocore: Code is not in master so don't force SHA validation The 0.9.0 release is in a different branch (+patches) and it is easier to not write the branch name here. --- recipes-osmocom/libosmocore/libosmocore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index e8db2bc99a..9101886c66 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -2,7 +2,7 @@ require ${PN}.inc S = "${WORKDIR}/git" SRCREV = "70fcbda6dd733a503e9a046e01986d8bfc2e2bb2" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" PV = "0.9.0+gitr${SRCPV}" PR = "r0" From 87c73f768c84613f07e704026f3b6eff9459cfd0 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 8 Jan 2016 13:01:03 +0100 Subject: [PATCH 186/200] sofia-sip: Fix undefined behavior in parsing Symptoms with LCR: nta outgoing create: invalid URI Take patch posted to the upstream project and carried by Debian and Ubuntu for this project. Unroll the different fields by hand to fix undefined behavior. --- .../sofia-sip/files/msg_parser.c.diff | 35 +++++++++++++++++++ recipes-misc/sofia-sip/sofia-sip.inc | 5 ++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 recipes-misc/sofia-sip/files/msg_parser.c.diff diff --git a/recipes-misc/sofia-sip/files/msg_parser.c.diff b/recipes-misc/sofia-sip/files/msg_parser.c.diff new file mode 100644 index 0000000000..66c73395de --- /dev/null +++ b/recipes-misc/sofia-sip/files/msg_parser.c.diff @@ -0,0 +1,35 @@ +--- sofia-sip-1.12.11+20110422.1.orig/libsofia-sip-ua/msg/msg_parser.c ++++ sofia-sip-1.12.11+20110422.1/libsofia-sip-ua/msg/msg_parser.c +@@ -2468,8 +2468,6 @@ + msg_header_t ** + msg_hclass_offset(msg_mclass_t const *mc, msg_pub_t const *mo, msg_hclass_t *hc) + { +- int i; +- + assert(mc && hc); + + if (mc == NULL || hc == NULL) +@@ -2484,9 +2482,20 @@ + } + else + /* Header has no name. */ +- for (i = 0; i <= 6; i++) +- if (hc->hc_hash == mc->mc_request[i].hr_class->hc_hash) +- return (msg_header_t **)((char *)mo + mc->mc_request[i].hr_offset); ++ if (hc->hc_hash == mc->mc_request[0].hr_class->hc_hash) ++ return (msg_header_t **)((char *)mo + mc->mc_request[0].hr_offset); ++ else if (hc->hc_hash == mc->mc_status[0].hr_class->hc_hash) ++ return (msg_header_t **)((char *)mo + mc->mc_status[0].hr_offset); ++ else if (hc->hc_hash == mc->mc_separator[0].hr_class->hc_hash) ++ return (msg_header_t **)((char *)mo + mc->mc_separator[0].hr_offset); ++ else if (hc->hc_hash == mc->mc_payload[0].hr_class->hc_hash) ++ return (msg_header_t **)((char *)mo + mc->mc_payload[0].hr_offset); ++ else if (hc->hc_hash == mc->mc_unknown[0].hr_class->hc_hash) ++ return (msg_header_t **)((char *)mo + mc->mc_unknown[0].hr_offset); ++ else if (hc->hc_hash == mc->mc_error[0].hr_class->hc_hash) ++ return (msg_header_t **)((char *)mo + mc->mc_error[0].hr_offset); ++ else if (hc->hc_hash == mc->mc_multipart[0].hr_class->hc_hash) ++ return (msg_header_t **)((char *)mo + mc->mc_multipart[0].hr_offset); + + return NULL; + } diff --git a/recipes-misc/sofia-sip/sofia-sip.inc b/recipes-misc/sofia-sip/sofia-sip.inc index cd987faa6d..d282ed11cf 100644 --- a/recipes-misc/sofia-sip/sofia-sip.inc +++ b/recipes-misc/sofia-sip/sofia-sip.inc @@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03068f550c635f6520e0f0252da412fc" SECTION = "libs" DEPENDS = "glib-2.0 openssl" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ + file://msg_parser.c.diff \ + " inherit autotools pkgconfig From b89eec5de82885525d69c662ae143b66ed0dd74d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 30 Jan 2016 21:17:31 +0100 Subject: [PATCH 187/200] misc: Remove autotools_stage as it was removed in master autotools_stage has only included autotools at least in dora and later and we can simply change this. --- recipes-misc/libsmpp/libsmpp34_git.bb | 2 +- recipes-osmocom/libosmo-abis/libosmo-abis.inc | 2 +- recipes-osmocom/libosmo-netif/libosmo-netif.inc | 2 +- recipes-osmocom/libosmo-sccp/libosmo-sccp.inc | 2 +- recipes-osmocom/libosmocore/libosmocore.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index ed2e48bd21..4edbebdc67 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -13,7 +13,7 @@ PR = "r1" PARALLEL_MAKE = "" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig PACKAGES =+ "${PN}-apps" FILES_${PN}-apps = "${bindir}/*" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index ddc1275c0b..f6c19f5882 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -8,6 +8,6 @@ INC_PR="r2.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig ALLOW_EMPTY_libosmo-abis = "1" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc index 4284a6afb7..e8c6e21369 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif.inc +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -7,4 +7,4 @@ INC_PR="r2.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index 0b4ae81870..3925ed862d 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -7,6 +7,6 @@ INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig ALLOW_EMPTY_libosmo-sccp = "1" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index c0dba30f28..de5742f448 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,5 +6,5 @@ INC_PR="r1.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig From e274f00fa972447b44a4217b1aa2e7302891bb11 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 18 Feb 2016 09:16:12 +0100 Subject: [PATCH 188/200] libgsm: Pass in CC variable to compile libgsm It appears that in latest poky master the CC variable is not automatically passed to the build. The last good build was 7cd835177ae0208859f790c0c638cde908386d5c and now it was failing. Pass CC to the build. --- recipes-isdn/libgsm/libgsm_1.0.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-isdn/libgsm/libgsm_1.0.14.bb b/recipes-isdn/libgsm/libgsm_1.0.14.bb index 8d90ffcc89..690b40f03a 100644 --- a/recipes-isdn/libgsm/libgsm_1.0.14.bb +++ b/recipes-isdn/libgsm/libgsm_1.0.14.bb @@ -24,7 +24,7 @@ PARALLEL_MAKE = "" do_compile(){ unset LD - oe_runmake CCFLAGS="${CFLAGS}" + oe_runmake CCFLAGS="${CFLAGS}" CC="${CC}" } do_install(){ From aa458a136ebd4abc55d502984b5c90ddab458288 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 23 Feb 2016 12:22:19 +0100 Subject: [PATCH 189/200] add libtalloc and its dependency waf-samba.bbclass This also adds libtalloc-dev to the SDK, which is a first step to upgrading libosmocore to a 'post external talloc' version. --- classes/waf-samba.bbclass | 54 +++++++++++++++++++ .../packagegroup/packagegroup-sdk-osmo.inc | 1 + .../libtalloc/avoid-attr-unless-wanted.patch | 20 +++++++ recipes-support/libtalloc/libtalloc_2.1.3.bb | 41 ++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 classes/waf-samba.bbclass create mode 100644 recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch create mode 100644 recipes-support/libtalloc/libtalloc_2.1.3.bb diff --git a/classes/waf-samba.bbclass b/classes/waf-samba.bbclass new file mode 100644 index 0000000000..4b6e3c9f93 --- /dev/null +++ b/classes/waf-samba.bbclass @@ -0,0 +1,54 @@ +# waf is a build system which is used by samba related project. +# Obtain details from https://wiki.samba.org/index.php/Waf +# +inherit qemu pythonnative + +DEPENDS += "qemu-native python" + +CONFIGUREOPTS = " --prefix=${prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --oldincludedir=${oldincludedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + " + +do_configure() { + qemu_binary="${@qemu_target_binary(d)}" + if [ "${qemu_binary}" = "qemu-allarch" ]; then + qemu_binary="qemuwrapper" + fi + + libdir_qemu="${STAGING_DIR_HOST}/${libdir}" + base_libdir_qemu="${STAGING_DIR_HOST}/${base_libdir}" + + CROSS_EXEC="${qemu_binary} \ + ${QEMU_OPTIONS} \ + -L ${STAGING_DIR_HOST} \ + -E LD_LIBRARY_PATH=${libdir_qemu}:${base_libdir_qemu}" + + export BUILD_SYS=${BUILD_SYS} + export HOST_SYS=${HOST_SYS} + export BUILD_ARCH=${BUILD_ARCH} + export HOST_ARCH=${HOST_ARCH} + export STAGING_LIBDIR=${STAGING_LIBDIR} + export STAGING_INCDIR=${STAGING_INCDIR} + export PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} + + ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} --cross-compile --cross-execute="${CROSS_EXEC}" +} + +do_compile () { + python ./buildtools/bin/waf ${PARALLEL_MAKE} +} + +do_install() { + oe_runmake install DESTDIR=${D} +} diff --git a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc index 29f3ad98ce..8a520165fd 100644 --- a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc +++ b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc @@ -1,4 +1,5 @@ SDK-OSMO = " \ + libtalloc-dev \ libosmocore-dev \ libosmo-sccp-staticdev \ libosmo-abis-dev \ diff --git a/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch new file mode 100644 index 0000000000..a3ee9ccd97 --- /dev/null +++ b/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch @@ -0,0 +1,20 @@ +--- a/lib/replace/wscript 2015-11-13 16:04:04.000000000 +0100 ++++ b/lib/replace/wscript 2015-11-13 16:23:20.000000000 +0100 +@@ -636,8 +636,6 @@ + if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' + if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' + if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' +- if not bld.CONFIG_SET('HAVE_GETXATTR') or bld.CONFIG_SET('XATTR_ADDITIONAL_OPTIONS'): +- REPLACE_SOURCE += ' xattr.c' + + bld.SAMBA_LIBRARY('replace', + source=REPLACE_SOURCE, +@@ -648,7 +646,7 @@ + # at the moment: + # hide_symbols=bld.BUILTIN_LIBRARY('replace'), + private_library=True, +- deps='crypt dl nsl socket rt attr' + extra_libs) ++ deps='crypt dl nsl socket rt ' + extra_libs) + + bld.SAMBA_SUBSYSTEM('replace-test', + source='''test/testsuite.c test/strptime.c diff --git a/recipes-support/libtalloc/libtalloc_2.1.3.bb b/recipes-support/libtalloc/libtalloc_2.1.3.bb new file mode 100644 index 0000000000..8209264966 --- /dev/null +++ b/recipes-support/libtalloc/libtalloc_2.1.3.bb @@ -0,0 +1,41 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://talloc.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" + +DEPENDS += "libbsd" + +SRC_URI = "http://samba.org/ftp/talloc/talloc-${PV}.tar.gz" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ + file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" + +SRC_URI[md5sum] = "3e285de2228ae67ff0a0f5cec658f627" +SRC_URI[sha256sum] = "7aa5f75b22d4ef9c737b25515f2a2837ddc13014ff4ac6e58dd9e311f41f2cb0" + +inherit waf-samba + +PACKAGECONFIG[attr] = ",,attr" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/talloc-${PV}" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --disable-silent-rules \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " +DISABLE_STATIC = "" + +PACKAGES += "pytalloc pytalloc-dbg pytalloc-dev" + +FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpytalloc-util.so.2 \ + ${libdir}/libpytalloc-util.so.2.1.1 \ + " +FILES_pytalloc-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ + ${libdir}/.debug/libpytalloc-util.so.2.1.1" +FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so" +RDEPENDS_pytalloc = "python" From 0f016bb89e8c06f293dffaacdd325ca77ab9fc85 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 27 Feb 2016 09:27:29 +0100 Subject: [PATCH 190/200] libosmocore: Split the package into one package per library This will allow us to have multiple versions installed at the same time. Use a HACK to not have package.bbclass renamed the RREPLACE we need for the upgrade. Fixes: SYS#217 --- recipes-osmocom/libosmocore/libosmocore_git.bb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 9101886c66..e482f8c538 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -4,9 +4,23 @@ S = "${WORKDIR}/git" SRCREV = "70fcbda6dd733a503e9a046e01986d8bfc2e2bb2" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" PV = "0.9.0+gitr${SRCPV}" -PR = "r0" +PR = "r1" -PACKAGES =+ "libosmoctrl" +PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" +FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}" +FILES_libosmogb = "${libdir}/libosmogb${SOLIBS}" +FILES_libosmogsm = "${libdir}/libosmogsm${SOLIBS}" +FILES_libosmovty = "${libdir}/libosmovty${SOLIBS}" +FILES_osmo-arfcn = "${bindir}/osmo-arfcn" +FILES_osmo-auc-gen = "${bindir}/osmo-auc-gen" + +# Requires fix for upgrades +RREPLACES_libosmocore = "DONOTREPLACElibosmocore" +RREPLACES_libosmoctrl = "DONOTREPLACElibosmocore" +RREPLACES_libosmocodec = "DONOTREPLACElibosmocore" +RREPLACES_libosmogb = "DONOTREPLACElibosmocore" +RREPLACES_libosmogsm = "DONOTREPLACElibosmocore" +RREPLACES_libosmovty = "DONOTREPLACElibosmocore" EXTRA_OECONF += "--disable-pcsc" From 2d24a1a1f5b4d75b11ea01bd3ed624136ca94669 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 29 Feb 2016 16:43:25 +0100 Subject: [PATCH 191/200] put libusb1-dev into osmocom SDK this is helpful for SDK-based development of applications accessing USB from userspace (like simtrace). --- recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc index 8a520165fd..7e3b709142 100644 --- a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc +++ b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc @@ -1,4 +1,5 @@ SDK-OSMO = " \ + libusb1-dev \ libtalloc-dev \ libosmocore-dev \ libosmo-sccp-staticdev \ From 00e53d5e6e92e4b79c399d4509a1f7a73d264d83 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 23 Mar 2016 11:53:00 +0100 Subject: [PATCH 192/200] lksctp-tools: Add package from meta-networking In the future libsomo-netif will require libsctp to build. Take the copy from meta-networking to handle this dependency. Fixes: SYS#2524 --- .../lksctp-tools/lksctp-tools/run-ptest | 5 ++ .../lksctp-tools/lksctp-tools/v4test.sh | 11 ++++ .../lksctp-tools/lksctp-tools/v6test.sh | 11 ++++ .../lksctp-tools/lksctp-tools_1.0.16.bb | 65 +++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 recipes-misc/lksctp-tools/lksctp-tools/run-ptest create mode 100644 recipes-misc/lksctp-tools/lksctp-tools/v4test.sh create mode 100644 recipes-misc/lksctp-tools/lksctp-tools/v6test.sh create mode 100644 recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb diff --git a/recipes-misc/lksctp-tools/lksctp-tools/run-ptest b/recipes-misc/lksctp-tools/lksctp-tools/run-ptest new file mode 100644 index 0000000000..e67f18e55a --- /dev/null +++ b/recipes-misc/lksctp-tools/lksctp-tools/run-ptest @@ -0,0 +1,5 @@ +#!/bin/sh + +sh v4test.sh +sh v6test.sh + diff --git a/recipes-misc/lksctp-tools/lksctp-tools/v4test.sh b/recipes-misc/lksctp-tools/lksctp-tools/v4test.sh new file mode 100644 index 0000000000..5130856999 --- /dev/null +++ b/recipes-misc/lksctp-tools/lksctp-tools/v4test.sh @@ -0,0 +1,11 @@ +#!/bin/sh +echo "v4test starting:" +for t in $(find -maxdepth 1 -type f \! -name test\*_v6 -name test\*); do + echo "$t"; + if $t; then + echo "PASS: $t"; echo ""; + else + echo "FAIL: $t"; echo ""; + fi + sleep 1; +done diff --git a/recipes-misc/lksctp-tools/lksctp-tools/v6test.sh b/recipes-misc/lksctp-tools/lksctp-tools/v6test.sh new file mode 100644 index 0000000000..3a667df820 --- /dev/null +++ b/recipes-misc/lksctp-tools/lksctp-tools/v6test.sh @@ -0,0 +1,11 @@ +#!/bin/sh +echo "v6test starting:" +for t in $(find -maxdepth 1 -name test\*_v6); do + echo "$t"; + if $t; then + echo "PASS: $t"; echo ""; + else + echo "FAIL: $t"; echo ""; + fi + sleep 1; +done diff --git a/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb b/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb new file mode 100644 index 0000000000..d3e6a5dda8 --- /dev/null +++ b/recipes-misc/lksctp-tools/lksctp-tools_1.0.16.bb @@ -0,0 +1,65 @@ +SUMMARY = "The Linux Kernel Stream Control Transmission Protocol (lksctp) project" +HOMEPAGE = "http://lksctp.org" +SECTION = "net" +LICENSE = "LGPLv2.1 & GPLv2" + +LIC_FILES_CHKSUM = " \ + file://COPYING.lib;md5=0a1b79af951c42a9c8573533fbba9a92 \ + file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ +" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \ + file://run-ptest \ + file://v4test.sh \ + file://v6test.sh \ + " + +SRC_URI[md5sum] = "708bb0b5a6806ad6e8d13c55b067518e" +SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26" + +#| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared -fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1 -o .libs/libsctp.so.1.0.16 +#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version +#| collect2: error: ld returned 1 exit status +#| make[4]: *** [libsctp.la] Error 1 +PNBLACKLIST[lksctp-tools] ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" + +S = "${WORKDIR}/${BP}" + +BBCLASSEXTEND = "native" + +inherit autotools pkgconfig binconfig ptest + +do_install_ptest () { + install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH} + install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH} + for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do + install $testcase ${D}${PTEST_PATH} + done +} + +SOLIBVERSION="${PV}" +SOLIBMAJORVERSION="1" + +PACKAGES =+ "${PN}-withsctp ${PN}-utils" + +FILES_${PN} = " \ + ${libdir}/libsctp.so.${SOLIBVERSION} \ + ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \ +" + +FILES_${PN}-withsctp = " \ + ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ + ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \ +" + +FILES_${PN}-dev += " \ + ${libdir}/libsctp.so \ + ${libdir}/lksctp-tools/libwithsctp.so \ + ${datadir}/lksctp-tools/*.c \ + ${datadir}/lksctp-tools/*.h \ +" + +FILES_${PN}-utils = "${bindir}/*" + +RRECOMMENDS_${PN}-utils += "kernel-module-sctp" +RRECOMMENDS_${PN}-ptest += "kernel-module-sctp" From 9092529d52b16e271eb8f2e287d4ae6b19a04e7e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 23 Mar 2016 11:54:26 +0100 Subject: [PATCH 193/200] packagegroup-sdk-osmo: Add libsctp as dependency for the SDK Make libsctp available to be used by libosmo-netif and othr Osmocom software. Fixes: SYS#2524 --- recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc index 7e3b709142..0a3f1d4c95 100644 --- a/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc +++ b/recipes-osmocom/packagegroup/packagegroup-sdk-osmo.inc @@ -1,4 +1,5 @@ SDK-OSMO = " \ + lksctp-tools-dev \ libusb1-dev \ libtalloc-dev \ libosmocore-dev \ From 1ba7ed6c28ab2bc859284f22bda0aaeec23adc53 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 11 Apr 2016 18:31:57 -0400 Subject: [PATCH 194/200] meta-toolchain-osmo: Attempt to fix hash data issue Exclude DATETIME from the variables to fix errors like: ERROR: meta-toolchain-osmo-1.0-r7 do_populate_sdk: Taskhash mismatch 0fb3116488402f87d1e4d637af229664 verses 6dda5ee949e484709fbac4a097018fc2 for meta-telephony/recipes-osmocom/meta/meta-toolchain-osmo.bb.do_populate_sdk --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index 6755fb693e..a2fb793f9f 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -2,6 +2,7 @@ TOOLCHAIN_TARGET_OSMOTASK ?= "packagegroup-core-standalone-osmo-sdk-target" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}" +TOOLCHAIN_OUTPUTNAME[vardepsexclude] = "DATETIME" PROVIDES = "meta-toolchain-sdk" require recipes-core/meta/meta-toolchain.bb From 50321ae4a12fdba6fe9b68277c23ed2110122e28 Mon Sep 17 00:00:00 2001 From: Chris Trobridge Date: Tue, 3 May 2016 11:47:38 +0100 Subject: [PATCH 195/200] Add missing items to fix build with Yocto Krogoth Add kernel module for dahdi-vpmadt032-loader. Add hotplug/firmware directory to dahdi-firmware package. --- recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb index 59825718d6..dc7926e68d 100644 --- a/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb +++ b/recipes-isdn/dahdi-linux/dahdi-linux_2.10.2.bb @@ -130,12 +130,13 @@ DAHDI_KERNEL_MODULE = "\ kernel-module-dahdi-echocan-sec \ kernel-module-xpd-echo \ kernel-module-xpd-fxs \ + kernel-module-dahdi-vpmadt032-loader \ " PACKAGE_ARCH_dahdi-firmware = "all" PACKAGES =+ "dahdi-firmware ${DAHDI_KERNEL_MODULE}" FILES_${PN} = "${base_libdir}/modules/ ${sysconfdir}/udev/rules.d" -FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi" +FILES_dahdi-firmware = "${base_libdir}/firmware ${datadir}/dahdi ${libdir}/hotplug/firmware " RRECOMMENDS_${PN} = "dahdi-firmware" From a7e967225d4b3b2bc518e14296e82be1f3b6c25b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 10 Feb 2017 16:10:14 +0100 Subject: [PATCH 196/200] toolchain-osmo: Add nativesdk-python-argparse libosmocore needs this during code generation of some of the header files, so let's make sure the SDK has python-argparse included. --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index a2fb793f9f..e8746f876d 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -3,6 +3,7 @@ TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}" TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}" TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}" TOOLCHAIN_OUTPUTNAME[vardepsexclude] = "DATETIME" +TOOLCHAIN_HOST_TASK_append = " nativesdk-python-argparse" PROVIDES = "meta-toolchain-sdk" require recipes-core/meta/meta-toolchain.bb From 24b544024cfcfe1b3e49b07992187cd826ba7028 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 10 Feb 2017 17:00:37 +0100 Subject: [PATCH 197/200] Add .bbappend for nativesdk-python-argparse In commit a7e967225d4b3b2bc518e14296e82be1f3b6c25b we added python-argparse to the SDK/toolchain. However, upstream dora doesn't have this in the nativesdk bbclass, so let's add it using a .bbappend file. I tried with python-argparse_%.bbappend to be less version dependent, but that didn't work. --- recipes-devtools/python/python-argparse_1.2.1.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 recipes-devtools/python/python-argparse_1.2.1.bbappend diff --git a/recipes-devtools/python/python-argparse_1.2.1.bbappend b/recipes-devtools/python/python-argparse_1.2.1.bbappend new file mode 100644 index 0000000000..077365c350 --- /dev/null +++ b/recipes-devtools/python/python-argparse_1.2.1.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND_append = " nativesdk" From 2b3379dfc2bbbb18267c606c59e26d5924804b2a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Apr 2017 15:49:51 +0200 Subject: [PATCH 198/200] lcr: Fix compilation with new versions of gcc --- .../files/0001-Fixed-compiler-warnings.patch | 167 ++++++++++++++++++ recipes-isdn/lcr/lcr_git.bb | 1 + 2 files changed, 168 insertions(+) create mode 100644 recipes-isdn/lcr/files/0001-Fixed-compiler-warnings.patch diff --git a/recipes-isdn/lcr/files/0001-Fixed-compiler-warnings.patch b/recipes-isdn/lcr/files/0001-Fixed-compiler-warnings.patch new file mode 100644 index 0000000000..dcb99ae454 --- /dev/null +++ b/recipes-isdn/lcr/files/0001-Fixed-compiler-warnings.patch @@ -0,0 +1,167 @@ +From 2aac6a668be131c610b6705a99817e6baf10599f Mon Sep 17 00:00:00 2001 +From: Andreas Eversberg +Date: Tue, 15 Dec 2015 20:49:18 +0100 +Subject: [PATCH] Fixed compiler warnings + +--- + alawulaw.c | 18 +++++++++--------- + gentones.c | 8 ++++---- + genwave.c | 10 +++++----- + 3 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/alawulaw.c b/alawulaw.c +index cafe1af..f38fa46 100644 +--- a/alawulaw.c ++++ b/alawulaw.c +@@ -13,7 +13,7 @@ signed int *audio_law_to_s32; + unsigned char silence; + + /* ulaw -> signed 16-bit */ +-static signed int audio_ulaw_to_s32[] = ++static unsigned int audio_ulaw_to_s32[] = + { + 0xffff8284, 0xffff8684, 0xffff8a84, 0xffff8e84, + 0xffff9284, 0xffff9684, 0xffff9a84, 0xffff9e84, +@@ -82,7 +82,7 @@ static signed int audio_ulaw_to_s32[] = + }; + + /* alaw -> signed 16-bit */ +-static signed int audio_alaw_to_s32[] = ++static unsigned int audio_alaw_to_s32[] = + { + 0x000013fc, 0xffffec04, 0x00000144, 0xfffffebc, + 0x0000517c, 0xffffae84, 0x0000051c, 0xfffffae4, +@@ -155,7 +155,7 @@ unsigned char audio_s16_to_law[65536]; + + + /* table is used to generate s16_to_alaw */ +-static short audio_alaw_relations[] = ++static unsigned short audio_alaw_relations[] = + { + 0x8684, 0x55, 0x8a84, 0xd5, 0x8e84, 0x15, 0x9284, 0x95, + 0x9684, 0x75, 0x9a84, 0xf5, 0x9e84, 0x35, 0xa284, 0xb5, +@@ -231,32 +231,32 @@ void generate_tables(char law) + + if (law == 'a') { + silence = 0x2a; +- audio_law_to_s32=audio_alaw_to_s32; ++ audio_law_to_s32 = (signed int *)audio_alaw_to_s32; + /* generating alaw-table */ + i = j = 0; + while(i < 65536) { +- if (i-32768 > audio_alaw_relations[j<<1]) ++ if (i-32768 > (signed short)audio_alaw_relations[j<<1]) + j++; + if (j>255) + j=255; + audio_s16_to_law[(i-32768) & 0xffff] +- = audio_alaw_relations[(j<<1)|1]; ++ = (signed short)audio_alaw_relations[(j<<1)|1]; + i++; + } + } else { + silence = 0xff; +- audio_law_to_s32=audio_ulaw_to_s32; ++ audio_law_to_s32 = (signed int *)audio_ulaw_to_s32; + /* generating ulaw-table */ + i = j = 0; + while(i < 32768) { +- if (i-32768 > audio_ulaw_to_s32[j]) ++ if (i-32768 > (signed int)audio_ulaw_to_s32[j]) + j++; + audio_s16_to_law[(i-32768) & 0xffff] = j; + i++; + } + j = 255; + while(i < 65536) { +- if (i-0x32768 > audio_ulaw_to_s32[j]) ++ if (i-0x32768 > (signed int)audio_ulaw_to_s32[j]) + j--; + audio_s16_to_law[(i-32768) & 0xffff] = j; + i++; +diff --git a/gentones.c b/gentones.c +index aaac659..a712f1a 100644 +--- a/gentones.c ++++ b/gentones.c +@@ -10,7 +10,7 @@ + + + /* ulaw -> signed 16-bit */ +-static short isdn_audio_ulaw_to_s16[] = ++static unsigned short isdn_audio_ulaw_to_s16[] = + { + 0x8284, 0x8684, 0x8a84, 0x8e84, 0x9284, 0x9684, 0x9a84, 0x9e84, + 0xa284, 0xa684, 0xaa84, 0xae84, 0xb284, 0xb684, 0xba84, 0xbe84, +@@ -47,7 +47,7 @@ static short isdn_audio_ulaw_to_s16[] = + }; + + /* alaw -> signed 16-bit */ +-static short isdn_audio_alaw_to_s16[] = ++static unsigned short isdn_audio_alaw_to_s16[] = + { + 0x13fc, 0xec04, 0x0144, 0xfebc, 0x517c, 0xae84, 0x051c, 0xfae4, + 0x0a3c, 0xf5c4, 0x0048, 0xffb8, 0x287c, 0xd784, 0x028c, 0xfd74, +@@ -92,7 +92,7 @@ unsigned char encode_isdn(short sample, char law) + + i=0; + while(i<256) { +- diff = (law=='u')?isdn_audio_ulaw_to_s16[i]:isdn_audio_alaw_to_s16[i]-sample; ++ diff = (law=='u')?((signed short)isdn_audio_ulaw_to_s16[i]):((signed short)isdn_audio_alaw_to_s16[i])-sample; + //printf("s16=%d sample%d diff=%d\n",isdn_audio_to_s16[i],sample,diff); + if (diff<0) + diff=0-diff; +@@ -150,7 +150,7 @@ void write_wav(FILE *fp, char *wav, char law) + short sample, sample2; + signed int size, chunk; + int gotfmt = 0, gotdata = 0; +- int ret; ++ int __attribute__((__unused__)) ret; + + if ((wfp=fopen(wav,"r"))) { + ret=fread(buffer,8,1,wfp); +diff --git a/genwave.c b/genwave.c +index 685b5fa..fe74658 100644 +--- a/genwave.c ++++ b/genwave.c +@@ -9,7 +9,7 @@ + + + /* ulaw -> signed 16-bit */ +-static short isdn_audio_ulaw_to_s16[] = ++static unsigned short isdn_audio_ulaw_to_s16[] = + { + 0x8284, 0x8684, 0x8a84, 0x8e84, 0x9284, 0x9684, 0x9a84, 0x9e84, + 0xa284, 0xa684, 0xaa84, 0xae84, 0xb284, 0xb684, 0xba84, 0xbe84, +@@ -46,7 +46,7 @@ static short isdn_audio_ulaw_to_s16[] = + }; + + /* alaw -> signed 16-bit */ +-static short isdn_audio_alaw_to_s16[] = ++static unsigned short isdn_audio_alaw_to_s16[] = + { + 0x13fc, 0xec04, 0x0144, 0xfebc, 0x517c, 0xae84, 0x051c, 0xfae4, + 0x0a3c, 0xf5c4, 0x0048, 0xffb8, 0x287c, 0xd784, 0x028c, 0xfd74, +@@ -100,7 +100,7 @@ void write_law(FILE *fp, char *name, char law) + unsigned int i; + short sample; + unsigned int size, wsize; +- int ret; ++ int __attribute__((__unused__)) ret; + + if ((lfp=fopen(name,"r"))) { + /* get size */ +@@ -134,9 +134,9 @@ void write_law(FILE *fp, char *name, char law) + while(i < size) { + ret = fread(buffer, 1, 1, lfp); + if (law == 'a') +- sample = isdn_audio_alaw_to_s16[*buffer]; ++ sample = (signed short)isdn_audio_alaw_to_s16[*buffer]; + else +- sample = isdn_audio_ulaw_to_s16[*buffer]; ++ sample = (signed short)isdn_audio_ulaw_to_s16[*buffer]; + ret = fwrite(&sample, 2, 1, fp); + i+=2; + } +-- +1.9.1 + diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb index d08dbf11a4..5858c895a4 100644 --- a/recipes-isdn/lcr/lcr_git.bb +++ b/recipes-isdn/lcr/lcr_git.bb @@ -10,6 +10,7 @@ PR = "r4" SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c" SRC_URI = "git://git.misdn.eu/lcr.git \ file://lcr-disable-gsmfr.diff \ + file://0001-Fixed-compiler-warnings.patch \ file://lcr.init " S = "${WORKDIR}/git" From 0319396ca8a31ff7245b1fa73d7eddfc4da4249e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 5 Apr 2017 09:41:20 +0200 Subject: [PATCH 199/200] meta-toolchain-osmo: Attempt to fix it for master For master we need to change to SDKDEPLOYDIR to add the symlink we want. Try to keep it working for dora. --- recipes-osmocom/meta/meta-toolchain-osmo.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb index e8746f876d..0350005ee0 100644 --- a/recipes-osmocom/meta/meta-toolchain-osmo.bb +++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb @@ -13,7 +13,13 @@ do_populate_sdk_append() { create_symlink() { - cd ${SDK_DEPLOY}/ + # master or dora? + if [ -e ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh ]; then + cd ${SDKDEPLOYDIR}/ + else + cd ${SDK_DEPLOY}/ + fi + rm -f ${TOOLCHAIN_OUTPUT_BASENAME}.sh ln -s ${TOOLCHAIN_OUTPUTNAME}.sh ${TOOLCHAIN_OUTPUT_BASENAME}.sh } From 3b2076a5563a27e114b02a1e41cf4f62330e9575 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 2 May 2017 11:22:31 +0200 Subject: [PATCH 200/200] openbsc: Fix build failure Add explicit reference to osmo-gbproxy.service to fix build issue. ERROR: QA Issue: openbsc: Files/directories were installed but not shipped /lib/systemd/system/osmo-gbproxy.service ERROR: QA run found fatal errors. Please consider fixing them. --- recipes-osmocom/openbsc/openbsc.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index b8eaca58cd..a965040333 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -93,6 +93,8 @@ FILES_osmo-sgsn = " ${bindir}/osmo-sgsn \ FILES_ipaccess-utils = " ${bindir}/ipaccess-find ${bindir}/ipaccess-config ${bindir}/ipaccess-proxy " FILES_osmo-bsc-nat = " ${bindir}/osmo-bsc_nat " -FILES_osmo-gbproxy = " ${bindir}/osmo-gbproxy " +FILES_osmo-gbproxy = " ${bindir}/osmo-gbproxy \ + ${systemd_unitdir}/system/osmo-gbproxy.service \ + " FILES_osmo-gbproxy-dbg = " ${bindir}/.debug/osmo-gbproxy "