base-files: Fix /etc/fstab file to not mount the root filesystem in /boot

Ticket: SYS#3688
2017-06-15 18:02:02 +02:00
24 changed files with 36 additions and 6180 deletions
--- a/classes/gitver-pkg.bbclass
+++ b/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
-
--- a/classes/gitver-repo.bbclass
+++ b/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
-
-
--- a/classes/sysmocom-archiver.bbclass
+++ b/classes/sysmocom-archiver.bbclass
@ -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 "

--- a/conf/machine/litecell15.conf
+++ b/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"
--- a/conf/machine/sysmobts2100.conf
+++ b/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']} \
-	"
--- a/conf/machine/sysmocom-alix.conf
+++ b/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"
--- a/conf/machine/sysmocom-bsc-v2.conf
+++ b/conf/machine/sysmocom-bsc-v2.conf
@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: common_pc
-#@DESCRIPTION: Machine configuration for sysmocom apu2 based hardware
+#@DESCRIPTION: Machine configuration for running a common x86

 require conf/machine/include/tune-core2.inc
 require conf/machine/include/genericx86-common.inc
--- a/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/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}"
--- a/recipes-bsp/linux/files/sysmobts2100/defconfig
+++ b/recipes-bsp/linux/files/sysmobts2100/defconfig
--- a/recipes-bsp/linux/linux-litecell15_4.4.32.bb
+++ b/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"
--- a/recipes-bsp/rtl8169-eeprom/rtl8169-eeprom_git.bb
+++ b/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 = "47e0b24d7a86acf429991ac155a51c78f1be341e"
 SRC_URI = "git://git.sysmocom.de/rtl8168-eeprom;protocol=git;branch=master"
 PV = "v0.0.1+git${SRCPV}"
 PR = "r0"
--- a/recipes-bsp/u-boot/files/0001-fw_env-missing-header.patch
+++ b/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>
--- a/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch
+++ b/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
-
--- a/recipes-bsp/u-boot/u-boot-fw-utils_2015.07.bb
+++ b/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"
--- a/recipes-bsp/u-boot/u-boot-litecell15-2015.07.inc
+++ b/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
-}
--- a/recipes-bsp/u-boot/u-boot-litecell15_2015.07.bb
+++ b/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"
-
-
--- a/recipes-bsp/u-boot/u-boot.inc
+++ b/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 \
-            "
--- a/recipes-extra/gpsd/gpsd/sysmobts2100/gpsd-default
+++ b/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"
-
--- a/recipes-fixes/systemd/systemd/sysmobts2100/system.conf
+++ b/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=
--- a/recipes-fixes/systemd/systemd_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd_sysmocom.inc
@ -1,7 +1,7 @@
 S_THISDIR := "${@os.path.dirname(d.getVar('FILE', 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"
--- a/recipes-sysmobts/firmware/lc15-firmware_git.bb
+++ b/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/*"
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@ -8,31 +8,22 @@ SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/0.3.5
 SRCREV_osmobts = "a4bd813081e788012c72f34d31150cdf02db307f"
 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 +36,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 "
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/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
--- a/yocto-shared/packagegroup-core-standalone-osmo-sdk-target.bbappend
+++ b/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"