init-install.sh: Save/restore an existing VPN certificate

Fix fstab for sysmonitb-ip as well and increment princ

Ticket: SYS#3688

classes/gitver-pkg.bbclass

@@ -1,155 +0,0 @@
-# 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

@@ -1,139 +0,0 @@
-# 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

@@ -133,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 = d.getVar('PN', True)
+        pn = bb.data.getVar('PN', d , True)
         if pn == 'gcc-cross':
               return False
         return True
@@ -362,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 = d.getVar('WORKDIR', 1)
-    distro = d.getVar('DISTRO', 1)
+    workdir = bb.data.getVar('WORKDIR', d, 1)
+    distro = bb.data.getVar('DISTRO', d, 1)
     s = d.getVar('S', True)
     pf = d.getVar('PF', True)
     target_sys = d.getVar('TARGET_SYS', True)
@@ -383,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 d.getVarFlag(e, 'python'):
-            f.write("\npython %s () {\n%s}\n" % (e, d.getVar(e, 1)))
+        if bb.data.getVarFlag(e, 'python', d):
+            f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
     f.close()
 
 def create_diff_gz(d):
@@ -460,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

@@ -35,7 +35,3 @@ PACKAGECONFIG_pn-systemd = "compat ldconfig binfmt sysusers randomseed myhostnam
 
 # 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/machine/include/sysmobts.inc

@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 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%')}"
+PREFERRED_VERSION_linux-sysmocom = "3.10.84+git%"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
@@ -41,6 +41,3 @@ 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

@@ -1,33 +0,0 @@
-#@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

@@ -1,17 +0,0 @@
-# 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

@@ -1,6 +0,0 @@
-#@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

@@ -1,43 +0,0 @@
-#@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

@@ -8,8 +8,7 @@ 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%')}"
+PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
 
 require conf/machine/include/tune-geode.inc
 

conf/machine/sysmocom-idu.conf

@@ -10,8 +10,7 @@ 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%')}"
+PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
 
 MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
 

conf/machine/sysmonitb-ip.conf

@@ -0,0 +1,38 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for running a common x86
+
+TARGET_ARCH = "i586"
+
+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', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
+
+require conf/machine/include/tune-geode.inc
+
+MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+IMAGE_FSTYPES ?= "tar.gz ext4"
+
+SERIAL_CONSOLE = "38400 ttyS0"
+MACHINE_CONSOLE = "console=ttyS0,38400n8"
+
+# 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 = "\
+	${@['', 'busybox-ifplugd'][d.getVar('DISTRO_VERSION', True)[0:3] == '1.5']} \
+        linux-firmware-rtl-nic "

recipes-apps/images/sysmocom-3g-image.bb

@@ -0,0 +1,18 @@
+require sysmocom-image.inc
+
+IMAGE_INSTALL += " task-sysmocom-3g "
+ 
+# Activate osmo-hnbgw, osmo-hlr, osmo-msc, osmo-sgsn and openggsn for 3G
+activate_core() {
+}
+
+activate_systemd_core() {
+	ln -sf ${systemd_unitdir}/system/osmo-hnbgw.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
+	ln -sf ${systemd_unitdir}/system/osmo-msc.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
+	ln -sf ${systemd_unitdir}/system/osmo-bsc-mgcp.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
+	ln -sf ${systemd_unitdir}/system/osmo-sgsn.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
+	ln -sf ${systemd_unitdir}/system/osmo-hlr.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
+	ln -sf ${systemd_unitdir}/system/openggsn.service ${IMAGE_ROOTFS}/etc/systemd/system/multi-user.target.wants/
+}
+
+IMAGE_PREPROCESS_COMMAND += "${@base_contains('DISTRO_FEATURES','systemd','activate_systemd_core','activate_core',d)}; "

recipes-apps/images/sysmocom-core-image-minimal.bb

@@ -1,4 +1,4 @@
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} packagegroup-osmocom task-sysmocom"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} packagegroup-osmocom task-sysmocom-2g"
 IMAGE_LINGUAS = " "
 LICENSE = "MIT"
 

recipes-apps/images/sysmocom-image.inc

@@ -1,5 +1,5 @@
 DEPENDS = "${MACHINE_EXTRA_RDEPENDS} util-linux-native"
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
 IMAGE_LINGUAS = " "
 IMAGE_FEATURES += " package-management "
 LICENSE = "MIT"

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

@@ -1,5 +1,7 @@
 require sysmocom-image.inc
 
+IMAGE_INSTALL += " task-sysmocom-2g "
+
 # This variant of the image will run osmo-bts and osmo-nitb
 activate_nitb() {
 	echo "NO_START=0" > ${IMAGE_ROOTFS}/etc/default/osmo-nitb

recipes-apps/sysmocom-backup-data/files/sysmonitb-ip/data.mount

@@ -0,0 +1,7 @@
+[Unit]
+Description=/data
+
+[Mount]
+What=/dev/sda4
+Where=/data
+Type=ext4

recipes-apps/sysmocom-backup/files/default.files

@@ -3,20 +3,13 @@ etc/ifplugd.sh
 etc/network/interfaces
 etc/openvpn
 etc/opkg/sysmocom-config.conf
-etc/osmocom/osmo-bsc-mgcp.cfg
-etc/osmocom/osmo-bsc.cfg
-etc/osmocom/osmo-bts.cfg
-etc/osmocom/osmo-nitb.cfg
-etc/osmocom/osmo-pcu.cfg
-etc/osmocom/osmo-sgsn.cfg
-etc/systemd/system/multi-user.target.wants/osmo-nitb.service
-etc/systemd/system/multi-user.target.wants/osmo-bsc.service
-etc/systemd/system/multi-user.target.wants/osmo-sgsn.service
+etc/osmocom
+etc/systemd/system/multi-user.target.wants
 etc/ggsn.conf
 etc/default
-var/lib/osmocom/hlr.sqlite3
+var/lib/osmocom/hlr.db
 etc/lcr
-etc/udhcpd.conf
+etc/dnsmasq.conf
 etc/sysmocom/backup.d
 etc/machine-id
 etc/dropbear/dropbear_rsa_host_key

recipes-apps/sysmocom-udhcpd-config/files/sysmonitb-ip/udhcpd.conf

@@ -0,0 +1,9 @@
+start 10.23.24.123
+end   10.23.24.254
+
+interface eth1
+
+option router 10.23.24.1
+option subnet 255.255.255.0
+option broadcast 10.23.24.255
+option dns 8.8.8.8

recipes-apps/sysmocom-udhcpd-config/files/sysmonitb-ip/udhcpd.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=UDHCPD
+Requires=sys-subsystem-net-devices-eth1.device
+After=sys-subsystem-net-devices-eth1.device
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/udhcpd -fS /etc/udhcpd.conf
+
+[Install]
+WantedBy=multi-user.target

recipes-apps/tasks/task-sysmocom-2g.bb

@@ -1,4 +1,4 @@
-DESCRIPTION = "Task for sysmocom"
+DESCRIPTION = "Task for sysmocom 2G"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -16,3 +16,9 @@ RDEPENDS_${PN} = "\
     ipaccess-utils \
     "
 
+PREFERRED_PROVIDER_osmo-bsc = "openbsc"
+PREFERRED_PROVIDER_osmo-bsc-mgcp = "openbsc"
+PREFERRED_PROVIDER_osmo-bsc-nat = "openbsc"
+PREFERRED_PROVIDER_osmo-bsc-nitb = "openbsc"
+PREFERRED_PROVIDER_osmo-bsc-gbproxy = "openbsc"
+PREFERRED_PROVIDER_ipaccess-utils = "openbsc"

recipes-apps/tasks/task-sysmocom-3g.bb

@@ -0,0 +1,29 @@
+DESCRIPTION = "Task for sysmocom 3G"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = " \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+DEPENDS = "virtual/kernel"
+ALLOW_EMPTY_${PN} = "1"
+PR = "r2"
+
+RDEPENDS_${PN} = "\
+    task-sysmocom-tools \
+    osmo-hnbgw \
+    osmo-hlr \
+    osmo-msc \
+    osmo-sgsn \
+    osmo-bsc-mgcp \
+    openggsn \
+    dnsmasq \
+    sysmocom-ggsn-config \
+    gprs-routing \
+    sqlite3 \
+    "
+
+PREFERRED_PROVIDER_osmo-bsc-mgcp = "osmocom-3g"
+PREFERRED_PROVIDER_osmo-bsc-nat = "osmocom-3g"
+PREFERRED_PROVIDER_osmo-bsc-nitb = "osmocom-3g"
+PREFERRED_PROVIDER_osmo-bsc-gbproxy = "osmocom-3g"
+PREFERRED_PROVIDER_osmo-sgsn = "osmocom-3g"
+
+#PREFERRED_VERSION_osmocom-3g =

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 = "r24"
+PR = "r23"
 
 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-bsp/barebox/barebox-sysmobts_git.bb

@@ -1,6 +1,6 @@
 require barebox.inc
 
-SRCREV = "1d8bdd6f226df2ecbde3776b52fbc228158293fd"
+SRCREV = "f2b03e21a869b8df30e428ac9408d7988d55279a"
 SRC_URI = " \
 	git://git.sysmocom.de/barebox.git;branch=v2015.06 \
 	file://defconfig \
@@ -17,9 +17,6 @@ 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/base-files/base-files_sysmocom.inc

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

recipes-bsp/base-files/files/sysmonitb-ip/fstab

@@ -0,0 +1,6 @@
+rootfs               /                    auto       defaults              0  1
+proc                 /proc                proc       defaults              0  0
+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

recipes-bsp/init-ifupdown/init-ifupdown-master/sysmonitb-ip/interfaces

@@ -0,0 +1,23 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+#eth0 is our gateway to the network.
+auto eth0
+iface eth0 inet dhcp
+
+#eth1 will provide dhcp to clients
+auto eth1
+iface eth1 inet static
+	address 10.23.24.1
+	netmask 255.255.255.0
+	network 10.23.24.0
+
+auto eth1:1
+iface eth1:1 inet static
+        address 10.23.123.1
+        netmask 255.255.255.0
+        network 10.23.123.0
+

recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-bsc/interfaces

@@ -16,7 +16,7 @@ iface eth1 inet static
 
 auto eth1:1
 iface eth1:1 inet static
-        address 10.23.123.1
+        address 10.23.24.2
         netmask 255.255.255.0
-        network 10.23.123.0
+        network 10.23.24.0
 

recipes-bsp/init-ifupdown/init-ifupdown/sysmonitb-ip/interfaces

@@ -0,0 +1,22 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+#eth0 is our gateway to the network. ifplugd will run ifup/ifdown for us
+iface eth0 inet dhcp
+
+#eth1 will provide dhcp to clients
+auto eth1
+iface eth1 inet static
+	address 10.23.24.1
+	netmask 255.255.255.0
+	network 10.23.24.0
+
+auto eth1:1
+iface eth1:1 inet static
+        address 10.23.24.2
+        netmask 255.255.255.0
+        network 10.23.24.0
+

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

@@ -1,2 +1,2 @@
-SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
+SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, 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(d.getVar('FILE', True))}"
+SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:"
 PRINC = "13"
 

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

@@ -1,78 +0,0 @@
-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_3.10.bb

@@ -23,7 +23,7 @@ SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "(sysmobts-v2|sysmocom-bsc)"
+COMPATIBLE_MACHINE = "(sysmobts-v2|sysmocom-bsc|sysmonitb-ip)"
 EXTRA_OEMAKE += "KALLSYMS_EXTRA_PASS=1"
 
 require linux-tools.inc

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

@@ -1,59 +0,0 @@
-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(d.getVar('FILE', True))}"
+SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "21"
 

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

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

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

@@ -1,12 +0,0 @@
-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

@@ -1,91 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,76 +0,0 @@
-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(d.getVar('FILE', True))}"
+SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "9"
 

recipes-config/openggsn-config/files/ggsn.conf

@@ -33,7 +33,7 @@
 # TAG: listen
 # Specifies the local IP address to listen to
 #listen 10.0.0.240
-listen 10.23.123.1
+listen 10.23.24.2
 
 # TAG: net
 # IP network address of external packet data network

recipes-config/sysmocom-configure/files/sysmonitb-ip/multi-user.target.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+TEST_VALUE="default"
+
+. /slot/system.conf
+
+cat >/etc/sysmocom/test.cfg <<EOF
+[main]
+bla=$TEST_VALUE
+model=sysmonitb-ip
+EOF

recipes-core/busybox/busybox_sysmocom.inc

@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
+SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, 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(d.getVar('FILE', True))}"
+SYSMOCOM_D := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-systemd:${SYSMOCOM_D}/${PN}:"
 PRINC := "${@int(PRINC) + 3}"

recipes-core/initrdscripts/files/init-install.sh

@@ -122,6 +122,14 @@ if [ ! "${device#mmcblk}" = "${device}" ]; then
 fi
 rootfs=/dev/${device}${part_prefix}1
 
+## Backup - only works if install is using the same partition as before
+mkdir -p /bkup_root
+if [ mount -o ro $rootfs /bkup_root ]; then
+	echo "Saving openVPN certificate if it exists"
+	cp -r /bkup_root/etc/openvpn /tmp/ || true
+	umount /bkup_root
+fi
+
 echo "*****************"
 echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
 echo "*****************"
@@ -148,6 +156,12 @@ dd if=/media/$dev_name/$image_name of=$rootfs bs=1024
 # Handling of the target root partition
 mount $rootfs /tgt_root
 
+# Restore OpenVPN certificate and config
+if [ -d /tmp/openvpn/ -a -d /tgt_root/etc/ ]; then
+	echo "Restoring openVPN certificate"
+	cp -r /tmp/openvpn /tgt_root/etc/
+fi
+
 if [ -d /tgt_root/etc/ ] ; then
     # We dont want udev to mount our root device while we're booting...
     if [ -d /tgt_root/etc/udev/ ] ; then

recipes-core/initrdscripts/initramfs-framework_sysmocom.inc

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

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

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

recipes-core/initrdscripts/initramfs-rauc-slot/sysmonitb-ip/mount_data

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mount_data_enabled() {
+	return 0
+}
+
+mount_data_run() {
+	info "Mounting data..."
+	mkdir -p /rootfs/data
+	mount -t ext4 /dev/sda4 /rootfs/data
+}

recipes-extra/dnsmasq/files/sysmonitb-ip/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

@@ -1,17 +0,0 @@
-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

@@ -1,5 +0,0 @@
-# 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,7 +11,6 @@ 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 \
@@ -34,8 +33,6 @@ 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/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch

@@ -1,56 +0,0 @@
-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,8 +7,7 @@ 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://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch "
+	file://busybox-yocto-compat.patch "
 
 SRC_URI[md5sum] = "bb204ae2fa4171d6f1de4097f4570a7d"
 SRC_URI[sha256sum] = "8a0647c59ee0606f5da9205c5b3c5b000fea98fe39348f6bb2cba5fecfc51090"

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

@@ -0,0 +1,8 @@
+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

@@ -1,13 +0,0 @@
-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.5.bb

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

recipes-extra/rauc/files/sysmonitb-ip/system.conf

@@ -0,0 +1,27 @@
+[system]
+compatible=sysmocom-idu
+bootloader=grub
+mountprefix=/mnt/rauc
+
+[keyring]
+path=ca.pem
+
+[slot.rescue.0]
+device=/dev/sda1
+type=ext4
+bootname=R
+readonly=true
+
+[slot.rootfs.0]
+device=/dev/sda2
+type=ext4
+bootname=A
+
+[slot.rootfs.1]
+device=/dev/sda3
+type=ext4
+bootname=B
+
+[slot.data.0]
+device=/dev/sda4
+type=ext4

recipes-extra/rauc/rauc.bb

@@ -15,13 +15,14 @@ S = "${WORKDIR}/git"
 
 SRCREV = "011953fa6c824ca518cf0ea074ddeede3726bdcd"
 
-DEPENDS = "curl openssl glib-2.0 glib-2.0-native"
+DEPENDS = "curl openssl glib-2.0"
 
 # 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"
+RDEPENDS_${PN}_append_sysmonitb-ip = " grub"
 
 FILES_${PN} += "/mnt/rauc"
 FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"

recipes-fixes/cronie/cronie_sysmocom.inc

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

recipes-fixes/dropbear/dropbear_sysmocom.inc

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

recipes-fixes/initscripts/initscripts_dora.inc

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

recipes-fixes/iproute2/iproute2_sysmocom.inc

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

recipes-fixes/opkg/opkg_sysmocom.inc

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

recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc

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

recipes-fixes/systemd/systemd-compat-units_sysmocom.inc

@@ -3,11 +3,10 @@ PRINC="3"
 # We need networking to run as we have no native services yet
 SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking dnsmasq"
 
-S_THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
+S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
 SRC_URI += "file://alignment.service"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 do_install_append() {
 	install -d ${D}${systemd_unitdir}/system/basic.target.wants

recipes-fixes/systemd/systemd/sysmobts2100/system.conf

@@ -1,43 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-# See systemd.conf(5) for details
-
-[Manager]
-#LogLevel=info
-#LogTarget=journal-or-kmsg
-#LogColor=yes
-#LogLocation=no
-#DumpCore=yes
-#CrashShell=no
-#ShowStatus=yes
-#CrashChVT=1
-#CPUAffinity=1 2
-#DefaultControllers=cpu
-#DefaultStandardOutput=journal
-#DefaultStandardError=inherit
-#JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
-RuntimeWatchdogSec=20
-ShutdownWatchdogSec=20
-#CapabilityBoundingSet=
-#TimerSlackNSec=
-#DefaultLimitCPU=
-#DefaultLimitFSIZE=
-#DefaultLimitDATA=
-#DefaultLimitSTACK=
-#DefaultLimitCORE=
-#DefaultLimitRSS=
-#DefaultLimitNOFILE=
-#DefaultLimitAS=
-#DefaultLimitNPROC=
-#DefaultLimitMEMLOCK=
-#DefaultLimitLOCKS=
-#DefaultLimitSIGPENDING=
-#DefaultLimitMSGQUEUE=
-#DefaultLimitNICE=
-#DefaultLimitRTPRIO=
-#DefaultLimitRTTIME=

recipes-fixes/systemd/systemd_sysmocom.inc

@@ -1,7 +1,7 @@
-S_THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
+S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
-PRINC="26"
+PRINC="25"
 
 SRC_URI += "file://journald.conf \
             file://legacy.conf \
@@ -10,8 +10,6 @@ SRC_URI += "file://journald.conf \
 
 SRC_URI_append_sysmobts-v2 = " file://system.conf"
 SRC_URI_append_sysmocom-odu = " file://system.conf"
-SRC_URI_append_gsmk-owhw = " file://system.conf"
-SRC_URI_append_sysmobts2100 = " file://system.conf"
 
 # We want the journal on the ODU...
 SRC_URI_append_sysmocom-idu = " file://system.conf"

recipes-fixes/udev/udev_sysmocom.inc

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

recipes-support/netcat-openbsd/netcat-openbsd_1.105.bb

@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://../debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3a
 
 DEPENDS += "glib-2.0 libbsd"
 
-inherit pkgconfig
-
 SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \
            ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch"
 
@@ -33,7 +31,7 @@ python do_patch() {
 do_compile() {
     cd ${S}
     pkgrel=4
-    oe_runmake LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\""
+    oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\""
 }
 
 do_install() {

recipes-sysmobts/dvnixload/dvnixload_0.2.6.bb

@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "5b76e9cb0ee843208c17053315926e0e168db8a89fe960655a0d0f4871
 
 do_deploy() {
         install -d ${DEPLOY_DIR_TOOLS}
-        install -m 0755 ${B}/src/dvnixload ${DEPLOY_DIR_TOOLS}/dvnixload-${PV}
+        install -m 0755 src/dvnixload ${DEPLOY_DIR_TOOLS}/dvnixload-${PV}
         rm -f ${DEPLOY_DIR_TOOLS}/dvnixload
         ln -sf ./dvnixload-${PV} ${DEPLOY_DIR_TOOLS}/dvnixload
 

recipes-sysmobts/firmware/lc15-firmware_git.bb

@@ -1,48 +0,0 @@
-SUMMARY = "Firmware files for Nuran Wireless Litecell 1.5 Mainboard"
-LICENSE = "CLOSED"
-
-NRW_LC15_MIRROR ??= "gitlab.com/nrw_litecell15"
-
-S = "${WORKDIR}/git"
-
-inherit gitver-pkg gitver-repo
-
-REPODIR   = "${THISDIR}"
-REPOFILE  = "lc15-firmware_git.bb"
-PR       := "r${REPOGITFN}"
-
-PV   = "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}/litecell15-fw.git;protocol=https;branch=${DEV_BRANCH}"
-
-REL_BRANCH  = "nrw/litecell15"
-REL_SRCREV  = "68607b5c33a02883c50f9408f423234747407d99"
-REL_SRCURI := "git://${NRW_LC15_MIRROR}/litecell15-fw.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}"
-}
-
-inherit allarch
-
-do_install() {
-    install -d ${D}${includedir}/nrw
-    install -d ${D}${includedir}/nrw/litecell15
-    install -m 0644 ${S}/inc/nrw/litecell15/* ${D}${includedir}/nrw/litecell15
-
-    install -d ${D}${base_libdir}/firmware
-    install -m 0644 ${S}/bin/* ${D}${base_libdir}/firmware
-}
-
-INSANE_SKIP_${PN} = "arch"
-
-FILES_${PN} = "${base_libdir}/firmware/*"
-FILES_${PN}-dev = "${includedir}/nrw/litecell15/*"

recipes-sysmobts/osmo-bts/files/gcc6-linking-fix.patch

@@ -1,12 +0,0 @@
-Index: git/src/osmo-bts-sysmo/l1_if.h
-===================================================================
---- git.orig/src/osmo-bts-sysmo/l1_if.h
-+++ git/src/osmo-bts-sysmo/l1_if.h
-@@ -132,6 +132,6 @@ int bts_check_for_ciph_cmd(struct femtol
- void bts_check_for_first_ciphrd(struct femtol1_hdl *fl1h,
- 				GsmL1_MsgUnitParam_t *msgUnitParam,
- 				struct gsm_lchan *lchan);
--inline int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,
-+int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,
- 			const uint8_t ms_power, const float rxLevel);
- #endif /* _FEMTO_L1_H */

recipes-sysmobts/osmo-bts/osmo-bts_git.bb

@@ -3,36 +3,26 @@ LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
 SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/0.3.5-stable;name=osmobts;destsuffix=git \
-           git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc \
-           file://gcc6-linking-fix.patch"
-SRCREV_osmobts = "a4bd813081e788012c72f34d31150cdf02db307f"
+           git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
+SRCREV_osmobts = "1a2ff06d206fc4ff3cb8170ebe2b5570addc5be3"
 SRCREV_openbsc = "57ee78078905c7499bd4e6857f8981d22badfcac"
 PV = "0.4.3+git${SRCPV}"
-PR = "r20.${META_TELEPHONY_OSMO_INC}"
+PR = "r18.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"
-
 DEPENDS = "libosmocore libosmo-abis femtobts-api gpsd"
-DEPENDS_append_sysmobts-v2 = " femtobts-api"
-DEPENDS_append_sysmobts2100 = " lc15-firmware"
+RDEPENDS_${PN} += "coreutils sysmobts-firmware (>= 5.1)"
+RCONFLICTS_${PN} = "sysmobts-firmware (< 5.1)"
 
-RDEPENDS_${PN} += "coreutils"
+EXTRA_OECONF += "--enable-sysmocom-bts"
 
-RDEPENDS_${PN}_append_sysmobts-v2 = " sysmobts-firmware (>= 5.1)"
-RCONFLICTS_${PN}_append_sysmobts-v2 = " sysmobts-firmware (< 5.1)"
-
-RDEPENDS_${PN}_append_sysmobts2100 = " lc15-firmware"
-
-EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts"
-EXTRA_OECONF_sysmobts2100 += "--enable-litecell15"
-
-inherit autotools pkgconfig
+inherit autotools update-rc.d pkgconfig
 
 
 # Select the API version
 inherit femtobts_api
-CPPFLAGS_append_sysmobts-v2 = " ${BTS_HW_VERSION} "
+CPPFLAGS += " ${BTS_HW_VERSION} "
 
 do_configure_prepend() {
 	ln -sf ../openbsc openbsc || true
@@ -45,48 +35,37 @@ do_compile_append_sysmobts-v2() {
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/osmocom
+	install -m 0660 ${S}/doc/examples/osmo-bts.cfg ${D}${sysconfdir}/osmocom
+	install -m 0755 ${S}/contrib/respawn.sh ${D}${sysconfdir}/osmocom/
+	install -m 0755 ${S}/contrib/respawn-only.sh ${D}${sysconfdir}/osmocom/
+	install -m 0644 ${S}/contrib/screenrc-sysmobts ${D}${sysconfdir}/osmocom/
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${S}/contrib/sysmobts.init ${D}${sysconfdir}/init.d/sysmobts
+
+	# Install systemd and enable on sysinit
+	install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
+	install -m 0644 ${S}/contrib/sysmobts.service ${D}${systemd_unitdir}/system/
+	ln -sf ../sysmobts.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
 
 	# Future sysmobts-mgr handling
-	install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
+	install -m 0660 ${S}/doc/examples/sysmobts-mgr.cfg ${D}${sysconfdir}/osmocom
 	install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_unitdir}/system/
 	ln -sf ../sysmobts-mgr.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
 }
 
 do_install_append_sysmobts-v2() {
 	install -m 0755 ${S}/contrib/sysmobts-calib/sysmobts-calib ${D}${bindir}/
-
-	install -m 0660 ${S}/doc/examples/osmo-bts.cfg ${D}${sysconfdir}/osmocom
-
-	# Install systemd and enable on sysinit
-	install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
-	install -m 0660 ${S}/doc/examples/sysmo/sysmobts-mgr.cfg ${D}${sysconfdir}/osmocom
-	install -m 0644 ${S}/contrib/sysmobts.service ${D}${systemd_unitdir}/system/
-	ln -sf ../sysmobts.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
 }
 
-do_install_append_sysmobts2100() {
-	install -m 0660 ${S}/doc/examples/litecell15/osmo-bts.cfg ${D}${sysconfdir}/osmocom
-
-	# ensure consistent naming
-	mv ${D}/${bindir}/lc15bts-util ${D}/${bindir}/sysmobts-util
-	mv ${D}/${bindir}/lc15bts-mgr ${D}/${bindir}/sysmobts-mgr
-
-	# Install systemd and enable on sysinit
-	install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
-	install -m 0660 ${S}/doc/examples/litecell15/lc15bts-mgr.cfg ${D}${sysconfdir}/osmocom/
-	install -m 0644 ${S}/contrib/osmo-bts-lc15.service ${D}${systemd_unitdir}/system/
-	ln -sf ../osmo-bts-lc15.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
-}
-
-
 CONFFILES_${PN} = "${sysconfdir}/osmocom/osmo-bts.cfg"
-CONFFILES_${PN}_append_sysmobts-v2 = " ${sysconfdir}/osmocom/sysmobts-mgr.cfg"
+CONFFILES_${PN} += "${sysconfdir}/osmocom/sysmobts-mgr.cfg"
+INITSCRIPT_PACKAGES = "${PN}"
+INITSCRIPT_NAME_${PN} = "sysmobts"
+INITSCRIPT_PARAMS_${PN} = "defaults 30 30"
 
-# somehow it seems not posible to use _append constructs on PACKAGES
-#PACKAGES_append_sysmobts-v2 = " osmo-bts-remote sysmobts-calib sysmobts-util"
 PACKAGES =+ "osmo-bts-remote sysmobts-calib sysmobts-util"
 
 FILES_${PN} += "${systemd_unitdir}"
-FILES_osmo-bts-remote_sysmobts-v2 = " ${bindir}/osmo-bts-sysmo-remote "
-FILES_sysmobts-calib_sysmobts-v2 = " ${bindir}/sysmobts-calib "
+FILES_osmo-bts-remote = " ${bindir}/sysmobts-remote "
+FILES_sysmobts-calib = " ${bindir}/sysmobts-calib "
 FILES_sysmobts-util = " ${bindir}/sysmobts-util "

recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb

@@ -5,26 +5,21 @@ LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=jerlbeck/master"
 SRCREV = "6e75bc7fe304eec274f6e485a8b23a164fd4e28e"
 PV = "0.4+git${SRCPV}"
-PR = "r5.${META_TELEPHONY_OSMO_INC}"
+PR = "r4.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
-DEPENDS = "libosmocore osmo-bts"
-DEPENDS_append_sysmobts-v2 = " femtobts-api"
-DEPENDS_append_litecell15   = " lc15-firmware"
-DEPENDS_append_sysmobts2100 = " lc15-firmware"
+DEPENDS = "libosmocore femtobts-api osmo-bts"
 
 # This implements PCU Interface v5 (GPRS RSSI)
 RDEPENDS_${PN} = "osmo-bts (>= 0.4.0)"
 
 EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts --enable-sysmocom-dsp"
-EXTRA_OECONF_litecell15   += "--enable-lc15bts-phy"
-EXTRA_OECONF_sysmobts2100 += "--enable-lc15bts-phy"
 
 inherit autotools pkgconfig
 
 # Select the API version
 inherit femtobts_api
-CPPFLAGS_append_sysmobts-v2 = " ${BTS_HW_VERSION} "
+CPPFLAGS += " ${BTS_HW_VERSION} "
 
 do_install_append() {
         # Install systemd and enable on sysinit

recipes-sysmobts/uboot/u-boot_sysmocom.inc

@@ -1,11 +1,11 @@
-SRC_URI = "git://git.sysmocom.de/sysmo-bts/u-boot;branch=tracking/upstream-next;protocol=git"
-SRCREV = "64b07727fbb268bd19bacfed6711bdb060effcfa"
-PV = "v2017.03+git${SRCPV}"
+SRC_URI = "git://git.sysmocom.de/sysmo-bts/u-boot;branch=v2011.12;protocol=git"
+SRCREV = "ab8a84d9ac4c9d938ec6fa85e3f4f640d883c774"
+PV = "v2011.12+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 PRINC = "13"
 
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=22;md5=2687c5ebfd9cb284491c3204b726ea29"
+LIC_FILES_CHKSUM = "file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"
 
 UBOOT_MACHINE_sysmobts-v2 = "davinci_sysmobts_v2_config"
 COMPATIBLE_MACHINE = "(sysmobts-v2)"
@@ -13,16 +13,14 @@ COMPATIBLE_MACHINE = "(sysmobts-v2)"
 UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}"
 UBOOT_SYMLINK = "u-boot-${MACHINE}"
 
-DEPENDS += " bc-native "
-
 do_install_append() {
     rm ${D}/boot/*
 }
 
 do_deploy_prepend () {
     install -d ${DEPLOYDIR}
-    install ${B}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}.bin
-    install ${B}/u-boot ${DEPLOYDIR}/${UBOOT_IMAGE}.elf
+    install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}.bin
+    install ${S}/u-boot ${DEPLOYDIR}/${UBOOT_IMAGE}.elf
 
     cd ${DEPLOYDIR}
     rm -f ${UBOOT_SYMLINK}.bin

yocto-master/images/image-rauc-ubi.bb

@@ -1,78 +0,0 @@
-DESCRIPTION = "ubi with rescue slot"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-PACKAGES = ""
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_fetch[cleandirs] = "${S}"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-do_install[noexec] = "1"
-do_populate_sysroot[noexec] = "1"
-do_package[noexec] = "1"
-do_packagedata[noexec] = "1"
-do_package_write_ipk[noexec] = "1"
-do_package_write_deb[noexec] = "1"
-do_package_write_rpm[noexec] = "1"
-
-do_fetch[depends] += "virtual/kernel:do_deploy image-rauc-rescue-initramfs:do_image_complete"
-do_deploy[depends] += "mtd-utils-native:do_populate_sysroot"
-
-S = "${WORKDIR}"
-
-do_fetch() {
-	mkdir -p "${S}/fs"
-
-	cp "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin" "${S}/fs/kernel"
-	cp "${DEPLOY_DIR_IMAGE}/image-rauc-rescue-initramfs-${MACHINE}.cpio.xz" "${S}/fs/initramfs"
-}
-
-do_fetch_append_gsmk-owhw() {
-	cp "${DEPLOY_DIR_IMAGE}/uImage-am335x-gsmk-owhw.dtb" "${S}/fs/devicetree"
-}
-
-IMAGE_ROOTFS = "${S}/fs"
-IMAGE_NAME = "${PN}-${MACHINE}-${DATETIME}"
-# Don't include the DATETIME variable in the sstate package sigantures
-IMAGE_NAME[vardepsexclude] = "DATETIME"
-IMAGE_LINK_NAME = "${PN}-${MACHINE}"
-
-do_deploy() {
-	echo \[rescue\] > ubinize.cfg
-	echo mode=ubi >> ubinize.cfg
-	echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rescue.ubifs >> ubinize.cfg
-	echo vol_id=0 >> ubinize.cfg
-	echo vol_size=14MiB >> ubinize.cfg
-	echo vol_type=dynamic >> ubinize.cfg
-	echo vol_name=rescue >> ubinize.cfg
-	echo \[system0\] >> ubinize.cfg
-	echo mode=ubi >> ubinize.cfg
-	echo vol_id=1 >> ubinize.cfg
-	echo vol_size=35MiB >> ubinize.cfg
-	echo vol_type=dynamic >> ubinize.cfg
-	echo vol_name=system0 >> ubinize.cfg
-	echo \[system1\] >> ubinize.cfg
-	echo mode=ubi >> ubinize.cfg
-	echo vol_id=2 >> ubinize.cfg
-	echo vol_size=35MiB >> ubinize.cfg
-	echo vol_type=dynamic >> ubinize.cfg
-	echo vol_name=system1 >> ubinize.cfg
-	echo \[data\] >> ubinize.cfg
-	echo mode=ubi >> ubinize.cfg
-	echo vol_id=3 >> ubinize.cfg
-	echo vol_size=16MiB >> ubinize.cfg
-	echo vol_type=dynamic >> ubinize.cfg
-	echo vol_name=data >> ubinize.cfg
-	echo vol_flags=autoresize >> ubinize.cfg
-
-	mkfs.ubifs --squash-uids -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rescue.ubifs ${MKUBIFS_ARGS}
-	ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubi ${UBINIZE_ARGS} ubinize.cfg
-	ln -sf ${IMAGE_NAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ubi
-}
-
-addtask deploy after do_fetch before do_build

yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend

@@ -1,4 +1,3 @@
 SDK-OSMO_append = "femtobts-api-dev gpsd-dev"
-SDK-OSMO_append_sysmobts2100 = " lc15-firmware-dev"
 
-PRINC = "3"
+PRINC = "2"