diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup index 1166824478..481f07bf39 100755 --- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup +++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/files/sysmocom-backup @@ -4,6 +4,9 @@ # Make sure to look at sysmocom-restore to check if the file would # be restored right. Currently only some dirs get restored. FILES="\ + etc/hostname \ + etc/ifplugd.sh \ + etc/network/interfaces \ etc/openvpn etc/osmocom/osmo-bsc-mgcp.cfg \ etc/osmocom/osmo-bsc.cfg \ @@ -12,9 +15,7 @@ FILES="\ etc/osmocom/osmo-pcu.cfg \ etc/osmocom/osmo-sgsn.cfg \ etc/ggsn.conf \ - etc/default/osmo-nitb \ - etc/default/osmo-bsc \ - etc/default/osmocom-tcpdump \ + etc/default \ var/lib/osmocom/hlr.sqlite3 \ " DATE=`date +%Y%m%d` diff --git a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb index 4ce0b0feb0..6b0ce5bb59 100644 --- a/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb +++ b/meta-sysmocom-bsp/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "sysmocom config backup and restore scripts" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r3" +PR = "r7" SRC_URI = "file://sysmocom-backup file://sysmocom-restore" RDEPENDS_${PN} = "tar" diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb index 98eb987e9e..fd13ae8240 100644 --- a/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb +++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-gprscore.bb @@ -3,10 +3,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" +ALLOW_EMPTY_${PN} = "1" PR = "r1" -RDEPENDS_task-gprscore = "\ +RDEPENDS_${PN} = "\ openggsn \ gprs-routing osmo-sgsn \ sysmocom-ggsn-config \ diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb index ec91bf123f..b5abb1af08 100644 --- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.bb +++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-bts.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 = "r17" +ALLOW_EMPTY_${PN} = "1" +PR = "r18" CALIB = "" CALIB_sysmobts-v2 = "sysmobts-calib" diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb index 5612b9ebc3..c1a7ecd042 100644 --- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb +++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-debug.bb @@ -3,10 +3,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" -PR = "r3" +ALLOW_EMPTY_${PN} = "1" +PR = "r4" -RDEPENDS_task-sysmocom-debug = "\ +RDEPENDS_${PN} = "\ dropbear \ mtd-utils \ strace \ diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb index f71beb9cc7..998824e56c 100644 --- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb +++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-e1.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Task for E1 based sysmocom" 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" -RDEPENDS_task-sysmocom-e1 = "\ +RDEPENDS_${PN} = "\ dahdi-linux \ dahdi-firmware \ dahdi-tools \ diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb index 709b5f4ac1..7026a7b745 100644 --- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb +++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-tools.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Task for sysmocom external tools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -ALLOW_EMPTY = "1" +ALLOW_EMPTY_${PN} = "1" PR = "r7" -RDEPENDS_task-sysmocom-tools = "\ +RDEPENDS_${PN} = "\ lmsensors-scripts \ dropbear \ mtd-utils \ diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb index 3d784ae06f..4f79e54f12 100644 --- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb +++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom.bb @@ -3,10 +3,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" +ALLOW_EMPTY_${PN} = "1" PR = "r11" -RDEPENDS_task-sysmocom = "\ +RDEPENDS_${PN} = "\ task-sysmocom-tools \ osmo-bsc \ osmo-bsc-mgcp \ diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig index b25fb76d00..5609fd3b88 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig +++ b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v1/defconfig @@ -1037,8 +1037,7 @@ CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig index ef95f8905c..6d8712c297 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig +++ b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmobts-v2/defconfig @@ -1043,8 +1043,7 @@ CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-bsc/defconfig b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-bsc/defconfig index d1f7734783..c63d880ae9 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-bsc/defconfig +++ b/meta-sysmocom-bsp/recipes-bsp/linux/files/sysmocom-bsc/defconfig @@ -1457,8 +1457,7 @@ CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NOZOMI is not set # CONFIG_N_GSM is not set diff --git a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb index 265a774485..d8afea0d98 100644 --- a/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb @@ -12,7 +12,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" SRCREV = "996c4d772886fa81ffa5d2d971ef88e6da41e115" -PR = "r29" +PR = "r30" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \ diff --git a/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config/sysmocom-vpn.conf b/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config/sysmocom-vpn.conf new file mode 100644 index 0000000000..aabbc7fb0a --- /dev/null +++ b/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config/sysmocom-vpn.conf @@ -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 diff --git a/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb b/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb new file mode 100644 index 0000000000..733d99b797 --- /dev/null +++ b/meta-sysmocom-bsp/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb @@ -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 +} diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch similarity index 100% rename from meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch rename to meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch similarity index 100% rename from meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch rename to meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch similarity index 100% rename from meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch rename to meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0004-SConstruct-remove-rpath.patch similarity index 100% rename from meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch rename to meta-sysmocom-bsp/recipes-extra/gpsd/gpsd-3.9/0004-SConstruct-remove-rpath.patch diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default similarity index 100% rename from meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default rename to meta-sysmocom-bsp/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default diff --git a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.9.bb similarity index 95% rename from meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb rename to meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.9.bb index e833187f68..d320f97ec7 100644 --- a/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb +++ b/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.9.bb @@ -8,7 +8,7 @@ PROVIDES = "virtual/gpsd" EXTRANATIVEPATH += "chrpath-native" -PR = "r3.6" +PR = "r3.8" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ 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://60-gpsd.rules \ " -SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98" -SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac" +SRC_URI[md5sum] = "53a88f24a0973d23427e82e9a8914f19" +SRC_URI[sha256sum] = "d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a" #inherit scons update-rc.d python-dir pythonnative inherit scons update-rc.d @@ -135,6 +135,7 @@ FILES_libgps = "${libdir}/libgps.so.*" DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts" FILES_gpsd-conf = "${sysconfdir}" +CONFFILES_gpsd-conf = "${sysconfdir}/default/gpsd.default" DESCRIPTION_gpsd-gpsctl = "Tool for tweaking GPS modes" FILES_gpsd-gpsctl = "${bindir}/gpsctl" diff --git a/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb b/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb index d20f5465c0..1c0708a978 100644 --- a/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb +++ b/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb @@ -3,13 +3,15 @@ SECTION = "console/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 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 \ " -SRCREV = "86320146407ecee208ca03428a7424412f272024" +SRCREV = "0db898e4b8870ecc8e703ca3b6cafb6281077188" S = "${WORKDIR}/git" INITSCRIPT_NAME = "gpsdate" diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 51462a3d87..0e121ad349 100644 --- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -2,11 +2,11 @@ DESCRIPTION = "sysmocom OsmoBTS" LICENSE = "AGPLv3" 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" -SRCREV_osmobts = "cdc5a4dc384c91d5102376e08e3f34523e50b028" -SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a" -PV = "0.2.0+git${SRCPV}" +SRCREV_osmobts = "5eab81d02ae80af9f87d75389707a8ff76414076" +SRCREV_openbsc = "f659992616a910a48d48766986460f6ccd23e971" +PV = "0.3.0+git${SRCPV}" PR = "r1.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb index 1bb31e8069..444115165a 100644 --- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb +++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly_merge" -SRCREV = "81a12be317bb5d2ad13bc27be1b2b1cb1605f4de" +SRCREV = "06d28bb08aa9834bc0f0c2740ffbebc12ce8560f" PV = "0.2+git${SRCPV}" PR = "r2.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git"