From 8b61400347f7276fe74b851eb85f3df1270b6ef9 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 14 Jan 2013 20:28:45 +0100 Subject: [PATCH 01/16] task-core-boot: Make sure the 'kernel' package is installed The modules depend on kernel-base (renamed kernel-3.2.35) package, the tasks depend on some modules and nothing needed the kernel package. In OE Core/Poky the machines depend on kernel-modules which will pull the kernel package into the rootfs. We do it by hand using the essential depends and bumping the PR for the task-core-boot. I have verified that on a kernel ugrade task-core-boot will be updated and the kernel package is installed. --- conf/machine/include/sysmobts.inc | 1 + recipes-apps/tasks/task-core-boot.bbappend | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc index 616305acd4..e26e8ceb89 100644 --- a/conf/machine/include/sysmobts.inc +++ b/conf/machine/include/sysmobts.inc @@ -20,6 +20,7 @@ MACHINE_FEATURES = "kernel26 serial" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\ busybox-ifplugd \ watchdog \ + kernel \ kernel-module-davinci-wdt \ kernel-module-dspdl \ kernel-module-dspdl-dm644x \ diff --git a/recipes-apps/tasks/task-core-boot.bbappend b/recipes-apps/tasks/task-core-boot.bbappend index 7e68765b2b..7e058f52f5 100644 --- a/recipes-apps/tasks/task-core-boot.bbappend +++ b/recipes-apps/tasks/task-core-boot.bbappend @@ -1,3 +1,3 @@ -PRINC = "6" +PRINC = "7" RDEPENDS_task-core-boot += "" From 9bf7206ce71067b2f5887ecd3957d0c5df753215 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 15 Jan 2013 13:53:56 +0100 Subject: [PATCH 02/16] Upload the tmp cache as well to allow to re-create the build The git revision counter is local, upload it so one could re-use it on a different system --- sysmocom-upload.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/sysmocom-upload.sh b/sysmocom-upload.sh index 4d63dc3e8d..472948838e 100755 --- a/sysmocom-upload.sh +++ b/sysmocom-upload.sh @@ -3,5 +3,6 @@ rsync --delete -avz tmp/deploy/ipk/ generic@sysmocom-downloads:sysmobts/20120 rsync --delete -avz tmp/deploy/images/ generic@sysmocom-downloads:sysmobts/201208-testing/images rsync --delete -avz tmp/deploy/tools/ generic@sysmocom-downloads:sysmobts/201208-testing/tools rsync --delete -avz tmp/deploy/sdk/ generic@sysmocom-downloads:sysmobts/201208-testing/sdk +rsync --delete -avz tmp/cache/ generic@sysmocom-downloads:sysmobts/201208-testing/cache-state rsync -avz tmp/deploy/sources/ generic@sysmocom-downloads:sysmobts/201208-testing/sources From fd02a175f62968f8ecc4275c590e2d8fce6ac1cf Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 15 Jan 2013 14:10:39 +0100 Subject: [PATCH 03/16] linux-sysmocom: Upgrade the BTS kernel to 3.2.36 --- recipes-bsp/linux/linux-sysmocom_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index f3c0dbad01..c8e22f8459 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -1,7 +1,7 @@ inherit kernel require linux-sysmocom.inc -LINUX_VERSION ?= "3.2.35" +LINUX_VERSION ?= "3.2.36" LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}" # Overrides for the sysmocom bts v1 @@ -10,7 +10,7 @@ BTS_FIRMWARE_NAME_sysmobts-v1 = "sysmobts-v1" # Overrides for the sysmocom bts v2 BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" -SRCREV = "20b5f4f07eb6719e41cc6d25fc2a73d95337421c" +SRCREV = "1db46a2b69e034677802b2c83b7d523b4338769f" PR = "r26" PV = "${LINUX_VERSION}+git${SRCPV}" From b726969f844fa435c44138be9c288e1c59aea072 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 17 Jan 2013 09:23:16 +0100 Subject: [PATCH 04/16] linux-sysmocom: Disable the debug message of the DSPDL loading code --- recipes-bsp/linux/linux-sysmocom_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index c8e22f8459..c9b43ab6a8 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 = "1db46a2b69e034677802b2c83b7d523b4338769f" -PR = "r26" +PR = "r27" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \ @@ -44,7 +44,7 @@ module_autoload_msgqueue = "msgqueue" module_autoload_rtfifo = "rtfifo" # module configs (alphabetically sorted) -module_conf_dspdl_dm644x = "options dspdl_dm644x fw_name=${BTS_FIRMWARE_NAME}.out debug=1" +module_conf_dspdl_dm644x = "options dspdl_dm644x fw_name=${BTS_FIRMWARE_NAME}.out debug=0" module_conf_fpgadl_par = "options fpgadl_par fw_name=${BTS_FIRMWARE_NAME}.bit" module_conf_msgqueue = "options msgqueue fw_name=${BTS_FIRMWARE_NAME}.out" module_conf_rtfifo = "options rtfifo fw_name=${BTS_FIRMWARE_NAME}.out" 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 05/16] 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 267d7a4dabcc87aa12bc54551ffae6dca50b7d7c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 29 Jan 2013 15:16:35 +0100 Subject: [PATCH 06/16] sysmocom-upload.sh: Make sure that not the wrong dir is synced --- sysmocom-upload.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sysmocom-upload.sh b/sysmocom-upload.sh index 472948838e..62a62ee3cb 100755 --- a/sysmocom-upload.sh +++ b/sysmocom-upload.sh @@ -1,4 +1,10 @@ #!/bin/sh + +if [ `pwd` != '/home/vagrant/generic-poky/build' ]; then + echo "Must be called from the sysmoBTS build directory" + exit 0 +fi + rsync --delete -avz tmp/deploy/ipk/ generic@sysmocom-downloads:sysmobts/201208-testing/ipk rsync --delete -avz tmp/deploy/images/ generic@sysmocom-downloads:sysmobts/201208-testing/images rsync --delete -avz tmp/deploy/tools/ generic@sysmocom-downloads:sysmobts/201208-testing/tools From cd37803dab43d521ccb2669c28fb686c30331a14 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 29 Jan 2013 15:20:07 +0100 Subject: [PATCH 07/16] sysmocom-upload-bsc.sh: Add script for uploading a test build --- sysmocom-upload-bsc.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 sysmocom-upload-bsc.sh diff --git a/sysmocom-upload-bsc.sh b/sysmocom-upload-bsc.sh new file mode 100755 index 0000000000..21ad370311 --- /dev/null +++ b/sysmocom-upload-bsc.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ `pwd` != '/home/vagrant/generic-poky/build.sysmobsc' ]; then + echo "Must be called from the sysmoBSC build directory" + exit 0 +fi + +rsync --delete -avz tmp/deploy/ipk/ generic@sysmocom-downloads:sysmobsc/201208-testing/ipk +rsync --delete -avz tmp/deploy/images/ generic@sysmocom-downloads:sysmobsc/201208-testing/images +rsync --delete -avz tmp/deploy/tools/ generic@sysmocom-downloads:sysmobsc/201208-testing/tools +rsync --delete -avz tmp/deploy/sdk/ generic@sysmocom-downloads:sysmobsc/201208-testing/sdk +rsync --delete -avz tmp/cache/ generic@sysmocom-downloads:sysmobsc/201208-testing/cache-state +rsync -avz tmp/deploy/sources/ generic@sysmocom-downloads:sysmobsc/201208-testing/sources + From 557e1b47baeefe01d261092222dadfb67e6d3c56 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 29 Jan 2013 15:25:42 +0100 Subject: [PATCH 08/16] femtobts-api: ensure SRCREV is set on non-sysmobts machines. COMPATIBLE_MACHINE didn't work, unfortunately. --- recipes-sysmobts/femtobts-api/femtobts-api_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb index a5686efcb1..bf948bdf58 100644 --- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb +++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb @@ -3,6 +3,7 @@ SECTION = "kernel" LICENSE = "CLOSED" SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master" +SRCREV = "superfemto_v3.0.1pre" SRCREV_sysmobts-v2 = "superfemto_v3.0.1pre" SRCREV_sysmobts-v1 = "femtobts_v2.7" PV = "${SRCREV}+git${SRCPV}" From 4aad63620b77a150fa3580a9e696d5b99cd543f5 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 29 Jan 2013 19:54:07 +0100 Subject: [PATCH 09/16] 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 d0d30fee996328e4c43bc9cb2f0b04faec0c2e1b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 6 Feb 2013 15:35:17 +0100 Subject: [PATCH 10/16] sysmobts-firmware_v2.7: Fix build on sysmobts_v1 --- recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb b/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb index fc2324ccd4..809f03d56b 100644 --- a/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb +++ b/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb @@ -4,7 +4,7 @@ PR = "r2.${INC_PR}" require ${PN}.inc -do_install_sysmobts() { +do_install() { install -d ${D}/lib/firmware/ install -m 0666 ${S}/Firmware/Dsp/femtobts.out ${D}/lib/firmware/sysmobts-v1.out 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 11/16] 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 12/16] 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 489f392cc63daf1487f4480ebc96a46652766db4 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 7 Feb 2013 15:42:53 +0100 Subject: [PATCH 13/16] update udhcp.conf to add router/subnet/broadcast ... otherwise busybox-udhcpc is not happy with it --- .../sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf | 3 +++ .../sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb | 1 + 2 files changed, 4 insertions(+) diff --git a/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf b/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf index 798f1ae67f..723ad1f2bb 100644 --- a/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf +++ b/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf @@ -3,3 +3,6 @@ end 10.23.24.254 interface eth1 +option subnet 10.23.24.0 +option router 10.23.24.1 +option broadcast 10.23.24.255 diff --git a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb index edf0f19a61..e0e1047986 100644 --- a/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb +++ b/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://udhcpd.conf" +PR = "r2" CONFFILES_${PN} = "${sysconfdir}/udhcpd.conf" From 0925b23f069d7d5786a36f90d81d2fbf3f34a20e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 9 Feb 2013 12:20:01 +0100 Subject: [PATCH 14/16] 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 bcf77644586e3d411fcae8053a3c8403013c93f1 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 9 Feb 2013 13:30:42 +0100 Subject: [PATCH 15/16] update osmo-bts for the "rtp bind-ip" related fixes --- 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 aa7a7293fa..21715aae72 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -4,10 +4,10 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \ git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" -SRCREV_osmobts = "24b2128e2975f14f9941caa156890480005df81e" +SRCREV_osmobts = "98407bd457b88c1a26de2a9955de3de9846e4f68" SRCREV_openbsc = "f2621e506de5fdbe7d800c4b1a9e764d7c9cdeef" PV = "0.1.0+git${SRCPV}" -PR = "r6.${META_TELEPHONY_OSMO_INC}" +PR = "r7.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts" From cf29168330626bd17a9cc0888149cfb3ad52fb0e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 9 Feb 2013 14:19:12 +0100 Subject: [PATCH 16/16] update osmo-bts for further ortp fixes --- 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 21715aae72..6efe7fb092 100644 --- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb +++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb @@ -4,10 +4,10 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \ git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc" -SRCREV_osmobts = "98407bd457b88c1a26de2a9955de3de9846e4f68" +SRCREV_osmobts = "18708dd3b60fa27e6a7121b686f11ee8c8069a4b" SRCREV_openbsc = "f2621e506de5fdbe7d800c4b1a9e764d7c9cdeef" PV = "0.1.0+git${SRCPV}" -PR = "r7.${META_TELEPHONY_OSMO_INC}" +PR = "r8.${META_TELEPHONY_OSMO_INC}" S = "${WORKDIR}/git" SRCREV_FORMAT = "openbsc-rosmobts"