systemd_sysmocom.inc: Make sure machine-specific systemd.conf is used

We have machine-specific systemd.conf for sysmobts2100 and owhw, but we
didn't add them to SRC_URI so far, resulting in them not being used as
intended.

classes/gitver-pkg.bbclass

@@ -0,0 +1,155 @@
+# gitver-pkg.bbclass 
+#
+# Based on gitpkgv.bbclass from meta-openembedded
+
+PKGGITH = "${@get_pkg_gith(d, '${PN}')}"
+PKGGITN = "${@get_pkg_gitn(d, '${PN}')}"
+PKGGITV = "${@get_pkg_gitv(d, '${PN}')}"
+
+def gitpkgv_drop_tag_prefix(version):
+    import re
+    if re.match("v\d", version):
+        return version[1:]
+    else:
+        return version
+
+def get_pkg_gitv(d, pn):
+    import os
+    import bb
+    from pipes import quote
+
+    src_uri = d.getVar('SRC_URI', 1).split()
+    fetcher = bb.fetch2.Fetch(src_uri, d)
+    ud = fetcher.ud
+
+    ver = "0.0-0"
+
+    for url in ud.values():
+        if url.type == 'git' or url.type == 'gitsm':
+            for name, rev in url.revisions.items():
+                if not os.path.exists(url.localpath):
+                    return None
+
+                vars = { 'repodir' : quote(url.localpath),
+                         'rev' : quote(rev) }
+
+                # Verify of the hash is present 
+                try:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe %(rev)s --always 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+                    
+                except Exception:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && git fetch 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+
+                # Try to get a version using git describe
+                try:
+                    output = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe %(rev)s --long 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+
+                    ver = gitpkgv_drop_tag_prefix(output)
+
+                except Exception:
+                    try:
+                        commits = bb.fetch2.runfetchcmd(
+                            "cd %(repodir)s && "
+                            "git rev-list %(rev)s --count 2> /dev/null " % vars,
+                            d, quiet=True).strip()
+
+                        if commits == "":
+                           commits = "0"
+
+                        rev = bb.fetch2.get_srcrev(d).split('+')[1]
+                    
+                        ver = "0.0-%s-g%s" % (commits, rev[:7])
+
+                    except Exception:
+                        pass
+    return ver
+
+def get_pkg_gitn(d, pn):
+    import os
+    import bb
+    from pipes import quote
+
+    src_uri = d.getVar('SRC_URI', 1).split()
+    fetcher = bb.fetch2.Fetch(src_uri, d)
+    ud = fetcher.ud
+
+    for url in ud.values():
+        if url.type == 'git' or url.type == 'gitsm':
+            for name, rev in url.revisions.items():
+                if not os.path.exists(url.localpath):
+                    return None
+
+                vars = { 'repodir' : quote(url.localpath),
+                         'rev' : quote(rev) }
+
+                # Verify of the hash is present 
+                try:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe %(rev)s --always 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+                    
+                except Exception:
+                    bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && git fetch 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+
+
+                try:
+                    tag = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git describe --abbrev=0 %(rev)s 2>/dev/null" % vars,
+                        d, quiet=True).strip()
+ 
+                    vars = { 'repodir' : quote(url.localpath),
+                             'rev' : quote(rev),
+                             'tag' : quote(tag) }
+
+                    commits = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git rev-list %(rev)s ^%(tag)s --count 2> /dev/null " % vars,
+                        d, quiet=True).strip()
+
+                    return commits
+
+                except Exception:
+                    commits = bb.fetch2.runfetchcmd(
+                        "cd %(repodir)s && "
+                        "git rev-list %(rev)s --count 2> /dev/null " % vars,
+                        d, quiet=True).strip()
+
+                    if commits == "":
+                        commits = "0"
+
+                    return commits
+
+    return '0'
+
+
+def get_pkg_gith(d, pn):
+    import os
+    import bb
+    from pipes import quote
+
+    src_uri = d.getVar('SRC_URI', 1).split()
+    fetcher = bb.fetch2.Fetch(src_uri, d)
+    ud = fetcher.ud
+
+    for url in ud.values():
+        if url.type == 'git' or url.type == 'gitsm':
+            for name, rev in url.revisions.items():
+                if not os.path.exists(url.localpath):
+                    return None
+                else:
+                    return rev
+
+    return None
+

classes/gitver-repo.bbclass

@@ -0,0 +1,139 @@
+# gitver-repo.bbclass
+#
+# Based on gitpkgv.bbclass from meta-openembedded
+
+REPODIR ?= "${THISDIR}"
+
+REPOGITH  = "${@get_repo_gith(d,  '${REPODIR}')}"
+REPOGITN  = "${@get_repo_gitn(d,  '${REPODIR}')}"
+REPOGITV  = "${@get_repo_gitv(d,  '${REPODIR}')}"
+REPOGITT  = "${@get_repo_gitt(d,  '${REPODIR}')}"
+REPOGITFN = "${@get_repo_gitfn(d, '${REPODIR}', '${REPOFILE}')}"
+
+def gitver_repo_drop_tag_prefix(version):
+    import re
+    if re.match("v\d", version):
+        return version[1:]
+    else:
+        return version
+
+def get_repo_gitv(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+
+    try:
+        output = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --long 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        ver = gitver_repo_drop_tag_prefix(output)
+
+    except Exception:
+        return None
+
+    return ver
+
+def get_repo_gitn(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+    
+    try:
+        
+        tag = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --abbrev=0 2>/dev/null" % vars, 
+            d, quiet=False).strip()
+
+        vars = { 'repodir' : quote(repodir),
+                 'tag' : quote(tag) }
+
+        commits = bb.fetch2.runfetchcmd(
+                        "git -C %(repodir)s rev-list %(tag)s.. --count 2> /dev/null" % vars,
+                        d, quiet=True).strip()
+
+        return commits
+
+    except Exception:
+        commits = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s rev-list --count HEAD 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        if commits == "":
+            commits = "0"
+
+        return commits
+
+def get_repo_gitt(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+
+    try:
+        tag = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --abbrev=0 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        return tag
+
+    except Exception:
+        return None
+
+def get_repo_gith(d, repodir):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir' : quote(repodir) }
+
+    try:
+        hash = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s rev-parse HEAD 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        return hash
+    
+    except Exception:
+        return None
+
+def get_repo_gitfn(d, repodir, repofile):
+    import os
+    import bb
+    from pipes import quote
+
+    vars = { 'repodir'  : quote(repodir),
+             'repofile' : quote(repofile) }
+    
+    try:
+        
+        tag = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s describe --abbrev=0 2>/dev/null" % vars, 
+            d, quiet=False).strip()
+
+        vars = { 'repodir'  : quote(repodir),
+                 'repofile' : quote(repofile),
+                 'tag'      : quote(tag) }
+
+        commits = bb.fetch2.runfetchcmd(
+                        "git -C %(repodir)s rev-list --count %(tag)s.. %(repofile)s 2> /dev/null" % vars,
+                        d, quiet=True).strip()
+
+        return commits
+
+    except Exception:
+        commits = bb.fetch2.runfetchcmd(
+            "git -C %(repodir)s rev-list --count HEAD %(repofile)s 2>/dev/null" % vars, 
+            d, quiet=True).strip()
+
+        if commits == "":
+            commits = "0"
+
+        return commits
+
+

classes/sysmocom-archiver.bbclass

@@ -7,6 +7,10 @@ ARCHIVE_TYPE ?= "TAR SRPM"
 DISTRO ?= "poky"
 PATCHES_ARCHIVE_WITH_SERIES = 'TRUE'
 
+
+def compat_cmp(a, b):
+    return (a>b)-(a<b)
+
 def get_bb_inc(d):
     '''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}'''
     import re
@@ -83,7 +87,7 @@ def get_series(d):
     locals = (fetch.localpath(url) for url in fetch.urls)
     for local in locals:
         src_patches.append(local)
-    if not cmp(work_dir,s):
+    if not compat_cmp(work_dir,s):
         tmp_list = src_patches
     else:
         tmp_list = src_patches[1:]
@@ -129,7 +133,7 @@ def not_tarball(d):
     workdir = d.getVar('WORKDIR',True)
     s = d.getVar('S',True)
     if 'work-shared' in s or 'task-' in workdir or 'native' in workdir:
-        pn = bb.data.getVar('PN', d , True)
+        pn = d.getVar('PN', True)
         if pn == 'gcc-cross':
               return False
         return True
@@ -178,7 +182,7 @@ def archive_sources_from_directory(d,stage_name):
         try:
             source_dir = os.path.join(work_dir,[ i for i in s.replace(work_dir,'').split('/') if i][0])
         except IndexError:
-            if not cmp(s,work_dir):
+            if not compat_cmp(s,work_dir):
                 return ''
     else:
         return ''
@@ -250,7 +254,9 @@ def get_licenses(d):
                         clean_licenses += x
         if '|' in clean_licenses:
                 clean_licenses = clean_licenses.replace('|','')
-        return clean_licenses
+        # linux-firmware has many many licenses, leading to too long path
+        # so let's truncate it at 200...
+        return clean_licenses[0:200]
 
 def move_tarball_deploy(d,tarball_list):
     '''move tarball in location to ${DEPLOY_DIR}/sources'''
@@ -356,8 +362,8 @@ def archive_scripts_logs(d):
 
 def dumpdata(d):
     '''dump environment to "${P}-${PR}.showdata.dump" including all kinds of variables and functions when running a task'''
-    workdir = bb.data.getVar('WORKDIR', d, 1)
-    distro = bb.data.getVar('DISTRO', d, 1)
+    workdir = d.getVar('WORKDIR', 1)
+    distro = d.getVar('DISTRO', 1)
     s = d.getVar('S', True)
     pf = d.getVar('PF', True)
     target_sys = d.getVar('TARGET_SYS', True)
@@ -377,8 +383,8 @@ def dumpdata(d):
     bb.data.emit_env(f, d, True)
     # emit the metadata which isnt valid shell
     for e in d.keys():
-        if bb.data.getVarFlag(e, 'python', d):
-            f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
+        if d.getVarFlag(e, 'python'):
+            f.write("\npython %s () {\n%s}\n" % (e, d.getVar(e, 1)))
     f.close()
 
 def create_diff_gz(d):
@@ -454,8 +460,8 @@ python do_archive_linux_yocto(){
     s = d.getVar('S', True)
     if 'linux-yocto' in s:
         source_tar_name = archive_sources(d,'')
-    if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() not in 'SRPM':
-        move_tarball_deploy(d,[source_tar_name,''])
+        if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() not in 'SRPM':
+            move_tarball_deploy(d,[source_tar_name,''])
 }
 do_kernel_checkout[postfuncs] += "do_archive_linux_yocto "
 

conf/distro/include/sysmocom-defaults.conf

@@ -30,8 +30,12 @@ USE_NLS = "no"
 # We don't need x11, nfc, selinux, pam in our builds
 DISTRO_FEATURES_remove = "x11 nfc selinux pam"
 
-# Get rid off XZ for systemd
-PACKAGECONFIG_pn-systemd = "ldconfig"
+# Get rid off XZ, xkbcommon, pam, selinux for systemd and many more now
+PACKAGECONFIG_pn-systemd = "compat ldconfig binfmt sysusers randomseed myhostname firstboot utmp"
 
 # From fido on.. build curl with libssl to avoid gnutls
 PACKAGECONFIG_pn-curl="ipv6 ssl zlib"
+
+# disable libsolv as it is broken Yocto Bug #11427
+PACKAGECONFIG_pn-opkg = ""
+PACKAGECONFIG_pn-opkg-native = ""

conf/layer.conf

@@ -10,6 +10,7 @@ BBFILES += "${BBFILES_SYSMOCOM_BSP}"
 
 # selects specific distro or master when DISTRO_VERSION contains snapshot
 BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*.bbappend"
+BBFILES_SYSMOCOM_BSP += "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*/*.bb"
 
 BBFILE_COLLECTIONS += "sysmocom-bsp"
 BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/"

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 += "ubifs"
+
+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 mtd-utils-ubifs bossa \
+"

conf/machine/include/sysmobts.inc

@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "3.10.84+git%"
+PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
@@ -41,3 +41,6 @@ MACHINE_EXTRA_RDEPENDS = "\
 
 require conf/machine/include/tune-arm926ejs.inc
 require conf/machine/include/dm6446.inc
+
+# we tune for armv5te but it ends up as armv5e on pyro and probably earlier. Help it.
+ARMPKGSFX_THUMB="t"

conf/machine/litecell15.conf

@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: Litecel15 EVM
+#@DESCRIPTION: Machine configuration for the NRW Litecell15 EVM
+
+# (omap-a15.inc)
+
+SOC_FAMILY = "omap-a15"
+require conf/machine/include/soc-family.inc
+
+DEFAULTTUNE = "cortexa15thf-neon"
+require conf/machine/include/tune-cortexa15.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-litecell15"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-litecell15"
+PREFERRED_PROVIDER_u-boot = "u-boot-litecell15"
+
+IMAGE_FSTYPES += "tar.gz"
+SERIAL_CONSOLE = "115200 ttyS2"
+UBOOT_MACHINE = "litecell15_config"
+
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm vfat ext2"
+
+MACHINE_GPS_DEVICE = "/dev/ttyS0"

conf/machine/sysmobts2100.conf

@@ -0,0 +1,17 @@
+# sysmoBTS 2100 machine type, based on LC15
+require conf/machine/litecell15.conf
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
+	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+	kernel-module-rpmsg-proto \
+	kernel-module-rpmsg-rpc \
+	kernel-module-nrw-clkerr \
+	kernel-module-nrw-vswr \
+	kernel-module-omap-remoteproc \
+	kernel-module-fpgadl \
+	"
+
+MACHINE_EXTRA_RDEPENDS = "\
+	task-sysmocom-bts \
+	${@['watchdog', ''][d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd']} \
+	"

conf/machine/sysmocom-alix.conf

@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for sysmocom alix2d based hardware
+
+require sysmocom-bsc.conf
+MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"

conf/machine/sysmocom-apu2.conf

@@ -0,0 +1,43 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for sysmocom apu2 based hardware
+
+require conf/machine/include/tune-core2.inc
+require conf/machine/include/genericx86-common.inc
+
+
+PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
+PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
+
+MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+IMAGE_FSTYPES = "ext4"
+
+# After dora core2 got renamed to core2-32
+# After dora core2 got renamed to core2-32
+DEFAULTTUNE := "${@['core2', 'core2-32']['core2-32' in d.getVar('AVAILTUNES', True)]}"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+MACHINE_CONSOLE = "console=ttyS0,115200n8"
+
+# We bypass swrast but we need it to be present for X to load correctly
+XSERVER ?= "xserver-xf86-dri-lite \
+           mesa-dri-driver-swrast \
+           xf86-input-vmmouse \
+           xf86-input-keyboard \
+           xf86-input-evdev \
+           xf86-video-vmware"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+#MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "linux-firmware-rtl-nic"
+
+MACHINEOVERRIDES = "${MACHINE}:sysmocom-bsc"

conf/machine/sysmocom-bsc.conf

@@ -5,10 +5,11 @@
 TARGET_ARCH = "i586"
 
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
+PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
 
 require conf/machine/include/tune-geode.inc
 

conf/machine/sysmocom-idu.conf

@@ -7,10 +7,11 @@ require conf/machine/include/genericx86-common.inc
 
 
 PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
+PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
 
 MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
 

recipes-apps/images/sysmocom-bsc-image.bb

@@ -1,6 +1,7 @@
 require sysmocom-image.inc
 
 IMAGE_LINGUAS = " "
+IMAGE_INSTALL_append = " dnsmasq "
 
 # This variant of the image will run osmo-bts and osmo-bsc
 activate_bsc() {

recipes-apps/images/sysmocom-owhw-image.bb

@@ -0,0 +1,26 @@
+require recipes-apps/images/sysmocom-image.inc
+require recipes-apps/images/image-passwd.inc
+require recipes-apps/images/image-sshkey.inc
+
+# have enough space for log files and db
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE} \
+		 task-owhw-image task-sysmocom-debug \
+		 task-sysmocom-tools"
+
+# vim: tabstop=8 shiftwidth=8 noexpandtab
+
+# create what the rauc slots expect...
+link_kernel() {
+    echo "Linking the current uImage to /kernel"
+    OLD_PWD=$PWD
+
+    cd ${IMAGE_ROOTFS}/
+    ln ./boot/uImage-* ./kernel || true
+
+    echo "Copying devicetree to /devicetree"
+    cp "${DEPLOY_DIR_IMAGE}/uImage-am335x-gsmk-owhw.dtb" ./devicetree
+
+    cd $OLD_PWD
+}
+
+IMAGE_PREPROCESS_COMMAND += "link_kernel; "

recipes-apps/images/sysmocom-owhw-rauc-image.bb

@@ -0,0 +1,2 @@
+require sysmocom-owhw-image.bb
+require sysmocom-rauc-slot.inc

recipes-apps/sysmocom-backup-data/files/gsmk-owhw/data.mount

@@ -0,0 +1,7 @@
+[Unit]
+Description=/data
+
+[Mount]
+What=ubi0:data
+Where=/data
+Type=ubifs

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"

recipes-apps/sysmocom-backup/files/sysmocom-backup

@@ -7,7 +7,7 @@ FILES="etc/sysmocom/backup.d"
 
 # Pick some extra files
 if [ -e /etc/sysmocom/backup.d/ ]; then
-	for extra in `ls /etc/sysmocom/backup.d/*.backup`;
+	for extra in `ls /etc/sysmocom/backup.d/*.files`;
 	do
 		echo "Add extras from $extra."
 		FILES="$FILES `cat $extra`"

recipes-apps/sysmocom-backup/sysmocom-backup_1.0.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "sysmocom config backup and restore scripts"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = " \
 	file://sysmocom-backup \

recipes-apps/tasks/task-owhw-image.bb

@@ -0,0 +1,21 @@
+DESCRIPTION = "Task for OWHW hardware"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = " \
+		    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r2"
+
+RDEPENDS_${PN} = "usbutils openvpn gpsd gps-utils dropbear \
+	wget ntp ca-cacert-rootcert early-date i2c-tools \
+	wireless-tools iw crda gpsdate \
+	kernel-module-cfg80211 \
+	kernel-module-mac80211 \
+	kernel-module-rt2x00lib \
+	kernel-module-rt2x00usb \
+	kernel-module-rt2800lib \
+	kernel-module-rt2800usb \
+	linux-firmware-ralink \
+	procps iputils \
+"
+
+# vim: tabstop=8 shiftwidth=8 noexpandtab

recipes-apps/tasks/task-sysmocom-bts.bb

@@ -4,22 +4,22 @@ LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r23"
+PR = "r24"
 
 CALIB = ""
 CALIB_sysmobts-v2 = "sysmobts-calib sysmobts-util"
 
 UTIL = ""
 UTIL_sysmobts-v2 = "sbts2050-util gpsd gps-utils"
+UTIL_sysmobts2100 = "gpsd gps-utils"
 
 # TODO: re-add femtobts-calib after it went through the API migration
 RDEPENDS_${PN} = "\
     osmo-bts \
-    osmo-bts-remote \
     osmo-pcu \
     lmsensors-scripts \
-    sysmobts-config \
     ${CALIB} \
     ${UTIL} \
     "
+RDEPENDS_${PN}_append_sysmobts-v2 = " osmo-bts-remote sysmobts-config"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

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 = "r21"
 
 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 lksctp-tools task-gprscore"

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

recipes-bsp/barebox/barebox-gsmk-owhw-mlo_git.bb

@@ -0,0 +1,21 @@
+require barebox.inc
+
+SRCREV = "ce8849b03a40718fdaa9d7fc30312eeeb0fafcac"
+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}
+}

recipes-bsp/barebox/barebox-gsmk-owhw/0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch

@@ -0,0 +1,29 @@
+From 5661d2be63f55e5cbaa72e1da1dae32e7a5c3071 Mon Sep 17 00:00:00 2001
+From: Harald Welte <laforge@gnumonks.org>
+Date: Mon, 22 Feb 2016 23:42:44 +0100
+Subject: [PATCH] OWHW HACK: hard-code the bootstate backend-node
+
+this is required as the spi controller used in barebox is spi-gpio,
+while on Linux we use the hardware spi controller of the am335x,
+resulting in different devicetree paths.
+---
+ common/state.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/common/state.c b/common/state.c
+index 9c0b218..1571b53 100644
+--- a/common/state.c
++++ b/common/state.c
+@@ -758,7 +758,8 @@ static int of_state_fixup(struct device_node *root, void *ctx)
+ 	}
+ 
+ 	/* backend phandle */
+-	backend_node = of_find_node_by_path_from(root, state->backend->of_path);
++	//backend_node = of_find_node_by_path_from(root, state->backend->of_path);
++	backend_node = of_find_node_by_path_from(root, "/ocp/spi@481a0000/m95m02@0");
+ 	if (!backend_node) {
+ 		ret = -ENODEV;
+ 		goto out;
+-- 
+2.7.0
+

recipes-bsp/barebox/barebox-gsmk-owhw/defconfig

@@ -0,0 +1,615 @@
+#
+# 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_SPI=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_ENC28J60 is not set
+# CONFIG_DRIVER_NET_KS8851_MLL is not set
+# CONFIG_DRIVER_NET_MICREL 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=y
+CONFIG_DRIVER_SPI_GPIO=y
+CONFIG_DRIVER_SPI_OMAP3=y
+CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_GPIO=y
+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_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# 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_AT25=y
+# CONFIG_EEPROM_AT24 is not set
+
+#
+# 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_74164 is not set
+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
+#
+# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
+
+#
+# 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

recipes-bsp/barebox/barebox-gsmk-owhw_git.bb

@@ -0,0 +1,32 @@
+require barebox.inc
+
+RDEPENDS_${PN} += "${PN}-mlo"
+
+SRCREV = "ec82959f054af3e4a27267290905cfd895f75331"
+SRC_URI = " \
+	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
+        file://0001-OWHW-HACK-hard-code-the-bootstate-backend-node.patch \
+	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}
+}

recipes-bsp/barebox/barebox-sysmobts_git.bb

@@ -1,6 +1,6 @@
 require barebox.inc
 
-SRCREV = "95e1a85cb276362e0b76396841e4e6988ab523b0"
+SRCREV = "1d8bdd6f226df2ecbde3776b52fbc228158293fd"
 SRC_URI = " \
 	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
 	file://defconfig \
@@ -17,6 +17,9 @@ BAREBOX_BIN_SYMLINK ?= "barebox-${MACHINE}.bin"
 # generated using echo -n 'bts-stop' | sha1sum
 BAREBOX_PASSWORD = "5a7ef8875df28cb95a0f833906f94df8573bcc5d"
 
+# Provide a replacement for calling whoami
+export KBUILD_BUILD_USER="poky"
+
 do_configure_append () {
 	mkdir -p ${WORKDIR}/env/nv
 	echo 5 > ${WORKDIR}/env/nv/login.timeout

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 \

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 \

recipes-bsp/base-files/base-files_sysmocom.inc

@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
-PRINC="3"
+PRINC="4"

recipes-bsp/base-files/files/sysmocom-bsc/fstab

@@ -4,5 +4,3 @@ devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
 usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
 tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
 tmpfs                /var/volatile        tmpfs      defaults              0  0
-
-/dev/sda1            /boot                ext4       defaults,nofail       0  2

recipes-bsp/bossa/bossa_git.bb

@@ -0,0 +1,23 @@
+SUMMARY = "flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"
+HOMEPAGE = "http://sourceforge.net/projects/b-o-s-s-a/"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
+SRCREV = "05bfcc39bc0453c3028b1161175b95a81af7a901"
+SRC_URI = "git://git.code.sf.net/p/b-o-s-s-a/code"
+DEPENDS = "readline"
+
+PV = "v0.0+git${SRCPV}"
+PR = "r2"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	mkdir -p obj/arm-dis
+	oe_runmake -f Makefile bin/bossac bin/bossash
+}
+
+do_install() {
+	install -d ${D}${bindir}/
+	install -m 0755 ${S}/bin/bossac ${D}${bindir}/bossac
+	install -m 0755 ${S}/bin/bossash ${D}${bindir}/bossash
+}

recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc

@@ -1,2 +1,2 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown-master:"

recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:"
 PRINC = "13"
 

recipes-bsp/linux/linux-litecell15_4.4.32.bb

@@ -0,0 +1,78 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the LiteCell 1.5"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+COMPATIBLE_MACHINE = "(litecell15|sysmobts2100)"
+
+RDEPENDS_kernel-base += "kernel-devicetree"
+
+KERNEL_DEVICETREE_litecell15 = "litecell15.dtb"
+KERNEL_DEVICETREE_sysmobts2100 = "litecell15.dtb"
+
+RDEPENDS_kernel-devicetree += "update-alternatives-opkg"
+
+LINUX_VERSION = "${PV}"
+LINUX_VERSION_EXTENSION = "-lc15"
+
+RDEPENDS_kernel-image += "update-alternatives-opkg"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+S = "${WORKDIR}/git"
+
+NRW_LC15_MIRROR ??= "gitlab.com/nrw_litecell15"
+
+inherit gitver-pkg gitver-repo
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "linux-litecell15_4.4.32.bb"
+PR       := "r${REPOGITFN}"
+
+REPODIR   = "${THISDIR}/files"
+REPOFILE  = ""
+PR       := "${PR}.${REPOGITFN}"
+
+PV   = "4.4.32+git${SRCPV}"
+PKGV = "${PKGGITV}"
+
+DEV_BRANCH  = "${@ 'nrw/litecell15-next' if d.getVar('NRW_BSP_DEVEL', False) == "next" else 'nrw/litecell15'}"
+DEV_SRCREV  = "${AUTOREV}"
+DEV_SRCURI := "git://${NRW_LC15_MIRROR}/processor-sdk-linux.git;protocol=https;branch=${DEV_BRANCH}"
+
+REL_BRANCH  = "nrw/litecell15"
+REL_SRCREV  = "a54d64a4be25d87032a8600b97b271f255587844"
+REL_SRCURI := "git://${NRW_LC15_MIRROR}/processor-sdk-linux.git;protocol=https;branch=${REL_BRANCH}"
+
+BRANCH  = "${@ '${DEV_BRANCH}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_BRANCH}'}"
+SRCREV  = "${@ '${DEV_SRCREV}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCREV}'}"
+SRC_URI = "${@ '${DEV_SRCURI}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCURI}'}"
+
+addtask showversion after do_compile before do_install
+do_showversion() {
+    bbplain "${PN}: ${PKGGITV} => ${BRANCH}:${PKGGITH}"
+}
+
+do_configure_prepend() {
+    sed -i -e 's/EXTRAVERSION =.*/EXTRAVERSION = .${PKGGITN}-lc15/g' ${S}/Makefile
+}
+
+SRC_URI += "file://defconfig"
+
+# autoload defaults (alphabetically sorted)
+module_autoload_fpgadl = "fpgadl"
+module_autoload_nrw_clkerr = "nrw-clkerr"
+module_autoload_nrw_vswr = "nrw-vswr"
+module_autoload_omap_remoteproc = "omap_remoteproc"
+module_autoload_rpmsg_proto = "rpmsg-proto"
+module_autoload_rpmsg_rpc = "rpmsg-rpc"
+
+KERNEL_MODULE_PROBECONF_append = "fpgadl nrw_clkerr nrw_vswr omap_remoteproc rpmsg_proto rpmsg_rpc"
+KERNEL_MODULE_AUTOLOAD_append = "fpgadl nrw_clkerr nrw_vswr omap_remoteproc rpmsg_proto rpmsg_rpc"
+
+RDEPENDS_kernel-module-omap-remoteproc += "lc15-firmware"
+RDEPENDS_kernel-module-fpgadl += "lc15-firmware"

recipes-bsp/linux/linux-sysmocom_4.9.bb

@@ -0,0 +1,59 @@
+inherit kernel
+require linux-sysmocom.inc
+
+DEPENDS += "bc-native"
+
+# ATTENTION: Update linux-backports PR on version change. In Dora the
+# 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 ?= "4.9.14"
+LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}"
+
+# Overrides for the sysmocom bts v2
+BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
+
+SRCREV = "8d5d275254642b70b3ecf18a5b9b9fe9d5777230"
+
+PR = "r1"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=lynxis/v4.9 \
+	   file://defconfig"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = "(sysmobts-v2|sysmocom-bsc)"
+EXTRA_OEMAKE += "KALLSYMS_EXTRA_PASS=1"
+
+require linux-tools.inc
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${B}/.config
+	oe_runmake -C ${S} O=${B} oldconfig
+}
+
+# autoload defaults (alphabetically sorted)
+module_autoload_davinci_mmc = "davinci_mmc"
+module_autoload_dspdl_dm644x = "dspdl_dm644x"
+module_autoload_fpgadl_par = "fpgadl_par"
+module_autoload_leds-gpio = "leds-gpio"
+module_autoload_mmc_block = "mmc_block"
+module_autoload_msgqueue = "msgqueue"
+module_autoload_rtfifo = "rtfifo"
+
+KERNEL_MODULE_PROBECONF_append = "davinci_mmc dspdl_dm644x fpgadl_par leds-gpio mmc_block msgqueue rtfifo"
+KERNEL_MODULE_AUTOLOAD_append = "davinci_mmc dspdl_dm644x fpgadl_par leds-gpio mmc_block msgqueue rtfifo"
+
+# module configs (alphabetically sorted)
+module_conf_dspdl_dm644x = "options dspdl_dm644x fw_name=${BTS_FIRMWARE_NAME}.out debug=0"
+module_conf_fpgadl_par = "options fpgadl_par fw_name=${BTS_FIRMWARE_NAME}.bit"
+module_conf_msgqueue = "options msgqueue fw_name=${BTS_FIRMWARE_NAME}.out"
+module_conf_rtfifo = "options rtfifo fw_name=${BTS_FIRMWARE_NAME}.out"
+
+RDEPENDS_kernel-module-dspdl-dm644x += "sysmobts-firmware"
+RDEPENDS_kernel-module-fpgadl-par += "sysmobts-firmware"
+RDEPENDS_kernel-module-msgqueue += "sysmobts-firmware"
+RDEPENDS_kernel-module-rtfifo += "sysmobts-firmware"
+
+DEFAULT_PREFERENCE = "-1"

recipes-bsp/netbase/netbase_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "21"
 

recipes-bsp/ntp/ntp_4.2.8p6.bb

@@ -25,10 +25,10 @@ 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"
+SRC_URI[md5sum] = "60049f51e9c8305afe30eb22b711c5c6"
+SRC_URI[sha256sum] = "583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048"
 
 inherit autotools update-rc.d useradd systemd pkgconfig
 
@@ -101,6 +101,10 @@ do_install_append() {
 
     install -d ${D}${systemd_unitdir}/ntp-units.d
     install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list
+
+    if [ `ls -A ${D}${libexecdir} | wc -l` -eq 0 ]; then
+        rm -rf ${D}${libexecdir}
+    fi
 }
 
 PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils ${PN}-perl"
@@ -162,6 +166,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

recipes-bsp/odu-static-devicenames/files/gsmk-owhw/odu-persistens-serial.rules

@@ -0,0 +1,19 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION=="remove", GOTO="owhw_persistent_serial_end"
+SUBSYSTEM!="tty", GOTO="owhw_persistent_serial_end"
+KERNEL!="ttyUSB[0-9]*", GOTO="owhw_persistent_serial_end"
+
+KERNELS=="2-1.2:1.0", SYMLINK+="ttyModem1DM"
+KERNELS=="2-1.2:1.1", SYMLINK+="ttyModem1NMEA"
+KERNELS=="2-1.2:1.2", SYMLINK+="ttyModem1AT"
+KERNELS=="2-1.2:1.3", SYMLINK+="ttyModem1PPP"
+KERNELS=="2-1.2:1.4", SYMLINK+="ttyModem1NDIS"
+
+KERNELS=="2-1.3:1.0", SYMLINK+="ttyModem2DM"
+KERNELS=="2-1.3:1.1", SYMLINK+="ttyModem2NMEA"
+KERNELS=="2-1.3:1.2", SYMLINK+="ttyModem2AT"
+KERNELS=="2-1.3:1.3", SYMLINK+="ttyModem2PPP"
+KERNELS=="2-1.3:1.4", SYMLINK+="ttyModem2NDIS"
+
+LABEL="owhw_persistent_serial_end"

recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb

@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "pciutils"
 
-SRCREV = "e62e515ce314599e48b268dac69d2f16a504264c"
+SRCREV = "2052514dc99575140af40b25e41c438c98eb9b48"
 SRC_URI = "git://git.sysmocom.de/rtl8168-eeprom;protocol=git;branch=master"
 PV = "v0.0.1+git${SRCPV}"
 PR = "r0"

recipes-bsp/sob-odu/files/gsmk-owhw/gpio_usb2514

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+SYSGPIO=/sys/class/gpio
+DEVGPIO=/dev/gpio
+
+[ -d "$DEVGPIO " ] || mkdir "$DEVGPIO"
+
+export_gpio()
+{
+	NUM="$1"
+	DIR="$2"
+
+	GPIOPATH="$SYSGPIO/gpio$NUM"
+
+	[ -d "$GPIOPATH" ] || echo $1 > "$SYSGPIO/export"
+	echo $2 > "$GPIOPATH/direction"
+}
+
+export_gpio_out()
+{
+	NUM="$1"
+	NAME="$2"
+	VAL="$3"
+	INV="$4"
+
+	GPIOPATH="$SYSGPIO/gpio$NUM"
+
+	export_gpio $NUM out
+	ln -sfn "$GPIOPATH" "$DEVGPIO/$NAME"
+
+	if [ "x$INV" != "x" ]; then
+		echo 1 > "$GPIOPATH/active_low"
+	else
+		echo 0 > "$GPIOPATH/active_low"
+	fi
+
+	echo $VAL > "$GPIOPATH/value"
+}
+
+export_gpio_in()
+{
+	NUM="$1"
+	NAME="$2"
+	INV="$3"
+
+	GPIOPATH="$SYSGPIO/gpio$NUM"
+
+	export_gpio $NUM in
+	ln -sfn "$GPIOPATH" "$DEVGPIO/$NAME"
+
+	if [ "x$INV" != "x" ]; then
+		echo 1 > "$GPIOPATH/active_low"
+	else
+		echo 0 > "$GPIOPATH/active_low"
+	fi
+}
+
+
+export_gpio_out 48 pse_i2c_buf_en 0 active_low
+export_gpio_in 52 pse_int active_low
+export_gpio_out 23 connect_st_usim1 0
+export_gpio_out 27 connect_st_usim2 0
+export_gpio_out 26 mdm1_rst 0
+export_gpio_out 59 mdm1_on 1
+export_gpio_out 58 mdm_ldo_en 1
+#export_gpio_in 57 button active_low
+export_gpio_out 55 mdm2_rst 0
+#export_gpio_out 54 system_led 1 active_low
+export_gpio_out 51 eeprom_wp 0
+export_gpio_out 50 mdm2_on 1
+export_gpio_out 113 simtrace_erase 0
+export_gpio_out 115 simtrace_bootloader 0
+export_gpio_out 114 simtrace_reset 0
+export_gpio_in 104 acc_int active_low
+export_gpio_out 62 hub_reset 1 active_low

recipes-bsp/sob-odu/files/usb2514.c

@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <limits.h>
 #include <fcntl.h>
+#include <string.h>
 
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -30,11 +31,110 @@
 /* #include <linux/i2c-dev.h> */
 #include "i2c-dev.h"
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-#define USB2514_SLAVE_ADDR	0x2C
+enum compare_op {
+	EQUAL,
+	NOT_EQUAL,
+	LESS_THAN_OR_EQUAL,
+	GREATER_THAN_OR_EQUAL,
+};
+
+struct usb2514_board {
+	const char *name;
+
+	unsigned int i2c_bus;
+	uint8_t i2c_addr;
+
+	const char *board_version_file;
+	unsigned int board_version;
+	enum compare_op board_version_op;
+
+	uint8_t ports_swap;
+
+	const char *reset_gpio_path;
+	int reset_low_active;
+};
+
+struct board_group {
+	/* new /sys/firmware/devicetree/base/model */
+	const char *device_tree_name;
+	/* old pre-device tree kernels, "Hardware :" in /proc/cpuinfo */
+	const char *proc_name;
+
+	const struct usb2514_board *boards;
+	unsigned int num_boards;
+};
+
+static const struct usb2514_board odu_boards[] = {
+	{
+		.name = "sob-odu v1",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 1,
+		.board_version_op = EQUAL,
+		.ports_swap = 0x00,	/* ports are still swapped in hardware */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 1,
+	}, {
+		.name = "sob-odu v2",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 2,
+		.board_version_op = EQUAL,
+		.ports_swap = 0x0E,	/* swap DN1, DN2, DN3 */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 0,
+	}, {
+		.name = "sob-odu v2",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 0,	/* EEPROM Empty ?!? */
+		.board_version_op = EQUAL,
+		.ports_swap = 0x0E,	/* swap DN1, DN2, DN3 */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 0,
+	}, {
+		.name = "sob-odu v3+",
+		.i2c_bus = 0,
+		.i2c_addr = 0x2C,
+		.board_version_file = "/sys/devices/platform/sob-odu.0/board_version",
+		.board_version = 3,
+		.board_version_op = GREATER_THAN_OR_EQUAL,
+		.ports_swap = 0x0C,	/* swap only DN2 and DN3 */
+		.reset_gpio_path = "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value",
+		.reset_low_active = 0,
+	},
+};
+
+static const struct usb2514_board owhw_boards[] = {
+	{
+		.name = "OWHW",
+		.i2c_bus = 1,
+		.i2c_addr = 0x2C,
+		.board_version_op = EQUAL,
+		.ports_swap = 0x10,	/* swap only DN4 */
+		.reset_gpio_path = "/dev/gpio/hub_reset/value",
+		.reset_low_active = 0,
+	},
+};
+
+static const struct board_group boards[] = {
+	{
+		.proc_name = "sob-odu",
+		.device_tree_name = "sysmocom ODU",
+		.boards = odu_boards,
+		.num_boards = ARRAY_SIZE(odu_boards),
+	}, {
+		.device_tree_name = "GSMK OWHW",
+		.boards = owhw_boards,
+		.num_boards = ARRAY_SIZE(owhw_boards),
+	},
+};
 
-#define BOARD_VER_PATH "/sys/devices/platform/sob-odu.0/board_version"
-#define RESET_PATH "/sys/devices/platform/sob-odu.0/gpio_hub_reset/value"
 #define RESET_PATH_OLD "/sys/class/gpio/gpio62/value"
 
 /* Default configuration as per data sheet */
@@ -119,7 +219,7 @@ static int g_fd;
 static unsigned long get_support(void)
 {
 	int rc;
-	unsigned long funcs;
+	unsigned long funcs = 0;
 
 	rc = ioctl(g_fd, I2C_FUNCS, funcs);
 
@@ -128,7 +228,6 @@ static unsigned long get_support(void)
 	return funcs;
 }
 
-
 static int write_regs(const uint8_t *regs)
 {
 	unsigned int i;
@@ -145,12 +244,12 @@ static int write_regs(const uint8_t *regs)
 }
 
 /* attempt to obtain the board version from sysfs */
-static int get_board_version(void)
+static int get_board_version(const char *ver_file)
 {
 	FILE *f;
 	unsigned int ver;
 
-	f = fopen(BOARD_VER_PATH, "r");
+	f = fopen(ver_file, "r");
 	if (!f)
 		return -1;
 
@@ -164,20 +263,143 @@ static int get_board_version(void)
 	return ver;
 }
 
-/* attempt to reset the hub via sysfs */
-static int reset_hub(void)
+static int board_ver_matches(const struct usb2514_board *board,
+			     unsigned int version)
+{
+	switch (board->board_version_op) {
+	case EQUAL:
+		return (version == board->board_version);
+	case NOT_EQUAL:
+		return (version != board->board_version);
+	case LESS_THAN_OR_EQUAL:
+		return (version <= board->board_version);
+	case GREATER_THAN_OR_EQUAL:
+		return (version >= board->board_version);
+	default:
+		return 0;
+	}
+}
+
+static char *get_proc_name(void)
+{
+	FILE *f = fopen("/proc/cpuinfo", "r");
+	char linebuf[256];
+
+	while (fgets(linebuf, sizeof(linebuf), f)) {
+		/* strip LF at the end of line */
+		char *lf = strrchr(linebuf, '\n');
+		if (lf)
+			*lf = '\0';
+
+		if (strncmp(linebuf, "Hardware", 8) &&
+		    strncmp(linebuf, "machine", 7))
+			continue;
+
+		/* search for the colon */
+		char *colon = strchr(linebuf, ':');
+		if (!colon)
+			continue;
+		colon++;
+
+		/* strip any leading whitespace */
+		while (*colon == ' ' || *colon == '\t')
+			colon++;
+
+		fclose(f);
+		return strdup(colon);
+	}
+
+	fclose(f);
+	return NULL;
+}
+
+static char *get_dt_name(void)
 {
 	FILE *f;
-	int invert_logic = 0;
+	char *name = NULL;
+	char linebuf[256];
 
-	f = fopen(RESET_PATH, "w");
-	if (!f) {
-		f = fopen(RESET_PATH_OLD, "w");
-		if (!f)
-			return -1;
-		invert_logic = 1;
+	f = fopen("/sys/firmware/devicetree/base/model", "r");
+	if (!f)
+		return NULL;
+
+	if (!fgets(linebuf, sizeof(linebuf), f)) {
+		fclose(f);
+		return NULL;
 	}
 
+	fclose(f);
+
+	return strdup(linebuf);
+}
+
+
+static const struct board_group *find_matching_board_group()
+{
+	int i;
+	char *proc_name, *dt_name;
+
+	proc_name = get_proc_name();
+	dt_name = get_dt_name();
+
+	for (i = 0; i < ARRAY_SIZE(boards); i++) {
+		const struct board_group *bgrp = &boards[i];
+
+		if (dt_name && bgrp->device_tree_name &&
+		    !strcmp(dt_name, bgrp->device_tree_name)) {
+			free(proc_name);
+			free(dt_name);
+			return bgrp;
+		}
+
+		if (proc_name && bgrp->proc_name &&
+		    !strcmp(proc_name, bgrp->proc_name)) {
+			free(proc_name);
+			free(dt_name);
+			return bgrp;
+		}
+	}
+
+	free(proc_name);
+	free(dt_name);
+
+	return NULL;
+}
+
+
+static const struct usb2514_board *
+find_matching_board(const struct board_group *bgrp)
+{
+	int i;
+
+	for (i = 0; i < bgrp->num_boards; i++) {
+		const struct usb2514_board *board = &bgrp->boards[i];
+		int ver;
+
+		if (board->board_version_file) {
+			/* get board version and compare */
+			ver = get_board_version(board->board_version_file);
+			if (ver < 0)
+				continue;
+			if (!board_ver_matches(board, ver))
+				continue;
+		}
+
+		return board;
+	}
+
+	return NULL;
+}
+
+/* attempt to reset the hub via sysfs */
+static int reset_hub(const char *reset_path, int invert_logic)
+{
+	FILE *f;
+
+	f = fopen(reset_path, "w");
+	if (!f)
+		return -1;
+
 	if (invert_logic)
 		fputs("0", f);
 	else
@@ -198,56 +420,53 @@ static int reset_hub(void)
 int main(int argc, char **argv)
 {
 	int rc;
-	int board_version;
-	int adapter_nr;
-	long slave_addr = USB2514_SLAVE_ADDR;
 	char filename[PATH_MAX];
+	const struct board_group *bgrp;
+	const struct usb2514_board *board;
 
-	if (argc < 2) {
-		fprintf(stderr, "You have to specify I2C bus number\n");
-		exit(2);
-	}
-
-	adapter_nr = atoi(argv[1]);
-	snprintf(filename, sizeof(filename)-1, "/dev/i2c-%d", adapter_nr);
-	rc = open(filename, O_RDWR);
-	if (rc < 0) {
-		fprintf(stderr, "Error opening the device: %d\n", rc);
+	bgrp = find_matching_board_group();
+	if (!bgrp) {
+		fprintf(stderr, "Cannot find matching board group for this system\n");
 		exit(1);
 	}
+	printf("Found matching board group %s(%s)\n", bgrp->proc_name, bgrp->device_tree_name);
 
+	board = find_matching_board(bgrp);
+	if (!board) {
+		fprintf(stderr, "Cannot find matching config for this system\n");
+		exit(1);
+	}
+	printf("Found matching board %s\n", board->name);
+
+	/* open the I2C bus device */
+
+	snprintf(filename, sizeof(filename)-1, "/dev/i2c-%d", board->i2c_bus);
+	rc = open(filename, O_RDWR);
+	if (rc < 0) {
+		fprintf(stderr, "Error opening the device %s: %d\n", filename, rc);
+		exit(1);
+	}
 	g_fd = rc;
-
 	get_support();
 
-	board_version = get_board_version();
-	if (board_version >= 3) {
-		/* on board version 3 and later we don't need to swap
-		 * USB downlink port 1 */
-		printf("Detected board >= v3, not swapping DN1\n");
-		usb2514_odu[0xFA] = 0x0C;
-	} else if (board_version == 1) {
-		/* ports are still swapped in hardware */
-		printf("Detected board v1, not swapping any ports\n");
-		usb2514_odu[0xFA] = 0x00;
-	} else if (board_version == 2) {
-		printf("Detected board v2, swapping DN1, DN2 and DN3\n");
-		/* default */
-	} else {
-		printf("Assuming board v2, swapping DN1, DN2 and DN3\n");
-		/* default */
-	}
+	/* set the slave address */
 
-	rc = ioctl(g_fd, I2C_SLAVE, slave_addr);
+	rc = ioctl(g_fd, I2C_SLAVE, board->i2c_addr);
 	if (rc < 0) {
 		fprintf(stderr, "Error setting slave addr: %d\n", rc);
 		exit(1);
 	}
 
-	/* First reset the USB hub before loading data into it */
-	if (reset_hub() < 0) {
-		fprintf(stderr, "Couldn't reset the USB hub!\n");
-	}
+	if (board->reset_gpio_path) {
+		/* First reset the USB hub before loading data into it */
+		if (reset_hub(board->reset_gpio_path, board->reset_low_active) < 0) {
+			fprintf(stderr, "Couldn't reset the USB hub!\n");
+		}
+	} else
+		fprintf(stderr, "board config doesn't indicate USB hub reset GPIO\n");
+
+	/* patch the port inversion byte into the array */
+	usb2514_odu[0xFA] = board->ports_swap;
 
 	rc = write_regs(usb2514_odu);
 	if (rc < 0) {

recipes-bsp/sob-odu/usb2514_1.bb

@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/usb2514.c;beginline=1;endline=18;md5=3b8421a1c05d21add65cc20fccfa29cd"
 DEPENDS += "lmsensors-apps"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://usb2514.c \
            file://gpio_usb2514 \

recipes-bsp/u-boot/files/0001-fw_env-missing-header.patch

@@ -0,0 +1,12 @@
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index daa02a7..eff638a 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <inttypes.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>

recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch

@@ -0,0 +1,91 @@
+From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001
+From: yocto <yocto@yocto.org>
+Date: Thu, 2 Jun 2016 03:21:51 -0500
+Subject: [PATCH] fix build error under gcc6
+
+Fix the following error:
+| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory
+|  #include gcc_header(__GNUC__)
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
+
+Upstream-Status: Pending
+---
+ include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+ create mode 100644 include/linux/compiler-gcc6.h
+
+diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
+new file mode 100644
+index 0000000..c8c5659
+--- /dev/null
++++ b/include/linux/compiler-gcc6.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used				__attribute__((__used__))
++#define __must_check			__attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++   to them will be unlikely.  This means a lot of manual unlikely()s
++   are unnecessary now for any paths leading to the usual suspects
++   like BUG(), printk(), panic() etc. [but let's keep them for now for
++   older compilers]
++
++   Early snapshots of gcc 4.3 don't support this and we can't detect this
++   in the preprocessor, but we can live with this because they're unreleased.
++   Maketime probing would be overkill here.
++
++   gcc also has a __attribute__((__hot__)) to move hot functions into
++   a special section, but I don't see any sense in this right now in
++   the kernel context */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
+2.5.0
+

recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb

@@ -0,0 +1,45 @@
+require u-boot-litecell15-${PV}.inc
+
+SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
+SECTION = "bootloader"
+DEPENDS = "mtd-utils u-boot"
+PROVIDES_litecell15 = "u-boot-fw-utils"
+
+S = "${WORKDIR}/git"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-fw-utils_2015.07.bb"
+PR       := "${INC_PR}.${REPOGITFN}"
+
+INSANE_SKIP_${PN} = "already-stripped"
+EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
+EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
+
+inherit uboot-config
+
+do_compile () {
+	oe_runmake ${UBOOT_MACHINE}
+	oe_runmake env
+}
+
+do_install () {
+	install -d ${D}${base_sbindir}
+	install -d ${D}${sysconfdir}
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
+	install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
+}
+
+do_install_class-cross () {
+	install -d ${D}${bindir_cross}
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
+	install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
+}
+
+SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
+uboot_fw_utils_cross() {
+	sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+BBCLASSEXTEND = "cross"

recipes-bsp/u-boot/u-boot-litecell15-2015.07.inc

@@ -0,0 +1,41 @@
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
+
+NRW_LC15_MIRROR ??= "gitlab.com/nrw_litecell15"
+
+inherit gitver-pkg gitver-repo
+
+# Should match the one in u-boot.inc
+INC_PR  ??= "r1"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-litecell15-2015.07.inc"
+INC_PR   := "${INC_PR}.${REPOGITFN}"
+
+PV   = "2015.07+git${SRCPV}"
+PKGV = "${PKGGITV}"
+
+DEV_BRANCH  = "${@ 'nrw/litecell15-next' if d.getVar('NRW_BSP_DEVEL', False) == "next" else 'nrw/litecell15'}"
+DEV_SRCREV  = "${AUTOREV}"
+DEV_SRCURI := "git://${NRW_LC15_MIRROR}/u-boot.git;protocol=https;branch=${DEV_BRANCH}"
+
+REL_BRANCH  = "nrw/litecell15"
+REL_SRCREV  = "e2b1ddd84d72d8c57815265860ae58f6b170551c"
+REL_SRCURI := "git://${NRW_LC15_MIRROR}/u-boot.git;protocol=https;branch=${REL_BRANCH}"
+
+BRANCH  = "${@ '${DEV_BRANCH}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_BRANCH}'}"
+SRCREV  = "${@ '${DEV_SRCREV}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCREV}'}"
+SRC_URI = "${@ '${DEV_SRCURI}' if d.getVar('NRW_BSP_DEVEL', False) else '${REL_SRCURI}'}"
+
+SRC_URI += "file://0001-fw_env-missing-header.patch"
+SRC_URI += "file://fix-build-error-under-gcc6.patch"
+
+addtask showversion after do_compile before do_install
+do_showversion() {
+    bbplain "${PN}: ${PKGGITV} => ${BRANCH}:${PKGGITH}"
+}
+
+do_configure_prepend() {
+    sed -i -e 's/SUBLEVEL =.*/SUBLEVEL = ${PKGGITN}/g' ${S}/Makefile
+    sed -i -e 's/EXTRAVERSION =.*/EXTRAVERSION = -lc15/g' ${S}/Makefile
+}

recipes-bsp/u-boot/u-boot-litecell15_2015.07.bb

@@ -0,0 +1,22 @@
+require u-boot.inc
+require ${PN}-${PV}.inc
+
+PROVIDES_litecell15 = " \
+	u-boot \
+ 	virtual/bootloader \
+"
+
+DESCRIPTION = "u-boot bootloader for LC15 / sysmoBTS 2100"
+
+REPODIR   = "${THISDIR}"
+REPOFILE  = "u-boot-litecell15_2015.07.bb"
+PR       := "${INC_PR}.${REPOGITFN}"
+
+# set theses two variables to 1 to specify u-boot update requierement when the rootfs is updated 
+export MLO_UPGRADE = "1"
+export UBOOT_UPGRADE = "1"
+
+SPL_BINARY = "MLO"
+SPL_UART_BINARY = "u-boot-spl.bin"
+
+

recipes-bsp/u-boot/u-boot.inc

@@ -0,0 +1,76 @@
+require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
+
+INC_PR = "r1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PROVIDES += "u-boot"
+PKG_${PN} = "u-boot"
+PKG_${PN}-dev = "u-boot-dev"
+PKG_${PN}-dbg = "u-boot-dbg"
+
+S = "${WORKDIR}/git"
+
+UBOOT_SUFFIX = "img"
+
+#RDEPENDS_${PN} = "repair"
+
+# SPL (Second Program Loader) to be loaded over UART
+SPL_UART_BINARY ?= ""
+SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
+SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
+MLO_BIN ?= "MLO-${MACHINE}-${PV}-${PR}"
+
+do_install_append () {
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
+        ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
+    fi
+    #FIXME: do we want/need this? replace iwth 'openssl enc -base64 -d'?
+    #md5sum ${D}/boot/${MLO_BIN} | cut -d ' ' -f 1 | xxd -r -p >> ${D}/boot/${MLO_BIN}
+    install -d ${D}${sysconfdir}
+    echo "MLO_UPGRADE=${MLO_UPGRADE}" >> ${D}${sysconfdir}/mlo.conf
+    echo "UBOOT_UPGRADE=${UBOOT_UPGRADE}" >> ${D}${sysconfdir}/uboot.conf
+    chmod 755 ${D}${sysconfdir}/mlo.conf 
+    chmod 755 ${D}${sysconfdir}/uboot.conf 
+}
+
+do_deploy_append () {
+    cd ${DEPLOYDIR}
+    if [ "x${SPL_UART_BINARY}" != "x" ]
+    then
+        install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
+        rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
+        ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+    fi
+    #FIXME: do we want/need this? replace iwth 'openssl enc -base64 -d'?
+    #md5sum ${DEPLOYDIR}/${MLO_BIN} | cut -d ' ' -f 1 | xxd -r -p >> ${DEPLOYDIR}/${MLO_BIN}
+}
+
+pkg_postinst_${PN}_append() {
+if [ x"$D" = "x" ]; then
+    if [ -f /usr/bin/checkboot ]; then
+        echo "Verify boot file possible update..."
+        /usr/bin/checkboot -c -d
+        __CHECK_RET=$?
+        if test ${__CHECK_RET} -eq 100; then
+            sleep 30s
+            /usr/bin/checkboot -c -d
+            __CHECK_RET=$?
+        fi
+        if test ${__CHECK_RET} -ne 0; then
+            echo "Verify boot file possible update... error!"
+        else
+            echo "Verify boot file possible update... done!"
+        fi
+    fi
+fi
+}
+
+FILES_${PN} += "${sysconfdir}/mlo.conf \
+            ${sysconfdir}/uboot.conf \
+            "

recipes-bsp/watchdog/watchdog_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "9"
 

recipes-config/openggsn-config/files/sysmocom-bsc/gprs_routing

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-NAME=gprs_routing
-
-set -e
-
-case "$1" in
-  start)
-    echo 1 > /proc/sys/net/ipv4/ip_forward
-    iptables -t nat -I POSTROUTING -o eth0 -j MASQUERADE
-    echo "Enabled masquerading"
-    ;;
-  stop)
-    echo 0 > /proc/sys/net/ipv4/ip_forward
-    iptables -t nat -D POSTROUTING -o eth0 -j MASQUERADE
-    ;;
-  *)
-    N=/etc/init.d/$NAME
-    echo "Usage: $N {start|stop|restart|force-reload}" >&2
-    exit 1
-esac
-
-exit 0

recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch

@@ -0,0 +1,21 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sat, 23 Aug 2014 12:27:34 -0700
+Subject: crda: Do not run ldconfig if DESTDIR is set
+
+Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126028.html]
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
+
+--- a/Makefile
++++ b/Makefile
+@@ -132,7 +132,9 @@ install-libreg:
+ 	$(NQ) '  INSTALL  libreg'
+ 	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
+ 	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
++ifndef DESTDIR
+ 	$(Q)ldconfig
++endif
+ 
+ %.o: %.c regdb.h $(LIBREG)
+ 	$(NQ) '  CC  ' $@

recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch

@@ -0,0 +1,50 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sat, 23 Aug 2014 12:26:37 -0700
+Subject: Fix linking of libraries used by libreg
+
+The math and crypto libraries are called by and need to be linked to
+libreg.so, not to the executables.
+
+Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027.html]
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
+
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda
+ CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+ LDLIBS += $(LDLIBREG)
+-LDLIBS += -lm
++LIBREGLDLIBS += -lm
+ LIBREG += libreg.so
+ LDFLAGS += -L ./
+ 
+@@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r
+ 
+ ifeq ($(USE_OPENSSL),1)
+ CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
+-LDLIBS += `pkg-config --libs openssl`
++LIBREGLDLIBS += `pkg-config --libs openssl`
+ 
+ ifeq ($(RUNTIME_PUBKEY_ONLY),1)
+ CFLAGS += -DRUNTIME_PUBKEY_ONLY
+@@ -51,7 +51,7 @@ endif
+ 
+ else
+ CFLAGS += -DUSE_GCRYPT
+-LDLIBS += -lgcrypt
++LIBREGLDLIBS += -lgcrypt
+ 
+ $(LIBREG): keys-gcrypt.c
+ 
+@@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(
+ 
+ $(LIBREG): regdb.h reglib.h reglib.c
+ 	$(NQ) '  CC  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
++	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS)
+ 
+ install-libreg-headers:
+ 	$(NQ) '  INSTALL  libreg-headers'

recipes-connectivity/crda/crda_3.18.bb

@@ -0,0 +1,41 @@
+SUMMARY = "Wireless Central Regulatory Domain Agent"
+HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA"
+SECTION = "net"
+LICENSE = "copyleft-next-0.3.0 & ISC"
+LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe \
+                    file://${WORKDIR}/wireless-regdb-2014.11.18/LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
+
+DEPENDS = "python-m2crypto-native python-native libgcrypt libnl"
+
+SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \
+           https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \
+           file://do-not-run-ldconfig-if-destdir-is-set.patch \
+           file://fix-linking-of-libraries-used-by-reglib.patch \
+"
+SRC_URI[crda.md5sum] = "0431fef3067bf503dfb464069f06163a"
+SRC_URI[crda.sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf"
+
+SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2"
+SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd"
+
+inherit python-dir pythonnative
+# Recursive make problem
+EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg'"
+
+do_compile() {
+    oe_runmake all_noverify
+}
+
+do_install() {
+    oe_runmake SBINDIR=${sbindir}/ install
+
+    install -d ${D}${libdir}/crda/
+
+    install -m 0644 ${WORKDIR}/wireless-regdb-2014.11.18/regulatory.bin ${D}${libdir}/crda/regulatory.bin
+}
+
+
+RDEPENDS_${PN} = "udev"
+FILES_${PN} += "${libdir}crda/regulatory.bin \
+                ${base_libdir}/udev/rules.d/85-regulatory.rules \
+"

recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch

@@ -0,0 +1,44 @@
+From 5310abba864cfe3a8b65af130729447604190b29 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 29 Nov 2011 17:03:27 +0100
+Subject: [PATCH] iw: version.sh: don't use git describe for versioning
+
+It will detect top-level git repositories like the Angstrom setup-scripts and break.
+
+Upstream-Status: Unknown
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ version.sh |   16 +---------------
+ 1 files changed, 1 insertions(+), 15 deletions(-)
+
+diff --git a/version.sh b/version.sh
+index 3fb9f6d..e4a56cb 100755
+--- a/version.sh
++++ b/version.sh
+@@ -3,21 +3,7 @@
+ VERSION="3.2"
+ OUT="$1"
+ 
+-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+-	git update-index --refresh --unmerged > /dev/null
+-	descr=$(git describe)
+-
+-	# on git builds check that the version number above
+-	# is correct...
+-	[ "${descr%%-*}" = "v$VERSION" ] || exit 2
+-
+-	v="${descr#v}"
+-	if git diff-index --name-only HEAD | read dummy ; then
+-		v="$v"-dirty
+-	fi
+-else
+-	v="$VERSION"
+-fi
++v="$VERSION"
+ 
+ echo '#include "iw.h"' > "$OUT"
+ echo "const char iw_version[] = \"$v\";" >> "$OUT"
+-- 
+1.7.7.3
+

recipes-connectivity/iw/iw_3.11.bb

@@ -0,0 +1,23 @@
+SUMMARY = "nl80211 based CLI configuration utility for wireless devices"
+DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \
+wireless devices. It supports almost all new drivers that have been added \
+to the kernel recently. "
+HOMEPAGE = "http://wireless.kernel.org/en/users/Documentation/iw"
+SECTION = "base"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
+
+DEPENDS = "libnl pkgconfig"
+
+SRC_URI = "http://www.kernel.org/pub/software/network/iw/${P}.tar.bz2 \
+           file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
+"
+
+SRC_URI[md5sum] = "e633cf7c875c7d8b547abafc0d95f6c4"
+SRC_URI[sha256sum] = "09348d4f7371fad00c07cfb67b9e34f24403cbd9361f9634cfb4dff9cdd40139"
+
+EXTRA_OEMAKE = ""
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+}

recipes-core/busybox/busybox_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
 PRINC = "30"
 

recipes-core/busybox/busybox_sysmocom_systemd.inc

@@ -1,4 +1,4 @@
 # Make busybox work nicely with systemd
-SYSMOCOM_D := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM_D := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-systemd:${SYSMOCOM_D}/${PN}:"
 PRINC := "${@int(PRINC) + 3}"

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"
 

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"
 
@@ -16,6 +17,7 @@ IMAGE_FSTYPES = "cpio.xz"
 BAD_RECOMMENDATIONS_append = " busybox-syslog kbd kbd-consolefonts kbd-keymaps"
 BAD_RECOMMENDATIONS_append_sysmobts-v2 = " e2fsprogs-e2fsck"
 BAD_RECOMMENDATIONS_append_sysmocom-odu = " e2fsprogs-e2fsck"
+BAD_RECOMMENDATIONS_append_gsmk-owhw = " e2fsprogs-e2fsck"
 
 inherit core-image
 require recipes-apps/images/image-manifest.inc

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"
 

recipes-core/initrdscripts/initramfs-framework_sysmocom.inc

@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
 
 PRINC="4"

recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
 
 PRINC = "2"

recipes-devtools/python-m2crypto/python-m2crypto/0001-M2Crypto-Error-fix.patch

@@ -0,0 +1,162 @@
+From 02a24ac541df68033d4efd7e2f8a1b92dc49328d Mon Sep 17 00:00:00 2001
+From: Li xin <lixin.fnst@cn.fujitsu.com>
+Date: Mon, 27 Jul 2015 05:06:20 +0900
+Subject: [PATCH] M2Crypto: Error fix.
+
+After swig upgrade from 3.0.2 to 3.0.6,build the recipes which
+depends on python-m2crypto will occur errors like this:
+SALT_LEN = m2.PKCS5_SALT_LEN
+AttributeError: 'module' object has no attribute 'PKCS5_SALT_LEN'
+since python-m2crypto depends on swig-native
+
+Ref:
+https://github.com/martinpaljak/M2Crypto/issues/60#issuecomment-75735489
+
+This patch is from:
+http://pkgs.fedoraproject.org/cgit/m2crypto.git/tree/m2crypto-0.21.1-swig-3.0.5.patch
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
+---
+ M2Crypto/__init__.py |  4 ++--
+ M2Crypto/m2.py       |  2 +-
+ SWIG/_lib.i          |  4 ++++
+ SWIG/_pkcs7.i        |  1 +
+ setup.py             | 26 +++++++++++++++++++++++++-
+ 5 files changed, 33 insertions(+), 4 deletions(-)
+
+diff --git a/M2Crypto/__init__.py b/M2Crypto/__init__.py
+index e7acfe7..02f4d28 100644
+--- a/M2Crypto/__init__.py
++++ b/M2Crypto/__init__.py
+@@ -19,7 +19,7 @@ Copyright 2008-2011 Heikki Toivonen. All rights reserved.
+ version_info = (0, 21, 1)
+ version = '.'.join([str(_v) for _v in version_info])
+ 
+-import __m2crypto
++import _m2crypto
+ import m2
+ import ASN1
+ import AuthCookie
+@@ -57,4 +57,4 @@ import util
+ encrypt=1
+ decrypt=0
+ 
+-__m2crypto.lib_init()
++_m2crypto.lib_init()
+diff --git a/M2Crypto/m2.py b/M2Crypto/m2.py
+index e4bb695..822143f 100644
+--- a/M2Crypto/m2.py
++++ b/M2Crypto/m2.py
+@@ -25,7 +25,7 @@ Portions created by Open Source Applications Foundation (OSAF) are
+ Copyright (C) 2004 OSAF. All Rights Reserved.
+ """
+ 
+-from __m2crypto import *
++from _m2crypto import *
+ lib_init()
+ 
+ 
+diff --git a/SWIG/_lib.i b/SWIG/_lib.i
+index 42dc180..47a53b8 100644
+--- a/SWIG/_lib.i
++++ b/SWIG/_lib.i
+@@ -100,6 +100,7 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) {
+     int cret;
+     int new_style_callback = 0, warning_raised_exception=0;
+     PyGILState_STATE gilstate;
++    PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
+ 
+     ssl = (SSL *)X509_STORE_CTX_get_app_data(ctx);
+ 
+@@ -185,6 +186,7 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) {
+ void ssl_info_callback(const SSL *s, int where, int ret) {
+     PyObject *argv, *retval, *_SSL;
+     PyGILState_STATE gilstate;
++    PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
+ 
+     gilstate = PyGILState_Ensure();
+ 
+@@ -204,6 +206,7 @@ DH *ssl_set_tmp_dh_callback(SSL *ssl, int is_export, int keylength) {
+     PyObject *argv, *ret, *_ssl;
+     DH *dh;
+     PyGILState_STATE gilstate;
++    PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
+ 
+     gilstate = PyGILState_Ensure();
+ 
+@@ -227,6 +230,7 @@ RSA *ssl_set_tmp_rsa_callback(SSL *ssl, int is_export, int keylength) {
+     PyObject *argv, *ret, *_ssl;
+     RSA *rsa;
+     PyGILState_STATE gilstate;
++    PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
+ 
+     gilstate = PyGILState_Ensure();
+ 
+diff --git a/SWIG/_pkcs7.i b/SWIG/_pkcs7.i
+index 174f40a..7bffbfc 100644
+--- a/SWIG/_pkcs7.i
++++ b/SWIG/_pkcs7.i
+@@ -157,6 +157,7 @@ PyObject *smime_read_pkcs7(BIO *bio) {
+     BIO *bcont = NULL;
+     PKCS7 *p7;
+     PyObject *tuple, *_p7, *_BIO;
++    PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
+ 
+     if (BIO_method_type(bio) == BIO_TYPE_MEM) {
+         /* OpenSSL FAQ explains that this is needed for mem BIO to return EOF,
+diff --git a/setup.py b/setup.py
+index e7c49eb..b98abe0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -20,6 +20,7 @@ except ImportError:
+     from distutils.command import build_ext
+ 
+ from distutils.core import Extension
++from distutils.file_util import copy_file
+ 
+ 
+ class _M2CryptoBuildExt(build_ext.build_ext):
+@@ -57,7 +58,17 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+         self.swig_opts.append('-includeall')
+         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
+         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
+-        
++        self.swig_opts.append('-modern')
++        self.swig_opts.append('-builtin')
++
++        # These two lines are a workaround for
++        # http://bugs.python.org/issue2624 , hard-coding that we are only
++        # building a single extension with a known path; a proper patch to
++        # distutils would be in the run phase, when extension name and path are
++        # known.
++        self.swig_opts.append('-outdir')
++        self.swig_opts.append(os.path.join(self.build_lib, 'M2Crypto'))
++
+         self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+                               os.path.join(os.getcwd(), 'SWIG')]        
+             
+@@ -71,6 +82,19 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+                
+         self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+ 
++    def run(self):
++        '''Overloaded build_ext implementation to allow inplace=1 to work,
++        which is needed for (python setup.py test).'''
++        # This is another workaround for http://bugs.python.org/issue2624 + the
++        # corresponding lack of support in setuptools' test command. Note that
++        # just using self.inplace in finalize_options() above does not work
++        # because swig is not rerun if the __m2crypto.so extension exists.
++        # Again, hard-coding our extension name and location.
++        build_ext.build_ext.run(self)
++        if self.inplace:
++            copy_file(os.path.join(self.build_lib, 'M2Crypto', '_m2crypto.py'),
++                      os.path.join('M2Crypto', '_m2crypto.py'),
++                      verbose=self.verbose, dry_run=self.dry_run)
+ 
+ if sys.version_info < (2,4):
+ 
+-- 
+1.8.4.2
+

recipes-devtools/python-m2crypto/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch

@@ -0,0 +1,39 @@
+From f11b9c71080513f9b867ba8f40613ba2ebc6e960 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 29 Mar 2013 15:17:17 +0100
+Subject: [PATCH] setup.py: link in sysroot, not in host directories
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+
+Upstream-status: Unknown
+---
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index e7c49eb..8deaa34 100644
+--- a/setup.py
++++ b/setup.py
+@@ -40,7 +40,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             self.openssl = 'c:\\pkg'
+         else:
+             self.libraries = ['ssl', 'crypto']
+-            self.openssl = '/usr'
++            self.openssl = os.environ.get( "STAGING_DIR" )
+        
+     
+     def finalize_options(self):
+@@ -49,8 +49,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+ 
+         build_ext.build_ext.finalize_options(self)
+ 
+-        opensslIncludeDir = os.path.join(self.openssl, 'include')
+-        opensslLibraryDir = os.path.join(self.openssl, 'lib')
++        opensslIncludeDir = os.environ.get( "STAGING_INCDIR" )
++        opensslLibraryDir = os.environ.get( "STAGING_LIBDIR" )
+         
+         self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+                           [opensslIncludeDir]]
+-- 
+1.8.1.4
+

recipes-devtools/python-m2crypto/python-m2crypto_0.21.1.bb

@@ -0,0 +1,45 @@
+SUMMARY = "A Python crypto and SSL toolkit"
+HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto"
+
+DEPENDS = "openssl swig-native python"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e"
+
+SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \
+           file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \
+           file://0001-M2Crypto-Error-fix.patch"
+
+SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17"
+SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a"
+
+S = "${WORKDIR}/M2Crypto-${PV}"
+
+inherit setuptools
+
+SWIG_FEATURES_x86-64 = "-D__x86_64__"
+SWIG_FEATURES ?= ""
+export SWIG_FEATURES
+
+# Get around a problem with swig, but only if the
+# multilib header file exists.
+#
+do_compile_prepend() {
+    if [ "${SITEINFO_BITS}" = "64" ];then
+        bit="64"
+    else
+        bit="32"
+    fi
+
+    if [ -e ${STAGING_INCDIR}/openssl/opensslconf-${bit}.h ] ;then
+        for i in SWIG/_ec.i SWIG/_evp.i; do
+            sed -i -e "s/opensslconf.*\./opensslconf-${bit}\./" "$i"
+        done
+    elif [ -e ${STAGING_INCDIR}/openssl/opensslconf-n${bit}.h ] ;then
+        for i in SWIG/_ec.i SWIG/_evp.i; do
+            sed -i -e "s/opensslconf.*\./opensslconf-n${bit}\./" "$i"
+        done
+    fi
+}
+
+BBCLASSEXTEND = "native"

recipes-devtools/swig/swig.inc

@@ -0,0 +1,63 @@
+SUMMARY = "SWIG - Simplified Wrapper and Interface Generator"
+HOMEPAGE = "http://swig.sourceforge.net/"
+LICENSE = "BSD & GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
+                    file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
+
+SECTION = "devel"
+
+DEPENDS = "libpcre python"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
+
+inherit autotools pythonnative
+
+EXTRA_OECONF = " \
+    --with-python=${PYTHON} \
+    --without-allegrocl \
+    --without-android \
+    --without-boost \
+    --without-chicken \
+    --without-clisp \
+    --without-csharp \
+    --without-d \
+    --without-gcj \
+    --without-go \
+    --without-guile \
+    --without-java \
+    --without-lua \
+    --without-mzscheme \
+    --without-ocaml \
+    --without-octave \
+    --without-perl5 \
+    --without-pike \
+    --without-php \
+    --without-python3 \
+    --without-r \
+    --without-ruby \
+    --without-tcl \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
+do_configure() {
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
+    install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
+    oe_runconf
+}
+
+do_install_append_class-nativesdk() {
+    cd ${D}${bindir}
+    ln -s swig swig2.0
+}
+
+def swiglib_relpath(d):
+    swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
+    return os.path.relpath(swiglib, d.getVar('bindir', True))
+
+do_install_append_class-native() {
+    create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
+}

recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch

@@ -0,0 +1,69 @@
+From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001
+From: "NODA, Kai" <nodakai@gmail.com>
+Date: Sun, 22 Apr 2012 17:01:02 +0900
+Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
+ platforms.
+
+If it wasn't found, then fall back to a fixed string just as before.
+
+Upstream-Status: Submitted
+http://sourceforge.net/mailarchive/message.php?msg_id=29179733
+
+---
+ Source/Modules/main.cxx |   24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
+index d2f5d3b..cbb0a12 100644
+--- a/Source/Modules/main.cxx
++++ b/Source/Modules/main.cxx
+@@ -26,6 +26,11 @@ char cvsroot_main_cxx[] = "$Id$";
+ #include "cparse.h"
+ #include <ctype.h>
+ #include <limits.h>		// for INT_MAX
++#ifndef _WIN32
++#include <cstddef>
++#include <unistd.h>		// for readlink
++#include <sys/stat.h>		// for stat
++#endif
+ 
+ // Global variables
+ 
+@@ -902,9 +907,9 @@ int SWIG_main(int argc, char *argv[], Language *l) {
+ 
+   // Check for SWIG_LIB environment variable
+   if ((c = getenv("SWIG_LIB")) == (char *) 0) {
++    char *p;
+ #if defined(_WIN32)
+     char buf[MAX_PATH];
+-    char *p;
+     if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
+       *(p + 1) = '\0';
+       SwigLib = NewStringf("%sLib", buf); // Native windows installation path
+@@ -914,7 +919,22 @@ int SWIG_main(int argc, char *argv[], Language *l) {
+     if (Len(SWIG_LIB_WIN_UNIX) > 0)
+       SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
+ #else
+-    SwigLib = NewString(SWIG_LIB);
++    char buf[PATH_MAX];
++    if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) &&
++        (p = ::strstr(buf, "/bin/swig"))) {
++        int major, minor, patch;
++        const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
++        if (3 == ret) {
++            const ::ptrdiff_t dir_part_len = p - buf;
++            ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch);
++            struct ::stat stat_res;
++            if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) {
++                SwigLib = NewString(buf);
++            }
++        }
++    }
++    if (NULL == SwigLib)
++        SwigLib = NewString(SWIG_LIB);
+ #endif
+   } else {
+     SwigLib = NewString(c);
+-- 
+1.7.9.5
+

recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch

@@ -0,0 +1,64 @@
+From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen.kooi@linaro.org>
+Date: Tue, 17 Jun 2014 08:18:17 +0200
+Subject: [PATCH] configure: use pkg-config for pcre detection
+
+Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
+Upstream-Status: pending
+---
+ configure.ac | 38 +++++++-------------------------------
+ 1 file changed, 7 insertions(+), 31 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0c984b7..6edcec1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,38 +70,14 @@ AC_MSG_RESULT([$with_pcre])
+ 
+ dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script
+ if test x"${with_pcre}" = xyes ; then
+-  AC_MSG_CHECKING([whether to use local PCRE])
+-  local_pcre_config=no
+-  if test -z $PCRE_CONFIG; then
+-    if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then
+-      PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config
+-      local_pcre_config=$PCRE_CONFIG
+-    fi
+-  fi
+-  AC_MSG_RESULT([$local_pcre_config])
+-fi
+-AS_IF([test "x$with_pcre" != xno],
+-  [AX_PATH_GENERIC([pcre],
+-    [], dnl Minimal version of PCRE we need -- accept any
+-    [], dnl custom sed script for version parsing is not needed
+-    [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
+-     LIBS="$LIBS $PCRE_LIBS"
+-     CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
+-    ],
+-    [AC_MSG_FAILURE([
+-        Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions)
+-        library package. This dependency is needed for configure to complete,
+-        Either:
+-        - Install the PCRE developer package on your system (preferred approach).
+-        - Download the PCRE source tarball, build and install on your system
+-          as you would for any package built from source distribution.
+-        - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically
+-          link against. Run 'Tools/pcre-build.sh --help' for instructions.
+-          (quite easy and does not require privileges to install PCRE on your system)
+-        - Use configure --without-pcre to disable regular expressions support in SWIG
+-          (not recommended).])
+-    ])
++  PKG_CHECK_MODULES([PCRE], [libpcre], [
++    AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library])
++    LIBS="$LIBS $PCRE_LIBS"
++    CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"
++  ], [
++    AC_MSG_WARN([$PCRE_PKG_ERRORS])
+   ])
++fi
+ 
+ 
+ dnl CCache
+-- 
+1.9.3
+

recipes-devtools/swig/swig_3.0.6.bb

@@ -0,0 +1,8 @@
+require ${BPN}.inc
+
+SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \
+            file://0001-configure-use-pkg-config-for-pcre-detection.patch \
+           "
+SRC_URI[md5sum] = "df43ae271642bcfa61c1e59f970f9963"
+SRC_URI[sha256sum] = "c67f63ea11956106e4cda66416d5020330dc4ce2ee45057d39a9494ce33eca05"
+

recipes-extra/barebox-state/barebox-state.bb

@@ -1,15 +1,16 @@
 DESCRIPTION = "barebox state tool (dt)"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "\
-	git://git.pengutronix.de/git/tools/dt-utils.git\
-	file://0001-barebox-state-fix-typo.patch\
-	file://0002-barebox-state-add-support-for-uint8-variables.patch\
-	file://hardcode-layout-values.patch\
+	git://git.pengutronix.de/git/tools/dt-utils.git \
+	file://0001-barebox-state-fix-typo.patch \
 "
 
+SRC_URI_append_sysmocom-odu = "file://hardcode-layout-values.patch"
+SRC_URI_append_sysmobts-v2 = "file://hardcode-layout-values.patch"
+
 PACKAGES =+ "libdt-utils barebox-fdtdump"
 
 FILES_libdt-utils = "${libdir}/libdt-utils.so.*"
@@ -17,7 +18,7 @@ FILES_barebox-fdtdump = "${bindir}/fdtdump"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "2e87b7e47752380219c1f12b3dcbb5db706936e5"
+SRCREV = "f0bddb4f82deaf73cf20aeda5bbf64c50a59dd60"
 
 DEPENDS = "udev"
 

recipes-extra/barebox-state/barebox-state/0002-barebox-state-add-support-for-uint8-variables.patch

@@ -1,73 +0,0 @@
-From cada2ed0b4ca0d467621fa90de304421e17b4869 Mon Sep 17 00:00:00 2001
-From: Jan Luebbe <jluebbe@debian.org>
-Date: Sat, 30 May 2015 19:52:55 +0200
-Subject: [PATCH 2/3] barebox-state: add support for uint8 variables
-
-Signed-off-by: Jan Luebbe <jluebbe@debian.org>
----
- src/barebox-state.c | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/src/barebox-state.c b/src/barebox-state.c
-index 57305c4..f56275f 100644
---- a/src/barebox-state.c
-+++ b/src/barebox-state.c
-@@ -81,6 +81,7 @@ struct state_backend {
- enum state_variable_type {
- 	STATE_TYPE_INVALID = 0,
- 	STATE_TYPE_ENUM,
-+	STATE_TYPE_U8,
- 	STATE_TYPE_U32,
- 	STATE_TYPE_MAC,
- };
-@@ -185,6 +186,32 @@ static int state_uint32_import(struct state_variable *sv,
- 	return 0;
- }
- 
-+static struct state_variable *state_uint8_create(struct state *state,
-+		const char *name, struct device_node *node)
-+{
-+	struct state_uint32 *su32;
-+	struct param_d *param;
-+
-+	su32 = xzalloc(sizeof(*su32));
-+
-+	param = dev_add_param_int(&state->dev, name, state_set_dirty,
-+				  NULL, &su32->value, "%u", state);
-+	if (IS_ERR(param)) {
-+		free(su32);
-+		return ERR_CAST(param);
-+	}
-+
-+	su32->param = param;
-+	su32->var.size = sizeof(uint8_t);
-+#ifdef __LITTLE_ENDIAN
-+	su32->var.raw = &su32->value;
-+#else
-+	su32->var.raw = &su32->value + 3;
-+#endif
-+
-+	return &su32->var;
-+}
-+
- static struct state_variable *state_uint32_create(struct state *state,
- 		const char *name, struct device_node *node)
- {
-@@ -395,6 +422,14 @@ out:
- 
- static struct variable_type types[] =  {
- 	{
-+		.type = STATE_TYPE_U8,
-+		.type_name = "uint8",
-+		.export = state_uint32_export,
-+		.import = state_uint32_import,
-+		.create = state_uint8_create,
-+		.set = state_uint32_set,
-+		.get = state_uint32_get,
-+	}, {
- 		.type = STATE_TYPE_U32,
- 		.type_name = "uint32",
- 		.export = state_uint32_export,
--- 
-2.1.4
-

recipes-extra/ca-certificates/ca-cacert-rootcert.bb

@@ -5,18 +5,21 @@ LICENSE = "RDL-COD14"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r6"
 
-SRC_URI = "file://root.crt file://class3.crt"
+SRC_URI = "file://root.crt file://class3.crt file://DST_Root_CA_X3.pem"
 
 do_install() {
         install -d ${D}${libdir}/ssl/certs
         install -m 0644 ${WORKDIR}/root.crt ${D}${libdir}/ssl/certs/cacert.org.pem
         cat ${WORKDIR}/class3.crt >> ${D}${libdir}/ssl/certs/cacert.org.pem
+        install -m 0644 ${WORKDIR}/DST_Root_CA_X3.pem ${D}${libdir}/ssl/certs/
 
         # Create hash symlinks
         cd ${D}${libdir}/ssl/certs
         ln -s cacert.org.pem e5662767.0
         ln -s cacert.org.pem 5ed36f99.0
         ln -s cacert.org.pem 99d0fa06.0
+
+        ln -s DST_Root_CA_X3.pem 2e5ac55d.0
 }
 
 FILES_${PN} = "${libdir}/ssl/certs/*"

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 = "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"

recipes-extra/ca-certificates/files/DST_Root_CA_X3.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----

recipes-extra/dnsmasq/dnsmasq.inc

@@ -15,7 +15,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV
 
 inherit pkgconfig update-rc.d systemd
 
-PR = "r3"
+PR = "r4"
 
 INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"

recipes-extra/dnsmasq/files/sysmocom-bsc/dnsmasq.conf

@@ -0,0 +1,288 @@
+# Configuration file for dnsmasq.
+#
+# Format is one option per line, legal options are the same
+# as the long options legal on the command line. See
+# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details.
+
+# Change these lines if you want dnsmasq to serve MX records.
+# Only one of mx-host and mx-target need be set, the other defaults
+# to the name of the host  running dnsmasq.
+#mx-host=
+#mx-target=
+#selfmx
+#localmx
+
+# The following two options make you a better netizen, since they 
+# tell dnsmasq to filter out queries which the public DNS cannot
+# answer, and which load the servers (especially the root servers) 
+# uneccessarily. If you have a dial-on-demand link they also stop
+# these requests from bringing up the link uneccessarily.
+
+# Never forward plain names (with a dot or domain part)
+domain-needed
+# Never forward addresses in the non-routed address spaces.
+bogus-priv
+
+
+# Uncomment this to filter useless windows-originated DNS requests
+# which can trigger dial-on-demand links needlessly.
+# Note that (amongst other things) this blocks all SRV requests, 
+# so don't use it if you use eg Kerberos.
+#filterwin2k
+
+# Change this line if you want dns to get its upstream servers from
+# somewhere other that /etc/resolv.conf 
+#resolv-file=
+
+# By  default,  dnsmasq  will  send queries to any of the upstream
+# servers it knows about and tries to favour servers to are  known
+# to  be  up.  Uncommenting this forces dnsmasq to try each query
+# with  each  server  strictly  in  the  order  they   appear   in
+# /etc/resolv.conf
+#strict-order
+
+# If you don't want dnsmasq to read /etc/resolv.conf or any other
+# file, getting its servers for this file instead (see below), then
+# uncomment this
+#no-resolv
+
+# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv
+# files for changes and re-read them then uncomment this.
+#no-poll
+
+# Add other name servers here, with domain specs if they are for 
+# non-public domains.
+#server=/localnet/192.168.0.1
+
+# Add local-only domains here, queries in these domains are answered
+# from /etc/hosts or DHCP only.
+#local=/localnet/
+
+# Add domains which you want to force to an IP address here.
+# The example below send any host in doubleclick.net to a local
+# webserver.
+#address=/doubleclick.net/127.0.0.1
+
+# You no longer (as of version 1.7) need to set these to enable 
+# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the
+# "dip" group to achieve this.
+#user=
+#group=
+
+# If you want dnsmasq to listen for requests only on specified interfaces
+# (and the loopback) give the name of the interface (eg eth0) here. 
+# Repeat the line for more than one interface.
+interface=eth1
+# Or you can specify which interface _not_ to listen on
+#except-interface=
+# Or which to listen on by address (remember to include 127.0.0.1 if
+# you use this.)
+#listen-address=
+
+# On systems which support it, dnsmasq binds the wildcard address,
+# even when it is listening on only some interfaces. It then discards
+# requests that it shouldn't reply to. This has the advantage of 
+# working even when interfaces come and go and change address. If you
+# want dnsmasq to really bind only the interfaces it is listening on,
+# uncomment this option. About the only time you may need this is when 
+# running another nameserver on the same machine.
+#bind-interfaces 
+
+# If you don't want dnsmasq to read /etc/hosts, uncomment the
+# following line.
+#no-hosts
+# or if you want it to read another file, as well as /etc/hosts, use
+# this.
+#addn-hosts=/etc/banner_add_hosts
+
+# Set this (and domain: see below) if you want to have a domain
+# automatically added to simple names in a hosts-file.
+#expand-hosts
+
+# Set the domain for dnsmasq. this is optional, but if it is set, it
+# does the following things.
+# 1) Allows DHCP hosts to have fully qualified domain names, as long
+#     as the domain part matches this setting.
+# 2) Sets the "domain" DHCP option thereby potentially setting the
+#    domain of all systems configured by DHCP
+# 3) Provides the domain part for "expand-hosts"
+#domain=thekelleys.org.uk
+  
+# Uncomment this to enable the integrated DHCP server, you need
+# to supply the range of addresses available for lease and optionally 
+# a lease time. If you have more than one network, you will need to
+# repeat this for each network on which you want to supply DHCP
+# service.
+#dhcp-range=192.168.0.50,192.168.0.150,12h
+dhcp-range=10.23.24.10,10.23.24.200,2h
+
+# This is an example of a DHCP range where the netmask is given. This
+# is needed for networks we reach the dnsmasq DHCP server via a relay 
+# agent. If you don't know what a DHCP relay agent is, you probably
+# don't need to worry about this.
+#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h
+
+# This is an example of a DHCP range with a network-id, so that
+# some DHCP options may be set only for this network.
+#dhcp-range=red,192.168.0.50,192.168.0.150
+
+# Supply parameters for specified hosts using DHCP. There are lots
+# of valid alternatives, so we will give examples of each. Note that
+# IP addresses DO NOT have to be in the range given above, they just
+# need to be on the same network. The order of the parameters in these
+# do not matter, it's permissble to give name,adddress and MAC in any order
+
+# Always allocate the host with ethernet address 11:22:33:44:55:66 
+# The IP address 192.168.0.60
+#dhcp-host=11:22:33:44:55:66,192.168.0.60
+
+# Always set the name of the host with hardware address
+# 11:22:33:44:55:66 to be "fred"
+#dhcp-host=11:22:33:44:55:66,fred
+
+# Always give the host with ethernet address 11:22:33:44:55:66
+# the name fred and IP address 192.168.0.60 and lease time 45 minutes
+#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m
+
+# Give the machine which says it's name is "bert" IP address
+# 192.168.0.70 and an infinite lease
+#dhcp-host=bert,192.168.0.70,infinite
+
+# Always give the host with client identifier 01:02:02:04 
+# the IP address 192.168.0.60
+#dhcp-host=id:01:02:02:04,192.168.0.60
+
+# Always give the host with client identifier "marjorie"
+# the IP address 192.168.0.60
+#dhcp-host=id:marjorie,192.168.0.60
+
+# Enable the address given for "judge" in /etc/hosts
+# to be given to a machine presenting the name "judge" when
+# it asks for a DHCP lease.
+#dhcp-host=judge
+
+# Never offer DHCP service to a machine whose ethernet 
+# address is 11:22:33:44:55:66
+#dhcp-host=11:22:33:44:55:66,ignore
+
+# Ignore any client-id presented by the machine with ethernet
+# address 11:22:33:44:55:66. This is useful to prevent a machine 
+# being treated differently when running under different OS's or
+# between PXE boot and OS boot.
+#dhcp-host=11:22:33:44:55:66,id:*
+
+# Send extra options which are tagged as "red" to 
+# the machine with ethernet address 11:22:33:44:55:66
+#dhcp-host=11:22:33:44:55:66,net:red
+
+# Send extra options which are tagged as "red" to any machine whose
+# DHCP vendorclass string includes the substring "Linux"
+#dhcp-vendorclass=red,Linux
+
+# Send extra options which are tagged as "red" to any machine one 
+# of whose DHCP userclass strings includes the substring "accounts"
+#dhcp-userclass=red,accounts
+
+# If this line is uncommented, dnsmasq will read /etc/ethers and act
+# on the ethernet-address/IP pairs found there just as if they had
+# been given as --dhcp-host options. Useful if you keep
+# MAC-address/host mappings there for other purposes.
+#read-ethers
+
+# Send options to hosts which ask for a DHCP lease.
+# See RFC 2132 for details of available options.
+# Note that all the common settings, such as netmask and
+# broadcast address, DNS server and default route, are given
+# sane defaults by dnsmasq. You very likely will not need any
+# any dhcp-options. If you use Windows clients and Samba, there
+# are some options which are recommended, they are detailed at the
+# end of this section.
+# For reference, the common options are:
+# subnet mask - 1
+# default router - 3
+# DNS server - 6
+# broadcast address - 28
+
+# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5
+#dhcp-option=42,192.168.0.4,10.10.0.5
+
+# Set the NTP time server address to be the same machine as 
+# is running dnsmasq
+#dhcp-option=42,0.0.0.0
+
+# Set the NIS domain name to "welly"
+#dhcp-option=40,welly
+
+# Set the default time-to-live to 50
+#dhcp-option=23,50
+
+# Set the "all subnets are local" flag
+#dhcp-option=27,1
+
+# Send the etherboot magic flag and then etherboot options (a string).
+#dhcp-option=128,e4:45:74:68:00:00
+#dhcp-option=129,NIC=eepro100
+
+# Specify an option which will only be sent to the "red" network 
+# (see dhcp-range for the declaration of the "red" network)
+#dhcp-option=red,42,192.168.1.1
+
+# The following DHCP options set up dnsmasq in the same way as is specified
+# for the ISC dhcpcd in 
+# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt
+# adapted for a typical dnsmasq installation where the host running
+# dnsmasq is also the host running samba.
+# you may want to uncomment them if you use Windows clients and Samba.
+#dhcp-option=19,0           # option ip-forwarding off 
+#dhcp-option=44,0.0.0.0     # set netbios-over-TCP/IP nameserver(s) aka WINS server(s)
+#dhcp-option=45,0.0.0.0     # netbios datagram distribution server
+#dhcp-option=46,8           # netbios node type
+#dhcp-option=47             # empty netbios scope.
+ 
+
+# Set the boot filename and tftpd server name and address
+# for BOOTP. You will only need this is you want to
+# boot machines over the network.
+#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3
+
+# Set the limit on DHCP leases, the default is 150
+#dhcp-lease-max=150
+
+# The DHCP server needs somewhere on disk to keep its lease database.
+# This defaults to a sane location, but if you want to change it, use
+# the line below.
+#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
+
+# Set the cachesize here.
+#cache-size=150
+
+# If you want to disable negative caching, uncomment this.
+#no-negcache
+
+# Normally responses which come form /etc/hosts and the DHCP lease
+# file have Time-To-Live set as zero, which conventionally means
+# do not cache further. If you are happy to trade lower load on the 
+# server for potentially stale date, you can set a time-to-live (in 
+# seconds) here.
+#local-ttl=
+
+# If you want dnsmasq to detect attempts by Verisign to send queries
+# to unregistered .com and .net hosts to its sitefinder service and
+# have dnsmasq instead return the correct NXDOMAIN response, uncomment
+# this line. You can add similar lines to do the same for other
+# registries which have implemented wildcard A records.
+#bogus-nxdomain=64.94.110.11
+
+# If you want to fix up DNS results from upstream servers, use the
+# alias option. This only works for IPv4.
+# This alias makes a result of 1.2.3.4 appear as 5.6.7.8
+#alias=1.2.3.4,5.6.7.8
+# and this maps 1.2.3.x to 5.6.7.x
+#alias=1.2.3.0,5.6.7.0,255.255.255.0
+
+# For debugging purposes, log each DNS query as it passes through
+# dnsmasq.
+#log-queries
+
+# Include a another lot of configuration options.
+#conf-file=/etc/dnsmasq.more.conf

recipes-extra/gpsd/gpsd/gpsd-3.3-ldflags.patch

@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/391299
+
+split up linking flags into multiple arguments
+
+Index: gpsd-3.10/SConstruct
+===================================================================
+--- gpsd-3.10.orig/SConstruct	2017-03-28 23:47:02.815665786 +0200
++++ gpsd-3.10/SConstruct	2017-03-28 23:47:40.463666285 +0200
+@@ -250,7 +250,7 @@
+             env.Replace(**{j: os.getenv(i)})
+ for flag in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+     if os.environ.has_key(flag):
+-        env.MergeFlags({flag : [os.getenv(flag)]})
++        env.MergeFlags({flag : Split(os.getenv(flag))})
+ 
+ 
+ # Keep scan-build options in the environment

recipes-extra/gpsd/gpsd/sysmobts2100/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="-n"
+GPS_DEVICES="/dev/ttyS0"
+

recipes-extra/gpsd/gpsd_3.10.bb

@@ -11,6 +11,7 @@ PR = "r3.19"
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
   file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \
+  file://gpsd-3.3-ldflags.patch \
   file://no-rpath-please.patch \
   file://gpsd-tsip-pps.patch \
   file://leave-argv-untouched.patch \
@@ -33,6 +34,8 @@ INITSCRIPT_PARAMS = "defaults 35"
 
 export STAGING_INCDIR
 export STAGING_LIBDIR
+export LINKFLAGS="${TARGET_LDFLAGS}"
+export SHLINKFLAGS="${TARGET_LDFLAGS}"
 
 EXTRA_OESCONS = " \
   sysroot=${STAGING_DIR_TARGET} \

recipes-extra/gpsdate/gpsdate_git.bb

@@ -6,13 +6,13 @@ DEPENDS = "gpsd"
 RDEPENDS_${PN} = "libgps"
 
 PE = "1"
-PR = "r13"
+PR = "r14"
 PV = "0.2+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
 	file://gpsdate.default \
 "
-SRCREV = "8c0f608643504b14c42ecb0d436354fad3cc7929"
+SRCREV = "81690ca78e816f86e0da11bbe8cba725fa1a634d"
 S = "${WORKDIR}/git"
 
 INITSCRIPT_NAME = "gpsdate"

recipes-extra/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch

@@ -0,0 +1,56 @@
+From 7af9db748974cb3a2c6ef8f9e03d7db1f9f8ee16 Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Wed, 6 Aug 2014 14:54:12 -0400
+Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch
+
+In yocto we'll always be cross compiling, and we'll always
+be building on linux for linux (vs. *BSD, hurd, etc.)
+
+Without this the arch is not detected, but it doesn't error
+out, and hence you get useless binaries that don't know any
+arch specific methods, and the end result will be strangeness
+like the loopback device not being configured/enabled.
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+---
+ defn2c.pl   | 6 +++---
+ defn2man.pl | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/defn2c.pl b/defn2c.pl
+index c449de2f3d1c..38845e374c76 100755
+--- a/defn2c.pl
++++ b/defn2c.pl
+@@ -2,9 +2,9 @@
+ 
+ use strict;
+ 
+-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
+-
+-$DEB_HOST_ARCH_OS =~ s/\n//;
++#my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
++#$DEB_HOST_ARCH_OS =~ s/\n//;
++my $DEB_HOST_ARCH_OS ="linux";
+ 
+ # declarations
+ my $address_family = "";
+diff --git a/defn2man.pl b/defn2man.pl
+index 6ddcfdd4fe68..c9c4dd046597 100755
+--- a/defn2man.pl
++++ b/defn2man.pl
+@@ -2,9 +2,9 @@
+ 
+ use strict;
+ 
+-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
+-
+-$DEB_HOST_ARCH_OS =~ s/\n//;
++#my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
++#$DEB_HOST_ARCH_OS =~ s/\n//;
++my $DEB_HOST_ARCH_OS = "linux";
+ 
+ # declarations
+ my $line;
+-- 
+1.9.1
+

recipes-extra/ifupdown/ifupdown_0.7.52.bb

@@ -7,7 +7,8 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=7adfbe801102d1e7e6bfdd3f03754efa"
 
 SRC_URI = "https://launchpadlibrarian.net/194033720/ifupdown_${PV}.tar.xz \
-	file://busybox-yocto-compat.patch "
+	file://busybox-yocto-compat.patch \
+	file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch "
 
 SRC_URI[md5sum] = "bb204ae2fa4171d6f1de4097f4570a7d"
 SRC_URI[sha256sum] = "8a0647c59ee0606f5da9205c5b3c5b000fea98fe39348f6bb2cba5fecfc51090"

recipes-extra/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch

@@ -1,8 +0,0 @@
-diff --git iperf-2.0.5/man/Makefile.am iperf-2.0.5/man/Makefile.am
- index ed97bc6..728873f 100644
---- iperf-2.0.5/man/Makefile.am
-+++ iperf-2.0.5/man/Makefile.am
-@@ -1,2 +1 @@
--man_MANS = iperf.1
--dist_man_MANS = $(man_MANS)
-+dist_man_MANS = iperf.1

recipes-extra/iperf/iperf-2.0.9/stdbool-compilation.patch

@@ -0,0 +1,13 @@
+Index: iperf-2.0.9/include/util.h
+===================================================================
+--- iperf-2.0.9.orig/include/util.h
++++ iperf-2.0.9/include/util.h
+@@ -57,6 +57,8 @@
+     #include "config.h"
+ #endif
+ 
++#include <stdbool.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif

recipes-extra/iperf/iperf_2.0.9.bb

@@ -4,12 +4,12 @@ SECTION = "console/network"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298"
 
-SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${PN}-${PV}.tar.gz \
-            file://iperf-2.0.5_ManPage.patch \
-          "
+SRC_URI = "${SOURCEFORGE_MIRROR}/iperf2/${PN}-${PV}.tar.gz \
+           file://stdbool-compilation.patch \
+"
 
-SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"
-SRC_URI[sha256sum] = "636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b"
+SRC_URI[md5sum] = "351b018b71176b8cb25f20eef6a9e37c"
+SRC_URI[sha256sum] = "db02911f35686e808ed247160dfa766e08ae3f59d1e7dcedef0ffb2a6643f0bf"
 
 S = "${WORKDIR}/${PN}-${PV}"
 

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 = "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${PV}.tar.bz2/829d88fb09d67723fbf42853eb84d1fd/lm_sensors-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "829d88fb09d67723fbf42853eb84d1fd"
 SRC_URI[sha256sum] = "bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581"

recipes-extra/rauc/files/gsmk-owhw/system.conf

@@ -0,0 +1,27 @@
+[system]
+compatible=gsmk-owhw
+bootloader=barebox
+mountprefix=/mnt/rauc
+
+[keyring]
+path=ca.pem
+
+[slot.rescue.0]
+device=/dev/ubi0_rescue
+type=ubifs
+bootname=rescue
+readonly=true
+
+[slot.rootfs.0]
+device=/dev/ubi0_system0
+type=ubifs
+bootname=system0
+
+[slot.rootfs.1]
+device=/dev/ubi0_system1
+type=ubifs
+bootname=system1
+
+[slot.data.0]
+device=/dev/ubi0_data
+type=ubifs

recipes-extra/rauc/rauc.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "rauc update controller"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://github.com/jluebbe/rauc.git;protocol=https \
 	file://dev-ca.pem \
@@ -15,11 +15,12 @@ S = "${WORKDIR}/git"
 
 SRCREV = "011953fa6c824ca518cf0ea074ddeede3726bdcd"
 
-DEPENDS = "curl openssl glib-2.0"
+DEPENDS = "curl openssl glib-2.0 glib-2.0-native"
 
 # rauc is invoking these depending the machine
 RDEPENDS_${PN}_append_sysmobts-v2 = " barebox-state"
 RDEPENDS_${PN}_append_sysmocom-odu = " barebox-state"
+RDEPENDS_${PN}_append_gsmk-owhw = " barebox-state"
 RDEPENDS_${PN}_append_sysmocom-bsc = " grub"
 
 FILES_${PN} += "/mnt/rauc"

recipes-fixes/cronie/cronie_sysmocom.inc

@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
 PRINC="1"

recipes-fixes/dropbear/dropbear_sysmocom.inc

@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
 PRINC="4"

recipes-fixes/initscripts/initscripts_dora.inc

@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-dora"], d)}:"
 
 PRINC="4"

recipes-fixes/initscripts/initscripts_master.inc

@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-master"], d)}:"
 
 PRINC="4"

recipes-fixes/iproute2/iproute2_sysmocom.inc

@@ -1,5 +1,5 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/files/${PN}-${PV}"], d)}:${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
 PRINC="2"