From 12a661314b69948d93d4cf8421603fb8407a4a2f Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 24 Sep 2014 18:24:09 +0200
Subject: [PATCH 01/13] update-rc.d: Use _prepend to add to the extras

WARNING: FILESEXTRAPATHS-variable, must always use _prepend (or _append)
type of assignment, and don't forget the colon.
Please assign it with the format of:
  FILESEXTRAPATHS_append := ":${THISDIR}/Your_Files_Path" or
  FILESEXTRAPATHS_prepend := "${THISDIR}/Your_Files_Path:"
in your bbappend file
---
 recipes-fixes/update-rc.d/update-rc.d_angstrom.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-fixes/update-rc.d/update-rc.d_angstrom.inc b/recipes-fixes/update-rc.d/update-rc.d_angstrom.inc
index 0ec73014dd..966e6d6efe 100644
--- a/recipes-fixes/update-rc.d/update-rc.d_angstrom.inc
+++ b/recipes-fixes/update-rc.d/update-rc.d_angstrom.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS := "${THISDIR}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://0001-update-rc.d-make-s-a-noop-when-systemd-is-present.patch"
 

From 20b1decdd2c830ebe4dfa6b88f6b78f071723fe0 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 24 Sep 2014 18:26:10 +0200
Subject: [PATCH 02/13] dizzy: Begin with the Poky/Yocto 1.7 release

We are currently using 1.5 (dora). Copy the bbappends to the
yocto-dizzy directory and update the version numbers. For busybox
enable all features that were enabled between dora and origin/master.

For opkg_svn.bbapend. In dizzy there is a version attached to it.
This means we need to remove it from the yocto-shared directory
and keep it everywhere else.
---
 conf/layer.conf                               |    4 +-
 .../busybox/busybox-1.22.1/busybox-ifplugd.sh |   36 +
 recipes-core/busybox/busybox-1.22.1/defconfig | 1020 +++++++++++++++++
 .../ifplugd-use-a-larger-netlink-buffer.patch |   62 +
 yocto-dizzy/busybox_1.22.1.bbappend           |    4 +
 .../core-image-minimal-initramfs.bbappend     |    2 +
 yocto-dizzy/dbus_1.8.2.bbappend               |    1 +
 yocto-dizzy/dropbear_2014.63.bbappend         |    1 +
 yocto-dizzy/init-ifupdown_1.0.bbappend        |    1 +
 .../initramfs-live-install_1.0.bbappend       |    1 +
 yocto-dizzy/netbase_5.2.bbappend              |    1 +
 .../opkg_0.2.2.bbappend                       |    0
 yocto-dizzy/pkgconfig_0.28.bbappend           |    1 +
 yocto-dizzy/systemd-compat-units.bbappend     |    2 +
 yocto-dizzy/systemd_216.bbappend              |    1 +
 yocto-dizzy/u-boot_2013.07.bbappend           |    1 +
 yocto-dizzy/udev_182.bbappend                 |    1 +
 yocto-dizzy/update-rc.d_0.7.bbappend          |    1 +
 yocto-dizzy/watchdog_5.13.bbappend            |    1 +
 yocto-dizzy/wireless-tools_30.pre9.bbappend   |    1 +
 yocto-dora/opkg_svn.bbappend                  |    1 +
 yocto-edison/opkg_svn.bbappend                |    1 +
 22 files changed, 1142 insertions(+), 2 deletions(-)
 create mode 100644 recipes-core/busybox/busybox-1.22.1/busybox-ifplugd.sh
 create mode 100644 recipes-core/busybox/busybox-1.22.1/defconfig
 create mode 100644 recipes-core/busybox/busybox-1.22.1/ifplugd-use-a-larger-netlink-buffer.patch
 create mode 100644 yocto-dizzy/busybox_1.22.1.bbappend
 create mode 100644 yocto-dizzy/core-image-minimal-initramfs.bbappend
 create mode 100644 yocto-dizzy/dbus_1.8.2.bbappend
 create mode 100644 yocto-dizzy/dropbear_2014.63.bbappend
 create mode 100644 yocto-dizzy/init-ifupdown_1.0.bbappend
 create mode 100644 yocto-dizzy/initramfs-live-install_1.0.bbappend
 create mode 100644 yocto-dizzy/netbase_5.2.bbappend
 rename yocto-shared/opkg_svn.bbappend => yocto-dizzy/opkg_0.2.2.bbappend (100%)
 create mode 100644 yocto-dizzy/pkgconfig_0.28.bbappend
 create mode 100644 yocto-dizzy/systemd-compat-units.bbappend
 create mode 100644 yocto-dizzy/systemd_216.bbappend
 create mode 100644 yocto-dizzy/u-boot_2013.07.bbappend
 create mode 100644 yocto-dizzy/udev_182.bbappend
 create mode 100644 yocto-dizzy/update-rc.d_0.7.bbappend
 create mode 100644 yocto-dizzy/watchdog_5.13.bbappend
 create mode 100644 yocto-dizzy/wireless-tools_30.pre9.bbappend
 create mode 100644 yocto-dora/opkg_svn.bbappend
 create mode 100644 yocto-edison/opkg_svn.bbappend

diff --git a/conf/layer.conf b/conf/layer.conf
index ebc850d2d1..62685d4503 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,8 +8,8 @@ BBFILES += "${LAYERDIR}/yocto-shared/*.bbappend"
 # Now we will need to include the matching fixes for a yocto version
 BBFILES += "${BBFILES_SYSMOCOM_BSP}"
 
-# selects specific distro or master when DISTRO_VERSION contains SNAPSHOT
-BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.1','edison')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['SNAPSHOT' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend"
+# selects specific distro or master when DISTRO_VERSION contains snapshot
+BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.1','edison'), ('1.7', 'dizzy')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['snapshot' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend"
 
 BBFILE_COLLECTIONS += "sysmocom-bsp"
 BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/"
diff --git a/recipes-core/busybox/busybox-1.22.1/busybox-ifplugd.sh b/recipes-core/busybox/busybox-1.22.1/busybox-ifplugd.sh
new file mode 100644
index 0000000000..05052bcf02
--- /dev/null
+++ b/recipes-core/busybox/busybox-1.22.1/busybox-ifplugd.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+DAEMON=/usr/sbin/ifplugd
+NAME=ifplugd
+DESC="Busybox ifplugd Server"
+ARGS=" -i eth0  -M -I -r /etc/ifplugd.sh"
+
+test -f $DAEMON || exit 1
+
+set -e
+
+case "$1" in
+    start)
+        echo -n "starting $DESC: $NAME... "
+	/sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
+	echo "done."
+	;;
+    stop)
+        echo -n "stopping $DESC: $NAME... "
+	/sbin/start-stop-daemon -K -n $NAME
+	echo "done."
+	;;
+    restart)
+        echo "Not restarting $DESC: $NAME... "
+	;;
+    reload)
+	echo -n "reloading $DESC: $NAME... "
+	killall -HUP $(basename ${DAEMON})
+	echo "done."
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/recipes-core/busybox/busybox-1.22.1/defconfig b/recipes-core/busybox/busybox-1.22.1/defconfig
new file mode 100644
index 0000000000..684dc02b6d
--- /dev/null
+++ b/recipes-core/busybox/busybox-1.22.1/defconfig
@@ -0,0 +1,1020 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.20.2
+# Mon Aug 20 17:01:45 2012
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_DESKTOP is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LOCALE_SUPPORT is not set
+# CONFIG_UNICODE_SUPPORT is not set
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=0
+CONFIG_LAST_SUPPORTED_WCHAR=0
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+# CONFIG_CROSS_COMPILER_PREFIX is not set
+CONFIG_SYSROOT=""
+# CONFIG_EXTRA_CFLAGS is not set
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SMALL=1
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_FEATURE_SEAMLESS_XZ=y
+CONFIG_FEATURE_SEAMLESS_LZMA=y
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+CONFIG_FEATURE_SEAMLESS_Z=y
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_FEATURE_AR_CREATE is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_GZIP_FAST=0
+# CONFIG_LZOP is not set
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_FEATURE_TAR_TO_COMMAND is not set
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+# CONFIG_UNXZ is not set
+# CONFIG_XZ is not set
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+CONFIG_GROUPS=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+# CONFIG_BASE64 is not set
+CONFIG_WHO=y
+CONFIG_USERS=y
+# CONFIG_CAL is not set
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
+CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_FANCY is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+# CONFIG_FSYNC is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+# CONFIG_SHA256SUM is not set
+# CONFIG_SHA512SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+# CONFIG_FGCONSOLE is not set
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+# CONFIG_SHOWKEY is not set
+
+#
+# Common options for loadfont and setfont
+#
+# CONFIG_FEATURE_LOADFONT_PSF2 is not set
+# CONFIG_FEATURE_LOADFONT_RAW is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_PATCH=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_SED=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+# CONFIG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_INIT_TERMINAL_TYPE=""
+# CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+# CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELUSER is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_NOLOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
+# CONFIG_SU is not set
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODINFO is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+CONFIG_DEPMOD=y
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+# CONFIG_BLOCKDEV is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_REV is not set
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+# CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+CONFIG_FLOCK=y
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+# CONFIG_MKFS_EXT2 is not set
+CONFIG_MKFS_MINIX=y
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+# CONFIG_GETOPT is not set
+# CONFIG_FEATURE_GETOPT_LONG is not set
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+# CONFIG_LSUSB is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MAN is not set
+CONFIG_MICROCOM=y
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+CONFIG_RFKILL=y
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+# CONFIG_SETSID is not set
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NBDCLIENT is not set
+CONFIG_NC=y
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
+CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+CONFIG_DNSD=y
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+CONFIG_IFPLUGD=y
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPC6 is not set
+CONFIG_UDHCPD=y
+# CONFIG_DHCPRELAY is not set
+CONFIG_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+# CONFIG_IOSTAT is not set
+# CONFIG_LSOF is not set
+# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
+# CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_LONG=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_CTTYHACK is not set
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_HISTFILESIZE=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
diff --git a/recipes-core/busybox/busybox-1.22.1/ifplugd-use-a-larger-netlink-buffer.patch b/recipes-core/busybox/busybox-1.22.1/ifplugd-use-a-larger-netlink-buffer.patch
new file mode 100644
index 0000000000..a0670a54f1
--- /dev/null
+++ b/recipes-core/busybox/busybox-1.22.1/ifplugd-use-a-larger-netlink-buffer.patch
@@ -0,0 +1,62 @@
+Upstream-Status: Backport
+Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
+
+From da331d779c19d7d5d4ef05152ee467d617913a01 Mon Sep 17 00:00:00 2001
+From: Tito Ragusa <farmatito@tiscali.it>
+Date: Sun, 4 Aug 2013 18:08:40 +0200
+Subject: [PATCH 001/104] ifplugd: use a larger netlink buffer
+
+function                                             old     new   delta
+check_existence_through_netlink                      310     321     +11
+
+Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ networking/ifplugd.c |   14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/networking/ifplugd.c b/networking/ifplugd.c
+index 3cdc2c9..b578f4c 100644
+--- a/networking/ifplugd.c
++++ b/networking/ifplugd.c
+@@ -451,20 +451,24 @@ static smallint detect_link(void)
+ static NOINLINE int check_existence_through_netlink(void)
+ {
+ 	int iface_len;
+-	char replybuf[1024];
++	/* Buffer was 1K, but on linux-3.9.9 it was reported to be too small.
++	 * netlink.h: "limit to 8K to avoid MSG_TRUNC when PAGE_SIZE is very large".
++	 * Note: on error returns (-1) we exit, no need to free replybuf.
++	 */
++	enum { BUF_SIZE = 8 * 1024 };
++	char *replybuf = xmalloc(BUF_SIZE);
+ 
+ 	iface_len = strlen(G.iface);
+ 	while (1) {
+ 		struct nlmsghdr *mhdr;
+ 		ssize_t bytes;
+ 
+-		bytes = recv(netlink_fd, &replybuf, sizeof(replybuf), MSG_DONTWAIT);
++		bytes = recv(netlink_fd, replybuf, BUF_SIZE, MSG_DONTWAIT);
+ 		if (bytes < 0) {
+ 			if (errno == EAGAIN)
+-				return G.iface_exists;
++				goto ret;
+ 			if (errno == EINTR)
+ 				continue;
+-
+ 			bb_perror_msg("netlink: recv");
+ 			return -1;
+ 		}
+@@ -507,6 +511,8 @@ static NOINLINE int check_existence_through_netlink(void)
+ 		}
+ 	}
+ 
++ ret:
++	free(replybuf);
+ 	return G.iface_exists;
+ }
+ 
+-- 
+1.7.10.4
+
diff --git a/yocto-dizzy/busybox_1.22.1.bbappend b/yocto-dizzy/busybox_1.22.1.bbappend
new file mode 100644
index 0000000000..641aeb3c75
--- /dev/null
+++ b/yocto-dizzy/busybox_1.22.1.bbappend
@@ -0,0 +1,4 @@
+# PN/PV are wrong inside the .inc file with 1.19.1
+SYSMOCOM_ORIG_PV := "${PV}"
+require recipes-core/busybox/${PN}_sysmocom.inc
+require recipes-core/busybox/${PN}_sysmocom_systemd.inc
diff --git a/yocto-dizzy/core-image-minimal-initramfs.bbappend b/yocto-dizzy/core-image-minimal-initramfs.bbappend
new file mode 100644
index 0000000000..09b1baaeb8
--- /dev/null
+++ b/yocto-dizzy/core-image-minimal-initramfs.bbappend
@@ -0,0 +1,2 @@
+# add e2fsprogs for resize2fs need for bts installation
+IMAGE_INSTALL_append = " e2fsprogs "
diff --git a/yocto-dizzy/dbus_1.8.2.bbappend b/yocto-dizzy/dbus_1.8.2.bbappend
new file mode 100644
index 0000000000..0ada2aac4f
--- /dev/null
+++ b/yocto-dizzy/dbus_1.8.2.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom_systemd.inc
diff --git a/yocto-dizzy/dropbear_2014.63.bbappend b/yocto-dizzy/dropbear_2014.63.bbappend
new file mode 100644
index 0000000000..a3a97a3fa8
--- /dev/null
+++ b/yocto-dizzy/dropbear_2014.63.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/dropbear/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/init-ifupdown_1.0.bbappend b/yocto-dizzy/init-ifupdown_1.0.bbappend
new file mode 100644
index 0000000000..5e3605ffef
--- /dev/null
+++ b/yocto-dizzy/init-ifupdown_1.0.bbappend
@@ -0,0 +1 @@
+require recipes-bsp/netbase/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/initramfs-live-install_1.0.bbappend b/yocto-dizzy/initramfs-live-install_1.0.bbappend
new file mode 100644
index 0000000000..69d3d84219
--- /dev/null
+++ b/yocto-dizzy/initramfs-live-install_1.0.bbappend
@@ -0,0 +1 @@
+require recipes-core/initrdscripts/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/netbase_5.2.bbappend b/yocto-dizzy/netbase_5.2.bbappend
new file mode 100644
index 0000000000..5e3605ffef
--- /dev/null
+++ b/yocto-dizzy/netbase_5.2.bbappend
@@ -0,0 +1 @@
+require recipes-bsp/netbase/${PN}_sysmocom.inc
diff --git a/yocto-shared/opkg_svn.bbappend b/yocto-dizzy/opkg_0.2.2.bbappend
similarity index 100%
rename from yocto-shared/opkg_svn.bbappend
rename to yocto-dizzy/opkg_0.2.2.bbappend
diff --git a/yocto-dizzy/pkgconfig_0.28.bbappend b/yocto-dizzy/pkgconfig_0.28.bbappend
new file mode 100644
index 0000000000..9e035919af
--- /dev/null
+++ b/yocto-dizzy/pkgconfig_0.28.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/systemd-compat-units.bbappend b/yocto-dizzy/systemd-compat-units.bbappend
new file mode 100644
index 0000000000..d76e8d1973
--- /dev/null
+++ b/yocto-dizzy/systemd-compat-units.bbappend
@@ -0,0 +1,2 @@
+require recipes-fixes/systemd/${PN}_sysmocom.inc
+
diff --git a/yocto-dizzy/systemd_216.bbappend b/yocto-dizzy/systemd_216.bbappend
new file mode 100644
index 0000000000..9e035919af
--- /dev/null
+++ b/yocto-dizzy/systemd_216.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/u-boot_2013.07.bbappend b/yocto-dizzy/u-boot_2013.07.bbappend
new file mode 100644
index 0000000000..34003acec4
--- /dev/null
+++ b/yocto-dizzy/u-boot_2013.07.bbappend
@@ -0,0 +1 @@
+require recipes-sysmobts/uboot/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/udev_182.bbappend b/yocto-dizzy/udev_182.bbappend
new file mode 100644
index 0000000000..9e035919af
--- /dev/null
+++ b/yocto-dizzy/udev_182.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/update-rc.d_0.7.bbappend b/yocto-dizzy/update-rc.d_0.7.bbappend
new file mode 100644
index 0000000000..ec787dc779
--- /dev/null
+++ b/yocto-dizzy/update-rc.d_0.7.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_angstrom.inc
diff --git a/yocto-dizzy/watchdog_5.13.bbappend b/yocto-dizzy/watchdog_5.13.bbappend
new file mode 100644
index 0000000000..57590dbf4a
--- /dev/null
+++ b/yocto-dizzy/watchdog_5.13.bbappend
@@ -0,0 +1 @@
+require recipes-bsp/watchdog/${PN}_sysmocom.inc
diff --git a/yocto-dizzy/wireless-tools_30.pre9.bbappend b/yocto-dizzy/wireless-tools_30.pre9.bbappend
new file mode 100644
index 0000000000..ddc8865d5c
--- /dev/null
+++ b/yocto-dizzy/wireless-tools_30.pre9.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/wireless-tools/${PN}_sysmocom.inc
diff --git a/yocto-dora/opkg_svn.bbappend b/yocto-dora/opkg_svn.bbappend
new file mode 100644
index 0000000000..9e035919af
--- /dev/null
+++ b/yocto-dora/opkg_svn.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-edison/opkg_svn.bbappend b/yocto-edison/opkg_svn.bbappend
new file mode 100644
index 0000000000..9e035919af
--- /dev/null
+++ b/yocto-edison/opkg_svn.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc

From 906bdccd4fc31595a7d76692ad558b91b122d2a1 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 25 Sep 2014 16:15:53 +0200
Subject: [PATCH 03/13] watchdog: Fix the FILESEXTRAPATHS_prepend

We need to end our string with a ':' to not interfere with other
recipes adding things.
---
 recipes-bsp/watchdog/watchdog_sysmocom.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/watchdog/watchdog_sysmocom.inc b/recipes-bsp/watchdog/watchdog_sysmocom.inc
index fbd843b185..670d4e0753 100644
--- a/recipes-bsp/watchdog/watchdog_sysmocom.inc
+++ b/recipes-bsp/watchdog/watchdog_sysmocom.inc
@@ -1,5 +1,5 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}"
+FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "9"
 
 inherit update-rc.d

From a04f801241196e793531819c155c0da242a060bd Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 25 Sep 2014 16:16:51 +0200
Subject: [PATCH 04/13] linux: Select the 3.10 kernel for dizzy as well

We need to provide the right name of the branch as otherwise we
are not able to find the object in the clone.
---
 conf/machine/include/sysmobts.inc       | 2 +-
 recipes-bsp/linux/linux-sysmocom_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc
index 4b0c9c6d1e..94be7ef3d9 100644
--- a/conf/machine/include/sysmobts.inc
+++ b/conf/machine/include/sysmobts.inc
@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
-PREFERRED_VERSION_linux-sysmocom = "${@ dict([('1.5','3.10.50+git%'), ('1.5.1','3.10.50+git%'), ('1.5.2','3.10.50+git%'), ('1.5.3','3.10.50+git%'), ('1.1.2','')])[d.getVar('DISTRO_VERSION', True)]}"
+PREFERRED_VERSION_linux-sysmocom = "${@ dict([('1.7', '3.10.50+git%'), ('1.5','3.10.50+git%'), ('1.5.1','3.10.50+git%'), ('1.5.2','3.10.50+git%'), ('1.5.3','3.10.50+git%'), ('1.1.2','')])[d.getVar('DISTRO_VERSION', True)]}"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index fa31e3e994..297dc986c0 100644
--- a/recipes-bsp/linux/linux-sysmocom_git.bb
+++ b/recipes-bsp/linux/linux-sysmocom_git.bb
@@ -19,7 +19,7 @@ SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6"
 PR = "r35"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.10 \
+SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.50 \
 	   file://defconfig"
 
 # tmp disabled.. patch needs to be rebased for 3.10

From 0172c5958a0dda2c168e077ca2f3784506aaf589 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 25 Sep 2014 16:34:42 +0200
Subject: [PATCH 05/13] linux-sysmocom: Use the KERNEL_MODULE_PROBECONF on
 dizzy

This variable doesn't exist on dora and will not break things.

Fixes:
ERROR: Please ensure module rtfifo is listed in KERNEL_MODULE_PROBECONF since module_conf_rtfifo is set
---
 recipes-bsp/linux/linux-sysmocom.inc    | 2 ++
 recipes-bsp/linux/linux-sysmocom_git.bb | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/linux/linux-sysmocom.inc b/recipes-bsp/linux/linux-sysmocom.inc
index 470a19a129..c65bd46e26 100644
--- a/recipes-bsp/linux/linux-sysmocom.inc
+++ b/recipes-bsp/linux/linux-sysmocom.inc
@@ -11,6 +11,8 @@ module_autoload_mISDN_l1loop = "mISDN_l1loop"
 module_autoload_mISDN_dsp = "mISDN_dsp"
 module_conf_mISDN_l1loop = "options mISDN_l1loop pri=1 nchannel=20"
 
+KERNEL_MODULE_PROBECONF_append = "mISDN_l1loop mISDN_dsp"
+
 FILES_${PN} = ""
 
 # Remove when using a Poky/OE-Core with that includes e0bf758982843ec1981b74410616b3492c599d06
diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index 297dc986c0..5155fe1c57 100644
--- a/recipes-bsp/linux/linux-sysmocom_git.bb
+++ b/recipes-bsp/linux/linux-sysmocom_git.bb
@@ -16,7 +16,7 @@ BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2"
 
 SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6"
 
-PR = "r35"
+PR = "r36"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3.10.50 \
@@ -50,6 +50,8 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_msgqueue = "msgqueue"
 module_autoload_rtfifo = "rtfifo"
 
+KERNEL_MODULE_PROBECONF_append = "davinci_mmc davinci_wdt 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"

From 7aba3280c5363c29a644db9191b03a2c4ffb4658 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Fri, 12 Sep 2014 19:13:44 +0200
Subject: [PATCH 06/13] recipes: add functions for generating a rootpasswd

The rootpassword can be set via the
enviroment variable ROOT_PASS either in
the local.conf or on the cmdline
before bitbake.

Fixes: partly SYS#518
---
 recipes-apps/images/image-passwd.inc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 recipes-apps/images/image-passwd.inc

diff --git a/recipes-apps/images/image-passwd.inc b/recipes-apps/images/image-passwd.inc
new file mode 100644
index 0000000000..6839d195b4
--- /dev/null
+++ b/recipes-apps/images/image-passwd.inc
@@ -0,0 +1,16 @@
+DEPENDS += "openssl-native"
+
+rootpasswd = "${@d.getVar('ROOT_PASS', True) or ""}"
+
+ROOTFS_POSTPROCESS_COMMAND += "set_root_passwd;"
+
+set_root_passwd() {
+   if [ -n "${rootpasswd}" ]; then
+       HASHED_PASS=`openssl passwd -1 ${rootpasswd}`
+       if [ -n "${HASHED_PASS}" ]; then
+           sed -e "s%^root:[^:]*:%root:${HASHED_PASS}:%" \
+               -i ${IMAGE_ROOTFS}/etc/shadow
+           echo "Generated new root-passwd"
+       fi
+  fi
+}

From d6aabdf6b928cdedf1900907f5b62be77b8c187b Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Fri, 19 Sep 2014 17:27:44 +0200
Subject: [PATCH 07/13] recipes-images: add fragement to install sshkeys

Fixes: partly SYS#518
---
 recipes-apps/images/image-sshkey.inc | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 recipes-apps/images/image-sshkey.inc

diff --git a/recipes-apps/images/image-sshkey.inc b/recipes-apps/images/image-sshkey.inc
new file mode 100644
index 0000000000..ecbffff711
--- /dev/null
+++ b/recipes-apps/images/image-sshkey.inc
@@ -0,0 +1,18 @@
+
+hostsshkeysfile = "${@d.getVar('SSH_KEYS_FILE', True) or ''}"
+
+ROOTFS_POSTPROCESS_COMMAND += "copy_ssh_keys;"
+
+copy_ssh_keys() {
+    if [ -n "${hostsshkeysfile}" ]; then
+        if [ -r "${hostsshkeysfile}" ]; then
+            echo "Installing sshkeys from ${hostsshkeysfile}"
+            mkdir -p ${IMAGE_ROOTFS}/home/root/.ssh/
+            cat ${hostsshkeysfile} >> ${IMAGE_ROOTFS}/home/root/.ssh/authorized_keys
+            chown root:root ${IMAGE_ROOTFS}/home/root/.ssh/authorized_keys
+            chmod 0600 ${IMAGE_ROOTFS}/home/root/.ssh/authorized_keys
+        else
+            echo "Could not install sshkeys from ${hostsshkeysfile}"
+        fi
+    fi
+}

From 8e6355d9df8b93d26c80480f85564caa10ddb839 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 25 Sep 2014 18:02:31 +0200
Subject: [PATCH 08/13] packagegroup-core-boot: Continue to provide the old
 name

We are not ready for the task -> packagegroup rename and provide
the old.
---
 yocto-dizzy/packagegroup-core-boot.bbappend | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 yocto-dizzy/packagegroup-core-boot.bbappend

diff --git a/yocto-dizzy/packagegroup-core-boot.bbappend b/yocto-dizzy/packagegroup-core-boot.bbappend
new file mode 100644
index 0000000000..89e9f2e440
--- /dev/null
+++ b/yocto-dizzy/packagegroup-core-boot.bbappend
@@ -0,0 +1,5 @@
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-boot"
+RREPLACES_${PN} = "task-core-boot"
+RCONFLICTS_${PN} = "task-core-boot"
+

From f028093d924accb6ba9f56d48ac7275f017c88ed Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 25 Sep 2014 20:59:19 +0200
Subject: [PATCH 09/13] sysmobts-2050: These files were never used with edison,
 remove 2050

We have changed the strategy to support multiple BTS with a single
build but don't remove support from files that are used with Edison.
Linux 3.10 and systemd were not used with edison though. So we can
remove it. As the sysmobts-2050 extended the sysmobts-v2 build most
of the -sysmobts-2050 changes are not needed anyway.
---
 recipes-bsp/linux/linux-sysmocom_git.bb    |  3 +--
 recipes-fixes/systemd/systemd_sysmocom.inc | 15 ---------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb
index 5155fe1c57..5dd674f1d8 100644
--- a/recipes-bsp/linux/linux-sysmocom_git.bb
+++ b/recipes-bsp/linux/linux-sysmocom_git.bb
@@ -12,7 +12,6 @@ BTS_FIRMWARE_NAME_sysmobts-v1 = "sysmobts-v1"
 
 # Overrides for the sysmocom bts v2
 BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
-BTS_FIRMWARE_NAME_sysmobts-2050 = "sysmobts-v2"
 
 SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6"
 
@@ -27,7 +26,7 @@ SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=linux-3
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "(sysmobts-v1|sysmobts-v2|sysmobts-2050|sysmocom-bsc)"
+COMPATIBLE_MACHINE = "(sysmobts-v1|sysmobts-v2|sysmocom-bsc)"
 EXTRA_OEMAKE += "KALLSYMS_EXTRA_PASS=1"
 
 # we do not want to have the kernel image inside the kernel
diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc
index f73361e606..6836395110 100644
--- a/recipes-fixes/systemd/systemd_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd_sysmocom.inc
@@ -10,7 +10,6 @@ SRC_URI += "file://journald.conf \
 
 SRC_URI_append_sysmobts-v1 = " file://system.conf"
 SRC_URI_append_sysmobts-v2 = " file://system.conf"
-SRC_URI_append_sysmobts-2050 = " file://system.conf"
 
 # Disable depedency on dbus
 RDEPENDS_${PN}_remove = "dbus"
@@ -44,20 +43,6 @@ pkg_postinst_${PN}_append () {
         systemctl ${OPTS} mask systemd-journal-flush.service
 }
 
-pkg_postinst_${PN}_append_sysmobts-2050 () {
-        cd $D${sysconfdir}/init.d
-
-        echo "Disabling ttyS0 for sysmobts-2050:"
-
-        OPTS=""
-
-        if [ -n "$D" ]; then
-                OPTS="--root=$D"
-        fi
-
-        systemctl ${OPTS} mask serial-getty@ttyS0.service
-}
-
 do_install_append() {
         install -m 0644 ${WORKDIR}/journald.conf ${D}${sysconfdir}/systemd/
 

From 40c70870b7e6af342d59255e40f12af837c1f716 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 26 Sep 2014 11:24:16 +0200
Subject: [PATCH 10/13] osmo-bts/osmo-pcu: Specify the right branch for dizzy

With a wrong branch name the commit can not be found. Fix it.
---
 recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 2 +-
 recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index 8676f81b59..a6a8d9524d 100644
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "sysmocom OsmoBTS"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
-SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/features/handover;name=osmobts;destsuffix=git \
+SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
 SRCREV_osmobts = "04585dd90a1439e256d54affe4ccea113455cbe7"
 SRCREV_openbsc = "a4faeb1a79eac3c8d333ded27600228cc5e3a71b"
diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index 82aed14f87..be0130c6d3 100644
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Osmocom PCU for sysmoBTS"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=sysmocom/master"
+SRC_URI = "git://git.osmocom.org/osmo-pcu.git;protocol=git;branch=master"
 SRCREV = "f3405e5b0342362d5d592f013014847a4dc135d8"
 PV = "0.4+git${SRCPV}"
 PR = "r2.${META_TELEPHONY_OSMO_INC}"

From c44d0265eeedef5489c78e04d6613e327c7bbae1 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 26 Sep 2014 11:24:49 +0200
Subject: [PATCH 11/13] osmo-bts/osmo-pcu: Use autotools and pkgconfig to fix
 the build

Without inheriting pkgconfig the PKG_CHECK_MODULES macro can not
be expanded in dizzy. Fix it. While being there use "autotools"
for the pcu and not autotools_stage.
---
 recipes-sysmobts/osmo-bts/osmo-bts_git.bb | 3 ++-
 recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index a6a8d9524d..94c2d3c879 100644
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -17,7 +17,8 @@ RCONFLICTS_${PN} = "sysmobts-firmware (< 3.11)"
 
 EXTRA_OECONF += "--enable-sysmocom-bts"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d pkgconfig
+
 
 # Select the API version
 inherit femtobts_api
diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index be0130c6d3..f3ba7972ca 100644
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -15,7 +15,7 @@ RDEPENDS_${PN} = "osmo-bts (>= 0.4.0)"
 
 EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts --enable-sysmocom-dsp"
 
-inherit autotools_stage
+inherit autotools pkgconfig
 
 # Select the API version
 inherit femtobts_api

From f0be4861714d951f2d8761c286a4821a7b50193c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 26 Sep 2014 11:28:48 +0200
Subject: [PATCH 12/13] systemd: Make sure we install our custom copy of
 system.conf

We had a system.conf for the ODU but it was never installed. Fix
it by adding the file to SRC_URI.

Fixes: ORT#612
---
 recipes-fixes/systemd/systemd_sysmocom.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc
index 6836395110..817a60f3f5 100644
--- a/recipes-fixes/systemd/systemd_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd_sysmocom.inc
@@ -1,7 +1,7 @@
 S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
-PRINC="22"
+PRINC="23"
 
 SRC_URI += "file://journald.conf \
             file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch \
@@ -10,6 +10,7 @@ SRC_URI += "file://journald.conf \
 
 SRC_URI_append_sysmobts-v1 = " file://system.conf"
 SRC_URI_append_sysmobts-v2 = " file://system.conf"
+SRC_URI_append_sysmocom-odu = " file://system.conf"
 
 # Disable depedency on dbus
 RDEPENDS_${PN}_remove = "dbus"

From c9952b51550cd45959a5ead741e99bb40ef61f03 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 7 Oct 2014 16:59:48 +0200
Subject: [PATCH 13/13] task-sysmocom-feed: Provide cronie as a cron
 implementation

---
 recipes-apps/tasks/task-sysmocom-feed.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb
index 2ce678cd14..00e3bd450c 100644
--- a/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/recipes-apps/tasks/task-sysmocom-feed.bb
@@ -3,11 +3,11 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r10"
+PR = "r11"
 
 RDEPENDS_${PN} = "\
 	task-sysmocom-tools \
 	task-sysmocom-debug \
 	minicom vlan patch procps psmisc \
 	ppp rsync sed usbutils openvpn iperf \
-	lcr"
+	lcr cronie"