From ce34b983e3410f05e6beb7f3385c39124dda5c5b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 4 Sep 2015 07:19:26 +0200
Subject: [PATCH 01/26] opkg: Upstream has upgraded track it generically

We need to re-evaluate if module autoloading is broken
or not. This is now tracked in SYS#2116.
---
 yocto-master/{opkg_0.2.4.bbappend => opkg_%.bbappend} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename yocto-master/{opkg_0.2.4.bbappend => opkg_%.bbappend} (100%)

diff --git a/yocto-master/opkg_0.2.4.bbappend b/yocto-master/opkg_%.bbappend
similarity index 100%
rename from yocto-master/opkg_0.2.4.bbappend
rename to yocto-master/opkg_%.bbappend

From 6f165aba56e74725f4180854017f9bb6a1ec48ca Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Sat, 5 Sep 2015 10:59:33 +0200
Subject: [PATCH 02/26] image-rauc-ubi: make sure all files belong to root

mkfs.ubifs needs the --squash-uids options, which squashes owners making all
files owned by root.

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
---
 recipes-core/images/image-rauc-ubi.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/images/image-rauc-ubi.bb b/recipes-core/images/image-rauc-ubi.bb
index 3410fc6bf1..e8b1a63785 100644
--- a/recipes-core/images/image-rauc-ubi.bb
+++ b/recipes-core/images/image-rauc-ubi.bb
@@ -65,7 +65,7 @@ do_deploy() {
 	echo vol_name=data >> ubinize.cfg
 	echo vol_flags=autoresize >> ubinize.cfg
 
-	mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rescue.ubifs ${MKUBIFS_ARGS}
+	mkfs.ubifs --squash-uids -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rescue.ubifs ${MKUBIFS_ARGS}
 	ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubi ${UBINIZE_ARGS} ubinize.cfg
 	ln -sf ${IMAGE_NAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ubi
 }

From 6b6e9405ccf51ab319e6c98ddf0d3e9785d3323d Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Sun, 6 Sep 2015 19:13:12 +0200
Subject: [PATCH 03/26] initramfs-rauc-install: fix root device entry for slot
 B

The typo caused an empty root= command line argument, which made it
impossible to boot this slot.

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
---
 recipes-core/initrdscripts/initramfs-rauc-install/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/initrdscripts/initramfs-rauc-install/install b/recipes-core/initrdscripts/initramfs-rauc-install/install
index 035f6a5d32..511afe0182 100644
--- a/recipes-core/initrdscripts/initramfs-rauc-install/install
+++ b/recipes-core/initrdscripts/initramfs-rauc-install/install
@@ -152,7 +152,7 @@ menuentry "Slot A (OK=\$A_OK TRY=\$A_TRY)" ${ENTRY_ARGS}{
 }
 
 menuentry "Slot B (OK=\$B_OK TRY=\$B_TRY)" ${ENTRY_ARGS}{
-	linux (hd0,3)/kernel root=${INSTALL_TGT3} \$CMDLINE rauc.slot=B
+	linux (hd0,3)/kernel root=${INSTALL_TGT}3 \$CMDLINE rauc.slot=B
 	initrd (hd0,3)/initramfs
 }
 EOF

From ecff51c389c9e3a6d210b867e514a50abbaacc5e Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Sun, 6 Sep 2015 19:15:12 +0200
Subject: [PATCH 04/26] rauc: update to newer git version for file reuse
 support

The new version searches mounted slots for matching files referenced by
the new manifest. This avoids downloading files we already have on the
system.

Additionally, the new version includes better error handling and more
unit tests.

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
---
 recipes-extra/rauc/rauc.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-extra/rauc/rauc.bb b/recipes-extra/rauc/rauc.bb
index c51a5eadb7..9f607a79b3 100644
--- a/recipes-extra/rauc/rauc.bb
+++ b/recipes-extra/rauc/rauc.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "rauc update controller"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-PR = "r4"
+PR = "r0"
 
 SRC_URI = "git://github.com/jluebbe/rauc.git;protocol=https \
 	file://dev-ca.pem \
@@ -13,7 +13,7 @@ PV = "0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "d44adb00797d42efdd5f55064b0f3943906b081f"
+SRCREV = "011953fa6c824ca518cf0ea074ddeede3726bdcd"
 
 DEPENDS = "curl openssl glib-2.0"
 

From 4d66b042e4cf53486adf8f16820feb164939bfcf Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Sun, 6 Sep 2015 17:57:57 +0200
Subject: [PATCH 05/26] sysmocom-backup-data: do not enable the restore service
 automatically

This is needed for an upcoming change which will restore the backup from
the initramfs.

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
---
 recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb b/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
index 425c411cf0..b6bba993f1 100644
--- a/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
+++ b/recipes-apps/sysmocom-backup-data/sysmocom-backup-data_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "sysmocom config backup and restore scripts"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = " \
 	file://sysmocom-backup-data \
@@ -26,4 +26,4 @@ do_install() {
 
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} = "data.mount sysmocom-restore.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"

From 5fa7032384cab6216da02ff0701e9835a28b3acb Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Sun, 6 Sep 2015 17:58:52 +0200
Subject: [PATCH 06/26] initramfs-rauc-slot: support restoring the backup
 archive

This change adds an initramfs module to mount the data partition and
restore the backup to the overlay. It is enabled by adding it to the
image-rauc-slot-initramfs recipe.

Signed-off-by: Jan Luebbe <jluebbe@debian.org>

[hfreyther: keep udev out of the dependencies]
---
 .../images/image-rauc-slot-initramfs.bb       |  2 +-
 .../initrdscripts/initramfs-rauc-slot.bb      | 17 ++++++++--
 .../initramfs-rauc-slot/restore_backup        | 31 +++++++++++++++++++
 .../sysmobts-v2/mount_data                    | 11 +++++++
 .../sysmocom-bsc/mount_data                   | 11 +++++++
 .../sysmocom-odu/mount_data                   | 11 +++++++
 6 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 recipes-core/initrdscripts/initramfs-rauc-slot/restore_backup
 create mode 100644 recipes-core/initrdscripts/initramfs-rauc-slot/sysmobts-v2/mount_data
 create mode 100644 recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-bsc/mount_data
 create mode 100644 recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-odu/mount_data

diff --git a/recipes-core/images/image-rauc-slot-initramfs.bb b/recipes-core/images/image-rauc-slot-initramfs.bb
index 3c9c98a51a..0e05675e89 100644
--- a/recipes-core/images/image-rauc-slot-initramfs.bb
+++ b/recipes-core/images/image-rauc-slot-initramfs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "slot initramfs"
 
-PACKAGE_INSTALL = "initramfs-framework-base initramfs-module-debug initramfs-module-rauc-overlay busybox base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
+PACKAGE_INSTALL = "initramfs-framework-base initramfs-module-debug initramfs-module-rauc-overlay initramfs-module-rauc-backup busybox base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
 
 # Do not pollute the initrd image with rootfs features
 #IMAGE_FEATURES = ""
diff --git a/recipes-core/initrdscripts/initramfs-rauc-slot.bb b/recipes-core/initrdscripts/initramfs-rauc-slot.bb
index 755d96da1c..09e4aff6fa 100644
--- a/recipes-core/initrdscripts/initramfs-rauc-slot.bb
+++ b/recipes-core/initrdscripts/initramfs-rauc-slot.bb
@@ -2,12 +2,14 @@ SUMMARY = "Modular initramfs system components for RAUC"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PR = "r1"
+PR = "r2"
 
 inherit allarch
 
 SRC_URI = "file://overlay \
-           file://rescue"
+	   file://rescue \
+	   file://mount_data \
+	   file://restore_backup"
 
 do_install() {
     install -d ${D}/init.d
@@ -17,10 +19,15 @@ do_install() {
 
     # rescue
     install -m 0755 ${WORKDIR}/rescue ${D}/init.d/10-rescue
+
+    # backup
+    install -m 0755 ${WORKDIR}/mount_data ${D}/init.d/25-mount_data
+    install -m 0755 ${WORKDIR}/restore_backup ${D}/init.d/26-restore_backup
 }
 
 PACKAGES = "initramfs-module-rauc-overlay \
-            initramfs-module-rauc-rescue"
+	    initramfs-module-rauc-rescue \
+	    initramfs-module-rauc-backup"
 
 SUMMARY_initramfs-module-rauc-overlay = "initramfs support for overlayfs (ubifs&squashfs)"
 RDEPENDS_initramfs-module-rauc-overlay = "initramfs-framework-base"
@@ -29,3 +36,7 @@ FILES_initramfs-module-rauc-overlay = "/init.d/20-overlay"
 SUMMARY_initramfs-module-rauc-rescue = "initramfs rescue mode support"
 RDEPENDS_initramfs-module-rauc-rescue = "initramfs-framework-base"
 FILES_initramfs-module-rauc-rescue = "/init.d/10-rescue"
+
+SUMMARY_initramfs-module-rauc-backup = "initramfs backup restore support"
+RDEPENDS_initramfs-module-rauc-backup = "initramfs-module-rauc-overlay"
+FILES_initramfs-module-rauc-backup = "/init.d/25-mount_data /init.d/26-restore_backup"
diff --git a/recipes-core/initrdscripts/initramfs-rauc-slot/restore_backup b/recipes-core/initrdscripts/initramfs-rauc-slot/restore_backup
new file mode 100644
index 0000000000..17ae86ba49
--- /dev/null
+++ b/recipes-core/initrdscripts/initramfs-rauc-slot/restore_backup
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+BACKUP_FILE=/rootfs/data/sysmocom-backup.tar
+
+restore_backup_enabled() {
+	if [ ! -e "$BACKUP_FILE" ] ; then
+		info "The backup file '$BACKUP_FILE' does not exist, skipping restore..."
+		return 1
+	fi
+
+	return 0
+}
+
+restore_backup_extract() {
+	# List the files and check if grep hits something
+	SEARCH=`tar -tvf $1 | grep $2`
+	RES=$?
+	if [ $RES = 0 ]; then
+		tar -C /rootfs/tmp/ -xvf $1 $2
+		cp -a /rootfs/tmp/content/* /rootfs/
+		rm -rf /rootfs/tmp/content
+	else
+		echo "Directory '$2' is not in backup '$1'."
+	fi
+}
+
+restore_backup_run() {
+	info "Extracting files from the backup '$BACKUP_FILE'"
+	restore_backup_extract $BACKUP_FILE content/etc || fatal "Failed!"
+	restore_backup_extract $BACKUP_FILE content/var/lib/osmocom || fatal "Failed!"
+}
diff --git a/recipes-core/initrdscripts/initramfs-rauc-slot/sysmobts-v2/mount_data b/recipes-core/initrdscripts/initramfs-rauc-slot/sysmobts-v2/mount_data
new file mode 100644
index 0000000000..0491cea382
--- /dev/null
+++ b/recipes-core/initrdscripts/initramfs-rauc-slot/sysmobts-v2/mount_data
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mount_data_enabled() {
+	return 0
+}
+
+mount_data_run() {
+	info "Mounting data..."
+	mkdir -p /rootfs/data
+	mount -t ubifs ubi0:data /rootfs/data
+}
diff --git a/recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-bsc/mount_data b/recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-bsc/mount_data
new file mode 100644
index 0000000000..46a4ed13f7
--- /dev/null
+++ b/recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-bsc/mount_data
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mount_data_enabled() {
+	return 0
+}
+
+mount_data_run() {
+	info "Mounting data..."
+	mkdir -p /rootfs/data
+	mount -t ext4 /dev/sda4 /rootfs/data
+}
diff --git a/recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-odu/mount_data b/recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-odu/mount_data
new file mode 100644
index 0000000000..0491cea382
--- /dev/null
+++ b/recipes-core/initrdscripts/initramfs-rauc-slot/sysmocom-odu/mount_data
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mount_data_enabled() {
+	return 0
+}
+
+mount_data_run() {
+	info "Mounting data..."
+	mkdir -p /rootfs/data
+	mount -t ubifs ubi0:data /rootfs/data
+}

From a4edad8b84acd376970e52c035e5c911ddf7b7e0 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Thu, 6 Aug 2015 14:40:29 +0200
Subject: [PATCH 07/26] linux: update for sysmobts

Move to newer stable kernel (3.10.84).

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
---
 conf/machine/include/sysmobts.inc                       | 2 +-
 recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb | 2 +-
 recipes-bsp/linux/linux-sysmocom_git.bb                 | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc
index e1c71b1ce9..1beba7f3d5 100644
--- a/conf/machine/include/sysmobts.inc
+++ b/conf/machine/include/sysmobts.inc
@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "3.10.80+git%"
+PREFERRED_VERSION_linux-sysmocom = "3.10.84+git%"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
diff --git a/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb b/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb
index 8824e40468..5b1a3c9d3e 100644
--- a/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb
+++ b/recipes-bsp/linux-backports/linux-backports_3.18.1.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 inherit sysmocom-module
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/projects/backports/stable/v3.18.1/backports-3.18.1-1.tar.xz \
            file://dont-export-clk_enable-twice.patch \
diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index 1ae499681b..e4f1069397 100644
--- a/recipes-bsp/linux/linux-sysmocom_git.bb
+++ b/recipes-bsp/linux/linux-sysmocom_git.bb
@@ -7,18 +7,18 @@ DEPENDS += "bc-native"
 # reverse dependency tracking for the kernel doesn't appear to work. So
 # please bump the PR on version changes!
 # at versions changes do not forget to update conf/machine/include/sysmobts.inc too
-LINUX_VERSION ?= "3.10.80"
+LINUX_VERSION ?= "3.10.84"
 LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}"
 
 # Overrides for the sysmocom bts v2
 BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
 
-SRCREV = "3122273386e140378bfc7f8ec5d76e4e04c32ad1"
+SRCREV = "60c9ebbd1a683e8691223042a12958c5dc661feb"
 
 PR = "r43"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.80 \
+SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.84 \
 	   file://defconfig"
 
 S = "${WORKDIR}/git"

From ebb9f0dd710b2ae79b329ad478a39b198733f79e Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 8 Sep 2015 14:53:40 +0200
Subject: [PATCH 08/26] osmo-pcu: Upgrade to the latest PCU version

* Fix SGSN re-connect
* Reliability fixes
---
 recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index 3adcd16ad2..b0a43a7181 100644
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "Osmocom PCU for sysmoBTS"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jerlbeck/master"
-SRCREV = "1c3b8998bc6d9d6f78a2bc29ac1f0ba9cffa4fb8"
+SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=master"
+SRCREV = "7c8d39a67b7568cda38829c774ea541250f3142f"
 PV = "0.4+git${SRCPV}"
-PR = "r3.${META_TELEPHONY_OSMO_INC}"
+PR = "r4.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 DEPENDS = "libosmocore femtobts-api osmo-bts"

From 9c5ee37ab2e5e23c81bec92c028b62e21bdb4b22 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 8 Sep 2015 15:23:37 +0200
Subject: [PATCH 09/26] linux-sysmocom: Make room for linux4

Yocto master has introduced GCC5 and this doesn't like to compile
the older linux kernels yet. This year it is time to move to a newer
LTS kernel and this can be Linux-4.1. Make space for the upgrade
by moving the recipe to a new name.
---
 .../linux/{linux-sysmocom_git.bb => linux-sysmocom_3.10.bb}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-bsp/linux/{linux-sysmocom_git.bb => linux-sysmocom_3.10.bb} (100%)

diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_3.10.bb
similarity index 100%
rename from recipes-bsp/linux/linux-sysmocom_git.bb
rename to recipes-bsp/linux/linux-sysmocom_3.10.bb

From 08913496ccd54379763a3ffc4d719b7c6a1671b3 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Tue, 15 Sep 2015 17:16:52 +0200
Subject: [PATCH 10/26] ntp: change the cron call for ntpdate

* the ntpdate cron job turned into
  a shell script which now checks
  for running timeserver before
  updating the time via ntpdate

* install the cron stanza to the
  cron.d directory like serval
  other packages does

* comment the entry in the old
  crontab file when found

Fixes: SYS#1841
---
 recipes-bsp/ntp/files/ntpdate-cron | 34 ++++++++++++++++++++++++++++++
 recipes-bsp/ntp/files/ntpdate.cron |  1 +
 recipes-bsp/ntp/ntp_4.2.8p1.bb     | 26 +++++++++++++++++------
 3 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 recipes-bsp/ntp/files/ntpdate-cron
 create mode 100644 recipes-bsp/ntp/files/ntpdate.cron

diff --git a/recipes-bsp/ntp/files/ntpdate-cron b/recipes-bsp/ntp/files/ntpdate-cron
new file mode 100644
index 0000000000..f8e3e51bf3
--- /dev/null
+++ b/recipes-bsp/ntp/files/ntpdate-cron
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# script installed as cronjob for handling
+# machines which have not ntp or systemd-timessyncd installed
+#
+# (C) 2015 by sysmocom - s.f.m.c. GmbH
+# Author: Henning Heinold
+
+RUN_NTPDATE=1
+
+# check for systemd otherwise assume sysvinit with ps
+
+systemctl > /dev/null 2>&1
+
+if [ $? -eq 0 ]; then
+    systemctl status ntpd > /dev/null 2>&1 || systemctl status systemd-timesyncd > /dev/null 2>&1
+else
+    PS="ps"
+    ps -ef > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+       PS="ps -ef"
+    fi
+
+    # poor man search for a running ntpd
+    # under sysvinit we have no systemd-timesyncd
+    $PS | grep -v grep | grep "ntpd " > /dev/null 2>&1
+fi
+
+RUN_NTPDATE=$?
+
+# the commands must fail to run ntpdate
+if [ ${RUN_NTPDATE} -ne 0 ]; then
+    __bindir__/ntpdate-sync silent
+fi
diff --git a/recipes-bsp/ntp/files/ntpdate.cron b/recipes-bsp/ntp/files/ntpdate.cron
new file mode 100644
index 0000000000..5bd9179c05
--- /dev/null
+++ b/recipes-bsp/ntp/files/ntpdate.cron
@@ -0,0 +1 @@
+*/30 * * * * root __bindir__/ntpdate-cron
diff --git a/recipes-bsp/ntp/ntp_4.2.8p1.bb b/recipes-bsp/ntp/ntp_4.2.8p1.bb
index f672097e83..61a8344c98 100644
--- a/recipes-bsp/ntp/ntp_4.2.8p1.bb
+++ b/recipes-bsp/ntp/ntp_4.2.8p1.bb
@@ -21,9 +21,11 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
            file://sntp.service \
            file://sntp \
            file://ntpd.list \
+           file://ntpdate-cron \
+           file://ntpdate.cron \
 "
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed"
 SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88"
@@ -64,6 +66,8 @@ do_install_append() {
     install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d
     install -d ${D}${bindir}
     install -m 755 ${WORKDIR}/ntpdate ${D}${bindir}/ntpdate-sync
+    install -m 755 ${WORKDIR}/ntpdate-cron ${D}${bindir}/ntpdate-cron
+    install -D -m 0644 ${WORKDIR}/ntpdate.cron ${D}${sysconfdir}/cron.d/ntpdate
 
     install -m 755 -d ${D}${NTP_USER_HOME}
     chown ntp:ntp ${D}${NTP_USER_HOME}
@@ -74,6 +78,8 @@ do_install_append() {
     sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
     sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
     sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync
+    sed -i 's!__bindir__!${bindir}!g' ${D}${bindir}/ntpdate-cron
+    sed -i 's!__bindir__!${bindir}!g' ${D}${sysconfdir}/cron.d/ntpdate
     sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace
     sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace
     sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait
@@ -136,6 +142,8 @@ FILES_ntpdate = "${sbindir}/ntpdate \
     ${bindir}/ntpdate-sync \
     ${sysconfdir}/default/ntpdate \
     ${systemd_unitdir}/system/ntpdate.service \
+    ${bindir}/ntpdate-cron \
+    ${sysconfdir}/cron.d/ntpdate \
 "
 FILES_sntp = "${sbindir}/sntp \
               ${sysconfdir}/default/sntp \
@@ -143,17 +151,21 @@ FILES_sntp = "${sbindir}/sntp \
              "
 
 CONFFILES_${PN} = "${sysconfdir}/ntp.conf"
-CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate"
+CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate ${sysconfdir}/cron.d/ntpdate"
 
 INITSCRIPT_NAME = "ntpd"
 # No dependencies, so just go in at the standard level (20)
 INITSCRIPT_PARAMS = "defaults"
 
 pkg_postinst_ntpdate() {
-    if ! grep -q -s ntpdate $D/var/spool/cron/root; then
-        echo "adding crontab"
-        test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron
-        echo "30 * * * *    ${bindir}/ntpdate-sync silent" >> $D/var/spool/cron/root
+    if grep -q -s ntpdate $D/var/spool/cron/root; then
+        echo "comment the old crontab entry"
+        sed -i -e "/^[^#]/ s/\(.*\)\(.*ntpdate-sync.*$\)/#\1\2/g" $D/var/spool/cron/root
+    fi
+    systemctl status crond > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        systemctl restart crond
+    else
+        /etc/init.d/cron restart
     fi
 }
-

From 8e104ac413e92439c37fd097063fe80b42160b0e Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Wed, 24 Jun 2015 14:12:30 +0200
Subject: [PATCH 11/26] sysmocom-configure: add simple framework to run
 configuration scripts

The configuration scripts are named for the systemd units for which they
generate configuration files. The generator causes them to run before
those units are started.
---
 recipes-apps/tasks/task-sysmocom-tools.bb     |  1 +
 .../files/multi-user.target.sh                | 12 ++++++++
 .../files/osmo-bsc.service.sh                 | 12 ++++++++
 .../files/sysmocom-bsc/multi-user.target.sh   | 11 ++++++++
 .../files/sysmocom-generator                  | 28 +++++++++++++++++++
 .../sysmocom-configure_1.0.bb                 | 20 +++++++++++++
 6 files changed, 84 insertions(+)
 create mode 100644 recipes-config/sysmocom-configure/files/multi-user.target.sh
 create mode 100644 recipes-config/sysmocom-configure/files/osmo-bsc.service.sh
 create mode 100644 recipes-config/sysmocom-configure/files/sysmocom-bsc/multi-user.target.sh
 create mode 100755 recipes-config/sysmocom-configure/files/sysmocom-generator
 create mode 100644 recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb

diff --git a/recipes-apps/tasks/task-sysmocom-tools.bb b/recipes-apps/tasks/task-sysmocom-tools.bb
index 96e6307fc4..1bc7559d83 100644
--- a/recipes-apps/tasks/task-sysmocom-tools.bb
+++ b/recipes-apps/tasks/task-sysmocom-tools.bb
@@ -17,4 +17,5 @@ RDEPENDS_${PN} = "\
     sysmocom-backup \
     sysmocom-backup-default \
     sysmocom-systemd \
+    sysmocom-configure \
     "
diff --git a/recipes-config/sysmocom-configure/files/multi-user.target.sh b/recipes-config/sysmocom-configure/files/multi-user.target.sh
new file mode 100644
index 0000000000..3a10995e10
--- /dev/null
+++ b/recipes-config/sysmocom-configure/files/multi-user.target.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+
+TEST_VALUE="default"
+
+. /slot/system.conf
+
+cat >/etc/symocom/test.cfg <<EOF
+[main]
+bla=$TEST_VALUE
+EOF
diff --git a/recipes-config/sysmocom-configure/files/osmo-bsc.service.sh b/recipes-config/sysmocom-configure/files/osmo-bsc.service.sh
new file mode 100644
index 0000000000..7201c581a9
--- /dev/null
+++ b/recipes-config/sysmocom-configure/files/osmo-bsc.service.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+
+OSMOBSC_VALUE="bar"
+
+. /slot/system.conf
+
+cat >/etc/osmocom/osmo-bsc.cfg <<EOF
+#dummy: OSMOBSC_VALUE=$OSMOBSC_VALUE
+EOF
+
diff --git a/recipes-config/sysmocom-configure/files/sysmocom-bsc/multi-user.target.sh b/recipes-config/sysmocom-configure/files/sysmocom-bsc/multi-user.target.sh
new file mode 100644
index 0000000000..7e76b35fc5
--- /dev/null
+++ b/recipes-config/sysmocom-configure/files/sysmocom-bsc/multi-user.target.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+TEST_VALUE="default"
+
+. /slot/system.conf
+
+cat >/etc/sysmocom/test.cfg <<EOF
+[main]
+bla=$TEST_VALUE
+model=sysmocom-bsc
+EOF
diff --git a/recipes-config/sysmocom-configure/files/sysmocom-generator b/recipes-config/sysmocom-configure/files/sysmocom-generator
new file mode 100755
index 0000000000..40bb25cec2
--- /dev/null
+++ b/recipes-config/sysmocom-configure/files/sysmocom-generator
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. /slot/system.conf
+
+for HANDLER in $(ls /etc/sysmocom/configure.d/*.sh); do
+	UNIT=$(basename "$HANDLER" .sh)
+	cat >$1/${UNIT//./-}-configure.service <<EOF
+[Unit]
+Description=Generate $UNIT Configuration
+After=sysmocom-restore.service
+Before=$UNIT
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=$HANDLER
+EOF
+	mkdir -p $1/$UNIT.wants
+	ln -s /lib/systemd/system/${UNIT//./-}-configure.service $1/$UNIT.wants/
+done
+
+if [ -n "$OSMOBSC_ENABLED" ]; then
+	ln -s /lib/systemd/system/osmo-bsc.service $1/multi-user.target.wants/
+fi
+
+if [ -n "$OSMONITB_ENABLED" ]; then
+	ln -s /lib/systemd/system/osmo-nitb.service $1/multi-user.target.wants/
+fi
diff --git a/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb b/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb
new file mode 100644
index 0000000000..abecdba1ad
--- /dev/null
+++ b/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "sysmocom configuration scripts"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SRC_URI = " \
+	file://sysmocom-generator \
+	file://multi-user.target.sh \
+	file://osmo-bsc.service.sh \
+"
+
+do_install() {
+	install -d ${D}${systemd_unitdir}/system-generators
+	install -m 0755 ${WORKDIR}/sysmocom-generator ${D}${systemd_unitdir}/system-generators/
+
+	install -d ${D}${sysconfdir}/sysmocom/configure.d
+	install -m 0755 ${WORKDIR}/*.sh ${D}${sysconfdir}/sysmocom/configure.d/
+
+}
+
+FILES_${PN} += "${systemd_unitdir}/system-generators"

From ff183a100ea442e1ac9a9d530b5cae6c17c4c1a9 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Thu, 2 Jul 2015 11:41:20 +0200
Subject: [PATCH 12/26] sysmocom-configure: handle missing system.conf
 gracefully

If /slot/system.conf is missing, we just exit the generator.
---
 recipes-config/sysmocom-configure/files/sysmocom-generator  | 4 ++++
 recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-config/sysmocom-configure/files/sysmocom-generator b/recipes-config/sysmocom-configure/files/sysmocom-generator
index 40bb25cec2..b8f43e8118 100755
--- a/recipes-config/sysmocom-configure/files/sysmocom-generator
+++ b/recipes-config/sysmocom-configure/files/sysmocom-generator
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ ! -e /slot/system.conf ]; then
+	exit 0
+fi
+
 . /slot/system.conf
 
 for HANDLER in $(ls /etc/sysmocom/configure.d/*.sh); do
diff --git a/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb b/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb
index abecdba1ad..f3fca7ab58 100644
--- a/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb
+++ b/recipes-config/sysmocom-configure/sysmocom-configure_1.0.bb
@@ -14,7 +14,6 @@ do_install() {
 
 	install -d ${D}${sysconfdir}/sysmocom/configure.d
 	install -m 0755 ${WORKDIR}/*.sh ${D}${sysconfdir}/sysmocom/configure.d/
-
 }
 
 FILES_${PN} += "${systemd_unitdir}/system-generators"

From 9b775911a03c6da165a1353d36c238ca5c03879e Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 13 Oct 2015 17:39:19 +0200
Subject: [PATCH 13/26] systemd: Attempt to catch up with master

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

diff --git a/yocto-master/systemd_219.bbappend b/yocto-master/systemd_255.bbappend
similarity index 100%
rename from yocto-master/systemd_219.bbappend
rename to yocto-master/systemd_255.bbappend

From 20bcf2de071a4e4fc55c71686e1bfe7be26f9adf Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 13 Oct 2015 17:41:13 +0200
Subject: [PATCH 14/26] systemd: It is 225 and not 255.. but let's call it %

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

diff --git a/yocto-master/systemd_255.bbappend b/yocto-master/systemd_%.bbappend
similarity index 100%
rename from yocto-master/systemd_255.bbappend
rename to yocto-master/systemd_%.bbappend

From c820b61c1058abd4dbd44c0aed06bacae04e892a Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 31 Oct 2015 20:46:35 +0100
Subject: [PATCH 15/26] Add barebox recipe for OWHW

---
 .../barebox/barebox-gsmk-owhw-mlo/defconfig   | 329 ++++++++++
 .../barebox/barebox-gsmk-owhw-mlo_git.bb      |  21 +
 .../barebox/barebox-gsmk-owhw/defconfig       | 604 ++++++++++++++++++
 recipes-bsp/barebox/barebox-gsmk-owhw_git.bb  |  31 +
 4 files changed, 985 insertions(+)
 create mode 100644 recipes-bsp/barebox/barebox-gsmk-owhw-mlo/defconfig
 create mode 100644 recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb
 create mode 100644 recipes-bsp/barebox/barebox-gsmk-owhw/defconfig
 create mode 100644 recipes-bsp/barebox/barebox-gsmk-owhw_git.bb

diff --git a/recipes-bsp/barebox/barebox-gsmk-owhw-mlo/defconfig b/recipes-bsp/barebox/barebox-gsmk-owhw-mlo/defconfig
new file mode 100644
index 0000000000..a2db7738b6
--- /dev/null
+++ b/recipes-bsp/barebox/barebox-gsmk-owhw-mlo/defconfig
@@ -0,0 +1,329 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Barebox/arm 2015.06.0 Configuration
+#
+CONFIG_ARM=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DIGIC is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_S3C24xx is not set
+# CONFIG_ARCH_S5PCxx is not set
+# CONFIG_ARCH_S3C64xx is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_UEMD is not set
+# CONFIG_ARCH_ZYNQ is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v7=y
+
+#
+# processor features
+#
+# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
+CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+
+#
+# OMAP Features
+#
+CONFIG_ARCH_AM33XX=y
+CONFIG_OMAP_CLOCK_SOURCE_DMTIMER0=y
+CONFIG_OMAP_GPMC=y
+CONFIG_OMAP_BUILD_IFT=y
+# CONFIG_OMAP_BUILD_SPI is not set
+# CONFIG_OMAP_SERIALBOOT is not set
+CONFIG_OMAP_MULTI_BOARDS=y
+# CONFIG_MACH_AFI_GF is not set
+# CONFIG_MACH_BEAGLEBONE is not set
+CONFIG_MACH_PHYTEC_SOM_AM335X=y
+CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_AEABI=y
+CONFIG_THUMB2_BAREBOX=y
+
+#
+# ARM specific settings
+#
+# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
+CONFIG_ARM_EXCEPTIONS=y
+# CONFIG_ARM_UNWIND is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
+CONFIG_HAS_KALLSYMS=y
+CONFIG_HAS_MODULES=y
+CONFIG_HAS_CACHE=y
+CONFIG_HAS_DMA=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_BLOCK=y
+CONFIG_FILETYPE=y
+
+#
+# General Settings
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_BANNER=y
+# CONFIG_MEMINFO is not set
+# CONFIG_ENVIRONMENT_VARIABLES is not set
+
+#
+# memory layout
+#
+CONFIG_HAVE_PBL_IMAGE=y
+CONFIG_HAVE_PBL_MULTI_IMAGES=y
+CONFIG_HAVE_IMAGE_COMPRESSION=y
+CONFIG_PBL_IMAGE=y
+CONFIG_PBL_MULTI_IMAGES=y
+CONFIG_PBL_RELOCATABLE=y
+CONFIG_IMAGE_COMPRESSION=y
+# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
+CONFIG_IMAGE_COMPRESSION_LZO=y
+# CONFIG_IMAGE_COMPRESSION_GZIP is not set
+# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
+# CONFIG_IMAGE_COMPRESSION_NONE is not set
+CONFIG_MMU=y
+CONFIG_MMU_EARLY=y
+CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
+CONFIG_TEXT_BASE=0x0
+CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
+CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
+CONFIG_STACK_SIZE=0x8000
+CONFIG_MALLOC_SIZE=0x0
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_MALLOC_DLMALLOC is not set
+CONFIG_MALLOC_TLSF=y
+# CONFIG_MALLOC_DUMMY is not set
+# CONFIG_KALLSYMS is not set
+CONFIG_RELOCATABLE=y
+# CONFIG_PANIC_HANG is not set
+CONFIG_PROMPT="MLO>"
+CONFIG_BAUDRATE=115200
+CONFIG_SIMPLE_READLINE=y
+CONFIG_CBSIZE=1024
+# CONFIG_SHELL_HUSH is not set
+# CONFIG_SHELL_SIMPLE is not set
+CONFIG_SHELL_NONE=y
+# CONFIG_GLOB is not set
+# CONFIG_PASSWORD is not set
+# CONFIG_ERRNO_MESSAGES is not set
+# CONFIG_TIMESTAMP is not set
+CONFIG_IMD=y
+# CONFIG_IMD_TARGET is not set
+# CONFIG_KERNEL_INSTALL_TARGET is not set
+CONFIG_CONSOLE_FULL=y
+# CONFIG_CONSOLE_SIMPLE is not set
+# CONFIG_CONSOLE_NONE is not set
+# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
+# CONFIG_CONSOLE_ACTIVATE_ALL is not set
+CONFIG_CONSOLE_ACTIVATE_NONE=y
+CONFIG_PARTITION=y
+CONFIG_PARTITION_DISK=y
+CONFIG_PARTITION_DISK_DOS=y
+# CONFIG_PARTITION_DISK_EFI is not set
+# CONFIG_DEFAULT_ENVIRONMENT is not set
+CONFIG_DEFAULT_COMPRESSION_NONE=y
+CONFIG_HAVE_DEFAULT_ENVIRONMENT_NEW=y
+# CONFIG_BAREBOXENV_TARGET is not set
+# CONFIG_BAREBOXCRC32_TARGET is not set
+# CONFIG_POLLER is not set
+
+#
+# Debugging
+#
+CONFIG_COMPILE_LOGLEVEL=6
+CONFIG_DEFAULT_LOGLEVEL=7
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_OMAP_UART_PORT=1
+# CONFIG_DEBUG_INITCALLS is not set
+CONFIG_HAS_DEBUG_LL=y
+# CONFIG_HAS_POWEROFF is not set
+# CONFIG_NET is not set
+
+#
+# Drivers
+#
+CONFIG_OFTREE=y
+CONFIG_OFTREE_MEM_GENERIC=y
+CONFIG_DTC=y
+CONFIG_OFDEVICE=y
+CONFIG_OF_GPIO=y
+
+#
+# serial drivers
+#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
+CONFIG_DRIVER_SERIAL_NS16550=y
+CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
+# CONFIG_DRIVER_SERIAL_CADENCE is not set
+
+#
+# SPI drivers
+#
+# CONFIG_SPI is not set
+# CONFIG_I2C is not set
+CONFIG_MTD=y
+# CONFIG_MTD_WRITE is not set
+# CONFIG_MTD_OOB_DEVICE is not set
+# CONFIG_MTD_RAW_DEVICE is not set
+
+#
+# Self contained MTD devices
+#
+# CONFIG_MTD_DOCG3 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_DRIVER_CFI is not set
+CONFIG_NAND=y
+# CONFIG_NAND_ECC_SOFT is not set
+# CONFIG_NAND_ECC_BCH is not set
+CONFIG_NAND_ECC_HW=y
+# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
+# CONFIG_NAND_ECC_HW_SYNDROME is not set
+# CONFIG_NAND_ECC_HW_NONE is not set
+# CONFIG_NAND_INFO is not set
+# CONFIG_NAND_BBT is not set
+CONFIG_NAND_OMAP_GPMC=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_UBI is not set
+CONFIG_DISK=y
+# CONFIG_DISK_WRITE is not set
+
+#
+# drive types
+#
+# CONFIG_DISK_ATA is not set
+# CONFIG_DISK_AHCI is not set
+
+#
+# interface types
+#
+# CONFIG_DISK_INTF_PLATFORM_IDE is not set
+# CONFIG_USB_HOST is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_MUSB is not set
+# CONFIG_VIDEO is not set
+CONFIG_MCI=y
+
+#
+# --- Feature list ---
+#
+CONFIG_MCI_STARTUP=y
+# CONFIG_MCI_WRITE is not set
+# CONFIG_MCI_MMC_BOOT_PARTITIONS is not set
+
+#
+# --- MCI host drivers ---
+#
+# CONFIG_MCI_DW is not set
+CONFIG_MCI_OMAP_HSMMC=y
+CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
+
+#
+# MFD
+#
+# CONFIG_MFD_SYSCON is not set
+
+#
+# Misc devices
+#
+# CONFIG_JTAG is not set
+# CONFIG_SRAM is not set
+# CONFIG_BOOTSTATE_DRV is not set
+# CONFIG_LED is not set
+
+#
+# EEPROM support
+#
+
+#
+# Input device support
+#
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_PWM is not set
+
+#
+# DMA support
+#
+CONFIG_GPIOLIB=y
+
+#
+# GPIO
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IMX is not set
+# CONFIG_GPIO_MXS is not set
+CONFIG_GPIO_OMAP=y
+# CONFIG_GPIO_DESIGNWARE is not set
+# CONFIG_W1 is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_SINGLE=y
+
+#
+# Bus devices
+#
+CONFIG_BUS_OMAP_GPMC=y
+# CONFIG_REGULATOR is not set
+# CONFIG_RESET_CONTROLLER is not set
+# CONFIG_RTC_CLASS is not set
+
+#
+# Firmware Drivers
+#
+
+#
+# PHY Subsystem
+#
+# CONFIG_GENERIC_PHY is not set
+
+#
+# Filesystem support
+#
+CONFIG_FS=y
+# CONFIG_FS_CRAMFS is not set
+# CONFIG_FS_EXT4 is not set
+# CONFIG_FS_RAMFS is not set
+# CONFIG_FS_DEVFS is not set
+CONFIG_FS_FAT=y
+# CONFIG_FS_FAT_WRITE is not set
+CONFIG_FS_FAT_LFN=y
+# CONFIG_FS_BPKFS is not set
+# CONFIG_FS_UIMAGEFS is not set
+
+#
+# Library routines
+#
+# CONFIG_ZLIB is not set
+# CONFIG_BZLIB is not set
+# CONFIG_LZ4_DECOMPRESS is not set
+# CONFIG_XZ_DECOMPRESS is not set
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+# CONFIG_PROCESS_ESCAPE_SEQUENCE is not set
+# CONFIG_LZO_DECOMPRESS is not set
+
+#
+# Library gui routines
+#
+# CONFIG_BOOTSTRAP is not set
+# CONFIG_DIGEST is not set
diff --git a/recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb b/recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb
new file mode 100644
index 0000000000..ea246357d7
--- /dev/null
+++ b/recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb
@@ -0,0 +1,21 @@
+require barebox.inc
+
+SRCREV = "4d1c656aa7ba155d8a555602d832ff1fc76d63f8"
+SRC_URI = " \
+	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
+	file://defconfig \
+	"
+
+PV = "v2015.06+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+BAREBOX_IMAGE ?= "barebox-${MACHINE}-mlo-${PKGV}-${PKGR}.img"
+BAREBOX_SYMLINK ?= "barebox-${MACHINE}-mlo.img"
+
+do_deploy () {
+	install -d ${DEPLOYDIR}
+	install ${S}/images/barebox-am33xx-gsmk-owhw-mlo.img ${DEPLOYDIR}/${BAREBOX_IMAGE}
+	cd ${DEPLOYDIR}
+	rm -f ${BAREBOX_SYMLINK}
+	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
+}
diff --git a/recipes-bsp/barebox/barebox-gsmk-owhw/defconfig b/recipes-bsp/barebox/barebox-gsmk-owhw/defconfig
new file mode 100644
index 0000000000..65734251da
--- /dev/null
+++ b/recipes-bsp/barebox/barebox-gsmk-owhw/defconfig
@@ -0,0 +1,604 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Barebox/arm 2015.06.0 Configuration
+#
+CONFIG_ARM=y
+CONFIG_ARM_LINUX=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DIGIC is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NOMADIK is not set
+CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_ARCH_S3C24xx is not set
+# CONFIG_ARCH_S5PCxx is not set
+# CONFIG_ARCH_S3C64xx is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_UEMD is not set
+# CONFIG_ARCH_ZYNQ is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v7=y
+
+#
+# processor features
+#
+# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
+CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+
+#
+# OMAP Features
+#
+CONFIG_ARCH_AM33XX=y
+CONFIG_OMAP_CLOCK_SOURCE_DMTIMER0=y
+CONFIG_OMAP_GPMC=y
+# CONFIG_OMAP_BUILD_IFT is not set
+# CONFIG_OMAP_BUILD_SPI is not set
+# CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO is not set
+CONFIG_BAREBOX_UPDATE_AM33XX_NAND=y
+CONFIG_OMAP_MULTI_BOARDS=y
+# CONFIG_MACH_AFI_GF is not set
+# CONFIG_MACH_BEAGLEBONE is not set
+CONFIG_MACH_PHYTEC_SOM_AM335X=y
+CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_AEABI=y
+CONFIG_THUMB2_BAREBOX=y
+CONFIG_ARM_BOARD_APPEND_ATAG=y
+
+#
+# ARM specific settings
+#
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
+CONFIG_ARM_EXCEPTIONS=y
+CONFIG_ARM_UNWIND=y
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
+CONFIG_HAS_KALLSYMS=y
+CONFIG_HAS_MODULES=y
+CONFIG_ENV_HANDLING=y
+CONFIG_HAS_CACHE=y
+CONFIG_HAS_DMA=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_BOOTM=y
+CONFIG_FILETYPE=y
+CONFIG_BINFMT=y
+CONFIG_UIMAGE=y
+CONFIG_LOGBUF=y
+CONFIG_GLOBALVAR=y
+CONFIG_STDDEV=y
+CONFIG_BAREBOX_UPDATE=y
+CONFIG_MENUTREE=y
+CONFIG_FILE_LIST=y
+
+#
+# General Settings
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_BANNER=y
+CONFIG_MEMINFO=y
+CONFIG_ENVIRONMENT_VARIABLES=y
+
+#
+# memory layout
+#
+CONFIG_HAVE_PBL_IMAGE=y
+CONFIG_HAVE_PBL_MULTI_IMAGES=y
+CONFIG_HAVE_IMAGE_COMPRESSION=y
+CONFIG_PBL_IMAGE=y
+CONFIG_PBL_MULTI_IMAGES=y
+CONFIG_PBL_RELOCATABLE=y
+CONFIG_IMAGE_COMPRESSION=y
+# CONFIG_IMAGE_COMPRESSION_LZ4 is not set
+CONFIG_IMAGE_COMPRESSION_LZO=y
+# CONFIG_IMAGE_COMPRESSION_GZIP is not set
+# CONFIG_IMAGE_COMPRESSION_XZKERN is not set
+# CONFIG_IMAGE_COMPRESSION_NONE is not set
+CONFIG_MMU=y
+CONFIG_MMU_EARLY=y
+CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
+CONFIG_TEXT_BASE=0x0
+CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
+CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
+CONFIG_STACK_SIZE=0x8000
+CONFIG_MALLOC_SIZE=0x0
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_MALLOC_DLMALLOC is not set
+CONFIG_MALLOC_TLSF=y
+CONFIG_KALLSYMS=y
+CONFIG_RELOCATABLE=y
+# CONFIG_PANIC_HANG is not set
+CONFIG_PROMPT="barebox> "
+CONFIG_BAUDRATE=115200
+CONFIG_CBSIZE=1024
+CONFIG_SHELL_HUSH=y
+# CONFIG_SHELL_SIMPLE is not set
+# CONFIG_SHELL_NONE is not set
+CONFIG_GLOB=y
+CONFIG_GLOB_SORT=y
+CONFIG_PROMPT_HUSH_PS2="> "
+CONFIG_HUSH_FANCY_PROMPT=y
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
+CONFIG_MENU=y
+CONFIG_PASSWORD=y
+CONFIG_PASSWORD_DEFAULT=""
+# CONFIG_PASSWD_SUM_MD5 is not set
+CONFIG_PASSWD_SUM_SHA1=y
+# CONFIG_PASSWD_SUM_SHA256 is not set
+# CONFIG_PASSWD_SUM_SHA512 is not set
+# CONFIG_PASSWD_CRYPTO_PBKDF2 is not set
+CONFIG_DYNAMIC_CRC_TABLE=y
+CONFIG_ERRNO_MESSAGES=y
+# CONFIG_TIMESTAMP is not set
+CONFIG_IMD=y
+CONFIG_IMD_TARGET=y
+# CONFIG_KERNEL_INSTALL_TARGET is not set
+CONFIG_CONSOLE_FULL=y
+# CONFIG_CONSOLE_SIMPLE is not set
+# CONFIG_CONSOLE_NONE is not set
+# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
+CONFIG_CONSOLE_ACTIVATE_ALL=y
+# CONFIG_CONSOLE_ACTIVATE_NONE is not set
+# CONFIG_PARTITION is not set
+CONFIG_DEFAULT_ENVIRONMENT=y
+# CONFIG_DEFAULT_COMPRESSION_GZIP is not set
+# CONFIG_DEFAULT_COMPRESSION_LZO is not set
+CONFIG_DEFAULT_COMPRESSION_NONE=y
+CONFIG_HAVE_DEFAULT_ENVIRONMENT_NEW=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y
+CONFIG_DEFAULT_ENVIRONMENT_PATH=""
+CONFIG_BAREBOXENV_TARGET=y
+# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_POLLER=y
+CONFIG_STATE=y
+CONFIG_BOOTSTATE=y
+CONFIG_RESET_SOURCE=y
+
+#
+# Debugging
+#
+CONFIG_COMPILE_LOGLEVEL=6
+CONFIG_DEFAULT_LOGLEVEL=7
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_OMAP_UART_PORT=1
+# CONFIG_DEBUG_INITCALLS is not set
+CONFIG_HAS_DEBUG_LL=y
+CONFIG_COMMAND_SUPPORT=y
+# CONFIG_HAS_POWEROFF is not set
+CONFIG_COMPILE_HASH=y
+CONFIG_COMPILE_MEMORY=y
+
+#
+# Commands
+#
+
+#
+# Information
+#
+CONFIG_CMD_ARM_CPUINFO=y
+CONFIG_CMD_DEVINFO=y
+CONFIG_CMD_DMESG=y
+CONFIG_CMD_DRVINFO=y
+CONFIG_CMD_HELP=y
+CONFIG_LONGHELP=y
+CONFIG_CMD_IOMEM=y
+CONFIG_CMD_IMD=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_ARM_MMUINFO=y
+CONFIG_CMD_VERSION=y
+
+#
+# Boot
+#
+CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_CMD_BOOT=y
+CONFIG_CMD_BOOTM=y
+CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_BOOTM_VERBOSE=y
+CONFIG_CMD_BOOTM_INITRD=y
+CONFIG_CMD_BOOTM_OFTREE=y
+# CONFIG_CMD_BOOTM_OFTREE_UIMAGE is not set
+# CONFIG_CMD_BOOTM_AIMAGE is not set
+# CONFIG_CMD_BOOTU is not set
+# CONFIG_CMD_BOOTZ is not set
+CONFIG_CMD_GO=y
+CONFIG_CMD_LOADB=y
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_LOADY is not set
+CONFIG_CMD_RESET=y
+# CONFIG_CMD_UIMAGE is not set
+
+#
+# Partition
+#
+CONFIG_CMD_PARTITION=y
+CONFIG_CMD_AUTOMOUNT=y
+CONFIG_CMD_MOUNT=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFORMAT=y
+CONFIG_CMD_UMOUNT=y
+
+#
+# Environment
+#
+CONFIG_CMD_NV=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_DEFAULTENV=y
+CONFIG_CMD_GLOBAL=y
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_MAGICVAR=y
+CONFIG_CMD_MAGICVAR_HELP=y
+CONFIG_CMD_SAVEENV=y
+
+#
+# File
+#
+CONFIG_CMD_BASENAME=y
+CONFIG_CMD_CAT=y
+CONFIG_CMD_CD=y
+CONFIG_CMD_CP=y
+# CONFIG_CMD_CMP is not set
+CONFIG_CMD_DIGEST=y
+CONFIG_CMD_DIRNAME=y
+CONFIG_CMD_FILETYPE=y
+CONFIG_CMD_LN=y
+CONFIG_CMD_LS=y
+CONFIG_CMD_MD5SUM=y
+CONFIG_CMD_MKDIR=y
+CONFIG_CMD_PWD=y
+CONFIG_CMD_READLINK=y
+CONFIG_CMD_RM=y
+CONFIG_CMD_RMDIR=y
+# CONFIG_CMD_SHA1SUM is not set
+# CONFIG_CMD_SHA224SUM is not set
+# CONFIG_CMD_SHA256SUM is not set
+# CONFIG_CMD_SHA384SUM is not set
+# CONFIG_CMD_SHA512SUM is not set
+CONFIG_CMD_UNCOMPRESS=y
+
+#
+# Shell scripting
+#
+CONFIG_CMD_FALSE=y
+CONFIG_CMD_GETOPT=y
+CONFIG_CMD_LET=y
+CONFIG_CMD_MSLEEP=y
+CONFIG_CMD_READF=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_TEST=y
+CONFIG_CMD_TRUE=y
+
+#
+# Network
+#
+CONFIG_CMD_DHCP=y
+# CONFIG_CMD_HOST is not set
+CONFIG_NET_CMD_IFUP=y
+CONFIG_CMD_MIITOOL=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_TFTP=y
+
+#
+# Console and Framebuffer interaction
+#
+CONFIG_CMD_CLEAR=y
+CONFIG_CMD_ECHO=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_LOGIN=y
+CONFIG_CMD_MENU=y
+# CONFIG_CMD_MENU_MANAGEMENT is not set
+CONFIG_CMD_MENUTREE=y
+CONFIG_CMD_PASSWD=y
+# CONFIG_PASSWD_MODE_HIDE is not set
+CONFIG_PASSWD_MODE_STAR=y
+# CONFIG_PASSWD_MODE_CLEAR is not set
+# CONFIG_CMD_SPLASH is not set
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
+
+#
+# Memory
+#
+CONFIG_CMD_CRC=y
+CONFIG_CMD_CRC_CMP=y
+CONFIG_CMD_MD=y
+CONFIG_CMD_MEMCMP=y
+CONFIG_CMD_MEMCPY=y
+CONFIG_CMD_MEMSET=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MM=y
+CONFIG_CMD_MW=y
+
+#
+# Hardware manipulation
+#
+CONFIG_CMD_DETECT=y
+CONFIG_CMD_FLASH=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_LED=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_USBGADGET=y
+
+#
+# Miscellaneous
+#
+# CONFIG_CMD_2048 is not set
+CONFIG_CMD_BAREBOX_UPDATE=y
+# CONFIG_CMD_FIRMWARELOAD is not set
+CONFIG_CMD_OF_DUMP=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OF_DISPLAY_TIMINGS=y
+CONFIG_CMD_OFTREE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_STATE=y
+CONFIG_CMD_BOOTCHOOSER=y
+CONFIG_NET=y
+CONFIG_NET_NFS=y
+CONFIG_NET_NETCONSOLE=y
+CONFIG_NET_RESOLV=y
+CONFIG_NET_IFUP=y
+
+#
+# Drivers
+#
+CONFIG_OFTREE=y
+CONFIG_OFTREE_MEM_GENERIC=y
+CONFIG_DTC=y
+CONFIG_OFDEVICE=y
+CONFIG_OF_NET=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_BAREBOX_DRIVERS=y
+
+#
+# serial drivers
+#
+# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
+CONFIG_DRIVER_SERIAL_NS16550=y
+CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
+# CONFIG_DRIVER_SERIAL_CADENCE is not set
+CONFIG_PHYLIB=y
+
+#
+# Network drivers
+#
+# CONFIG_DRIVER_NET_ARC_EMAC is not set
+# CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set
+CONFIG_DRIVER_NET_CPSW=y
+# CONFIG_DRIVER_NET_DESIGNWARE is not set
+# CONFIG_DRIVER_NET_KS8851_MLL is not set
+# CONFIG_DRIVER_NET_SMC911X is not set
+# CONFIG_DRIVER_NET_SMC91111 is not set
+
+#
+# phylib
+#
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AT803X_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+CONFIG_MICREL_PHY=y
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_SMSC_PHY is not set
+
+#
+# MII bus device drivers
+#
+
+#
+# SPI drivers
+#
+# CONFIG_SPI is not set
+CONFIG_I2C=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_OMAP=y
+CONFIG_MTD=y
+CONFIG_MTD_WRITE=y
+CONFIG_MTD_OOB_DEVICE=y
+# CONFIG_MTD_RAW_DEVICE is not set
+
+#
+# Self contained MTD devices
+#
+# CONFIG_MTD_DOCG3 is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_DRIVER_CFI is not set
+CONFIG_NAND=y
+CONFIG_NAND_ECC_SOFT=y
+# CONFIG_NAND_ECC_BCH is not set
+CONFIG_NAND_ECC_HW=y
+# CONFIG_NAND_ECC_HW_OOB_FIRST is not set
+CONFIG_NAND_ECC_HW_SYNDROME=y
+CONFIG_NAND_ECC_HW_NONE=y
+CONFIG_NAND_INFO=y
+CONFIG_NAND_READ_OOB=y
+CONFIG_NAND_BBT=y
+# CONFIG_NAND_ALLOW_ERASE_BAD is not set
+CONFIG_NAND_OMAP_GPMC=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_DISK is not set
+CONFIG_USB=y
+# CONFIG_USB_HOST is not set
+CONFIG_USB_GADGET=y
+
+#
+# USB Gadget drivers
+#
+CONFIG_USB_GADGET_DFU=y
+CONFIG_USB_GADGET_SERIAL=y
+# CONFIG_USB_GADGET_FASTBOOT is not set
+CONFIG_USB_MUSB=y
+CONFIG_USB_MUSB_DSPS=y
+CONFIG_USB_MUSB_AM335X=y
+CONFIG_USB_MUSB_GADGET=y
+# CONFIG_VIDEO is not set
+# CONFIG_MCI is not set
+CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
+
+#
+# MFD
+#
+# CONFIG_MFD_ACT8846 is not set
+# CONFIG_MFD_LP3972 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_MFD_MC34704 is not set
+# CONFIG_MFD_MC9SDZ60 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_TWL4030 is not set
+# CONFIG_MFD_TWL6030 is not set
+
+#
+# Misc devices
+#
+# CONFIG_JTAG is not set
+# CONFIG_SRAM is not set
+CONFIG_STATE_DRV=y
+CONFIG_BOOTSTATE_DRV=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_LED_GPIO_OF=y
+# CONFIG_LED_GPIO_RGB is not set
+# CONFIG_LED_GPIO_BICOLOR is not set
+CONFIG_LED_TRIGGERS=y
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=y
+
+#
+# Input device support
+#
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_PWM is not set
+
+#
+# DMA support
+#
+CONFIG_GPIOLIB=y
+
+#
+# GPIO
+#
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_IMX is not set
+# CONFIG_GPIO_MXS is not set
+CONFIG_GPIO_OMAP=y
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_DESIGNWARE is not set
+# CONFIG_W1 is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_SINGLE=y
+
+#
+# Bus devices
+#
+CONFIG_BUS_OMAP_GPMC=y
+# CONFIG_REGULATOR is not set
+# CONFIG_RESET_CONTROLLER is not set
+# CONFIG_RTC_CLASS is not set
+
+#
+# Firmware Drivers
+#
+
+#
+# PHY Subsystem
+#
+# CONFIG_GENERIC_PHY is not set
+
+#
+# Filesystem support
+#
+CONFIG_FS=y
+CONFIG_FS_AUTOMOUNT=y
+# CONFIG_FS_CRAMFS is not set
+# CONFIG_FS_EXT4 is not set
+CONFIG_FS_RAMFS=y
+CONFIG_FS_DEVFS=y
+CONFIG_FS_TFTP=y
+CONFIG_FS_NFS=y
+# CONFIG_FS_FAT is not set
+CONFIG_FS_UBIFS=y
+CONFIG_FS_UBIFS_COMPRESSION_LZO=y
+CONFIG_FS_UBIFS_COMPRESSION_ZLIB=y
+# CONFIG_FS_BPKFS is not set
+# CONFIG_FS_UIMAGEFS is not set
+
+#
+# Library routines
+#
+CONFIG_PARAMETER=y
+CONFIG_UNCOMPRESS=y
+CONFIG_ZLIB=y
+# CONFIG_BZLIB is not set
+# CONFIG_LZ4_DECOMPRESS is not set
+# CONFIG_XZ_DECOMPRESS is not set
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+CONFIG_PROCESS_ESCAPE_SEQUENCE=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_QSORT=y
+CONFIG_LIBSCAN=y
+CONFIG_LIBUBIGEN=y
+CONFIG_LIBMTD=y
+
+#
+# Library gui routines
+#
+CONFIG_CRC32=y
+CONFIG_CRC16=y
+CONFIG_DIGEST=y
+CONFIG_MD5=y
+CONFIG_SHA1=y
+# CONFIG_DIGEST_MD5_GENERIC is not set
+CONFIG_DIGEST_SHA1_GENERIC=y
+# CONFIG_DIGEST_SHA224_GENERIC is not set
+# CONFIG_DIGEST_SHA256_GENERIC is not set
+# CONFIG_DIGEST_SHA384_GENERIC is not set
+# CONFIG_DIGEST_SHA512_GENERIC is not set
+# CONFIG_DIGEST_HMAC_GENERIC is not set
+# CONFIG_DIGEST_SHA1_ARM is not set
+# CONFIG_DIGEST_SHA256_ARM is not set
diff --git a/recipes-bsp/barebox/barebox-gsmk-owhw_git.bb b/recipes-bsp/barebox/barebox-gsmk-owhw_git.bb
new file mode 100644
index 0000000000..15908845b7
--- /dev/null
+++ b/recipes-bsp/barebox/barebox-gsmk-owhw_git.bb
@@ -0,0 +1,31 @@
+require barebox.inc
+
+RDEPENDS_${PN} += "${PN}-mlo"
+
+SRCREV = "4d1c656aa7ba155d8a555602d832ff1fc76d63f8"
+SRC_URI = " \
+	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
+	file://defconfig \
+	"
+
+PV = "v2015.06+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PKGV}-${PKGR}.img"
+BAREBOX_SYMLINK ?= "barebox-${MACHINE}.img"
+
+# generated using echo -n 'owhw-stop' | sha1sum
+BAREBOX_PASSWORD = "d797c986b04cdcb86206a990908e27f8c3ae96b4"
+
+do_configure_append () {
+	mkdir -p ${WORKDIR}/env/nv
+	echo 5 > ${WORKDIR}/env/nv/login.timeout
+}
+
+do_deploy_append () {
+	install -d ${DEPLOYDIR}
+	install ${S}/images/barebox-am33xx-gsmk-owhw.img ${DEPLOYDIR}/${BAREBOX_IMAGE}
+	cd ${DEPLOYDIR}
+	rm -f ${BAREBOX_SYMLINK}
+	ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
+}

From ba2e6da375859e401002fafdba9f201e63e16586 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sat, 31 Oct 2015 20:49:25 +0100
Subject: [PATCH 16/26] OWHW: add a machine config

---
 conf/machine/gsmk-owhw.conf | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 conf/machine/gsmk-owhw.conf

diff --git a/conf/machine/gsmk-owhw.conf b/conf/machine/gsmk-owhw.conf
new file mode 100644
index 0000000000..f99f88d596
--- /dev/null
+++ b/conf/machine/gsmk-owhw.conf
@@ -0,0 +1,41 @@
+#@TYPE: Machine
+#@NAME: gsmk-owhw
+#@DESCRIPTION: Machine configuration for the GSMK OWHW
+
+require conf/machine/include/ti33x.inc
+
+IMAGE_FSTYPES += "ubi tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO0"
+
+# UBI information.  Note that this is board and kernel specific.  Changes
+# in your kernel port may require changes in these variables.  For more
+# details about this board please see
+# http://processors.wiki.ti.com/index.php/UBIFS_Support
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1988 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
+
+# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+# UBI: VID header offset:          2048 (aligned 2048)
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
+
+# Go back to prefer our kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/bootloader = "barebox-gsmk-owhw"
+EXTRA_IMAGEDEPENDS += "barebox-gsmk-owhw"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
+	kernel usb2514 \
+"

From 20e26fcd3b0497d2f123d7c7adba777fcba77198 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 2 Nov 2015 08:46:27 +0100
Subject: [PATCH 17/26] ntp: fix postinst on systemd based hosts

We need to make sure we're not trying to call systemctl on the build
host.  Thanks to holger for pinpointing this.
---
 recipes-bsp/ntp/ntp_4.2.8p1.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/ntp/ntp_4.2.8p1.bb b/recipes-bsp/ntp/ntp_4.2.8p1.bb
index 61a8344c98..be5f6d9817 100644
--- a/recipes-bsp/ntp/ntp_4.2.8p1.bb
+++ b/recipes-bsp/ntp/ntp_4.2.8p1.bb
@@ -25,7 +25,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
            file://ntpdate.cron \
 "
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed"
 SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88"
@@ -162,6 +162,9 @@ pkg_postinst_ntpdate() {
         echo "comment the old crontab entry"
         sed -i -e "/^[^#]/ s/\(.*\)\(.*ntpdate-sync.*$\)/#\1\2/g" $D/var/spool/cron/root
     fi
+    if [ "x$D" != "x" ]; then
+	exit 0
+    fi
     systemctl status crond > /dev/null 2>&1
     if [ $? -eq 0 ]; then
         systemctl restart crond

From 8ce4ab4927f7769759c458b159a95e30f77ae116 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 20 Nov 2015 21:45:34 +0000
Subject: [PATCH 18/26] sysmocom-backup-data: Avoid an absolute symlink to fix
 restoring

When restoring the backup the rootfs is mounted in /rootfs/data
and the symlink to the real file would then not work. Attempt to
change the directory first to get a relative symlink.

Untested change and needed for rauc
---
 recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data b/recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data
index d78e45814f..c22bb127ee 100755
--- a/recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data
+++ b/recipes-apps/sysmocom-backup-data/files/sysmocom-backup-data
@@ -70,7 +70,8 @@ do_backup_files() {
 	tar -rf $BACKUP_FILE --transform='s,^,info/,' -C $NAME installed_packages mac_addr
 
 	# 6. Create stable link
-	ln -sf $BACKUP_FILE /data/sysmocom-backup.tar
+	cd /data/
+	ln -sf `basename $BACKUP_FILE` sysmocom-backup.tar
 
 	# 76
 	echo "The backup was stored to $BACKUP_FILE"

From 9170107271d68c6e1e92467c315829fc8800d4d5 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 20 Nov 2015 22:13:23 +0000
Subject: [PATCH 19/26] task-sysmocom-feed: Attempt to put perf into the feed
 as well

Make perf (perf-python, perf-perl) available to us as well. Let's
see what the CI is saying about it.
---
 recipes-apps/tasks/task-sysmocom-feed.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb
index 810a497380..baffbc00f6 100644
--- a/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/recipes-apps/tasks/task-sysmocom-feed.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r19"
+PR = "r20"
 
 RDEPENDS_${PN} = "\
 	task-sysmocom-tools \
@@ -16,4 +16,4 @@ RDEPENDS_${PN} = "\
 	logrotate python-jsonrpclib python-enum iputils \
 	packagegroup-sysmobts-sob rtl8169-eeprom autossh \
 	perl libdbd-sqlite-perl libdbi-perl libjson-perl \
-	netcat-openbsd"
+	netcat-openbsd perf"

From 0700c55790f2e6176298402199bccb4ca687b129 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sat, 21 Nov 2015 10:15:57 +0000
Subject: [PATCH 20/26] lm-sensors: Attempt to move to a URI where the code
 still exists

lm-sensors.org seems to have vanished from the internet. Start to
use a copy what was found by googling.
---
 recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1dd8081d8d..1ca94340d9 100644
--- a/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
+++ b/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb
@@ -7,7 +7,7 @@ PR = "r5"
 DEPENDS = "bison-native flex-native"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.bz2"
+SRC_URI = "https://downloads.openwrt.org/sources/lm_sensors-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "829d88fb09d67723fbf42853eb84d1fd"
 SRC_URI[sha256sum] = "bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581"

From 33b6d83eddf94c105e06bbdbbfd0f796948973d2 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sat, 21 Nov 2015 21:39:28 +0000
Subject: [PATCH 21/26] u-boot: Add the compiler-gcc5.h header file

When trying to compile with gcc5 we need this file to be present
as otherwise the build will fail.
---
 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 548be5e333..64b73db9fc 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 = "71497512280c9eac9be739ae0ca20eb21556bb92"
+SRCREV = "f6453a391125f824ebf5bab00ee03b6d73ae5695"
 PV = "v2011.12+git${SRCPV}"
 S = "${WORKDIR}/git"
 

From ca148fe4352db11b79b6b15634910a6ed7ec12fd Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Sun, 22 Nov 2015 16:02:08 +0100
Subject: [PATCH 22/26] barebox: update to newer git version for fixed sysmobts
 DSP

Signed-off-by: Jan Luebbe <jluebbe@debian.org>
---
 recipes-bsp/barebox/barebox-sysmobts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/barebox/barebox-sysmobts_git.bb b/recipes-bsp/barebox/barebox-sysmobts_git.bb
index 5acfb6acc5..f4a8d4ca39 100644
--- a/recipes-bsp/barebox/barebox-sysmobts_git.bb
+++ b/recipes-bsp/barebox/barebox-sysmobts_git.bb
@@ -1,6 +1,6 @@
 require barebox.inc
 
-SRCREV = "95e1a85cb276362e0b76396841e4e6988ab523b0"
+SRCREV = "0b1cbb933de3bc1b0773180413e89728cce53d3f"
 SRC_URI = " \
 	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
 	file://defconfig \

From b382d145a0fcb898cf4a50a43aab1562b1bcb51b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 25 Nov 2015 16:46:02 +0100
Subject: [PATCH 23/26] barebox: Update to be buildable with gcc5

No functional change for the specific hardware platform but a
new header to be consumed by gcc5.
---
 recipes-bsp/barebox/barebox-sysmobts_git.bb         | 2 +-
 recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb | 2 +-
 recipes-bsp/barebox/barebox-sysmocom-odu_git.bb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/barebox/barebox-sysmobts_git.bb b/recipes-bsp/barebox/barebox-sysmobts_git.bb
index f4a8d4ca39..5b19c9ea69 100644
--- a/recipes-bsp/barebox/barebox-sysmobts_git.bb
+++ b/recipes-bsp/barebox/barebox-sysmobts_git.bb
@@ -1,6 +1,6 @@
 require barebox.inc
 
-SRCREV = "0b1cbb933de3bc1b0773180413e89728cce53d3f"
+SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
 SRC_URI = " \
 	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
 	file://defconfig \
diff --git a/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb b/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb
index 5cfba3d248..5d44b4551c 100644
--- a/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb
+++ b/recipes-bsp/barebox/barebox-sysmocom-odu-mlo_git.bb
@@ -1,6 +1,6 @@
 require barebox.inc
 
-SRCREV = "95e1a85cb276362e0b76396841e4e6988ab523b0"
+SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
 SRC_URI = " \
 	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
 	file://defconfig \
diff --git a/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb b/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb
index f7c3470fba..6fac5afec9 100644
--- a/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb
+++ b/recipes-bsp/barebox/barebox-sysmocom-odu_git.bb
@@ -2,7 +2,7 @@ require barebox.inc
 
 RDEPENDS_${PN} += "${PN}-mlo"
 
-SRCREV = "95e1a85cb276362e0b76396841e4e6988ab523b0"
+SRCREV = "34a48171a699560d8a41d00d2c07ed37a79c00d8"
 SRC_URI = " \
 	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
 	file://defconfig \

From 85f60e5a6541fe6b7c3a0c1a2f3d0368bf3fe4b0 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 25 Nov 2015 17:28:42 +0100
Subject: [PATCH 24/26] ca-certificates: The source has vanished from debian

It was never a released version so it is not showing up on the
archive.debian.org page. Let's move to angstrom for our stable
source of it.
---
 recipes-extra/ca-certificates/ca-certificates_20120623.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extra/ca-certificates/ca-certificates_20120623.bb b/recipes-extra/ca-certificates/ca-certificates_20120623.bb
index 63fd8cb58b..00d6706861 100644
--- a/recipes-extra/ca-certificates/ca-certificates_20120623.bb
+++ b/recipes-extra/ca-certificates/ca-certificates_20120623.bb
@@ -4,7 +4,7 @@ SECTION = "misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=6135800ff6d893c7904d7aad90972eb5"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/ca-certificates_${PV}.tar.gz \
+SRC_URI = "http://sources.angstrom-distribution.org/ca-certificates_${PV}.tar.gz \
            file://0001-update-ca-certificates-remove-c-rehash.patch"
 
 SRC_URI[md5sum] = "5105d4cc086f0d4ecf7bf2e4c4667289"

From 5a1dca4d605e16e4dcc10877ceb4f5605085d4a4 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 25 Nov 2015 17:52:04 +0100
Subject: [PATCH 25/26] ca-certificates: Try to fetch it from launchpad

The angstrom mirror is very slow in finding the file (no dirhash?),
let's see if canonical is any better in serving the file.
---
 recipes-extra/ca-certificates/ca-certificates_20120623.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extra/ca-certificates/ca-certificates_20120623.bb b/recipes-extra/ca-certificates/ca-certificates_20120623.bb
index 00d6706861..9c585f1213 100644
--- a/recipes-extra/ca-certificates/ca-certificates_20120623.bb
+++ b/recipes-extra/ca-certificates/ca-certificates_20120623.bb
@@ -4,7 +4,7 @@ SECTION = "misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=6135800ff6d893c7904d7aad90972eb5"
 
-SRC_URI = "http://sources.angstrom-distribution.org/ca-certificates_${PV}.tar.gz \
+SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/ca-certificates_${PV}.tar.gz \
            file://0001-update-ca-certificates-remove-c-rehash.patch"
 
 SRC_URI[md5sum] = "5105d4cc086f0d4ecf7bf2e4c4667289"

From 04093241861f665ca3a7e47c5706be16269a4b9b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 27 Nov 2015 11:00:19 +0100
Subject: [PATCH 26/26] rauc: Do not try to populate /etc/opkg/

Our initramfs images are supposed to be small and don't have a
/etc/opkg folder so attempting to put feed config in there will
fail. Reset the FEED_URIS that come from our local.conf.
---
 recipes-core/images/image-rauc-install-initramfs.bb | 1 +
 recipes-core/images/image-rauc-rescue-initramfs.bb  | 1 +
 recipes-core/images/image-rauc-slot-initramfs.bb    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/recipes-core/images/image-rauc-install-initramfs.bb b/recipes-core/images/image-rauc-install-initramfs.bb
index aa1549d542..b3383ea35b 100644
--- a/recipes-core/images/image-rauc-install-initramfs.bb
+++ b/recipes-core/images/image-rauc-install-initramfs.bb
@@ -7,6 +7,7 @@ PACKAGE_INSTALL = "initramfs-framework-base initramfs-module-debug initramfs-mod
 
 #export IMAGE_BASENAME = "core-image-minimal-initramfs"
 IMAGE_LINGUAS = ""
+FEED_URIS=""
 
 LICENSE = "MIT"
 
diff --git a/recipes-core/images/image-rauc-rescue-initramfs.bb b/recipes-core/images/image-rauc-rescue-initramfs.bb
index f1ca7b8462..c4a5eac7c5 100644
--- a/recipes-core/images/image-rauc-rescue-initramfs.bb
+++ b/recipes-core/images/image-rauc-rescue-initramfs.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "rescue initramfs"
 PACKAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} rauc dropbear"
 
 IMAGE_LINGUAS = ""
+FEED_URIS=""
 
 LICENSE = "MIT"
 
diff --git a/recipes-core/images/image-rauc-slot-initramfs.bb b/recipes-core/images/image-rauc-slot-initramfs.bb
index 0e05675e89..287f60492c 100644
--- a/recipes-core/images/image-rauc-slot-initramfs.bb
+++ b/recipes-core/images/image-rauc-slot-initramfs.bb
@@ -7,6 +7,7 @@ PACKAGE_INSTALL = "initramfs-framework-base initramfs-module-debug initramfs-mod
 
 #export IMAGE_BASENAME = "core-image-minimal-initramfs"
 IMAGE_LINGUAS = ""
+FEED_URIS=""
 
 LICENSE = "MIT"