Merge commit '57cc5e9c588d4f9f39f5007afdcaf94a830d1401' into edison

This commit is contained in:
Holger Hans Peter Freyther 2013-08-01 19:50:24 +02:00
commit 44c4b09e83
23 changed files with 64 additions and 36 deletions

View File

@ -4,6 +4,9 @@
# Make sure to look at sysmocom-restore to check if the file would # Make sure to look at sysmocom-restore to check if the file would
# be restored right. Currently only some dirs get restored. # be restored right. Currently only some dirs get restored.
FILES="\ FILES="\
etc/hostname \
etc/ifplugd.sh \
etc/network/interfaces \
etc/openvpn etc/openvpn
etc/osmocom/osmo-bsc-mgcp.cfg \ etc/osmocom/osmo-bsc-mgcp.cfg \
etc/osmocom/osmo-bsc.cfg \ etc/osmocom/osmo-bsc.cfg \
@ -12,9 +15,7 @@ FILES="\
etc/osmocom/osmo-pcu.cfg \ etc/osmocom/osmo-pcu.cfg \
etc/osmocom/osmo-sgsn.cfg \ etc/osmocom/osmo-sgsn.cfg \
etc/ggsn.conf \ etc/ggsn.conf \
etc/default/osmo-nitb \ etc/default \
etc/default/osmo-bsc \
etc/default/osmocom-tcpdump \
var/lib/osmocom/hlr.sqlite3 \ var/lib/osmocom/hlr.sqlite3 \
" "
DATE=`date +%Y%m%d` DATE=`date +%Y%m%d`

View File

@ -1,7 +1,7 @@
DESCRIPTION = "sysmocom config backup and restore scripts" DESCRIPTION = "sysmocom config backup and restore scripts"
LICENSE = "GPLv3+" LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
PR = "r3" PR = "r7"
SRC_URI = "file://sysmocom-backup file://sysmocom-restore" SRC_URI = "file://sysmocom-backup file://sysmocom-restore"
RDEPENDS_${PN} = "tar" RDEPENDS_${PN} = "tar"

View File

@ -3,10 +3,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "virtual/kernel" DEPENDS = "virtual/kernel"
ALLOW_EMPTY = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r1" PR = "r1"
RDEPENDS_task-gprscore = "\ RDEPENDS_${PN} = "\
openggsn \ openggsn \
gprs-routing osmo-sgsn \ gprs-routing osmo-sgsn \
sysmocom-ggsn-config \ sysmocom-ggsn-config \

View File

@ -3,8 +3,8 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "virtual/kernel" DEPENDS = "virtual/kernel"
ALLOW_EMPTY = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r17" PR = "r18"
CALIB = "" CALIB = ""
CALIB_sysmobts-v2 = "sysmobts-calib" CALIB_sysmobts-v2 = "sysmobts-calib"

View File

@ -3,10 +3,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "virtual/kernel" DEPENDS = "virtual/kernel"
ALLOW_EMPTY = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r3" PR = "r4"
RDEPENDS_task-sysmocom-debug = "\ RDEPENDS_${PN} = "\
dropbear \ dropbear \
mtd-utils \ mtd-utils \
strace \ strace \

View File

@ -2,10 +2,10 @@ DESCRIPTION = "Task for E1 based sysmocom"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
ALLOW_EMPTY = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r1" PR = "r2"
RDEPENDS_task-sysmocom-e1 = "\ RDEPENDS_${PN} = "\
dahdi-linux \ dahdi-linux \
dahdi-firmware \ dahdi-firmware \
dahdi-tools \ dahdi-tools \

View File

@ -2,10 +2,10 @@ DESCRIPTION = "Task for sysmocom external tools"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
ALLOW_EMPTY = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r7" PR = "r7"
RDEPENDS_task-sysmocom-tools = "\ RDEPENDS_${PN} = "\
lmsensors-scripts \ lmsensors-scripts \
dropbear \ dropbear \
mtd-utils \ mtd-utils \

View File

@ -3,10 +3,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "virtual/kernel" DEPENDS = "virtual/kernel"
ALLOW_EMPTY = "1" ALLOW_EMPTY_${PN} = "1"
PR = "r11" PR = "r11"
RDEPENDS_task-sysmocom = "\ RDEPENDS_${PN} = "\
task-sysmocom-tools \ task-sysmocom-tools \
osmo-bsc \ osmo-bsc \
osmo-bsc-mgcp \ osmo-bsc-mgcp \

View File

@ -1037,8 +1037,7 @@ CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
CONFIG_LEGACY_PTYS=y # CONFIG_LEGACY_PTYS is not set
CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_GSM is not set # CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set # CONFIG_TRACE_SINK is not set

View File

@ -1043,8 +1043,7 @@ CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
CONFIG_LEGACY_PTYS=y # CONFIG_LEGACY_PTYS is not set
CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_GSM is not set # CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set # CONFIG_TRACE_SINK is not set

View File

@ -1457,8 +1457,7 @@ CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
CONFIG_LEGACY_PTYS=y # CONFIG_LEGACY_PTYS is not set
CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NOZOMI is not set # CONFIG_NOZOMI is not set
# CONFIG_N_GSM is not set # CONFIG_N_GSM is not set

View File

@ -12,7 +12,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
SRCREV = "996c4d772886fa81ffa5d2d971ef88e6da41e115" SRCREV = "996c4d772886fa81ffa5d2d971ef88e6da41e115"
PR = "r29" PR = "r30"
PV = "${LINUX_VERSION}+git${SRCPV}" PV = "${LINUX_VERSION}+git${SRCPV}"
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \ SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \

View File

@ -0,0 +1,11 @@
#OpenVPN client conf
tls-client
client
dev tun
proto udp
tun-mtu 1500
remote admin.sysmocom.de
remote 78.46.147.238
comp-lzo
pkcs12 sysmocom-client-cert.p12
cipher BF-CBC

View File

@ -0,0 +1,16 @@
HOMEPAGE = "http://www.sysmocom.de"
RDEPENDS_${PN} = "openvpn"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
SRC_URI = "file://sysmocom-vpn.conf"
PR = "r3"
CONFFILES_${PN} = "${sysconfdir}/openvpn/sysmocom-vpn.conf"
PACKAGE_ARCH = "all"
do_install() {
install -d ${D}${sysconfdir}/openvpn
install -m 0644 ${WORKDIR}/sysmocom-vpn.conf ${D}${sysconfdir}/openvpn
}

View File

@ -8,7 +8,7 @@ PROVIDES = "virtual/gpsd"
EXTRANATIVEPATH += "chrpath-native" EXTRANATIVEPATH += "chrpath-native"
PR = "r3.6" PR = "r3.8"
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
@ -18,8 +18,8 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
file://gpsd \ file://gpsd \
file://60-gpsd.rules \ file://60-gpsd.rules \
" "
SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98" SRC_URI[md5sum] = "53a88f24a0973d23427e82e9a8914f19"
SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac" SRC_URI[sha256sum] = "d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a"
#inherit scons update-rc.d python-dir pythonnative #inherit scons update-rc.d python-dir pythonnative
inherit scons update-rc.d inherit scons update-rc.d
@ -135,6 +135,7 @@ FILES_libgps = "${libdir}/libgps.so.*"
DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts" DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts"
FILES_gpsd-conf = "${sysconfdir}" FILES_gpsd-conf = "${sysconfdir}"
CONFFILES_gpsd-conf = "${sysconfdir}/default/gpsd.default"
DESCRIPTION_gpsd-gpsctl = "Tool for tweaking GPS modes" DESCRIPTION_gpsd-gpsctl = "Tool for tweaking GPS modes"
FILES_gpsd-gpsctl = "${bindir}/gpsctl" FILES_gpsd-gpsctl = "${bindir}/gpsctl"

View File

@ -3,13 +3,15 @@ SECTION = "console/network"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "gpsd" DEPENDS = "gpsd"
RDEPENDS = "libgps" RDEPENDS_${PN} = "libgps"
PR = "r6" PE = "1"
PR = "r8"
PV = "0.1+git${SRCPV}"
SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \ SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
" "
SRCREV = "86320146407ecee208ca03428a7424412f272024" SRCREV = "0db898e4b8870ecc8e703ca3b6cafb6281077188"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
INITSCRIPT_NAME = "gpsdate" INITSCRIPT_NAME = "gpsdate"

View File

@ -2,11 +2,11 @@ DESCRIPTION = "sysmocom OsmoBTS"
LICENSE = "AGPLv3" LICENSE = "AGPLv3"
LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \ SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/0.3.0-next;name=osmobts;destsuffix=git \
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
SRCREV_osmobts = "cdc5a4dc384c91d5102376e08e3f34523e50b028" SRCREV_osmobts = "5eab81d02ae80af9f87d75389707a8ff76414076"
SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a" SRCREV_openbsc = "f659992616a910a48d48766986460f6ccd23e971"
PV = "0.2.0+git${SRCPV}" PV = "0.3.0+git${SRCPV}"
PR = "r1.${META_TELEPHONY_OSMO_INC}" PR = "r1.${META_TELEPHONY_OSMO_INC}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@ -3,7 +3,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly_merge" SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly_merge"
SRCREV = "81a12be317bb5d2ad13bc27be1b2b1cb1605f4de" SRCREV = "06d28bb08aa9834bc0f0c2740ffbebc12ce8560f"
PV = "0.2+git${SRCPV}" PV = "0.2+git${SRCPV}"
PR = "r2.${META_TELEPHONY_OSMO_INC}" PR = "r2.${META_TELEPHONY_OSMO_INC}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"