From c71b4ead632741b9d692e4e283ff9e9b9de4ca10 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Wed, 13 Mar 2013 12:47:14 +0100
Subject: [PATCH 01/44] osmo-bts: Update to current git master

This will include
* Fix of CHAN_NR IEI in common channel RSL messages generated by BTS
* zecke/request_queueing
* Improve shutdown of DSP on exit
* various calib updates
* GSMTAP: use RxLevel and RxQual
* DSP power control bypass on ul_power_target==0
* Add radio link timeout procedure
---
 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 6efe7fb092..a9f0f66f39 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=master;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "18708dd3b60fa27e6a7121b686f11ee8c8069a4b"
-SRCREV_openbsc = "f2621e506de5fdbe7d800c4b1a9e764d7c9cdeef"
+SRCREV_osmobts = "f0bdc1e5629778500fa06bde08bb90cb7b8c11cb"
+SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a"
 PV = "0.1.0+git${SRCPV}"
 PR = "r8.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"

From b67bed4d3a6a85c49176f61fd4de3ebf61ced846 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Wed, 13 Mar 2013 13:48:43 +0100
Subject: [PATCH 02/44] Add recipes for firmware v3.2 and v3.3

---
 .../firmware/sysmobts-firmware_3.2.bb         | 19 +++++++++++++++++++
 .../firmware/sysmobts-firmware_3.3.bb         | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
 create mode 100644 recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb

diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
new file mode 100644
index 0000000000..504a3f4f7b
--- /dev/null
+++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
@@ -0,0 +1,19 @@
+COMPATIBLE_MACHINE = "sysmobts-v2"
+FIRMWARE-VERSION = "superfemto_v${PV}"
+PR = "r7.${INC_PR}"
+
+require ${PN}.inc
+
+# Currently there is no common Firmware for RevC and RevD Hardware and we
+# need to handle this differently for now.
+
+
+
+do_install() {
+	install -d ${D}/lib/firmware/
+
+	install -m 0666 ${S}/Image/Dsp/superfemto.out ${D}/lib/firmware/sysmobts-v2.out
+	install -m 0666 ${S}/Image/Fpga/superfemto.bit ${D}/lib/firmware/sysmobts-v2.bit
+}
+
+FILES_${PN} = "/lib/firmware/sysmobts-v2*"
diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb
new file mode 100644
index 0000000000..504a3f4f7b
--- /dev/null
+++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb
@@ -0,0 +1,19 @@
+COMPATIBLE_MACHINE = "sysmobts-v2"
+FIRMWARE-VERSION = "superfemto_v${PV}"
+PR = "r7.${INC_PR}"
+
+require ${PN}.inc
+
+# Currently there is no common Firmware for RevC and RevD Hardware and we
+# need to handle this differently for now.
+
+
+
+do_install() {
+	install -d ${D}/lib/firmware/
+
+	install -m 0666 ${S}/Image/Dsp/superfemto.out ${D}/lib/firmware/sysmobts-v2.out
+	install -m 0666 ${S}/Image/Fpga/superfemto.bit ${D}/lib/firmware/sysmobts-v2.bit
+}
+
+FILES_${PN} = "/lib/firmware/sysmobts-v2*"

From b6780a58267f40a9c9d37ed1916e8fcbee1cde8d Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 14 Mar 2013 14:03:40 +0100
Subject: [PATCH 03/44] sysmobts-firmware: Remove comment about both versions
 being installed

As of issue #48 we do not separate firmware for revc and revd. Remove
the comment about both versions being installed in parallel.
---
 recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb | 5 -----
 recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
index 504a3f4f7b..c011570a98 100644
--- a/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
+++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.2.bb
@@ -4,11 +4,6 @@ PR = "r7.${INC_PR}"
 
 require ${PN}.inc
 
-# Currently there is no common Firmware for RevC and RevD Hardware and we
-# need to handle this differently for now.
-
-
-
 do_install() {
 	install -d ${D}/lib/firmware/
 
diff --git a/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb b/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb
index 504a3f4f7b..c011570a98 100644
--- a/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb
+++ b/recipes-sysmobts/firmware/sysmobts-firmware_3.3.bb
@@ -4,11 +4,6 @@ PR = "r7.${INC_PR}"
 
 require ${PN}.inc
 
-# Currently there is no common Firmware for RevC and RevD Hardware and we
-# need to handle this differently for now.
-
-
-
 do_install() {
 	install -d ${D}/lib/firmware/
 

From 85a4948d4bb33d9815437f69724a7751d1e1c920 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Thu, 14 Mar 2013 21:15:50 +0100
Subject: [PATCH 04/44] add sysmobts-v2 specific GPSD config file

FIXME: this will actually assume a GPS that is indirectly attached
to a GSM Modem which will be handled by openmoko-gsmd and forwarded via
UDP.  However, we might have a GPS receiver attached directly to the
GPS UART in other hardware versions!
---
 recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default | 5 +++++
 recipes-extra/gpsd/gpsd_3.7.bb                   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default

diff --git a/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default b/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default
new file mode 100644
index 0000000000..e37c3b56dd
--- /dev/null
+++ b/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd.default
@@ -0,0 +1,5 @@
+# If you must specify a non-NMEA driver, uncomment and modify the next line
+GPSD_SOCKET="/var/run/gpsd.sock"
+GPSD_OPTIONS="" 
+GPS_DEVICES="udp://127.0.0.1:12345 udp://127.0.0.1:12346"
+
diff --git a/recipes-extra/gpsd/gpsd_3.7.bb b/recipes-extra/gpsd/gpsd_3.7.bb
index 460dc886bf..a2e7c9e8b7 100644
--- a/recipes-extra/gpsd/gpsd_3.7.bb
+++ b/recipes-extra/gpsd/gpsd_3.7.bb
@@ -8,7 +8,7 @@ PROVIDES = "virtual/gpsd"
 
 EXTRANATIVEPATH += "chrpath-native"
 
-PR = "r3.4"
+PR = "r3.5"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \

From 8d7bfd23e9b85f029dc85e5d6fbbcc18e7216531 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Thu, 14 Mar 2013 22:56:05 +0100
Subject: [PATCH 05/44] ggsn.conf update: use 127.0.0.2 on sysmobts-v2

---
 recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf b/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf
index 138e7af738..024270233e 100644
--- a/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf
+++ b/recipes-config/openggsn-config/files/sysmobts-v2/ggsn.conf
@@ -33,7 +33,7 @@
 # TAG: listen
 # Specifies the local IP address to listen to
 #listen 10.0.0.240
-listen 10.23.123.1
+listen 127.0.0.2
 
 # TAG: net
 # IP network address of external packet data network

From cbb7200e61db1c6158dc6ae1f6e6a4247375fce6 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 15 Mar 2013 11:52:47 +0100
Subject: [PATCH 06/44] Add UUCP recipe

---
 recipes-extra/uucp/files/policy.patch | 85 +++++++++++++++++++++++++++
 recipes-extra/uucp/uucp_1.07.bb       | 26 ++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 recipes-extra/uucp/files/policy.patch
 create mode 100644 recipes-extra/uucp/uucp_1.07.bb

diff --git a/recipes-extra/uucp/files/policy.patch b/recipes-extra/uucp/files/policy.patch
new file mode 100644
index 0000000000..26f1f172b8
--- /dev/null
+++ b/recipes-extra/uucp/files/policy.patch
@@ -0,0 +1,85 @@
+Index: uucp-1.07/policy.h
+===================================================================
+--- uucp-1.07.orig/policy.h	2003-05-29 06:08:45.000000000 +0000
++++ uucp-1.07/policy.h	2007-03-09 00:51:55.000000000 +0000
+@@ -240,7 +240,7 @@
+    the sendmail choice below.  Otherwise, select one of the other
+    choices as appropriate.  */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
++#define MAIL_PROGRAM "/usr/sbin/sendmail -oi -t"
+ /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
+ #define MAIL_PROGRAM_TO_BODY 1
+ #define MAIL_PROGRAM_SUBJECT_BODY 1
+@@ -302,7 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
++#define LOCKDIR "/var/lock"
+ 
+ /* You must also specify the format of the lock files by setting
+    exactly one of the following macros to 1.  Check an existing lock
+@@ -349,7 +349,7 @@
+    The format for QNX lock files was made up just for Taylor UUCP.
+    QNX doesn't come with a version of UUCP.  */
+ #define HAVE_V2_LOCKFILES 0
+-#define HAVE_HDB_LOCKFILES 0
++#define HAVE_HDB_LOCKFILES 1
+ #define HAVE_SCO_LOCKFILES 0
+ #define HAVE_SVR4_LOCKFILES 0
+ #define HAVE_SEQUENT_LOCKFILES 0
+@@ -466,8 +466,8 @@
+    When looking something up (a system, a port, etc.) the new style
+    configuration files will be read first, followed by the V2
+    configuration files, followed by the HDB configuration files.  */
+-#define HAVE_V2_CONFIG 0
+-#define HAVE_HDB_CONFIG 0
++#define HAVE_V2_CONFIG 1
++#define HAVE_HDB_CONFIG 1
+ 
+ /* Exactly one of the following macros must be set to 1.  The exact
+    format of the spool directories is explained in unix/spool.c.
+@@ -572,7 +572,7 @@
+ /* The name of the default spool directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``spool'' command in the
+    configuration file.  */
+-#define SPOOLDIR "/usr/spool/uucp"
++#define SPOOLDIR "/var/spool/uucp"
+ /* #define SPOOLDIR "/var/spool/uucp" */
+ 
+ /* The name of the default public directory.  If HAVE_TAYLOR_CONFIG is
+@@ -580,7 +580,7 @@
+    configuration file.  Also, a particular system may be given a
+    specific public directory by using the ``pubdir'' command in the
+    system file.  */
+-#define PUBDIR "/usr/spool/uucppublic"
++#define PUBDIR "/var/spool/uucppublic"
+ /* #define PUBDIR "/var/spool/uucppublic" */
+ 
+ /* The default command path.  This is a space separated list of
+@@ -644,21 +644,21 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/Log"
++#define LOGFILE "/var/spool/uucp/Log"
+ /* #define LOGFILE "/var/spool/uucp/Log" */
+ /* #define LOGFILE "/var/log/uucp/Log" */
+ 
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``statfile'' command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/Stats"
++#define STATFILE "/var/spool/uucp/Stats"
+ /* #define STATFILE "/var/spool/uucp/Stats" */
+ /* #define STATFILE "/var/log/uucp/Stats" */
+ 
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``debugfile'' command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
++#define DEBUGFILE "/var/spool/uucp/Debug"
+ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
+ /* #define DEBUGFILE "/var/log/uucp/Debug" */
+ 
diff --git a/recipes-extra/uucp/uucp_1.07.bb b/recipes-extra/uucp/uucp_1.07.bb
new file mode 100644
index 0000000000..44ea402c25
--- /dev/null
+++ b/recipes-extra/uucp/uucp_1.07.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "UUCP is used to transfer mail, news and random files between systems which are not connected by more modern networks. The communication can be made via modems, direct (hard-wired) serial connections or via an IP connection."
+HOMEPAGE = "http://www.airs.com/ian/uucp.html"
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r2"
+
+inherit autotools
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz \
+           file://policy.patch"
+
+do_configure() {
+	libtoolize --force
+	oe_runconf
+}
+
+do_install_append() {
+    fakeroot install -d -g uucp -o uucp ${D}/var/spool/uucp
+}
+
+PACKAGES =+ "cu"
+FILES_cu = "${bindir}/cu /var/spool"
+
+SRC_URI[md5sum] = "64c54d43787339a7cced48390eb3e1d0"
+SRC_URI[sha256sum] = "060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c"

From 209d4ec0be0479b0664be9d2418b56f76d38e574 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 15 Mar 2013 13:02:06 +0100
Subject: [PATCH 07/44] uucp: make sure /etc/uucp is the config path, not
 /usr/conf/uucp

---
 recipes-extra/uucp/uucp_1.07.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-extra/uucp/uucp_1.07.bb b/recipes-extra/uucp/uucp_1.07.bb
index 44ea402c25..dc4471d4c7 100644
--- a/recipes-extra/uucp/uucp_1.07.bb
+++ b/recipes-extra/uucp/uucp_1.07.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.airs.com/ian/uucp.html"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 
@@ -15,6 +15,8 @@ do_configure() {
 	oe_runconf
 }
 
+EXTRA_OECONF = "--with-newconfigdir=/etc/uucp"
+
 do_install_append() {
     fakeroot install -d -g uucp -o uucp ${D}/var/spool/uucp
 }

From 0f3ea35f1752507ab662b2e9156713ce4468af32 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 16 Mar 2013 09:12:56 +0100
Subject: [PATCH 08/44] gpsd: Make sure the chrpath-native is built before
 packaging gpsd

---
 recipes-extra/gpsd/gpsd_3.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extra/gpsd/gpsd_3.7.bb b/recipes-extra/gpsd/gpsd_3.7.bb
index a2e7c9e8b7..18314c90f9 100644
--- a/recipes-extra/gpsd/gpsd_3.7.bb
+++ b/recipes-extra/gpsd/gpsd_3.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "ncurses"
+DEPENDS = "ncurses chrpath-native"
 #DEPENDS = "ncurses libusb1 python"
 PROVIDES = "virtual/gpsd"
 

From aea5136f301bb5984fdbdb74c17f5abb1bc68f43 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 16 Mar 2013 18:00:48 +0100
Subject: [PATCH 09/44] gpsd: Make the stop work with the busybox
 start-stop-daemon

The stop command did not stop the GPSD. Let the start-stop-daemon
command stop the command based only on the PID.
---
 recipes-extra/gpsd/gpsd/gpsd   | 2 +-
 recipes-extra/gpsd/gpsd_3.7.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-extra/gpsd/gpsd/gpsd b/recipes-extra/gpsd/gpsd/gpsd
index ba73dafb2c..d4ec051da0 100755
--- a/recipes-extra/gpsd/gpsd/gpsd
+++ b/recipes-extra/gpsd/gpsd/gpsd
@@ -70,7 +70,7 @@ do_stop()
 	#   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
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.
diff --git a/recipes-extra/gpsd/gpsd_3.7.bb b/recipes-extra/gpsd/gpsd_3.7.bb
index 18314c90f9..0f5307c61c 100644
--- a/recipes-extra/gpsd/gpsd_3.7.bb
+++ b/recipes-extra/gpsd/gpsd_3.7.bb
@@ -8,7 +8,7 @@ PROVIDES = "virtual/gpsd"
 
 EXTRANATIVEPATH += "chrpath-native"
 
-PR = "r3.5"
+PR = "r3.6"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \

From de0f9b5f3df0153bba420a3beaf4c30dcd1993c3 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 16 Mar 2013 18:24:41 +0100
Subject: [PATCH 10/44] uucp: We are forced to chown this after the
 installation

We could use "fakeroot do_install() {}" but this will still not
make the spool directory be owned by uucp. Use a postinst script
to make this up. The logic is copied from the cronie bitbake file
and we will see how this works at image creation time.
---
 recipes-extra/uucp/uucp_1.07.bb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/recipes-extra/uucp/uucp_1.07.bb b/recipes-extra/uucp/uucp_1.07.bb
index dc4471d4c7..4221833270 100644
--- a/recipes-extra/uucp/uucp_1.07.bb
+++ b/recipes-extra/uucp/uucp_1.07.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.airs.com/ian/uucp.html"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r3"
+PR = "r3.4"
 
 inherit autotools
 
@@ -18,7 +18,16 @@ do_configure() {
 EXTRA_OECONF = "--with-newconfigdir=/etc/uucp"
 
 do_install_append() {
-    fakeroot install -d -g uucp -o uucp ${D}/var/spool/uucp
+    install -d ${D}/var/spool/uucp
+}
+
+pkg_postinst_${PN} () {
+	if [ "x$D" != "x" ] ; then
+		exit 1
+	fi
+
+	chown uucp:uucp /var/spool/uucp
+	chmod 770 /var/spool/uucp
 }
 
 PACKAGES =+ "cu"

From 99a6840eb4cd149bf096679c66ffb7a322224460 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 16 Mar 2013 19:19:36 +0100
Subject: [PATCH 11/44] osmo-bts: Upgrade for change in respawn scripts and
 misc fixes

* Fix the link timeout handling as found in post-review.
* Fix the set bts attr parsing due a funny parsing error.
* Sleep 10 seconds after the execution, reload DSP and FPGA firmware
---
 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 a9f0f66f39..d7e1b59fda 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=master;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "f0bdc1e5629778500fa06bde08bb90cb7b8c11cb"
+SRCREV_osmobts = "e45fc8635926f70b0e19d5214f1f8b8fd06068aa"
 SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a"
 PV = "0.1.0+git${SRCPV}"
 PR = "r8.${META_TELEPHONY_OSMO_INC}"

From 41a683d627f4eb3a205a18c4473617ab6dc03a78 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 16 Mar 2013 20:25:45 +0100
Subject: [PATCH 12/44] linux-sysmocom: Upgrade to 3.2.40 and add two more
 UARTS

The kernel has been rebased to target 3.2.40 with various bug
fixes in the upstream work. The sysmobts v2 config has been
changed to allocate space for two more UARTs. These are required
for the multi-trx configuration and they make a warning go away.
---
 recipes-bsp/linux/files/sysmobts-v2/defconfig | 4 ++--
 recipes-bsp/linux/linux-sysmocom_git.bb       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/linux/files/sysmobts-v2/defconfig b/recipes-bsp/linux/files/sysmobts-v2/defconfig
index 4ca8232052..f4615992cc 100644
--- a/recipes-bsp/linux/files/sysmobts-v2/defconfig
+++ b/recipes-bsp/linux/files/sysmobts-v2/defconfig
@@ -1055,8 +1055,8 @@ CONFIG_DEVKMEM=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=3
-CONFIG_SERIAL_8250_RUNTIME_UARTS=3
+CONFIG_SERIAL_8250_NR_UARTS=5
+CONFIG_SERIAL_8250_RUNTIME_UARTS=5
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index c9b43ab6a8..407c9b0b85 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.36"
+LINUX_VERSION ?= "3.2.40"
 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 = "1db46a2b69e034677802b2c83b7d523b4338769f"
+SRCREV = "996c4d772886fa81ffa5d2d971ef88e6da41e115"
 
 PR = "r27"
 PV = "${LINUX_VERSION}+git${SRCPV}"

From 22573382674f3f036466dad5ff5cf03db0d66c2c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 16 Mar 2013 23:35:08 +0100
Subject: [PATCH 13/44] osmo-bts: Update once more for sysvinit related scripts

* The /etc/init.d/sysmobts stop target is now working. It will
  terminate the screen, the run loop, the sysmobts and osmo-pcu.
---
 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 d7e1b59fda..eb7aea5ed3 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=master;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "e45fc8635926f70b0e19d5214f1f8b8fd06068aa"
+SRCREV_osmobts = "4ad8d4d3c0e46fa50fe421c6957db1ea4b048b62"
 SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a"
 PV = "0.1.0+git${SRCPV}"
 PR = "r8.${META_TELEPHONY_OSMO_INC}"

From b7f2cddc233074bcaeaeead5d44685cc1704fdff Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 17 Mar 2013 13:43:59 +0100
Subject: [PATCH 14/44] busybox: Copy the new OE-core syslog startup for the
 loglevel handling

We want to only log a given loglevel, backport the start up script
from OE-Core to get the LOGLEVEL variable. This removes the MARKINT
and adds DROPDUPLICATES and LOGLEVEL.
---
 recipes-apps/busybox/busybox_sysmocom.inc |  2 +-
 recipes-apps/busybox/files/syslog         | 77 +++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 recipes-apps/busybox/files/syslog

diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc
index 4f0c2aa2d6..a7671b9881 100644
--- a/recipes-apps/busybox/busybox_sysmocom.inc
+++ b/recipes-apps/busybox/busybox_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
-PRINC = "7"
+PRINC = "10"
 
 SRC_URI += "file://busybox-ifplugd.sh \
             file://ifplugd.sh"
diff --git a/recipes-apps/busybox/files/syslog b/recipes-apps/busybox/files/syslog
new file mode 100644
index 0000000000..88397e2a96
--- /dev/null
+++ b/recipes-apps/busybox/files/syslog
@@ -0,0 +1,77 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             sysklogd
+# Required-Start:       $remote_fs $time
+# Required-Stop:        $remote_fs $time
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    System logger
+### END INIT INFO
+
+set -e
+
+if [ -f /etc/syslog.conf ]; then
+	. /etc/syslog.conf
+	LOG_LOCAL=0
+	LOG_REMOTE=0
+	for D in $DESTINATION; do
+		if [ "$D" = "buffer" ]; then
+			SYSLOG_ARGS="$SYSLOG_ARGS -C$BUFFERSIZE"
+			LOG_LOCAL=1
+		elif [ "$D" = "file" ]; then
+			if [ -n "$LOGFILE" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -O $LOGFILE"
+			fi
+			if [ -n "$ROTATESIZE" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -s $ROTATESIZE"
+			fi
+			if [ -n "$ROTATEGENS" ]; then
+				SYSLOG_ARGS="$SYSLOG_ARGS -b $ROTATEGENS"
+			fi
+			LOCAL=0
+		elif [ "$D" = "remote" ]; then
+			SYSLOG_ARGS="$SYSLOG_ARGS -R $REMOTE"
+			LOG_REMOTE=1
+		fi
+	done
+	if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then
+		SYSLOG_ARGS="$SYSLOG_ARGS -L"
+	fi
+	if [ "$REDUCE" = "yes" ]; then
+		SYSLOG_ARGS="$SYSLOG_ARGS -S"
+	fi
+	if [ "$DROPDUPLICATES" = "yes" ]; then
+	    SYSLOG_ARGS="$SYSLOG_ARGS -D"
+	fi
+	if [ -n "$LOGLEVEL" ]; then
+	    SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL"
+	fi
+else
+	# default: log to 16K shm circular buffer
+	SYSLOG_ARGS="-C"
+fi
+
+case "$1" in
+  start)
+	echo -n "Starting syslogd/klogd: "
+	start-stop-daemon -S -b -n syslogd -a /sbin/syslogd -- -n $SYSLOG_ARGS
+	start-stop-daemon -S -b -n klogd -a /sbin/klogd -- -n
+	echo "done"
+	;;
+  stop)
+	echo -n "Stopping syslogd/klogd: "
+	start-stop-daemon -K -n syslogd
+	start-stop-daemon -K -n klogd
+	echo "done"
+	;;
+  restart)
+  	$0 stop
+	$0 start
+	;;
+  *)
+	echo "Usage: syslog { start | stop | restart }" >&2
+	exit 1
+	;;
+esac
+
+exit 0

From 7389f6f2b1401821580f31bbbfe055d89b3ff8af Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 17 Mar 2013 14:16:59 +0100
Subject: [PATCH 15/44] busybox-ifplugd: Disable the restart target as it is
 not working

This issue is documented in PRJ#72. The easiest is to to keep the
old software running as everything else is racy and start-stop-daemon
does not appear to implement the --retry command. Let's see how
far we get with this workaround.
---
 recipes-apps/busybox/busybox_sysmocom.inc     | 2 +-
 recipes-apps/busybox/files/busybox-ifplugd.sh | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc
index a7671b9881..cc2a48953c 100644
--- a/recipes-apps/busybox/busybox_sysmocom.inc
+++ b/recipes-apps/busybox/busybox_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
-PRINC = "10"
+PRINC = "11"
 
 SRC_URI += "file://busybox-ifplugd.sh \
             file://ifplugd.sh"
diff --git a/recipes-apps/busybox/files/busybox-ifplugd.sh b/recipes-apps/busybox/files/busybox-ifplugd.sh
index c66847f1ba..d8c0bb8530 100644
--- a/recipes-apps/busybox/files/busybox-ifplugd.sh
+++ b/recipes-apps/busybox/files/busybox-ifplugd.sh
@@ -20,10 +20,7 @@ case "$1" in
 	echo "done."
 	;;
     restart)
-        echo "restarting $DESC: $NAME... "
- 	$0 stop
-	$0 start
-	echo "done."
+        echo "Not restarting $DESC: $NAME... "
 	;;
     reload)
     	echo -n "reloading $DESC: $NAME... "

From 87f47c8586b4afd0e74c7c39b9154f010d9369e3 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 17 Mar 2013 15:09:44 +0100
Subject: [PATCH 16/44] busybox-syslog: Log to the MMC card if present

If the first partition of a MMC card is mounted and has a logs/
directory syslog will start to write log messages to the MMC card
in the directory /media/mmcblk0p1.
---
 recipes-apps/busybox/busybox_sysmocom.inc |  2 +-
 recipes-apps/busybox/files/syslog.conf    | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 recipes-apps/busybox/files/syslog.conf

diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc
index cc2a48953c..97e97104e9 100644
--- a/recipes-apps/busybox/busybox_sysmocom.inc
+++ b/recipes-apps/busybox/busybox_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
-PRINC = "11"
+PRINC = "12"
 
 SRC_URI += "file://busybox-ifplugd.sh \
             file://ifplugd.sh"
diff --git a/recipes-apps/busybox/files/syslog.conf b/recipes-apps/busybox/files/syslog.conf
new file mode 100644
index 0000000000..4f387a0571
--- /dev/null
+++ b/recipes-apps/busybox/files/syslog.conf
@@ -0,0 +1,22 @@
+DESTINATION="buffer"		# log destinations (buffer file remote)
+MARKINT=20			# intervall between --mark-- entries
+LOGFILE=/var/log/messages	# where to log (file)
+REMOTE=loghost:514		# where to log (syslog remote)
+REDUCE=no			# reduce-size logging
+#ROTATESIZE=0			# rotate log if grown beyond X [kByte] (incompatible with busybox)
+#ROTATEGENS=3			# keep X generations of rotated logs (incompatible with busybox)
+BUFFERSIZE=64			# size of circular buffer [kByte]
+FOREGROUND=no			# run in foreground (don't use!)
+LOGLEVEL=4
+
+# magic when a MMC card is mounted
+USING_MMC_CARD=`/bin/mount | grep /media/mmcblk0p1 | wc -l`
+if [ 1 -eq $USING_MMC_CARD ] ; then
+	if [ -e /media/mmcblk0p1/logs ] ; then
+		echo "Using mmc card"
+		LOGFILE=/media/mmcblk0p1/logs/messages
+		DESTINATION="file"
+		ROTATESIZE=2048
+		ROTATEGENS=20
+	fi
+fi

From 410d086a5a05ba70714a8c16812b0c5c04f4eae2 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 17 Mar 2013 17:19:12 +0100
Subject: [PATCH 17/44] update omso-pcu + osmo-bts to current master

This uses PCU API version 5 including RSSI measurements
---
 recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 6 +++---
 recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index eb7aea5ed3..87d20fe152 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 = "4ad8d4d3c0e46fa50fe421c6957db1ea4b048b62"
+SRCREV_osmobts = "19364a4c912a31be8548a943637ed3dbb9a34829"
 SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a"
-PV = "0.1.0+git${SRCPV}"
-PR = "r8.${META_TELEPHONY_OSMO_INC}"
+PV = "0.2.0+git${SRCPV}"
+PR = "r1.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"
diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index 494f963df6..a4e4e43585 100644
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -3,12 +3,12 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly_merge"
-SRCREV = "9aaf2ae24d544ce149fde7685ca0421d31262a09"
-PV = "0.1+git${SRCPV}"
-PR = "r10.${META_TELEPHONY_OSMO_INC}"
+SRCREV = "81a12be317bb5d2ad13bc27be1b2b1cb1605f4de"
+PV = "0.2+git${SRCPV}"
+PR = "r1.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
-DEPENDS = "libosmocore femtobts-api osmo-bts"
+DEPENDS = "libosmocore femtobts-api osmo-bts >= 0.2.0"
 
 EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts --enable-sysmocom-dsp"
 

From 7cb8c8d1b5f631c0d857a59883dd1bbd41cad63d Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 17 Mar 2013 17:07:52 +0100
Subject: [PATCH 18/44] linux-sysmocom: Always compile MMC support into the
 kernel

Make mounting using mountall work during the first boot by putting
MMC, MMC-block and the TI Davinci into the kernel.
---
 recipes-bsp/linux/files/sysmobts-v2/defconfig | 6 +++---
 recipes-bsp/linux/linux-sysmocom_git.bb       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/linux/files/sysmobts-v2/defconfig b/recipes-bsp/linux/files/sysmobts-v2/defconfig
index f4615992cc..ef95f8905c 100644
--- a/recipes-bsp/linux/files/sysmobts-v2/defconfig
+++ b/recipes-bsp/linux/files/sysmobts-v2/defconfig
@@ -1347,7 +1347,7 @@ CONFIG_DUMMY_CONSOLE=y
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 # CONFIG_MMC_CLKGATE is not set
@@ -1355,7 +1355,7 @@ CONFIG_MMC=m
 #
 # MMC/SD/SDIO Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
@@ -1367,7 +1367,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
-CONFIG_MMC_DAVINCI=m
+CONFIG_MMC_DAVINCI=y
 # CONFIG_MMC_DW is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index 407c9b0b85..6688a1e342 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 = "r27"
+PR = "r28"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \

From 2bae25e4cdccc7c12e6c84f6c09fdaefc5b09680 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 17 Mar 2013 17:35:56 +0100
Subject: [PATCH 19/44] osmo-pcu: make sure to use RDEPENDS to osmo-bts with
 PCU IF v5

As Holger points out, we need a runtime dependency, not build time
---
 recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index a4e4e43585..a407706691 100644
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -5,10 +5,13 @@ LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jolly_merge"
 SRCREV = "81a12be317bb5d2ad13bc27be1b2b1cb1605f4de"
 PV = "0.2+git${SRCPV}"
-PR = "r1.${META_TELEPHONY_OSMO_INC}"
+PR = "r2.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
-DEPENDS = "libosmocore femtobts-api osmo-bts >= 0.2.0"
+DEPENDS = "libosmocore femtobts-api osmo-bts"
+
+# This implements PCU Interface v5 (GPRS RSSI)
+RDEPENDS_${PN} = "osmo-bts >= 0.2.0"
 
 EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts --enable-sysmocom-dsp"
 

From c793b65258187fbcb03bfda81a80809fe6da3257 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 17 Mar 2013 17:42:00 +0100
Subject: [PATCH 20/44] osmo-pcu: Use parenthesis for osmo-bts version in
 RDEPENDS

---
 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 a407706691..1bb31e8069 100644
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git"
 DEPENDS = "libosmocore femtobts-api osmo-bts"
 
 # This implements PCU Interface v5 (GPRS RSSI)
-RDEPENDS_${PN} = "osmo-bts >= 0.2.0"
+RDEPENDS_${PN} = "osmo-bts (>= 0.2.0)"
 
 EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts --enable-sysmocom-dsp"
 

From 1c3982289e55ebc8f79113547de6b451eb8c1bec Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 17 Mar 2013 17:43:45 +0100
Subject: [PATCH 21/44] osmo-bts: fix git revision.

---
 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 87d20fe152..51462a3d87 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=master;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "19364a4c912a31be8548a943637ed3dbb9a34829"
+SRCREV_osmobts = "cdc5a4dc384c91d5102376e08e3f34523e50b028"
 SRCREV_openbsc = "8b29180cad875b396288a22fb252e158fa2a060a"
 PV = "0.2.0+git${SRCPV}"
 PR = "r1.${META_TELEPHONY_OSMO_INC}"

From 84f23b220398acbd46d3dd7c636b35be35344e54 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 17 Mar 2013 19:09:08 +0100
Subject: [PATCH 22/44] syslog: Use /media/mmcblk0p1/log to match /var/log

The nitb configuration expects /media/mmcblk0p1/log and to make it
work and match with unix naming use the singular version.
---
 recipes-apps/busybox/busybox_sysmocom.inc | 2 +-
 recipes-apps/busybox/files/syslog.conf    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc
index 97e97104e9..aa4918557e 100644
--- a/recipes-apps/busybox/busybox_sysmocom.inc
+++ b/recipes-apps/busybox/busybox_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
-PRINC = "12"
+PRINC = "13"
 
 SRC_URI += "file://busybox-ifplugd.sh \
             file://ifplugd.sh"
diff --git a/recipes-apps/busybox/files/syslog.conf b/recipes-apps/busybox/files/syslog.conf
index 4f387a0571..ee5d485974 100644
--- a/recipes-apps/busybox/files/syslog.conf
+++ b/recipes-apps/busybox/files/syslog.conf
@@ -12,9 +12,9 @@ LOGLEVEL=4
 # magic when a MMC card is mounted
 USING_MMC_CARD=`/bin/mount | grep /media/mmcblk0p1 | wc -l`
 if [ 1 -eq $USING_MMC_CARD ] ; then
-	if [ -e /media/mmcblk0p1/logs ] ; then
+	if [ -e /media/mmcblk0p1/log ] ; then
 		echo "Using mmc card"
-		LOGFILE=/media/mmcblk0p1/logs/messages
+		LOGFILE=/media/mmcblk0p1/log/messages
 		DESTINATION="file"
 		ROTATESIZE=2048
 		ROTATEGENS=20

From d9a117ed2176411cb8f371bd3aa4886e14b56328 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 17 Mar 2013 19:46:41 +0100
Subject: [PATCH 23/44] busybox-syslog: Increase back to notice (6) for the
 logging

This sadly still prints the firmware reload messages. But this is
necessary right now. The fpgadl/dspdl drivers do not log fatal
failures so the 'success' is the only information we have. This
is to be fixed in the driver.
---
 recipes-apps/busybox/busybox_sysmocom.inc | 2 +-
 recipes-apps/busybox/files/syslog.conf    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc
index aa4918557e..d331fcf2e7 100644
--- a/recipes-apps/busybox/busybox_sysmocom.inc
+++ b/recipes-apps/busybox/busybox_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
-PRINC = "13"
+PRINC = "14"
 
 SRC_URI += "file://busybox-ifplugd.sh \
             file://ifplugd.sh"
diff --git a/recipes-apps/busybox/files/syslog.conf b/recipes-apps/busybox/files/syslog.conf
index ee5d485974..f3d81fef4f 100644
--- a/recipes-apps/busybox/files/syslog.conf
+++ b/recipes-apps/busybox/files/syslog.conf
@@ -7,7 +7,7 @@ REDUCE=no			# reduce-size logging
 #ROTATEGENS=3			# keep X generations of rotated logs (incompatible with busybox)
 BUFFERSIZE=64			# size of circular buffer [kByte]
 FOREGROUND=no			# run in foreground (don't use!)
-LOGLEVEL=4
+LOGLEVEL=6
 
 # magic when a MMC card is mounted
 USING_MMC_CARD=`/bin/mount | grep /media/mmcblk0p1 | wc -l`

From d01ad496afe3d2289b65cf045ede871e61893d46 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 19 Mar 2013 19:26:35 +0100
Subject: [PATCH 24/44] femtobts-api_git.bb: Do not use symbolic names for the
 SRCREV

The name will be resolved to the hash during parse time. This will
not work when not having access to the internet. Use the sha1 sum
to make offline builds work.
---
 recipes-sysmobts/femtobts-api/femtobts-api_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
index bf948bdf58..ea3ff29822 100644
--- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
+++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
@@ -3,9 +3,9 @@ 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"
+SRCREV = "6eb9bcf22ca5163594d4d0d8ec7dd580d411d1ea"
+SRCREV_sysmobts-v2 = "6eb9bcf22ca5163594d4d0d8ec7dd580d411d1ea"
+SRCREV_sysmobts-v1 = "4dde9443e2aa11868e46a67529cb5ac45462699c"
 PV = "${SRCREV}+git${SRCPV}"
 PR = "r2"
 S = "${WORKDIR}/git"

From 7059d16861cb3031f86e5c811e190f24fc4b4f92 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 18 Mar 2013 19:30:02 +0100
Subject: [PATCH 25/44] task-sdk-host-nativesdk: Remove qemu from the
 depedencies

This is a hack and has the risk of "forgetting" a dependency that
we need. This needs to be re-evaluated for each OE-Core version.
---
 yocto-edison/task-sdk-host-nativesdk.bbappend | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 yocto-edison/task-sdk-host-nativesdk.bbappend

diff --git a/yocto-edison/task-sdk-host-nativesdk.bbappend b/yocto-edison/task-sdk-host-nativesdk.bbappend
new file mode 100644
index 0000000000..850e4b1b3b
--- /dev/null
+++ b/yocto-edison/task-sdk-host-nativesdk.bbappend
@@ -0,0 +1,13 @@
+# There is no point in packing qemu...
+PRINC = "1"
+
+# qemu removed
+RDEPENDS_${PN} = "\
+    pkgconfig-nativesdk \
+    pseudo-nativesdk \
+    unfs-server-nativesdk \
+    opkg-nativesdk \
+    libtool-nativesdk \
+    autoconf-nativesdk \
+    automake-nativesdk \
+    "

From cd0d240314ce165f409ce6c0c092398dcddca642 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 19 Mar 2013 19:48:30 +0100
Subject: [PATCH 26/44] meta-toolchain-sysmobts: Introduce a toolchain target
 for the BTS

Install the sysmobts firmware headers on top of the Osmocom toolchain.
This way the SDK can be used to re-compile both the OpenBSC and the
osmo-bts software.

Make sure the -dev package of the femtobts-api has not runtime
dependencies to a library that does not exist.
---
 recipes-bsp/meta/meta-toolchain-sysmobts.bb       | 9 +++++++++
 recipes-sysmobts/femtobts-api/femtobts-api_git.bb | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 recipes-bsp/meta/meta-toolchain-sysmobts.bb

diff --git a/recipes-bsp/meta/meta-toolchain-sysmobts.bb b/recipes-bsp/meta/meta-toolchain-sysmobts.bb
new file mode 100644
index 0000000000..afddeb2382
--- /dev/null
+++ b/recipes-bsp/meta/meta-toolchain-sysmobts.bb
@@ -0,0 +1,9 @@
+# Depend on the osmocom toolchain
+require recipes-osmocom/meta/meta-toolchain-osmo.bb
+
+# Change the name
+TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-sysmobts-${DISTRO_VERSION}-${DATETIME}"
+
+# Add API headers..
+TOOLCHAIN_TARGET_TASK += "femtobts-api-dev"
+
diff --git a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
index ea3ff29822..d3d6313955 100644
--- a/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
+++ b/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
@@ -7,9 +7,12 @@ SRCREV = "6eb9bcf22ca5163594d4d0d8ec7dd580d411d1ea"
 SRCREV_sysmobts-v2 = "6eb9bcf22ca5163594d4d0d8ec7dd580d411d1ea"
 SRCREV_sysmobts-v1 = "4dde9443e2aa11868e46a67529cb5ac45462699c"
 PV = "${SRCREV}+git${SRCPV}"
-PR = "r2"
+PR = "r3"
 S = "${WORKDIR}/git"
 
+# The API is only a header, nothing to compile
+RDEPENDS_${PN}-dev = ""
+
 
 do_compile() {
 	:

From 8e4991163e676a2f5ff7ea804c3391abc06c5215 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 23 Mar 2013 09:04:12 +0100
Subject: [PATCH 27/44] linux-sysmocom: Enable ext3/ext4 support for
 sysmobts-v1 as well

Some of our target applications require ext3/ext4 support for mounting
an MMC card. While the sysmobts-v1 hardware does not have an external
MMC card slot it is nice to have the same image available for this
hardware.
---
 recipes-bsp/linux/files/sysmobts-v1/defconfig | 18 ++++++++++++++++--
 recipes-bsp/linux/linux-sysmocom_git.bb       |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/linux/files/sysmobts-v1/defconfig b/recipes-bsp/linux/files/sysmobts-v1/defconfig
index 2b310f8a4b..b25fb76d00 100644
--- a/recipes-bsp/linux/files/sysmobts-v1/defconfig
+++ b/recipes-bsp/linux/files/sysmobts-v1/defconfig
@@ -1415,8 +1415,22 @@ CONFIG_IOMMU_SUPPORT=y
 # File systems
 #
 # CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_XATTR=y
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index 6688a1e342..265a774485 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 = "r28"
+PR = "r29"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \

From 661e10551b191b03ee77c26676d276f8611b00ae Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 6 Apr 2013 19:13:18 +0200
Subject: [PATCH 28/44] gpsd: Fix a warning with newer bitbake parsers

RROR: There is a confusing multiline, partially commented expression on line 22 of file /home/ich/firmen/gesmokom/source/meta-sysmocom-bsp/recipes-extra/gpsd/gpsd_3.7.bb (SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98").
---
 recipes-extra/gpsd/gpsd_3.7.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-extra/gpsd/gpsd_3.7.bb b/recipes-extra/gpsd/gpsd_3.7.bb
index 0f5307c61c..c2c17ba8a6 100644
--- a/recipes-extra/gpsd/gpsd_3.7.bb
+++ b/recipes-extra/gpsd/gpsd_3.7.bb
@@ -18,7 +18,6 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://gpsd \
   file://60-gpsd.rules \
 "
-#file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
 SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98"
 SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac"
 

From 40075f51411e28d7b94a451e115ef8db340e3f04 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 7 Feb 2013 13:32:48 +0100
Subject: [PATCH 29/44] misc: Ignore files generated by vi

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..45d62d8696
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.sw?

From 336c4212e5d20bf70a5a7e7d4bbd552c9857139c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 9 Feb 2013 11:04:43 +0100
Subject: [PATCH 30/44] lmsensors-apps: Ask lmsensors to install man pages to
 the right directory

Ask the buildsystem to install the manpages to the mandir. This will avoid
the following warning.

WARNING: QA Issue: lmsensors-apps: Files/directories were installed but not shipped
  /usr/man
---
 recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb b/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
index 7aadb383ab..1dd8081d8d 100644
--- a/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
+++ b/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.lm-sensors.org/"
 DEPENDS = "sysfsutils virtual/libiconv"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r4"
+PR = "r5"
 DEPENDS = "bison-native flex-native"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -15,7 +15,8 @@ SRC_URI[sha256sum] = "bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b
 S = "${WORKDIR}/lm_sensors-${PV}"
 
 EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \
-		MACHINE=${TARGET_ARCH} PREFIX=${prefix} CC="${CC}" AR="${AR}"'
+		MACHINE=${TARGET_ARCH} PREFIX=${prefix} CC="${CC}" AR="${AR}" \
+		MANDIR="${mandir}"'
 
 do_compile() {
 	oe_runmake user PROG_EXTRA=sensors
@@ -23,11 +24,6 @@ do_compile() {
 
 do_install() {
 	oe_runmake user_install DESTDIR=${D}
-
-	# move manuals into proper place
-	install -d ${D}${mandir}
-	rm -rf ${D}${mandir}/*
-	mv ${D}/usr/man/* ${D}${mandir}
 }
 
 PACKAGES =+  "libsensors libsensors-dev libsensors-staticdev libsensors-dbg libsensors-doc"

From 920b27acba09d321cf8fdad61a1ce3d7d682a64e Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Wed, 10 Apr 2013 14:11:41 +0200
Subject: [PATCH 31/44] add new gpsdate recipe

---
 recipes-extra/gpsdate/gpsdate_git.bb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 recipes-extra/gpsdate/gpsdate_git.bb

diff --git a/recipes-extra/gpsdate/gpsdate_git.bb b/recipes-extra/gpsdate/gpsdate_git.bb
new file mode 100644
index 0000000000..20f6fd587b
--- /dev/null
+++ b/recipes-extra/gpsdate/gpsdate_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A utility to set system RTC to GPSD time"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "gpsd"
+RDEPENDS = "libgps"
+
+PR = "r3"
+
+SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
+"
+SRCREV = "4ad6c932c9ad85d555b3a4ba1de4f433e1f39757"
+S = ${WORKDIR}/git
+
+INITSCRIPT_NAME = "gpsdate"
+INITSCRIPT_PARAMS = "defaults 35"
+
+do_install() {
+    install -d ${D}/${sbindir}
+    install -m 0755 ${S}/gpsdate ${D}/${sbindir}/gpsdate
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${S}/gpsdate.init ${D}/${sysconfdir}/init.d/gpsdate
+}

From fcfffacfa8cec8d461384e92eb156b928491c1e2 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Wed, 10 Apr 2013 15:17:43 +0200
Subject: [PATCH 32/44] update gpsdate to git 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 20f6fd587b..c7d52d300f 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 = "libgps"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
 "
-SRCREV = "4ad6c932c9ad85d555b3a4ba1de4f433e1f39757"
+SRCREV = "58e3cdeb19be929c0d18c34734fc1c031698e7f9"
 S = ${WORKDIR}/git
 
 INITSCRIPT_NAME = "gpsdate"

From 8b40a0c2f9bfc37ffcd145f59fb37017700b2f22 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 17 Sep 2012 02:38:58 +0800
Subject: [PATCH 33/44] task-sysmocom-debug: Remove oprofile as it is quite
 outdated

We should use perf for future performance problems but it might
require more work (e.g. not to install the source into the -dbg
package, adding newt, etc.). But oprofile is not very nice to
use right now anyway.
---
 recipes-apps/tasks/task-sysmocom-debug.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-apps/tasks/task-sysmocom-debug.bb b/recipes-apps/tasks/task-sysmocom-debug.bb
index a5d3291074..5612b9ebc3 100644
--- a/recipes-apps/tasks/task-sysmocom-debug.bb
+++ b/recipes-apps/tasks/task-sysmocom-debug.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
-PR = "r2"
+PR = "r3"
 
 RDEPENDS_task-sysmocom-debug = "\
     dropbear \
@@ -13,7 +13,6 @@ RDEPENDS_task-sysmocom-debug = "\
     tcpdump \
     gdb \
     gdbserver \
-    oprofile \
     net-tools \
     "
 

From 5e475b6b990d297e050b5b306ab769eb40f5608e Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 7 Feb 2013 13:02:31 +0100
Subject: [PATCH 34/44] images: Remove the sanity check for including an ext3
 filesystem

This sanity check is included in the used bbclass directly and to
support both Edison and master we will need to remove the custom
python code due a change in indention in the python code.
---
 recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb | 7 -------
 recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb b/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
index 3ab18d558d..4ae1318c69 100644
--- a/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
+++ b/recipes-apps/images/sysmocom-bsc-e1-image-directdisk.bb
@@ -7,13 +7,6 @@ LICENSE = "MIT"
 inherit boot-directdisk
 
 
-do_bootdirectdisk_prepend () {
-	import bb
-	fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-	if 'ext3' not in fstypes:
-		bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-
 ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-e1-image-${MACHINE}.ext3"
 do_bootdirectdisk[depends] += "sysmocom-bsc-e1-image:do_rootfs"
 
diff --git a/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb b/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
index 0ebfa93964..6dc4aea4b5 100644
--- a/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
+++ b/recipes-apps/images/sysmocom-bsc-ip-image-directdisk.bb
@@ -7,13 +7,6 @@ LICENSE = "MIT"
 inherit boot-directdisk
 
 
-do_bootdirectdisk_prepend () {
-	import bb
-	fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
-	if 'ext3' not in fstypes:
-		bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
-}
-
 ROOTFS = "${DEPLOY_DIR_IMAGE}/sysmocom-bsc-ip-image-${MACHINE}.ext3"
 do_bootdirectdisk[depends] += "sysmocom-bsc-ip-image:do_rootfs"
 

From 9c3b75040a81201fcd48b54f0ec70a292cda0087 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 16 Sep 2012 20:40:34 +0800
Subject: [PATCH 35/44] misc: Cleanup the RDEPENDS warning by the latest
 bitbake parser

This is addressing:
Variable RDEPENDS is set as not being package specific, please
fix this.
---
 recipes-config/openggsn-config/gprs-routing_0.1.bb | 3 ++-
 recipes-extra/debootstrap/debootstrap_1.0.42.bb    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes-config/openggsn-config/gprs-routing_0.1.bb b/recipes-config/openggsn-config/gprs-routing_0.1.bb
index c6250b02af..df053bc065 100644
--- a/recipes-config/openggsn-config/gprs-routing_0.1.bb
+++ b/recipes-config/openggsn-config/gprs-routing_0.1.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "OpenGGSN GPRS routing to the real world"
-RDEPENDS = "iptables kernel-module-ipt-masquerade"
+RDEPENDS_${PN} = "iptables kernel-module-ipt-masquerade"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
 SRC_URI = "file://gprs_routing"
 
+PR = "r1"
 
 inherit update-rc.d
 
diff --git a/recipes-extra/debootstrap/debootstrap_1.0.42.bb b/recipes-extra/debootstrap/debootstrap_1.0.42.bb
index 4f524dc586..adb6a51b75 100644
--- a/recipes-extra/debootstrap/debootstrap_1.0.42.bb
+++ b/recipes-extra/debootstrap/debootstrap_1.0.42.bb
@@ -7,8 +7,8 @@ LICENSE="MIT"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz"
-PR = "r5"
-RDEPENDS = "wget gnupg coreutils"
+PR = "r6"
+RDEPENDS_${PN} = "wget gnupg coreutils"
 
 inherit autotools
 

From 96c91eb8d684e9a6aa42ceb0a1532a1d70f0c75b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 16 Sep 2012 18:17:17 +0800
Subject: [PATCH 36/44] watchdog: Bump the pr, depend on the $localfs to fix
 the systemd init

systemd is using the depedencies of the LSB section and according to
the debian documentation all applications accessing /var should depend
on the localfs. This makes the watchdog start properly on systemd systems.
---
 recipes-bsp/watchdog/watchdog/init         | 8 ++++----
 recipes-bsp/watchdog/watchdog_sysmocom.inc | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/watchdog/watchdog/init b/recipes-bsp/watchdog/watchdog/init
index cdc960a6e8..4d75dfe3a3 100644
--- a/recipes-bsp/watchdog/watchdog/init
+++ b/recipes-bsp/watchdog/watchdog/init
@@ -5,8 +5,8 @@
 ### BEGIN INIT INFO
 # Provides:          watchdog
 # Short-Description: Start software watchdog daemon
-# Required-Start:    $all
-# Required-Stop:     $all
+# Required-Start:    $local_fs
+# Required-Stop:
 # Should-Start:      
 # Should-Stop:       
 # Default-Start:     S
@@ -67,8 +67,8 @@ case "$1" in
   force-reload)
     if [ $run_watchdog = 0 ]; then exit 0; fi
     echo "Restarting ${NAME}"
-    stop
-    start
+    $0 stop
+    $0 start
     ;;
 
   *)
diff --git a/recipes-bsp/watchdog/watchdog_sysmocom.inc b/recipes-bsp/watchdog/watchdog_sysmocom.inc
index 1362ddd019..7d09be3bce 100644
--- a/recipes-bsp/watchdog/watchdog_sysmocom.inc
+++ b/recipes-bsp/watchdog/watchdog_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}"
-PRINC = "7"
+PRINC = "8"
 
 inherit update-rc.d
 

From f9d158b7472c0149368c56acc05097df1f611142 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 6 Apr 2013 19:12:48 +0200
Subject: [PATCH 37/44] watchdog: Rename the master version

---
 yocto-master/{watchdog_5.12.bbappend => watchdog_5.13.bbappend} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename yocto-master/{watchdog_5.12.bbappend => watchdog_5.13.bbappend} (100%)

diff --git a/yocto-master/watchdog_5.12.bbappend b/yocto-master/watchdog_5.13.bbappend
similarity index 100%
rename from yocto-master/watchdog_5.12.bbappend
rename to yocto-master/watchdog_5.13.bbappend

From c83652a73a7e43c0e4e3e7e58633e1ad782aed59 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Fri, 10 May 2013 09:55:38 +0200
Subject: [PATCH 38/44] gpsd: Even when disabling python we still need it to be
 available during build

---
 recipes-extra/gpsd/gpsd_3.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extra/gpsd/gpsd_3.7.bb b/recipes-extra/gpsd/gpsd_3.7.bb
index c2c17ba8a6..e833187f68 100644
--- a/recipes-extra/gpsd/gpsd_3.7.bb
+++ b/recipes-extra/gpsd/gpsd_3.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "ncurses chrpath-native"
+DEPENDS = "ncurses chrpath-native python"
 #DEPENDS = "ncurses libusb1 python"
 PROVIDES = "virtual/gpsd"
 

From 1bca046d23f121236560daccccb2f5b36fc317f0 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Fri, 10 May 2013 18:09:39 +0200
Subject: [PATCH 39/44] u-boot: Build a new u-boot with increase system malloc

This should be more than 10MB and should help with the ubifs
recovery needed during boot.
---
 recipes-sysmobts/uboot/u-boot_sysmocom.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-sysmobts/uboot/u-boot_sysmocom.inc b/recipes-sysmobts/uboot/u-boot_sysmocom.inc
index 70e15c8b7f..05ee0300ee 100644
--- a/recipes-sysmobts/uboot/u-boot_sysmocom.inc
+++ b/recipes-sysmobts/uboot/u-boot_sysmocom.inc
@@ -1,5 +1,5 @@
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/u-boot;branch=v2011.12;protocol=git"
-SRCREV = "6633b83bf588ce21558a3bffb9e501479758c28b"
+SRCREV = "f289f5ed90c462f6b8f18ed787e9c27fc142fb6c"
 PV = "v2011.12+git${SRCPV}"
 S = "${WORKDIR}/git"
 

From e89d7ce77d9997a564a02371cab643e6ab5a1245 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 11 May 2013 14:29:19 +0200
Subject: [PATCH 40/44] images_types_sysmo: Add a new bbclass for creating
 different ubi images

For the sysmoBTS we want to include a kernel volume inside the UBI as
a fallback in case the mounting of the main kernel is failing. We still
need to modify the boot command of the bootloader to look at this UBI
and to modify the kernel to include the tun/tap modules so the kernel
will be capable of opening a OpenVPN connection.

Currently one needs to write INHERIT += images_types_sysmo into the
conf/local.conf and add ubi-sysmo to the IMAGE_FSTYPES variable.
---
 classes/images_types_sysmo.bbclass | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 classes/images_types_sysmo.bbclass

diff --git a/classes/images_types_sysmo.bbclass b/classes/images_types_sysmo.bbclass
new file mode 100644
index 0000000000..b46ad2ac3a
--- /dev/null
+++ b/classes/images_types_sysmo.bbclass
@@ -0,0 +1,20 @@
+# I add another image type for the sysmoBTS family
+
+UBI_VOLNAME ?= "${MACHINE}-rootfs"
+
+IMAGE_CMD_ubi-sysmo () {
+	echo \[kernel\] >> ubinize_sysmo.cfg
+	echo mode=ubi >> ubinize_sysmo.cfg
+	echo image=${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin >> ubinize_sysmo.cfg
+	echo vol_id=0 >> ubinize_sysmo.cfg
+	echo vol_type=static >> ubinize_sysmo.cfg
+	echo vol_name=${MACHINE}-backup-kernel >> ubinize_sysmo.cfg
+	echo \[ubifs\] >> ubinize_sysmo.cfg 
+	echo mode=ubi >> ubinize_sysmo.cfg
+	echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs-sysmo >> ubinize_sysmo.cfg 
+	echo vol_id=1 >> ubinize_sysmo.cfg 
+	echo vol_type=dynamic >> ubinize_sysmo.cfg 
+	echo vol_name=${UBI_VOLNAME} >> ubinize_sysmo.cfg 
+	echo vol_flags=autoresize >> ubinize_sysmo.cfg
+	mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs-sysmo ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi-sysmo ${UBINIZE_ARGS} ubinize_sysmo.cfg
+}

From 2761cd97f439f97d1739bd84280a73e818cc2ed4 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 11 May 2013 14:32:20 +0200
Subject: [PATCH 41/44] sysmobts-v2: Allow the rootfs to grow to the full size
 of the flash

The rootfs in the UBI is configured to grow to the full size of the
UBI, currently these are 999 LEBs (when there is no kernel volume)
but we had limited the LEBs the filesystem can hold to 400. After
this change the filesystem will grow from the 42MB to more than 120
MB.

I'm not sure if we really want to have a rootfs of that size but we
can at least experiment with it and see if the failure rate is changing
or not.
---
 conf/machine/sysmobts-v2.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/sysmobts-v2.conf b/conf/machine/sysmobts-v2.conf
index b86a9a1a78..586a44c5b0 100644
--- a/conf/machine/sysmobts-v2.conf
+++ b/conf/machine/sysmobts-v2.conf
@@ -7,7 +7,7 @@ EXTRA_IMAGEDEPENDS = "dvnixload-native ubl u-boot sysmobts-firmware"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 --no-cleanmarkers --pad=0x2000000 -n"
 
 # ubifs config
-MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 400"
+MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 999"
 UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512"
 
 

From 0c799876415af168900469b39b31b6f8e2ccc6c9 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 12 May 2013 12:00:02 +0200
Subject: [PATCH 42/44] gpsdate: Update to current git master (includes init
 script)

---
 recipes-extra/gpsdate/gpsdate_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-extra/gpsdate/gpsdate_git.bb b/recipes-extra/gpsdate/gpsdate_git.bb
index c7d52d300f..39a06dbc7b 100644
--- a/recipes-extra/gpsdate/gpsdate_git.bb
+++ b/recipes-extra/gpsdate/gpsdate_git.bb
@@ -5,16 +5,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "gpsd"
 RDEPENDS = "libgps"
 
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
 "
-SRCREV = "58e3cdeb19be929c0d18c34734fc1c031698e7f9"
+SRCREV = "86320146407ecee208ca03428a7424412f272024"
 S = ${WORKDIR}/git
 
 INITSCRIPT_NAME = "gpsdate"
 INITSCRIPT_PARAMS = "defaults 35"
 
+inherit update-rc.d
+
 do_install() {
     install -d ${D}/${sbindir}
     install -m 0755 ${S}/gpsdate ${D}/${sbindir}/gpsdate

From a144d1c3c02acdf7c29550dc1fa003425357e4eb Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 15 May 2013 12:52:36 +0200
Subject: [PATCH 43/44] tasks-sysmocom-tools: Move wget, ca-cacert-rootcert and
 sysmocom-backup to tools

We have some images that need the real wget for upgrades, the SSL
root certificate of CA-Cert but that doesn't use task-sysmocom to
build the image. Move these utilities into the tools task.
---
 recipes-apps/tasks/task-sysmocom-tools.bb | 5 ++++-
 recipes-apps/tasks/task-sysmocom.bb       | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-apps/tasks/task-sysmocom-tools.bb b/recipes-apps/tasks/task-sysmocom-tools.bb
index 30bbf19f2a..709b5f4ac1 100644
--- a/recipes-apps/tasks/task-sysmocom-tools.bb
+++ b/recipes-apps/tasks/task-sysmocom-tools.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY = "1"
-PR = "r6"
+PR = "r7"
 
 RDEPENDS_task-sysmocom-tools = "\
     lmsensors-scripts \
@@ -12,4 +12,7 @@ RDEPENDS_task-sysmocom-tools = "\
     screen \
     ethtool \
     ntpdate \
+    wget \
+    ca-cacert-rootcert \
+    sysmocom-backup \
     "
diff --git a/recipes-apps/tasks/task-sysmocom.bb b/recipes-apps/tasks/task-sysmocom.bb
index 730f561583..3d784ae06f 100644
--- a/recipes-apps/tasks/task-sysmocom.bb
+++ b/recipes-apps/tasks/task-sysmocom.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
-PR = "r10"
+PR = "r11"
 
 RDEPENDS_task-sysmocom = "\
     task-sysmocom-tools \
@@ -14,8 +14,5 @@ RDEPENDS_task-sysmocom = "\
     osmo-gbproxy \
     osmo-nitb \
     ipaccess-utils \
-    wget \
-    ca-cacert-rootcert \
-    sysmocom-backup \
     "
 

From 49ca632e9af816b65cd1b0f885fc8c3f4af4cdec Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 27 May 2013 16:48:30 +0200
Subject: [PATCH 44/44] busybox: include support for CIFS mounting

---
 recipes-apps/busybox/busybox_sysmocom.inc | 2 +-
 recipes-apps/busybox/files/defconfig      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-apps/busybox/busybox_sysmocom.inc b/recipes-apps/busybox/busybox_sysmocom.inc
index d331fcf2e7..32eb10762a 100644
--- a/recipes-apps/busybox/busybox_sysmocom.inc
+++ b/recipes-apps/busybox/busybox_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
-PRINC = "14"
+PRINC = "15"
 
 SRC_URI += "file://busybox-ifplugd.sh \
             file://ifplugd.sh"
diff --git a/recipes-apps/busybox/files/defconfig b/recipes-apps/busybox/files/defconfig
index 96cd6385b9..361e51d93f 100644
--- a/recipes-apps/busybox/files/defconfig
+++ b/recipes-apps/busybox/files/defconfig
@@ -552,7 +552,7 @@ CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_HELPERS is not set
 # CONFIG_FEATURE_MOUNT_LABEL is not set
 CONFIG_FEATURE_MOUNT_NFS=y
-# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_PIVOT_ROOT=y