From 212ab87663c3d432bac689bf897a05879aca8cd2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 7 Jun 2013 10:28:58 +0200 Subject: [PATCH 01/19] sysmocom-openvpn-config: Add a recipe with our generic OpenVPN client config This way I just need to install sysmocom-openvpn-config and copy a matching key to the device for the VPN config. The configuration file is marked as a CONFFILE, this means that modifications to it will not be lost during upgrade. --- .../sysmocom-openvpn-config/sysmocom-vpn.conf | 11 +++++++++++ .../sysmocom-openvpn-config_1.bb | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config/sysmocom-vpn.conf create mode 100644 recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb diff --git a/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config/sysmocom-vpn.conf b/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config/sysmocom-vpn.conf new file mode 100644 index 0000000000..aabbc7fb0a --- /dev/null +++ b/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/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb b/recipes-config/sysmocom-openvpn-config/sysmocom-openvpn-config_1.bb new file mode 100644 index 0000000000..733d99b797 --- /dev/null +++ b/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 +} From e9d0aa7cb415a57fb78367e4709112e797ccfe00 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 24 Apr 2013 14:20:40 +0200 Subject: [PATCH 02/19] misc: Use ALLOW_EMPTY_${PN} and RDEPENDS_${PN} to silent warnings Newer versions of poky warn about ALLOW_EMPTY on non _PN versions. --- recipes-apps/tasks/task-gprscore.bb | 4 ++-- recipes-apps/tasks/task-sysmocom-bts.bb | 4 ++-- recipes-apps/tasks/task-sysmocom-debug.bb | 6 +++--- recipes-apps/tasks/task-sysmocom-e1.bb | 6 +++--- recipes-apps/tasks/task-sysmocom-tools.bb | 4 ++-- recipes-apps/tasks/task-sysmocom.bb | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/recipes-apps/tasks/task-gprscore.bb b/recipes-apps/tasks/task-gprscore.bb index 98eb987e9e..fd13ae8240 100644 --- a/recipes-apps/tasks/task-gprscore.bb +++ b/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/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb index ec91bf123f..b5abb1af08 100644 --- a/recipes-apps/tasks/task-sysmocom-bts.bb +++ b/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/recipes-apps/tasks/task-sysmocom-debug.bb b/recipes-apps/tasks/task-sysmocom-debug.bb index 5612b9ebc3..c1a7ecd042 100644 --- a/recipes-apps/tasks/task-sysmocom-debug.bb +++ b/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/recipes-apps/tasks/task-sysmocom-e1.bb b/recipes-apps/tasks/task-sysmocom-e1.bb index f71beb9cc7..998824e56c 100644 --- a/recipes-apps/tasks/task-sysmocom-e1.bb +++ b/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/recipes-apps/tasks/task-sysmocom-tools.bb b/recipes-apps/tasks/task-sysmocom-tools.bb index 709b5f4ac1..7026a7b745 100644 --- a/recipes-apps/tasks/task-sysmocom-tools.bb +++ b/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/recipes-apps/tasks/task-sysmocom.bb b/recipes-apps/tasks/task-sysmocom.bb index 3d784ae06f..4f79e54f12 100644 --- a/recipes-apps/tasks/task-sysmocom.bb +++ b/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 \ From b6dc4b91a7b59b6c1e969cbe235d70c543507526 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 2 Jun 2013 08:52:15 +0200 Subject: [PATCH 03/19] gpsdate_git.bb: Use RDEPENDS_${PN} instead of RDEPENDS for dylan/master --- recipes-extra/gpsdate/gpsdate_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-extra/gpsdate/gpsdate_git.bb b/recipes-extra/gpsdate/gpsdate_git.bb index d20f5465c0..746611fef4 100644 --- a/recipes-extra/gpsdate/gpsdate_git.bb +++ b/recipes-extra/gpsdate/gpsdate_git.bb @@ -3,9 +3,9 @@ SECTION = "console/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gpsd" -RDEPENDS = "libgps" +RDEPENDS_${PN} = "libgps" -PR = "r6" +PR = "r7" SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \ " From 01e96dd2404baef345d053a760c09ce8b70487d2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 14 Sep 2012 13:44:16 +0800 Subject: [PATCH 04/19] linux-sysmocom: Disable the legacy PTY handling in the kernel There is no need to have the various pty files clobber the /dev directory when they are never used. Do not force a PR upgrade right now as we don't have a good upgreade strategy for the v1 and the BSC config. --- recipes-bsp/linux/files/sysmobts-v1/defconfig | 3 +-- recipes-bsp/linux/files/sysmobts-v2/defconfig | 3 +-- recipes-bsp/linux/files/sysmocom-bsc/defconfig | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/linux/files/sysmobts-v1/defconfig b/recipes-bsp/linux/files/sysmobts-v1/defconfig index b25fb76d00..5609fd3b88 100644 --- a/recipes-bsp/linux/files/sysmobts-v1/defconfig +++ b/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/recipes-bsp/linux/files/sysmobts-v2/defconfig b/recipes-bsp/linux/files/sysmobts-v2/defconfig index ef95f8905c..6d8712c297 100644 --- a/recipes-bsp/linux/files/sysmobts-v2/defconfig +++ b/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/recipes-bsp/linux/files/sysmocom-bsc/defconfig b/recipes-bsp/linux/files/sysmocom-bsc/defconfig index d1f7734783..c63d880ae9 100644 --- a/recipes-bsp/linux/files/sysmocom-bsc/defconfig +++ b/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 From 673d53bbf5881175726cb881b1f96cd4a203ec6e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 19 Jun 2013 20:40:17 +0200 Subject: [PATCH 05/19] linux-sysmocom: Force a rebuild of the kernel with the new config file The previous change modified the defconfig to not include the legacy pseudo terminal support. Increase the version for the sysmoBTS to have a kernel without old terminal files. --- recipes-bsp/linux/linux-sysmocom_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 265a774485..d8afea0d98 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/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 \ From 16f9bbb2885c370ebe129d363b9a45749317b059 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Jun 2013 10:15:40 +0200 Subject: [PATCH 06/19] gpsdate: Upgrade to a newer git version with improved init scripts --- recipes-extra/gpsdate/gpsdate_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-extra/gpsdate/gpsdate_git.bb b/recipes-extra/gpsdate/gpsdate_git.bb index 746611fef4..dbe6ca0775 100644 --- a/recipes-extra/gpsdate/gpsdate_git.bb +++ b/recipes-extra/gpsdate/gpsdate_git.bb @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gpsd" RDEPENDS_${PN} = "libgps" -PR = "r7" +PR = "r8" SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \ " -SRCREV = "86320146407ecee208ca03428a7424412f272024" +SRCREV = "f07a52709feca7a7f75a3d637a6f1ad5df6e3fa4" S = "${WORKDIR}/git" INITSCRIPT_NAME = "gpsdate" From 3f228b8e6eb43f4519c4d0f1308a740343159fb9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Jun 2013 10:44:06 +0200 Subject: [PATCH 07/19] gpsdate: Use SRCPV in the PV and bump the PE Follow the Poky conventions and use SRCPV for the git package. Bump the PR because otherwise the package is not upgradable. --- recipes-extra/gpsdate/gpsdate_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-extra/gpsdate/gpsdate_git.bb b/recipes-extra/gpsdate/gpsdate_git.bb index dbe6ca0775..8354f474b2 100644 --- a/recipes-extra/gpsdate/gpsdate_git.bb +++ b/recipes-extra/gpsdate/gpsdate_git.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gpsd" RDEPENDS_${PN} = "libgps" +PE = "1" PR = "r8" +PV = "0.1+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \ " From 5b3576665107d2569a8484e22d1e2138b26a876c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Jun 2013 11:18:25 +0200 Subject: [PATCH 08/19] gpsdate: Upgrade with a now fully working init script --- recipes-extra/gpsdate/gpsdate_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-extra/gpsdate/gpsdate_git.bb b/recipes-extra/gpsdate/gpsdate_git.bb index 8354f474b2..1c0708a978 100644 --- a/recipes-extra/gpsdate/gpsdate_git.bb +++ b/recipes-extra/gpsdate/gpsdate_git.bb @@ -11,7 +11,7 @@ PV = "0.1+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \ " -SRCREV = "f07a52709feca7a7f75a3d637a6f1ad5df6e3fa4" +SRCREV = "0db898e4b8870ecc8e703ca3b6cafb6281077188" S = "${WORKDIR}/git" INITSCRIPT_NAME = "gpsdate" From fea919fa5dd77afdce8a5d2a6e0a8fb34887c7e8 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Jun 2013 14:15:12 +0200 Subject: [PATCH 09/19] osmo-bts: Build the 0.3.0-next branch with further improvements This is a bigger update and brings the SAPI queue, readv/writev and realtime scheduling to the sysmobts software. This will greatly improve the stability of the software under load. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 51462a3d87..1dce6e08f5 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/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 = "d7b37b68cacc508fb2814013bfdbee081cd29efd" +SRCREV_openbsc = "b0bf1da4c87f1ab3f9367bbeea615dc86d13131c" +PV = "0.3.0+git${SRCPV}" PR = "r1.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" From 040f4432f53b739f62037ee7e5f9037e51a2c4cf Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Jun 2013 18:19:34 +0200 Subject: [PATCH 10/19] osmo-bts: Upgrade to the latest sysmocom/0.3.0-next version This introduces the auto-band that will help in managing configurations. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 1dce6e08f5..67231d4c0a 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" 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 = "d7b37b68cacc508fb2814013bfdbee081cd29efd" +SRCREV_osmobts = "602afee3df4cace9af26931b58afd0ca65103e0d" SRCREV_openbsc = "b0bf1da4c87f1ab3f9367bbeea615dc86d13131c" PV = "0.3.0+git${SRCPV}" PR = "r1.${META_TELEPHONY_OSMO_INC}" From 57c0346f5670bbf74c3f7ed345bb5c3b64544aa6 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 19 Jun 2013 20:17:22 +0200 Subject: [PATCH 11/19] gpsd: Upgrade to version 3.9 in the hope of some crashes being fixed GPSD 3.7 is somehow exiting without us really knowing the cause. The version 3.9 has been released and we hope that it might just fix the issues we are experiencing. --- ...SConstruct-disable-html-and-man-docs-building-becaus.patch | 0 ...SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch | 0 .../0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch | 0 .../{gpsd-3.7 => gpsd-3.9}/0004-SConstruct-remove-rpath.patch | 0 recipes-extra/gpsd/{gpsd_3.7.bb => gpsd_3.9.bb} | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename recipes-extra/gpsd/{gpsd-3.7 => gpsd-3.9}/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch (100%) rename recipes-extra/gpsd/{gpsd-3.7 => gpsd-3.9}/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch (100%) rename recipes-extra/gpsd/{gpsd-3.7 => gpsd-3.9}/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch (100%) rename recipes-extra/gpsd/{gpsd-3.7 => gpsd-3.9}/0004-SConstruct-remove-rpath.patch (100%) rename recipes-extra/gpsd/{gpsd_3.7.bb => gpsd_3.9.bb} (97%) diff --git a/recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch similarity index 100% rename from recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch rename to recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch diff --git a/recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch similarity index 100% rename from recipes-extra/gpsd/gpsd-3.7/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch rename to recipes-extra/gpsd/gpsd-3.9/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch diff --git a/recipes-extra/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch b/recipes-extra/gpsd/gpsd-3.9/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch similarity index 100% rename from recipes-extra/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch rename to recipes-extra/gpsd/gpsd-3.9/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch diff --git a/recipes-extra/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch b/recipes-extra/gpsd/gpsd-3.9/0004-SConstruct-remove-rpath.patch similarity index 100% rename from recipes-extra/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch rename to recipes-extra/gpsd/gpsd-3.9/0004-SConstruct-remove-rpath.patch diff --git a/recipes-extra/gpsd/gpsd_3.7.bb b/recipes-extra/gpsd/gpsd_3.9.bb similarity index 97% rename from recipes-extra/gpsd/gpsd_3.7.bb rename to recipes-extra/gpsd/gpsd_3.9.bb index e833187f68..4d7c643b15 100644 --- a/recipes-extra/gpsd/gpsd_3.7.bb +++ b/recipes-extra/gpsd/gpsd_3.9.bb @@ -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 From 6453080cef39935d72553db2b6b36669bf1ae500 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Jun 2013 19:48:56 +0200 Subject: [PATCH 12/19] gpsd: Make sure the sysmobts-v2 gpsd default version is installed The sysmobts-v2 version was not installed because the file was not called properly. Rename it to gpsd-default and the sysmobts-v2 version will be picked and installed. --- .../gpsd/gpsd/sysmobts-v2/{gpsd.default => gpsd-default} | 0 recipes-extra/gpsd/gpsd_3.9.bb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename recipes-extra/gpsd/gpsd/sysmobts-v2/{gpsd.default => gpsd-default} (100%) diff --git a/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default b/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default similarity index 100% rename from recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default rename to recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default diff --git a/recipes-extra/gpsd/gpsd_3.9.bb b/recipes-extra/gpsd/gpsd_3.9.bb index 4d7c643b15..50c2c34123 100644 --- a/recipes-extra/gpsd/gpsd_3.9.bb +++ b/recipes-extra/gpsd/gpsd_3.9.bb @@ -8,7 +8,7 @@ PROVIDES = "virtual/gpsd" EXTRANATIVEPATH += "chrpath-native" -PR = "r3.6" +PR = "r3.7" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ From 6e7383839c6ccf7075b5ca12bd7ac11197b1ee91 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 20 Jun 2013 20:37:31 +0200 Subject: [PATCH 13/19] gpsd: Mark the /etc/default/gpsd as a CONFFILE --- recipes-extra/gpsd/gpsd_3.9.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-extra/gpsd/gpsd_3.9.bb b/recipes-extra/gpsd/gpsd_3.9.bb index 50c2c34123..d320f97ec7 100644 --- a/recipes-extra/gpsd/gpsd_3.9.bb +++ b/recipes-extra/gpsd/gpsd_3.9.bb @@ -8,7 +8,7 @@ PROVIDES = "virtual/gpsd" EXTRANATIVEPATH += "chrpath-native" -PR = "r3.7" +PR = "r3.8" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ @@ -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" From 69d9a0609d0a6e1e5f3676e4dddc2116caf1224a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 22 Jun 2013 09:36:02 +0200 Subject: [PATCH 14/19] sysmocom-backup: Backup the /etc/network/interfaces file --- recipes-apps/sysmocom-backup/files/sysmocom-backup | 1 + recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-apps/sysmocom-backup/files/sysmocom-backup b/recipes-apps/sysmocom-backup/files/sysmocom-backup index 1166824478..1473877c18 100755 --- a/recipes-apps/sysmocom-backup/files/sysmocom-backup +++ b/recipes-apps/sysmocom-backup/files/sysmocom-backup @@ -4,6 +4,7 @@ # Make sure to look at sysmocom-restore to check if the file would # be restored right. Currently only some dirs get restored. FILES="\ + etc/network/interfaces \ etc/openvpn etc/osmocom/osmo-bsc-mgcp.cfg \ etc/osmocom/osmo-bsc.cfg \ diff --git a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb index 4ce0b0feb0..d8f8579730 100644 --- a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb +++ b/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 = "r4" SRC_URI = "file://sysmocom-backup file://sysmocom-restore" RDEPENDS_${PN} = "tar" From 03fd342e14381deece0125e94eca9b39d31f9703 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 22 Jun 2013 09:48:01 +0200 Subject: [PATCH 15/19] sysmocom-backup: Backup all of /etc/default Additional applications might store files in /etc/default and it is the easiest to backup up all of them. This has the danger that after an upgrade the default file is not compatible/optimal but we will need to deal with that once it occurs. --- recipes-apps/sysmocom-backup/files/sysmocom-backup | 4 +--- recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-apps/sysmocom-backup/files/sysmocom-backup b/recipes-apps/sysmocom-backup/files/sysmocom-backup index 1473877c18..27a924884a 100755 --- a/recipes-apps/sysmocom-backup/files/sysmocom-backup +++ b/recipes-apps/sysmocom-backup/files/sysmocom-backup @@ -13,9 +13,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/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb index d8f8579730..a9c06524fb 100644 --- a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb +++ b/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 = "r4" +PR = "r5" SRC_URI = "file://sysmocom-backup file://sysmocom-restore" RDEPENDS_${PN} = "tar" From f5d3fba9555584346761d80ef3fd62b654c94d54 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 22 Jun 2013 17:20:57 +0200 Subject: [PATCH 16/19] sysmocom-backup: Save two more files from the etc directory Save the ifplugd.sh script and hostname in the backup as well. I have a usecase where these two files were modified. --- recipes-apps/sysmocom-backup/files/sysmocom-backup | 2 ++ recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-apps/sysmocom-backup/files/sysmocom-backup b/recipes-apps/sysmocom-backup/files/sysmocom-backup index 27a924884a..481f07bf39 100755 --- a/recipes-apps/sysmocom-backup/files/sysmocom-backup +++ b/recipes-apps/sysmocom-backup/files/sysmocom-backup @@ -4,6 +4,8 @@ # 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 \ diff --git a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb b/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb index a9c06524fb..6b0ce5bb59 100644 --- a/recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb +++ b/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 = "r5" +PR = "r7" SRC_URI = "file://sysmocom-backup file://sysmocom-restore" RDEPENDS_${PN} = "tar" From f79726fdcca12929619fbeed8ee3d3ef14933216 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 24 Jun 2013 08:28:02 +0200 Subject: [PATCH 17/19] osmo-bts: Move to a new 0.3.0-next release with EEPROM reading --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index 67231d4c0a..cb22d4b565 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" 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 = "602afee3df4cace9af26931b58afd0ca65103e0d" +SRCREV_osmobts = "f169a75fc41c2474bb0602d5f6b6401213f03633" SRCREV_openbsc = "b0bf1da4c87f1ab3f9367bbeea615dc86d13131c" PV = "0.3.0+git${SRCPV}" PR = "r1.${META_TELEPHONY_OSMO_INC}" From ffce9e7f872c3b9623f6fa4223d583f18d3b993a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 11 Jul 2013 17:05:40 +0200 Subject: [PATCH 18/19] osmo-pcu: Build a 'hack'/tmp branch that exits the PCU after a BTS loss This will make the PCU exit after a BTS is lost. This is because the PCU is not resetting all the state and then BSSGP might not come up properly. --- recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb index 1bb31e8069..444115165a 100644 --- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb +++ b/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" From 57cc5e9c588d4f9f39f5007afdcaf94a830d1401 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 1 Aug 2013 19:45:00 +0200 Subject: [PATCH 19/19] osmo-bts: Update to an experimental version that uses libosmo-abis This is a osmo-bts that will use libosmo-abis for OML and RSL and is based on master. In one way it should improve quality in another it is also testing. --- recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb index cb22d4b565..0e121ad349 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" 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 = "f169a75fc41c2474bb0602d5f6b6401213f03633" -SRCREV_openbsc = "b0bf1da4c87f1ab3f9367bbeea615dc86d13131c" +SRCREV_osmobts = "5eab81d02ae80af9f87d75389707a8ff76414076" +SRCREV_openbsc = "f659992616a910a48d48766986460f6ccd23e971" PV = "0.3.0+git${SRCPV}" PR = "r1.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git"