Merge yocto-2.2 (morty) into master

83 files changed, 611 insertions, 1102 deletions

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 4af7d9e..580901d 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -1,13 +1,15 @@
 # redefine mkfs.jffs2 command and remove --faketime option so we get non-zero file times
 # having file mod times of zero confuses cron
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}"
 
-# set specified root password in image using ROOT_PASSWORD_HASH
+# set specified mtadm password in image using ROOT_PASSWORD_HASH
 mlinux_set_root_password () {
+    echo IMAGE_ROOTFS is ${IMAGE_ROOTFS} >/tmp/m_set_root_pwd.txt
+    ls ${IMAGE_ROOTFS} >/tmp/ls_pwd.txt
     if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
-        sed -i 's%^root:[^:]*:%root:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
+        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
     elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
-        sed -i 's%^root:[^:]*:%root:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
+        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
     fi
 }
 ROOTFS_POSTPROCESS_COMMAND += "mlinux_set_root_password;"
@@ -58,7 +60,7 @@ do_firmware () {
     rm -f bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
 }
 
-addtask firmware after do_rootfs before do_build
+addtask firmware after do_image_complete before do_build
 
 # make links to images in TFTPBOOT_DIR for ease of development
 do_tftpboot_links() {
diff --git a/classes/mlinux-mirrors.bbclass b/classes/mlinux-mirrors.bbclass
index 7f80d46..1e95651 100644
--- a/classes/mlinux-mirrors.bbclass
+++ b/classes/mlinux-mirrors.bbclass
@@ -6,7 +6,6 @@ hg://.*/.*  http://multitech.net/mlinux/sources/
 bzr://.*/.* http://multitech.net/mlinux/sources/
 osc://.*/.* http://multitech.net/mlinux/sources/
 p4://.*/.*  http://multitech.net/mlinux/sources/
-svk://.*/.* http://multitech.net/mlinux/sources/
 }
 
 MIRRORS_append () {
diff --git a/conf/distro/java.inc b/conf/distro/java.inc
index ff620d8..6980075 100644
--- a/conf/distro/java.inc
+++ b/conf/distro/java.inc
@@ -1,9 +1,11 @@
-PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
-
+PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+
+#PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
-PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12"
-PREFERRED_VERSION_icedtea7-native = "2.1.3"
+#PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12"
+#PREFERRED_VERSION_icedtea7-native = "2.1.3"
 
-PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre"
+#PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre"
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 1ad1f27..d09700e 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "3.3"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.7"
+DISTRO_BASE_VERSION = "4.0"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev1"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -72,7 +72,7 @@ PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
 require java.inc
 
-PREFERRED_VERSION_nodejs ?= "0.10.44"
-PREFERRED_VERSION_nodejs-native ?= "0.10.44"
+PREFERRED_VERSION_nodejs ?= "0.10.%"
+PREFERRED_VERSION_nodejs-native ?= "0.10.%"
 
 PREFERRED_VERSION_gpsd ?= "3.16"
diff --git a/contrib/local.conf b/contrib/local.conf
index 1e83060..7bfed06 100644
--- a/contrib/local.conf
+++ b/contrib/local.conf
@@ -49,3 +49,19 @@ PRSERV_HOST = "localhost:0"
 INHERIT += "buildhistory"
 BUILDHISTORY_COMMIT = "0"
 BUILDHISTORY_FEATURES = "image"
+
+IMAGE_FSTYPES =+ "jffs2 tar.gz"
+
+# OpenJDK Java runtime
+# Uncomment for a bigger image with java.
+# Java requires using tftp or a flash drive
+# for updating.
+# IMAGE_INSTALL += "openjdk-8"
+# OpenJDK with JamVM VM (Multi-Tech default)
+# IMAGE_INSTALL += "jamvm"
+# OpenJDK with CACAO VM (run with 'java -cacao')
+# IMAGE_INSTALL += "openjdk-7-vm-cacao"
+# OpenJDK Zero VM (run with 'java -zero')
+# IMAGE_INSTALL += "openjdk-7-vm-zero"
+
+PACKAGECONFIG_append_pn-boost = " python"
diff --git a/recipes-connectivity/bluez/bluez4_4.101.bbappend b/recipes-connectivity/bluez/bluez4_4.101.bbappend
deleted file mode 100644
index b478630..0000000
--- a/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRA_OECONF += " --enable-pand"
-SUMMARY_${PN}-plugins = "Sample Bluez4 plugins"
-S = "${WORKDIR}/bluez-${PV}"
-PACKAGES =+ "${PN}-plugins"
-RPROVIDES_${PN}-plugins = "bluetooth-plugins"
-FILES_${PN}-plugins = "${libdir}/bluetooth/plugins/*.o"
-do_install_append () {
-	echo "JAK from is ${S} and to is ${D} and PN is ${PN}"
-        echo "libdir is ${libdir}"
-        echo "JAK FILES_ is ${FILES_bluez4-plugins}"
-        install -m0755 -d ${D}/usr/lib/bluetooth/plugins
-	install -m0755 ${S}/plugins/*.o ${D}/usr/lib/bluetooth/plugins
-}
-
-
-
diff --git a/recipes-connectivity/bluez/bluez5_%.bbappend b/recipes-connectivity/bluez/bluez5_%.bbappend
new file mode 100644
index 0000000..c99f5c8
--- /dev/null
+++ b/recipes-connectivity/bluez/bluez5_%.bbappend
@@ -0,0 +1,4 @@
+EXTRA_OECONF += "--enable-deprecated --enable-experimental"
+
+
+
diff --git a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend b/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend
deleted file mode 100644
index 48af903..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-SRC_URI += "file://default"
-
-do_install_append() {
-    mkdir -p ${D}${sysconfdir}/default
-	install -m 644 ${WORKDIR}/default ${D}${sysconfdir}/default/hostapd
-}
diff --git a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
index 382328d..e7e5fed 100644
--- a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
+++ b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://www.semtech.com/"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
 DEPENDS = "libftdi libmpsse libusb1"
 INC_PR = "r9"
diff --git a/recipes-connectivity/lora/lora-gateway_4.1.3.bb b/recipes-connectivity/lora/lora-gateway_4.1.3.bb
index 6c3214b..9a471ac 100644
--- a/recipes-connectivity/lora/lora-gateway_4.1.3.bb
+++ b/recipes-connectivity/lora/lora-gateway_4.1.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Lora-net/lora_gateway"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
 DEPENDS = ""
 PR = "r10"
diff --git a/recipes-connectivity/lora/lora-network-server_1.0.35.bb b/recipes-connectivity/lora/lora-network-server_1.0.35.bb
index 4ab657d..e5c7bf7 100644
--- a/recipes-connectivity/lora/lora-network-server_1.0.35.bb
+++ b/recipes-connectivity/lora/lora-network-server_1.0.35.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
 DEPENDS = "jsoncpp libmts mosquitto sqlite3"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
 PR = "r1"
 
 SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
index 7ca1ffb..bfa21ff 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
@@ -3,11 +3,13 @@ HOMEPAGE = "https://github.com/Lora-net"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway-usb"
 PR = "r10"
 
+EXTRA_OEMAKE = " -e"
+
 # tag v1.4.1
 SRCREV = "0011a60759a7d81656a5393e97089daab1ff1a81"
 
@@ -23,13 +25,14 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
 "
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 LORA_DIR = "/opt/lora"
 
 export LGW_PATH = "${STAGING_LIBDIR}/lora-usb"
 export LGW_INC = "${STAGING_INCDIR}/lora-usb"
 
-CFLAGS += "-I${LGW_INC} -Iinc -I."
+CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
 
 do_compile() {
 	oe_runmake
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index bc5d8ec..51996f5 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "https://github.com/Lora-net/packet_forwarder"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway"
+RDEPENDS_${PN} += "bash"
 PR = "r9"
 
 SRCREV = "v${PV}"
@@ -28,13 +29,14 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
 
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 LORA_DIR = "/opt/lora"
 
 export LGW_PATH = "${STAGING_LIBDIR}/lora"
 export LGW_INC = "${STAGING_INCDIR}/lora"
 
-CFLAGS += "-I${LGW_INC} -Iinc -I."
+CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
 
 do_compile() {
   oe_runmake
diff --git a/recipes-connectivity/mosquitto/mosquitto/config_mk.patch b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
new file mode 100644
index 0000000..8c0494e
--- /dev/null
+++ b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
@@ -0,0 +1,12 @@
+diff -Naur old/config.mk new/config.mk
+--- old/config.mk	2017-04-17 14:33:32.504351936 -0500
++++ new/config.mk	2017-04-17 14:34:27.061557282 -0500
+@@ -240,7 +240,7 @@
+ endif
+ 
+ INSTALL?=install
+-prefix=/usr/local
++prefix=/usr
+ mandir=${prefix}/share/man
+ localedir=${prefix}/share/locale
+ STRIP?=strip
diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
index 3f035a7..133a0e0 100644
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb
+++ b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
@@ -1,14 +1,18 @@
+# This recipe was a merger of the Multitech Daisy 3.5 Recipe with the
+# reciped found at:
+# http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
+inherit autotools-brokensep
 SUMMARY = "Open source MQTT v3.5 implemention"
 DESCRIPTION = "Mosquitto is an open source (BSD licensed) message broker that implements the MQ Telemetry Transport protocol version 3.5. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. "
 HOMEPAGE = "http://mosquitto.org/"
 SECTION = "console/network"
-LICENSE = "EPL-1.0 EDL-1.0"
+LICENSE = "EPL-1.0 & EDL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20"
 
 # util-linux is needed to provide libuuid dependancy
 DEPENDS = "c-ares openssl util-linux"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
            file://mosquitto.init \
@@ -16,18 +20,24 @@ SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
            file://mosquitto.default \
            file://mosquitto.logrotate.conf \
            file://nostrip.patch \
+           file://config_mk.patch \
            "
 
 SRC_URI[md5sum] = "cd879f5964311501ba8e2275add71484"
 SRC_URI[sha256sum] = "591f3adcb6ed92c01f7ace1c878af728b797fe836892535620aa6106f42dbcc6"
 
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "mosquitto"
-INITSCRIPT_PARAMS = "defaults 70 30"
+export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}"
+#inherit autotools update-rc.d
 
+#INITSCRIPT_NAME = "mosquitto"
+#INITSCRIPT_PARAMS = "defaults 70 30"
+do_compile() {
+    oe_runmake PREFIX=/usr
+}
 do_install() {
-    oe_runmake DESTDIR=${D} prefix=/usr install
+    # oe_runmake DESTDIR=${D} prefix=/usr install
+	oe_runmake install DESTDIR=${D}
+	install -m 0755 -d ${D}/usr/lib
     install -m 0644 lib/libmosquitto.a ${D}${libdir}/
 
     install -d ${D}${sysconfdir}/init.d
@@ -45,7 +55,9 @@ PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-python"
 CONFFILES_${PN} = "${sysconfdir}/mosquitto.conf ${sysconfdir}/default/mosquitto"
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
-               ${sysconfdir} \
+               ${sysconfdir}/mosquitto \
+               ${systemd_unitdir}/system/mosquitto.service \
+               ${sysconfdir}/ \
 "
 
 FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
@@ -60,3 +72,6 @@ FILES_${PN}-staticdev += "${libdir}/libmosquitto.a"
 
 FILES_${PN}-python = "/usr/lib/python2.7/site-packages"
 
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "mosquitto.service"
diff --git a/recipes-connectivity/openssh/openssh_6.5p1.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend
index 87891c8..87891c8 100644
--- a/recipes-connectivity/openssh/openssh_6.5p1.bbappend
+++ b/recipes-connectivity/openssh/openssh_%.bbappend
diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl.inc
index 3b59e96..7533e8a 100644
--- a/recipes-connectivity/openssl/openssl.inc
+++ b/recipes-connectivity/openssl/openssl.inc
@@ -8,8 +8,8 @@ SECTION = "libs/network"
 LICENSE = "openssl"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
-# DEPENDS = "makedepend-native hostperl-runtime-native"
-DEPENDS = "makedepend-native perl-native-runtime"
+DEPENDS = "makedepend-native hostperl-runtime-native"
+#DEPENDS = "makedepend-native perl-native-runtime"
 DEPENDS_append_class-target = " openssl-native"
 
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/0001-ppp-Fix-compilation-errors-in-Makefile.patch b/recipes-connectivity/ppp/ppp-2.4.7/0001-ppp-Fix-compilation-errors-in-Makefile.patch
deleted file mode 100644
index 8aa2d2e..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/0001-ppp-Fix-compilation-errors-in-Makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ba0f6058d1f25b2b60fc31ab2656bf12a71ffdab Mon Sep 17 00:00:00 2001
-From: Lu Chong <Chong.Lu@windriver.com>
-Date: Tue, 5 Nov 2013 17:32:56 +0800
-Subject: [PATCH] ppp: Fix compilation errors in Makefile
-
-This patch fixes below issues:
-
-1. Make can't exit while compilation error occurs in subdir for plugins building.
-
-2. If build ppp with newer kernel (3.10.10), it will pick 'if_pppox.h' from sysroot-dir and
-   'if_pppol2tp.h' from its own source dir, this cause below build errors:
-
-        bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:84:26:
-        error: field 'pppol2tp' has incomplete type
-          struct pppol2tpin6_addr pppol2tp;
-                                  ^
-        bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:99:28:
-        error: field 'pppol2tp' has incomplete type
-          struct pppol2tpv3in6_addr pppol2tp;
-                                    ^
-
-The 'sysroot-dir/if_pppox.h' enabled ipv6 support but the 'source-dir/if_pppol2tp.h' lost
-related structure definitions, we should use both header files from sysroots to fix this
-build failure.
-
-Upstream-Status: Pending
-
-Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
----
- pppd/plugins/Makefile.linux          |    2 +-
- pppd/plugins/pppol2tp/Makefile.linux |    2 +-
- pppd/plugins/rp-pppoe/Makefile.linux |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index 0a7ec7b..2a2c15a 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -20,7 +20,7 @@ include .depend
- endif
- 
- all:	$(PLUGINS)
--	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
-+	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit 1; done
- 
- %.so: %.c
- 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
-diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
-index 19eff67..feb2f52 100644
---- a/pppd/plugins/pppol2tp/Makefile.linux
-+++ b/pppd/plugins/pppol2tp/Makefile.linux
-@@ -1,6 +1,6 @@
- #CC	= gcc
- COPTS	= -O2 -g
--CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
-+CFLAGS	= $(COPTS) -I. -I../.. -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
- 
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index f078991..15b9118 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -26,7 +26,7 @@ INSTALL	= install
- RP_VERSION=3.8p
- 
- COPTS=-O2 -g
--CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
-+CFLAGS=$(COPTS) '-DRP_VERSION="$(RP_VERSION)"'
- all: rp-pppoe.so pppoe-discovery
- 
- pppoe-discovery: pppoe-discovery.o debug.o
--- 
-1.7.9.5
-
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/08setupdns b/recipes-connectivity/ppp/ppp-2.4.7/08setupdns
deleted file mode 100644
index 998219d..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/08setupdns
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-ACTUALCONF=/var/run/resolv.conf
-PPPCONF=/var/run/ppp/resolv.conf
-if [ -f $PPPCONF ] ; then
-	if [ -f $ACTUALCONF ] ; then
-		if [ ! -h $ACTUALCONF -o ! "`readlink $ACTUALCONF 2>&1`" = "$PPPCONF" ] ; then
-			mv $ACTUALCONF $ACTUALCONF.ppporig
-		fi
-	fi
-
-	ln -sf $PPPCONF $ACTUALCONF
-fi
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/92removedns b/recipes-connectivity/ppp/ppp-2.4.7/92removedns
deleted file mode 100644
index 2eadec6..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/92removedns
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-ACTUALCONF=/var/run/resolv.conf
-if [ -f $ACTUALCONF.ppporig ] ; then
-	mv $ACTUALCONF.ppporig $ACTUALCONF
-fi
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/cifdefroute.patch b/recipes-connectivity/ppp/ppp-2.4.7/cifdefroute.patch
deleted file mode 100644
index db4dbc2..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/cifdefroute.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-This patch comes from OpenEmbedded.
-The original patch is from Debian / SuSE to implement replacedefaultroute
-Rebased it to fit ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [debian/suse patches]
-
-diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
---- ppp-2.4.5-orig/pppd/ipcp.c	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/ipcp.c	2010-06-30 16:40:00.478716855 +0800
-@@ -198,6 +198,16 @@
-       "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
-       &ipcp_wantoptions[0].default_route },
- 
-+#ifdef __linux__
-+    { "replacedefaultroute", o_bool,
-+                               &ipcp_wantoptions[0].replace_default_route,
-+      "Replace default route", 1
-+    },
-+    { "noreplacedefaultroute", o_bool,
-+                               &ipcp_allowoptions[0].replace_default_route,
-+      "Never replace default route", OPT_A2COPY,
-+                               &ipcp_wantoptions[0].replace_default_route },
-+#endif
-     { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
-       "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
-     { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
-@@ -271,7 +281,7 @@
-     ip_active_pkt
- };
- 
--static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t));
-+static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool));
- static void ipcp_script __P((char *, int));	/* Run an up/down script */
- static void ipcp_script_done __P((void *));
- 
-@@ -1742,7 +1752,12 @@
-     if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
- 	return 0;
-     if (wo->default_route)
-+#ifndef __linux__
- 	if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr))
-+#else
-+	if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr,
-+                                            wo->replace_default_route))
-+#endif
- 	    default_route_set[u] = 1;
-     if (wo->proxy_arp)
- 	if (sifproxyarp(u, wo->hisaddr))
-@@ -1830,7 +1845,8 @@
-      */
-     if (demand) {
- 	if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
--	    ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr);
-+	    ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr, 
-+				      wo->replace_default_route);
- 	    if (go->ouraddr != wo->ouraddr) {
- 		warn("Local IP address changed to %I", go->ouraddr);
- 		script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
-@@ -1855,7 +1871,12 @@
- 
- 	    /* assign a default route through the interface if required */
- 	    if (ipcp_wantoptions[f->unit].default_route) 
-+#ifndef __linux__
- 		if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
-+#else
-+		if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
-+					     wo->replace_default_route))
-+#endif
- 		    default_route_set[f->unit] = 1;
- 
- 	    /* Make a proxy ARP entry if requested. */
-@@ -1905,7 +1926,12 @@
- 
- 	/* assign a default route through the interface if required */
- 	if (ipcp_wantoptions[f->unit].default_route) 
-+#ifndef __linux__
- 	    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
-+#else
-+	    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
-+					 wo->replace_default_route))
-+#endif
- 		default_route_set[f->unit] = 1;
- 
- 	/* Make a proxy ARP entry if requested. */
-@@ -1983,7 +2009,7 @@
- 	sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
- 	sifdown(f->unit);
- 	ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
--			 ipcp_hisoptions[f->unit].hisaddr);
-+			 ipcp_hisoptions[f->unit].hisaddr, 0);
-     }
- 
-     /* Execute the ip-down script */
-@@ -1999,12 +2025,21 @@
-  * proxy arp entries, etc.
-  */
- static void
--ipcp_clear_addrs(unit, ouraddr, hisaddr)
-+ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute)
-     int unit;
-     u_int32_t ouraddr;  /* local address */
-     u_int32_t hisaddr;  /* remote address */
-+    bool replacedefaultroute;
- {
--    if (proxy_arp_set[unit]) {
-+    /* If replacedefaultroute, sifdefaultroute will be called soon
-+     * with replacedefaultroute set and that will overwrite the current
-+     * default route. This is the case only when doing demand, otherwise
-+     * during demand, this cifdefaultroute would restore the old default
-+     * route which is not what we want in this case. In the non-demand
-+     * case, we'll delete the default route and restore the old if there
-+     * is one saved by an sifdefaultroute with replacedefaultroute.
-+     */
-+    if (!replacedefaultroute && default_route_set[unit]) {
- 	cifproxyarp(unit, hisaddr);
- 	proxy_arp_set[unit] = 0;
-     }
-diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h
---- ppp-2.4.5-orig/pppd/ipcp.h	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/ipcp.h	2010-06-30 16:40:49.586203129 +0800
-@@ -70,6 +70,7 @@
-     bool old_addrs;		/* Use old (IP-Addresses) option? */
-     bool req_addr;		/* Ask peer to send IP address? */
-     bool default_route;		/* Assign default route through interface? */
-+    bool replace_default_route; /* Replace default route through interface? */
-     bool proxy_arp;		/* Make proxy ARP entry for peer? */
-     bool neg_vj;		/* Van Jacobson Compression? */
-     bool old_vj;		/* use old (short) form of VJ option? */
-diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8
---- ppp-2.4.5-orig/pppd/pppd.8	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/pppd.8	2010-06-30 16:42:47.102413859 +0800
-@@ -121,6 +121,13 @@
- This entry is removed when the PPP connection is broken.  This option
- is privileged if the \fInodefaultroute\fR option has been specified.
- .TP
-+.B replacedefaultroute
-+This option is a flag to the defaultroute option. If defaultroute is
-+set and this flag is also set, pppd replaces an existing default route
-+with the new default route.
-+
-+
-+.TP
- .B disconnect \fIscript
- Execute the command specified by \fIscript\fR, by passing it to a
- shell, after
-@@ -717,7 +724,12 @@
- .TP
- .B nodefaultroute
- Disable the \fIdefaultroute\fR option.  The system administrator who
--wishes to prevent users from creating default routes with pppd
-+wishes to prevent users from adding a default route with pppd
-+can do so by placing this option in the /etc/ppp/options file.
-+.TP
-+.B noreplacedefaultroute
-+Disable the \fIreplacedefaultroute\fR option. The system administrator who
-+wishes to prevent users from replacing a default route with pppd
- can do so by placing this option in the /etc/ppp/options file.
- .TP
- .B nodeflate
-diff -urN ppp-2.4.5-orig/pppd/pppd.h ppp-2.4.5/pppd/pppd.h
---- ppp-2.4.5-orig/pppd/pppd.h	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/pppd.h	2010-06-30 16:43:36.514148327 +0800
-@@ -643,7 +643,11 @@
- int  cif6addr __P((int, eui64_t, eui64_t));
- 				/* Remove an IPv6 address from i/f */
- #endif
-+#ifndef __linux__
- int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
-+#else
-+int  sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
-+#endif
- 				/* Create default route through i/f */
- int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
- 				/* Delete default route through i/f */
-diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c
---- ppp-2.4.5-orig/pppd/sys-linux.c	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/sys-linux.c	2010-06-30 16:54:00.362716231 +0800
-@@ -206,6 +206,8 @@
- 
- static int	if_is_up;	/* Interface has been marked up */
- static int	have_default_route;	/* Gateway for default route added */
-+static struct rtentry old_def_rt;       /* Old default route */
-+static int       default_rt_repl_rest;  /* replace and restore old default rt */
- static u_int32_t proxy_arp_addr;	/* Addr for proxy arp entry added */
- static char proxy_arp_dev[16];		/* Device for proxy arp entry */
- static u_int32_t our_old_addr;		/* for detecting address changes */
-@@ -1537,6 +1539,9 @@
- 	p = NULL;
-     }
- 
-+    SET_SA_FAMILY (rt->rt_dst,     AF_INET);
-+    SET_SA_FAMILY (rt->rt_gateway, AF_INET);
-+
-     SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
-     SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
-     SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
-@@ -1606,20 +1611,51 @@
- /********************************************************************
-  *
-  * sifdefaultroute - assign a default route through the address given.
-- */
--
--int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
--{
--    struct rtentry rt;
--
--    if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
--	if (rt.rt_flags & RTF_GATEWAY)
--	    error("not replacing existing default route via %I",
--		  SIN_ADDR(rt.rt_gateway));
--	else
--	    error("not replacing existing default route through %s",
--		  rt.rt_dev);
--	return 0;
-+ *
-+ * If the global default_rt_repl_rest flag is set, then this function
-+ * already replaced the original system defaultroute with some other
-+ * route and it should just replace the current defaultroute with
-+ * another one, without saving the current route. Use: demand mode,
-+ * when pppd sets first a defaultroute it it's temporary ppp0 addresses
-+ * and then changes the temporary addresses to the addresses for the real
-+ * ppp connection when it has come up.
-+ */
-+
-+int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace)
-+{
-+    struct rtentry rt, tmp_rt;
-+    struct rtentry *del_rt = NULL;
-+
-+    if (default_rt_repl_rest) {
-+	/* We have already reclaced the original defaultroute, if we
-+         * are called again, we will delete the current default route
-+         * and set the new default route in this function.  
-+         * - this is normally only the case the doing demand: */
-+	if (defaultroute_exists( &tmp_rt ))
-+		del_rt = &tmp_rt;
-+    } else if ( defaultroute_exists( &old_def_rt                ) &&
-+	                     strcmp(  old_def_rt.rt_dev, ifname ) != 0) {
-+	/* We did not yet replace an existing default route, let's
-+	 * check if we should save and replace a default route:
-+         */
-+	u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway);
-+	if (old_gateway != gateway) {
-+	    if (!replace) {
-+	        error("not replacing default route to %s [%I]",
-+			old_def_rt.rt_dev, old_gateway);
-+		return 0;
-+	    } else {
-+		// we need to copy rt_dev because we need it permanent too:
-+		char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1);
-+		strcpy(tmp_dev, old_def_rt.rt_dev);
-+		old_def_rt.rt_dev = tmp_dev;
-+
-+		notice("replacing old default route to %s [%I]",
-+			old_def_rt.rt_dev, old_gateway);
-+	        default_rt_repl_rest = 1;
-+		del_rt = &old_def_rt;
-+	    }
-+	}
-     }
- 
-     memset (&rt, 0, sizeof (rt));
-@@ -1638,6 +1674,12 @@
- 	    error("default route ioctl(SIOCADDRT): %m");
- 	return 0;
-     }
-+    if (default_rt_repl_rest && del_rt)
-+        if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) {
-+	    if ( ! ok_error ( errno ))
-+	        error("del old default route ioctl(SIOCDELRT): %m(%d)", errno);
-+	    return 0;
-+        }
- 
-     have_default_route = 1;
-     return 1;
-@@ -1673,6 +1715,16 @@
- 	    return 0;
- 	}
-     }
-+    if (default_rt_repl_rest) {
-+	notice("restoring old default route to %s [%I]",
-+			old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
-+        if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) {
-+	    if ( ! ok_error ( errno ))
-+	        error("restore default route ioctl(SIOCADDRT): %m(%d)", errno);
-+	    return 0;
-+        }
-+        default_rt_repl_rest = 0;
-+    }
- 
-     return 1;
- }
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/copts.patch b/recipes-connectivity/ppp/ppp-2.4.7/copts.patch
deleted file mode 100644
index 53ff06e..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/copts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-ppp: use build system CFLAGS when compiling
-
-Upstream-Status: Pending
-
-Override the hard-coded COPTS make variables with
-CFLAGS.  Add COPTS into one Makefile that did not
-use it.
-
-Signed-off-by: Joe Slater <jslater@windriver.com>
-
---- a/pppd/plugins/radius/Makefile.linux
-+++ b/pppd/plugins/radius/Makefile.linux
-@@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ 
- INSTALL	= install
- 
- PLUGIN=radius.so radattr.so radrealms.so
--CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
-+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
- 
- # Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol.
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/init b/recipes-connectivity/ppp/ppp-2.4.7/init
deleted file mode 100755
index 5b3b7ab..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-#   /etc/init.d/ppp: start or stop PPP link.
-#
-# If you want PPP started on boot time (most dialup systems won't need it)
-# rename the /etc/ppp/no_ppp_on_boot file to /etc/ppp/ppp_on_boot, and
-# follow the instructions in the comments in that file.
-
-test -x /usr/sbin/pppd -a -f /etc/ppp/ppp_on_boot || exit 0
-if [ -x /etc/ppp/ppp_on_boot ]; then RUNFILE=1; fi
-
-case "$1" in
-  start)
-      echo -n "Starting up PPP link: pppd"
-      if [ "$RUNFILE" = "1" ]; then
-        /etc/ppp/ppp_on_boot
-      else
-        pppd call provider
-      fi
-      echo "."
-    ;;
-  stop)
-      echo -n "Shutting down PPP link: pppd"
-      if [ "$RUNFILE" = "1" ]; then
-        poff
-      else
-        poff provider
-      fi
-      echo "."
-    ;;
-  restart|force-reload)
-    echo -n "Restarting PPP link: pppd"
-    if [ "$RUNFILE" = "1" ]; then      
-      poff
-      sleep 5
-      /etc/ppp/ppp_on_boot
-    else                  
-      poff provider
-      sleep 5
-      pppd call provider
-    fi
-    echo "."
-    ;;
-  *)
-      echo "Usage: /etc/init.d/ppp {start|stop|restart|force-reload}"
-      exit 1
-    ;;
-esac
-
-exit 0
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/ip-down b/recipes-connectivity/ppp/ppp-2.4.7/ip-down
deleted file mode 100755
index 06d3548..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/ip-down
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $Id: ip-down,v 1.2 1998/02/10 21:21:55 phil Exp $
-#
-# This script is run by the pppd _after_ the link is brought down.
-# It uses run-parts to run scripts in /etc/ppp/ip-down.d, so to delete
-# routes, unset IP addresses etc. you should create script(s) there.
-#
-# Be aware that other packages may include /etc/ppp/ip-down.d scripts (named
-# after that package), so choose local script names with that in mind.
-#
-# This script is called with the following arguments:
-#    Arg  Name                          Example
-#    $1   Interface name                ppp0
-#    $2   The tty                       ttyS1
-#    $3   The link speed                38400
-#    $4   Local IP number               12.34.56.78
-#    $5   Peer  IP number               12.34.56.99
-#    $6   Optional ``ipparam'' value    foo
-
-# The  environment is cleared before executing this script
-# so the path must be reset
-PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-export PATH
-# These variables are for the use of the scripts run by run-parts
-PPP_IFACE="$1"
-PPP_TTY="$2"
-PPP_SPEED="$3"
-PPP_LOCAL="$4"
-PPP_REMOTE="$5"
-PPP_IPPARAM="$6"
-export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
-
-# as an additional convenience, $PPP_TTYNAME is set to the tty name,
-# stripped of /dev/ (if present) for easier matching.
-PPP_TTYNAME=`/usr/bin/basename "$2"`
-export PPP_TTYNAME 
-
-# Main Script starts here
-
-run-parts /etc/ppp/ip-down.d
-
-# last line
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/ip-up b/recipes-connectivity/ppp/ppp-2.4.7/ip-up
deleted file mode 100755
index b78e688..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/ip-up
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# $Id: ip-up,v 1.2 1998/02/10 21:25:34 phil Exp $
-#
-# This script is run by the pppd after the link is established.
-# It uses run-parts to run scripts in /etc/ppp/ip-up.d, so to add routes,
-# set IP address, run the mailq etc. you should create script(s) there.
-#
-# Be aware that other packages may include /etc/ppp/ip-up.d scripts (named
-# after that package), so choose local script names with that in mind.
-#
-# This script is called with the following arguments:
-#    Arg  Name                          Example
-#    $1   Interface name                ppp0
-#    $2   The tty                       ttyS1
-#    $3   The link speed                38400
-#    $4   Local IP number               12.34.56.78
-#    $5   Peer  IP number               12.34.56.99
-#    $6   Optional ``ipparam'' value    foo
-
-# The  environment is cleared before executing this script
-# so the path must be reset
-PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-export PATH
-# These variables are for the use of the scripts run by run-parts
-PPP_IFACE="$1"
-PPP_TTY="$2"
-PPP_SPEED="$3"
-PPP_LOCAL="$4"
-PPP_REMOTE="$5"
-PPP_IPPARAM="$6"
-export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
-
-
-# as an additional convenience, $PPP_TTYNAME is set to the tty name,
-# stripped of /dev/ (if present) for easier matching.
-PPP_TTYNAME=`/usr/bin/basename "$2"`
-export PPP_TTYNAME 
-
-# Main Script starts here
-
-run-parts /etc/ppp/ip-up.d
-
-# save timestamp
-linkuptime=$(cat /proc/uptime)
-linkuptime=${linkuptime%%.*}
-echo "$linkuptime" > /var/run/pppisup-$PPP_IFACE.sec
-
-# last line
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/makefile-remove-hard-usr-reference.patch b/recipes-connectivity/ppp/ppp-2.4.7/makefile-remove-hard-usr-reference.patch
deleted file mode 100644
index d59717e..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/makefile-remove-hard-usr-reference.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-The patch comes from OpenEmbedded.
-Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Updated from OE-Classic to include the pcap hunk.
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
---- ppp-2.4.5-orig/pppd/Makefile.linux	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/Makefile.linux	2010-06-30 17:08:21.806363042 +0800
-@@ -117,10 +117,10 @@
- #LIBS     += -lshadow $(LIBS)
- endif
- 
--ifneq ($(wildcard /usr/include/crypt.h),)
-+#ifneq ($(wildcard /usr/include/crypt.h),)
- CFLAGS  += -DHAVE_CRYPT_H=1
- LIBS	+= -lcrypt
--endif
-+#endif
- 
- ifdef NEEDDES
- ifndef USE_CRYPT
-@@ -169,10 +169,10 @@
- endif
- 
- ifdef FILTER
--ifneq ($(wildcard /usr/include/pcap-bpf.h),)
-+#ifneq ($(wildcard /usr/include/pcap-bpf.h),)
- LIBS    += -lpcap
- CFLAGS  += -DPPP_FILTER
--endif
-+#endif
- endif
- 
- ifdef HAVE_INET6
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/makefile.patch b/recipes-connectivity/ppp/ppp-2.4.7/makefile.patch
deleted file mode 100644
index 2d09baf..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/makefile.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-The patch comes from OpenEmbedded
-Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN ppp-2.4.5-orig/chat/Makefile.linux ppp-2.4.5/chat/Makefile.linux
---- ppp-2.4.5-orig/chat/Makefile.linux	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/chat/Makefile.linux	2010-06-30 15:51:30.450118446 +0800
-@@ -25,7 +25,7 @@
- 
- install: chat
- 	mkdir -p $(BINDIR) $(MANDIR)
--	$(INSTALL) -s -c chat $(BINDIR)
-+	$(INSTALL) -c chat $(BINDIR)
- 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
- 
- clean:
-diff -ruN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
---- ppp-2.4.5-orig/pppd/Makefile.linux	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/Makefile.linux	2010-06-30 15:52:11.214170607 +0800
-@@ -99,7 +99,7 @@
- CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
- LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
- TARGETS	+= srp-entry
--EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
-+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
- MANPAGES += srp-entry.8
- EXTRACLEAN += srp-entry.o
- NEEDDES=y
-@@ -200,7 +200,7 @@
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
- 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
- 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
- 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-diff -ruN ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.5/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux	2010-06-30 15:51:12.047676187 +0800
-+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux	2010-06-30 15:53:47.750182267 +0800
-@@ -36,11 +36,11 @@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
--	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
--	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
-+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
-+	$(INSTALL) -m 444 pppd-radius.8 $(MANDIR)
-+	$(INSTALL) -m 444 pppd-radattr.8 $(MANDIR)
- 
- radius.so: radius.o libradiusclient.a
- 	$(CC) -o radius.so -shared radius.o libradiusclient.a
-diff -ruN ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux	2010-06-30 15:51:12.047676187 +0800
-+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux	2010-06-30 15:53:15.454486877 +0800
-@@ -43,9 +43,9 @@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
- 	$(INSTALL) -d -m 755 $(BINDIR)
--	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
-+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
- 
- clean:
- 	rm -f *.o *.so pppoe-discovery
-diff -ruN ppp-2.4.5-orig/pppdump/Makefile.linux ppp-2.4.5/pppdump/Makefile.linux
---- ppp-2.4.5-orig/pppdump/Makefile.linux	2010-06-30 15:51:12.058183383 +0800
-+++ ppp-2.4.5/pppdump/Makefile.linux	2010-06-30 15:52:25.762183537 +0800
-@@ -17,5 +17,5 @@
- 
- install:
- 	mkdir -p $(BINDIR) $(MANDIR)
--	$(INSTALL) -s -c pppdump $(BINDIR)
-+	$(INSTALL) -c pppdump $(BINDIR)
- 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff -ruN ppp-2.4.5-orig/pppstats/Makefile.linux ppp-2.4.5/pppstats/Makefile.linux
---- ppp-2.4.5-orig/pppstats/Makefile.linux	2010-06-30 15:51:12.058183383 +0800
-+++ ppp-2.4.5/pppstats/Makefile.linux	2010-06-30 15:52:42.486341081 +0800
-@@ -22,7 +22,7 @@
- 
- install: pppstats
- 	-mkdir -p $(MANDIR)
--	$(INSTALL) -s -c pppstats $(BINDIR)
-+	$(INSTALL) -c pppstats $(BINDIR)
- 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
- 
- pppstats: $(PPPSTATSRCS)
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/pap b/recipes-connectivity/ppp/ppp-2.4.7/pap
deleted file mode 100644
index 093c326..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/pap
+++ /dev/null
@@ -1,22 +0,0 @@
-# You can use this script unmodified to connect to sites which allow
-# authentication via PAP, CHAP and similar protocols.
-# This script can be shared among different pppd peer configurations.
-# To use it, add something like this to your /etc/ppp/peers/ file:
-#
-# connect "/usr/sbin/chat -v -f /etc/chatscripts/pap -T PHONE-NUMBER"
-# user YOUR-USERNAME-IN-PAP-SECRETS
-# noauth
-
-# Uncomment the following line to see the connect speed.
-# It will be logged to stderr or to the file specified with the -r chat option.
-#REPORT		CONNECT
-
-ABORT		BUSY
-ABORT		VOICE
-ABORT		"NO CARRIER"
-ABORT		"NO DIALTONE"
-ABORT		"NO DIAL TONE"
-""		ATZ
-OK		ATDT\T
-CONNECT		""
-
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/poff b/recipes-connectivity/ppp/ppp-2.4.7/poff
deleted file mode 100644
index 0521a94..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/poff
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Lets see how many pppds are running....
-set -- `cat /var/run/ppp*.pid 2>/dev/null`
-
-case $# in
-  0) # pppd only creates a pid file once ppp is up, so let's try killing pppd
-     # on the assumption that we've not got that far yet.
-     killall pppd
-     ;;
-  1) # If only one was running then it can be killed (apparently killall
-     # caused problems for some, so lets try killing the pid from the file)
-     kill $1
-     ;;
-  *) # More than one! Aieehh.. Dont know which one to kill.
-     echo "More than one pppd running. None stopped"
-     exit 1
-     ;;
-esac
-
-if [ -r /var/run/ppp-quick ]
-then
-    rm -f /var/run/ppp-quick
-fi
-
-exit 0
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/pon b/recipes-connectivity/ppp/ppp-2.4.7/pon
deleted file mode 100644
index 91c0595..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/pon
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "quick" ]
-then
-    touch /var/run/ppp-quick
-    shift
-fi
-
-/usr/sbin/pppd call ${1:-provider}
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot b/recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot
deleted file mode 100644
index 9793761..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot
+++ /dev/null
@@ -1,21 +0,0 @@
-###!/bin/sh
-#
-#   Rename this file to ppp_on_boot and pppd will be fired up as
-#   soon as the system comes up, connecting to `provider'.
-#
-#   If you also make this file executable, and replace the first line
-#   with just "#!/bin/sh", the commands below will be executed instead.
-#
-
-# The location of the ppp daemon itself (shouldn't need to be changed)
-PPPD=/usr/sbin/pppd
-
-# The default provider to connect to
-$PPPD call provider
-
-# Additional connections, which would just use settings from
-# /etc/ppp/options.<tty>
-#$PPPD ttyS0
-#$PPPD ttyS1
-#$PPPD ttyS2
-#$PPPD ttyS3
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/pppd-resolv-varrun.patch b/recipes-connectivity/ppp/ppp-2.4.7/pppd-resolv-varrun.patch
deleted file mode 100644
index a72414f..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/pppd-resolv-varrun.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-The patch comes from OpenEmbedded
-Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
---- ppp-2.4.5-orig/pppd/ipcp.c	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/ipcp.c	2010-06-30 17:02:33.930393283 +0800
-@@ -55,6 +55,8 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- 
- #include "pppd.h"
- #include "fsm.h"
-@@ -2095,6 +2097,14 @@
-     u_int32_t peerdns1, peerdns2;
- {
-     FILE *f;
-+    struct stat dirinfo;
-+
-+    if(stat(_PATH_OUTDIR, &dirinfo)) {
-+        if(mkdir(_PATH_OUTDIR, 0775)) {
-+            error("Failed to create directory %s: %m", _PATH_OUTDIR);
-+            return;
-+        }
-+    }
- 
-     f = fopen(_PATH_RESOLV, "w");
-     if (f == NULL) {
-diff -ruN ppp-2.4.5-orig/pppd/pathnames.h ppp-2.4.5/pppd/pathnames.h
---- ppp-2.4.5-orig/pppd/pathnames.h	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/pathnames.h	2010-06-30 17:03:20.594371055 +0800
-@@ -30,7 +30,8 @@
- #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
- #define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
- #define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
--#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
-+#define _PATH_OUTDIR	_ROOT_PATH _PATH_VARRUN "/ppp"
-+#define _PATH_RESOLV	_PATH_OUTDIR "/resolv.conf"
- 
- #define _PATH_USEROPT	 ".ppprc"
- #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/provider b/recipes-connectivity/ppp/ppp-2.4.7/provider
deleted file mode 100644
index e74d71a..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/provider
+++ /dev/null
@@ -1,35 +0,0 @@
-# example configuration for a dialup connection authenticated with PAP or CHAP
-#
-# This is the default configuration used by pon(1) and poff(1).
-# See the manual page pppd(8) for information on all the options.
-
-# MUST CHANGE: replace myusername@realm with the PPP login name given to
-# your by your provider.
-# There should be a matching entry with the password in /etc/ppp/pap-secrets
-# and/or /etc/ppp/chap-secrets.
-user "myusername@realm"
-
-# MUST CHANGE: replace ******** with the phone number of your provider.
-# The /etc/chatscripts/pap chat script may be modified to change the
-# modem initialization string.
-connect "/usr/sbin/chat -v -f /etc/chatscripts/pap -T ********"
-
-# Serial device to which the modem is connected.
-/dev/modem
-
-# Speed of the serial line.
-115200
-
-# Assumes that your IP address is allocated dynamically by the ISP.
-noipdefault
-# Try to get the name server addresses from the ISP.
-usepeerdns
-# Use this connection as the default route.
-defaultroute
-
-# Makes pppd "dial again" when the connection is lost.
-persist
-
-# Do not ask the remote to authenticate.
-noauth
-
diff --git a/recipes-connectivity/ppp/ppp_2.4.7.bb b/recipes-connectivity/ppp/ppp_2.4.7.bb
deleted file mode 100644
index 881c40e..0000000
--- a/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ /dev/null
@@ -1,88 +0,0 @@
-SUMMARY = "Point-to-Point Protocol (PPP) support"
-DESCRIPTION = "ppp (Paul's PPP Package) is an open source package which implements \
-the Point-to-Point Protocol (PPP) on Linux and Solaris systems."
-SECTION = "console/network"
-HOMEPAGE = "http://samba.org/ppp/"
-BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs"
-DEPENDS = "libpcap"
-LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD"
-LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \
-                    file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
-                    file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
-                    file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
-PR = "r8"
-
-SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
-           file://makefile.patch \
-           file://cifdefroute.patch \
-           file://pppd-resolv-varrun.patch \
-           file://makefile-remove-hard-usr-reference.patch \
-           file://pon \
-           file://poff \
-           file://init \
-           file://ip-up \
-           file://ip-down \
-           file://08setupdns \
-           file://92removedns \
-           file://copts.patch \
-           file://pap \
-           file://ppp_on_boot \
-           file://provider \
-           file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \
-"
-
-SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
-SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30"
-
-inherit autotools
-
-TARGET_CC_ARCH += " ${LDFLAGS}"
-EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}"
-EXTRA_OECONF = "--disable-strip"
-
-# Package Makefile computes CFLAGS, referencing COPTS.
-# Typically hard-coded to '-O2 -g' in the Makefile's.
-#
-EXTRA_OEMAKE += ' COPTS="${CFLAGS}"'
-
-do_install_append () {
-	make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
-	mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
-	mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/
-	mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/
-	install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon
-	install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp
-	install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/
-	install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/
-	install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/
-	install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/
-	mkdir -p ${D}${sysconfdir}/chatscripts
-	mkdir -p ${D}${sysconfdir}/ppp/peers
-	install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts
-	install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot
-	install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider
-	rm -rf ${D}/${mandir}/man8/man8
-	chmod u+s ${D}${sbindir}/pppd
-}
-
-CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
-PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools"
-FILES_${PN}        = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd"
-FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"
-FILES_${PN}-oa       = "${libdir}/pppd/${PV}/pppoatm.so"
-FILES_${PN}-oe       = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so"
-FILES_${PN}-radius   = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
-FILES_${PN}-winbind  = "${libdir}/pppd/${PV}/winbind.so"
-FILES_${PN}-minconn  = "${libdir}/pppd/${PV}/minconn.so"
-FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
-FILES_${PN}-l2tp     = "${libdir}/pppd/${PV}/*l2tp.so"
-FILES_${PN}-tools    = "${sbindir}/pppstats ${sbindir}/pppdump"
-DESCRIPTION_${PN}-oa       = "Plugin for PPP needed for PPP-over-ATM"
-DESCRIPTION_${PN}-oe       = "Plugin for PPP needed for PPP-over-Ethernet"
-DESCRIPTION_${PN}-radius   = "Plugin for PPP that are related to RADIUS"
-DESCRIPTION_${PN}-winbind  = "Plugin for PPP to authenticate against Samba or Windows"
-DESCRIPTION_${PN}-minconn  = "Plugin for PPP to specify a minimum connect time before the idle timeout applies"
-DESCRIPTION_${PN}-password = "Plugin for PPP to get passwords via a pipe"
-DESCRIPTION_${PN}-l2tp     = "Plugin for PPP for l2tp support"
-DESCRIPTION_${PN}-tools    = "The pppdump and pppstats utitilities"
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
index 0f0ae4f..b9a4231 100644
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 media_card="/media/card"
 media_card_mtcap=""
diff --git a/recipes-core/busybox/busybox_1.22.1.bbappend b/recipes-core/busybox/busybox_%.bbappend
index 40094e9..4c6e752 100644
--- a/recipes-core/busybox/busybox_1.22.1.bbappend
+++ b/recipes-core/busybox/busybox_%.bbappend
@@ -1,6 +1,6 @@
 PR .= ".mlinux1"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := ":${THISDIR}/files:"
 
 SRC_URI += "file://udhcpd.conf.example"
 
diff --git a/recipes-core/busybox/busybox-1.22.1/defconfig b/recipes-core/busybox/files/defconfig
index aa1e514..aa1e514 100644
--- a/recipes-core/busybox/busybox-1.22.1/defconfig
+++ b/recipes-core/busybox/files/defconfig
diff --git a/recipes-core/eglibc/eglibc_%.bbappend b/recipes-core/eglibc/eglibc_%.bbappend.obsolete
index 68af86e..68af86e 100644
--- a/recipes-core/eglibc/eglibc_%.bbappend
+++ b/recipes-core/eglibc/eglibc_%.bbappend.obsolete
diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index a0c460d..3ba6b2f 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -29,7 +29,7 @@ WIFI_FEATURES = " \
                 hostap-daemon hostap-utils \
                 "
 
-BLUETOOTH_FEATURES = "bluez4"
+BLUETOOTH_FEATURES = "bluez5"
 
 # Add all timezones available
 # ntpdate will sync time every 30 min by default via cron
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index c50619b..9da3040 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -25,8 +25,10 @@ IMAGE_INSTALL += "monit"
 IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb"
 
 # MQTT server
+#IMAGE_INSTALL += "mosquitto"
 IMAGE_INSTALL += "mosquitto mosquitto-clients"
 
+
 # Perl support
 IMAGE_INSTALL += "perl"
 IMAGE_INSTALL += "perl-module-io perl-module-fcntl"
@@ -58,17 +60,18 @@ python-xml \
 
 # Ruby support
 IMAGE_INSTALL += "ruby"
+
 IMAGE_INSTALL += "ruby-sqlite3"
 IMAGE_INSTALL += "ruby-serialport"
 
 # OpenJDK Java runtime
-IMAGE_INSTALL += "openjdk-7-jre"
+# IMAGE_INSTALL += "openjdk-8"
 # OpenJDK with JamVM VM (Multi-Tech default)
-IMAGE_INSTALL += "openjdk-7-vm-jamvm"
+# IMAGE_INSTALL += "jamvm"
 # OpenJDK with CACAO VM (run with 'java -cacao')
-IMAGE_INSTALL += "openjdk-7-vm-cacao"
+# IMAGE_INSTALL += "openjdk-7-vm-cacao"
 # OpenJDK Zero VM (run with 'java -zero')
-IMAGE_INSTALL += "openjdk-7-vm-zero"
+# IMAGE_INSTALL += "openjdk-7-vm-zero"
 
 # PHP support
 IMAGE_INSTALL += "php php-cli php-cgi"
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index 2f2d61b..1a92e8e 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -16,8 +16,10 @@ CORE_FEATURES = "packagegroup-core-boot packagegroup-distro-base \
                  openssh-sftp-server \
                  util-linux-mount util-linux-umount \
                  start-stop-daemon \
+		 sudo \
                  ${CORE_IMAGE_EXTRA_INSTALL} \
                  mlinux-feed-configs \
+		 useradd \
                  "
 
 NETWORKING_FEATURES = "ppp curl iproute2 \
diff --git a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index 5249571..9d000d6 100644
--- a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -4,10 +4,9 @@ SRC_URI += "file://bonding.pre-up \
            file://bonding.up \
            file://bonding.post-down"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 do_install_append () {
-	echo JAK workdir ${WORKDIR} sysconfdir ${D}${sysconfdir}
 	install -m 0755 ${WORKDIR}/bonding.pre-up ${D}${sysconfdir}/network/if-pre-up.d/bonding
 	install -m 0755 ${WORKDIR}/bonding.up ${D}${sysconfdir}/network/if-up.d/bonding
 	install -m 0755 ${WORKDIR}/bonding.post-down ${D}${sysconfdir}/network/if-post-down.d/bonding
diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs
index 8c12ebe..bfd4d47 100644
--- a/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -10,6 +10,7 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
+upgrade_fname="/var/volatile/do_flash_upgrade"
 
 umount_all() {
   echo "Deactivating swap..."
@@ -256,9 +257,13 @@ flash_upgrade() {
 }
 
 # do flash on reboot if do_flash_upgrade exists
-if [ -f /var/volatile/do_flash_upgrade ]; then
-    flash_upgrade /var/volatile
-    flash_upgrade /media/card
+# and is owned by root
+if [[ -f ${upgrade_fname} ]] ; then
+    owner=$(stat -c%u "${upgrade_fname}")
+    if ((${#owner} > 0)) && ((owner == 0)) ; then
+      flash_upgrade /var/volatile
+      flash_upgrade /media/card
+    fi
 fi
 
 umount_all
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc b/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc
index 979fc4c..0f5c136 100644
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc
+++ b/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc
@@ -3,6 +3,8 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
+RDEPENDS_${PN} += "bash"
+
 SRC_URI = "file://mlinux-wifi-ap \
 	file://mlinux-dhcpd \
 	file://mlinux-set-apn \
diff --git a/recipes-core/multitech/reset-handler_1.0.bb b/recipes-core/multitech/reset-handler_1.0.bb
index 9ccd475..39abaab 100644
--- a/recipes-core/multitech/reset-handler_1.0.bb
+++ b/recipes-core/multitech/reset-handler_1.0.bb
@@ -3,6 +3,7 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 PR = "r1"
+RDEPENDS_${PN} += "bash"
 
 inherit update-rc.d
 
diff --git a/recipes-core/udev/udev-182/cellular_radios.rules b/recipes-core/udev/eudev/cellular_radios.rules
index fd36bbd..fd36bbd 100644
--- a/recipes-core/udev/udev-182/cellular_radios.rules
+++ b/recipes-core/udev/eudev/cellular_radios.rules
diff --git a/recipes-core/udev/udev-182/init b/recipes-core/udev/eudev/init
index bd716b0..bd716b0 100644
--- a/recipes-core/udev/udev-182/init
+++ b/recipes-core/udev/eudev/init
diff --git a/recipes-core/udev/udev-182/mtcap/mtcap.rules b/recipes-core/udev/eudev/mtcap/mtcap.rules
index a0dc9fb..a0dc9fb 100644
--- a/recipes-core/udev/udev-182/mtcap/mtcap.rules
+++ b/recipes-core/udev/eudev/mtcap/mtcap.rules
diff --git a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules b/recipes-core/udev/eudev/mtcdt/accessory_ethernet.rules
index 376486b..376486b 100644
--- a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules
+++ b/recipes-core/udev/eudev/mtcdt/accessory_ethernet.rules
diff --git a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules b/recipes-core/udev/eudev/mtcdt/mtcdt.rules
index 5d528e6..5d528e6 100644
--- a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules
+++ b/recipes-core/udev/eudev/mtcdt/mtcdt.rules
diff --git a/recipes-core/udev/udev-182/udev-cache.default b/recipes-core/udev/eudev/udev-cache.default
index b1aa63f..b1aa63f 100644
--- a/recipes-core/udev/udev-182/udev-cache.default
+++ b/recipes-core/udev/eudev/udev-cache.default
diff --git a/recipes-core/udev/udev_182.bbappend b/recipes-core/udev/eudev_%.bbappend
index e793d1d..2a15734 100644
--- a/recipes-core/udev/udev_182.bbappend
+++ b/recipes-core/udev/eudev_%.bbappend
@@ -6,6 +6,7 @@ PR .= ".mlinux2"
 SRC_URI += "	file://cellular_radios.rules \
 		file://${MACHINE}.rules \
 		   "
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mtcdt = "       file://accessory_ethernet.rules \
 			"
diff --git a/recipes-core/udev/udev-extraconf_1.0.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
index 6d4804d..6d4804d 100644
--- a/recipes-core/udev/udev-extraconf_1.0.bbappend
+++ b/recipes-core/udev/udev-extraconf_%.bbappend
diff --git a/recipes-core/useradd/useradd.bb b/recipes-core/useradd/useradd.bb
new file mode 100644
index 0000000..458facf
--- /dev/null
+++ b/recipes-core/useradd/useradd.bb
@@ -0,0 +1,57 @@
+SUMMARY = "Add mtadm user"
+DESCRIPTION = "Add mtadm user for security purposes"
+SECTION = "mtadm"
+PR = "r1"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+S = "${WORKDIR}"
+
+inherit useradd
+
+# You must set USERADD_PACKAGES when you inherit useradd. This
+# lists which output packages will include the user/group
+# creation code.
+#USERADD_PACKAGES = "${PN} ${PN}-user3"
+USERADD_PACKAGES = "${PN}"
+
+# You must also set USERADD_PARAM and/or GROUPADD_PARAM when
+# you inherit useradd.
+
+# GROUPADD_PARAM works the same way, which you set to the options
+# you'd normally pass to the groupadd command. This will create
+# groups group1 and group2:
+GROUPADD_PARAM_${PN} = "-r  -g 27 sudo"
+
+# USERADD_PARAM specifies command line options to pass to the
+# useradd command. Multiple users can be created by separating
+# the commands with a semicolon. Here we'll create two users,
+# user1 and user2:
+USERADD_PARAM_${PN} = "-u 50 -G sudo -m -r -s /bin/bash mtadm"
+
+do_install () {
+        # If the recipe doesn't have a file, the ipk
+        # is deleted, and it does nothing.
+        # Create a .ssh directory for mtadm.
+        install -d 0700 ${D}/home/mtadm/.ssh
+	chown mtadm:mtadm ${D}/home/mtadm
+	chown mtadm:mtadm ${D}/home/mtadm/.ssh
+}
+
+FILES_${PN} = "/home/mtadm/.ssh"
+
+# Prevents do_package failures with:
+# debugsources.list: No such file or directory:
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+pkg_postinst_${PN} () {
+   profile=/home/mtadm/.profile
+   if ! grep 'sbin' ${profile} ; then
+     Sub='${PA'
+     Sub=${Sub}'TH}:/sbin:/usr/sbin'
+     echo 'PATH='${Sub} >>/home/mtadm/.profile
+     echo 'export PATH'  >>/home/mtadm/.profile
+   fi
+}
+
diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb
index 9e441c6..bcf5a67 100644
--- a/recipes-devtools/node-red/node-red_0.11.1.bb
+++ b/recipes-devtools/node-red/node-red_0.11.1.bb
@@ -3,9 +3,11 @@ HOMEPAGE = "http://nodered.org"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 DEPENDS = "nodejs nodejs-native"
+RDEPENDS_${PN} += "bash"
 PR = "r0"
 
-inherit npm
+inherit npm-base
+
 
 S = "${WORKDIR}"
 
@@ -15,7 +17,10 @@ do_install() {
     oe_runnpm install --prefix ./ node-red@0.11.1
 
     # npm install more stuff
-    oe_runnpm install --prefix ./node_modules/node-red serialport nodemailer
+    oe_runnpm install --prefix./node_modules/node-red nodemailer 
+    # Build patched serialport.
+    # Original is https://registry.npmjs.org/serialport/-/serialport-1.7.4.tgz
+    oe_runnpm install  --prefix ./node_modules/node-red http://multitech.net/mlinux/sources/node-red-serialport-1.7.4-mt1.tgz
 
     # modules needed for loragw
     oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants
@@ -32,6 +37,9 @@ do_install() {
     rm ./node_modules/node-red/nodes/core/hardware/nrgpio
     rm ./node_modules/node-red/nodes/core/hardware/nrgpio.py
 
+    # remove x86_64 serialport 0.0.5
+    rm -r ./node_modules/node-red/node_modules/node-red-node-serialport
+
     # install node-red
     install -d ${D}/opt/node-red
     cp -r ./node_modules/node-red/* ${D}/opt/node-red/
diff --git a/recipes-extended/autossh/autossh_1.4c.bb b/recipes-extended/autossh/autossh_1.4c.bb
index b40b53f..8ba78f8 100644
--- a/recipes-extended/autossh/autossh_1.4c.bb
+++ b/recipes-extended/autossh/autossh_1.4c.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Keeps ssh tunnels alive"
 HOMEPAGE = "http://www.harding.motd.ca/autossh"
-LICENSE = "custom-freely-distributable"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://autossh.c;start_line=10;end_line=22;md5=60abb4e02db9c8a062426f574d2fccae"
 SECTION = "console/utils"
 PRIORITY = "optional"
+inherit autotools-brokensep
 
 PR = "r1"
 
diff --git a/recipes-extended/fatrace/fatrace_0.9.bb b/recipes-extended/fatrace/fatrace_0.9.bb
index b47637b..866a801 100644
--- a/recipes-extended/fatrace/fatrace_0.9.bb
+++ b/recipes-extended/fatrace/fatrace_0.9.bb
@@ -1,3 +1,4 @@
+inherit autotools-brokensep
 DESCRIPTION = "Fatrace - report system wide file access events"
 HOMEPAGE = "https://launchpad.net/fatrace"
 LICENSE = "GPL-3.0"
diff --git a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend
index 473a113..8171f17 100644
--- a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
+++ b/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend
@@ -6,7 +6,7 @@ RDEPENDS_${PN} += " openssl logrotate "
 
 EXTRA_OECONF += "--with-openssl"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://lighttpd.logrotate.conf \
 			file://lighttpd.default"
diff --git a/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
new file mode 100644
index 0000000..2e931a2
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
@@ -0,0 +1,147 @@
+From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 17 Feb 2015 21:08:07 -0800
+Subject: [PATCH] Act as the "mv" command when rotate log
+
+Act as the "mv" command when rotate log, first rename, if failed, then
+read and write.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ logrotate.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 59 insertions(+), 12 deletions(-)
+
+diff --git a/logrotate.c b/logrotate.c
+index d3deb6a..cf8bf2c 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -1157,6 +1157,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force)
+     return 0;
+ }
+ 
++/* Act as the "mv" command, if rename failed, then read the old file and
++ * write to new file. The function which invokes the mvFile will use
++ * the strerror(errorno) to handle the error message, so we don't have
++ * to print the error message here */
++
++int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl)
++{
++    struct stat sbprev;
++    int fd_old, fd_new, n;
++    char buf[BUFSIZ];
++
++    /* Do the rename first */
++    if (!rename(oldName, newName))
++        return 0;
++
++    /* If the errno is EXDEV, then read old file, write newfile and
++     * remove the oldfile */
++    if (errno == EXDEV) {
++        /* Open the old file to read */
++        if ((fd_old = open(oldName, O_RDONLY)) < 0)
++            return 1;
++
++        /* Create the file to write, keep the same attribute as the old file */
++        if (stat(oldName, &sbprev))
++            return 1;
++        else {
++            if ((fd_new = createOutputFile(newName,
++                O_WRONLY | O_CREAT | O_TRUNC, &sbprev, acl, 0)) < 0 )
++                return 1;
++        }
++
++        /* Read and write */
++        while ((n = read(fd_old, buf, BUFSIZ)) > 0)
++            if (write(fd_new, buf, n) != n)
++                return 1;
++
++        if ((close(fd_old) < 0) ||
++            removeLogFile(oldName, log) ||
++            (close(fd_new) < 0))
++            return 1;
++
++        return 0;
++    }
++
++    return 1;
++}
++
+ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+ 		       struct logNames *rotNames)
+ {
+@@ -1523,15 +1570,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+ 		}
+ 
+ 	    message(MESS_DEBUG,
+-		    "renaming %s to %s (rotatecount %d, logstart %d, i %d), \n",
++		    "moving %s to %s (rotatecount %d, logstart %d, i %d), \n",
+ 		    oldName, newName, rotateCount, logStart, i);
+ 
+-	    if (!debug && rename(oldName, newName)) {
++	    if (!debug && mvFile(oldName, newName, log, prev_acl)) {
+ 		if (errno == ENOENT) {
+ 		    message(MESS_DEBUG, "old log %s does not exist\n",
+ 			    oldName);
+ 		} else {
+-		    message(MESS_ERROR, "error renaming %s to %s: %s\n",
++		    message(MESS_ERROR, "error moving %s to %s: %s\n",
+ 			    oldName, newName, strerror(errno));
+ 		    hasErrors = 1;
+ 		}
+@@ -1669,21 +1716,21 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+ 				return 1;
+ 			}
+ 
+-			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
++			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
+ 				tmpFilename);
+-			if (!debug && !hasErrors && rename(log->files[logNum], tmpFilename)) {
+-			message(MESS_ERROR, "failed to rename %s to %s: %s\n",
++			if (!debug && !hasErrors && mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
++			message(MESS_ERROR, "failed to move %s to %s: %s\n",
+ 				log->files[logNum], tmpFilename,
+ 				strerror(errno));
+ 				hasErrors = 1;
+ 			}
+ 		}
+ 		else {
+-			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
++			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
+ 				rotNames->finalName);
+ 			if (!debug && !hasErrors &&
+-			rename(log->files[logNum], rotNames->finalName)) {
+-				message(MESS_ERROR, "failed to rename %s to %s: %s\n",
++			mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
++				message(MESS_ERROR, "failed to move %s to %s: %s\n",
+ 					log->files[logNum], tmpFilename,
+ 					strerror(errno));
+ 					hasErrors = 1;
+@@ -2063,7 +2110,7 @@ int rotateLogSet(struct logInfo *log, int force)
+     return hasErrors;
+ }
+ 
+-static int writeState(char *stateFilename)
++static int writeState(struct logInfo *log, char *stateFilename)
+ {
+ 	struct logState *p;
+ 	FILE *f;
+@@ -2227,7 +2274,7 @@ static int writeState(char *stateFilename)
+ 		fclose(f);
+ 
+ 	if (error == 0) {
+-		if (rename(tmpFilename, stateFilename)) {
++		if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
+ 			unlink(tmpFilename);
+ 			error = 1;
+ 			message(MESS_ERROR, "error renaming temp state file %s\n",
+@@ -2525,7 +2572,7 @@ int main(int argc, const char **argv)
+ 		rc |= rotateLogSet(log, force);
+ 
+ 	if (!debug)
+-		rc |= writeState(stateFile);
++		rc |= writeState(log, stateFile);
+ 
+ 	return (rc != 0);
+ }
diff --git a/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
new file mode 100644
index 0000000..793d702
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
@@ -0,0 +1,32 @@
+Disable the check for different filesystems
+
+The logrotate supports rotate log across different filesystems now, so
+disable the check for different filesystems.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ config.c |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/config.c b/config.c
+index dbbf563..64e66f6 100644
+--- a/config.c
++++ b/config.c
+@@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
+ 							goto error;
+ 						}
+ 					}
+-
+-					if (sb.st_dev != sb2.st_dev
+-						&& !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) {
+-						message(MESS_ERROR,
+-							"%s:%d olddir %s and log file %s "
+-							"are on different devices\n", configFile,
+-							lineNum, newlog->oldDir, newlog->files[i]);
+-						goto error;
+-					}
+ 				}
+ 			}
+ 
diff --git a/recipes-extended/logrotate/logrotate/update-the-manual.patch b/recipes-extended/logrotate/logrotate/update-the-manual.patch
new file mode 100644
index 0000000..50d037d
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate/update-the-manual.patch
@@ -0,0 +1,38 @@
+From e0b0fe30e9c49234994a20a86aacfaf80e690087 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 17 Feb 2015 21:14:37 -0800
+Subject: [PATCH] Update the manual
+
+Update the manual for rotating on different filesystems.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ logrotate.8 |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/logrotate.8 b/logrotate.8
+index e4e5f48..84407d0 100644
+--- a/logrotate.8
++++ b/logrotate.8
+@@ -405,12 +405,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option).
+ 
+ .TP
+ \fBolddir \fIdirectory\fR
+-Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be
+-on the same physical device as the log file being rotated, unless \fBcopy\fR,
+-\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR
+-is assumed to be relative to the directory holding the log file
+-unless an absolute path name is specified. When this option is used all
+-old versions of the log end up in \fIdirectory\fR.  This option may be
++Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
++is assumed to be relative to the directory holding the log file unless
++an absolute path name is specified. When this option is used all old
++versions of the log end up in \fIdirectory\fR. This option may be
+ overridden by the \fBnoolddir\fR option.
+ 
+ .TP
+-- 
+1.7.9.5
+
diff --git a/recipes-extended/logrotate/logrotate_3.8.7.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend
index efebecb..c8adb80 100644
--- a/recipes-extended/logrotate/logrotate_3.8.7.bbappend
+++ b/recipes-extended/logrotate/logrotate_%.bbappend
@@ -1,9 +1,14 @@
 PR .= ".mlinux2"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3"
+SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617"
+
 
 SRC_URI += "file://logrotate.conf"
 
+# consider Systemd here someday.  Also prevent logrotate from starting if it is already running
+# use startdaemon?
 do_install_append() {
 	# setup cron to run logrotate more often
 	rm -f ${D}${sysconfdir}/cron.daily/logrotate
diff --git a/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb b/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb
new file mode 100644
index 0000000..ef26ce4
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb
@@ -0,0 +1,73 @@
+SUMMARY = "Rotates, compresses, removes and mails system log files"
+SECTION = "console/utils"
+HOMEPAGE = "https://github.com/logrotate/logrotate/issues"
+LICENSE = "GPLv2"
+
+# TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it.
+# TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox?
+
+DEPENDS="coreutils popt"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
+
+# When updating logrotate to latest upstream, SRC_URI should point to
+# a proper release tarball from https://github.com/logrotate/logrotate/releases
+# and we have to take the snapshot for now because there is no such
+# tarball available for 3.9.1.
+
+S = "${WORKDIR}/${BPN}-r3-9-1"
+
+UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+
+SRC_URI = "https://github.com/${BPN}/${BPN}/archive/r3-9-1.tar.gz;downloadfilename=${BP}.tar.gz\
+           file://act-as-mv-when-rotate.patch \
+           file://update-the-manual.patch \
+           file://disable-check-different-filesystems.patch \
+           "
+
+SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3"
+SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617"
+
+# PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
+PACKAGECONFIG ?= "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+"
+
+PACKAGECONFIG[acl] = ",,acl"
+PACKAGECONFIG[selinux] = ",,libselinux"
+
+CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status \
+		    ${sysconfdir}/logrotate.conf"
+
+# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
+# optimization variables, so use it rather than EXTRA_CFLAGS.
+EXTRA_OEMAKE = "\
+    LFS= \
+    OS_NAME='${OS_NAME}' \
+    'CC=${CC}' \
+    'RPM_OPT_FLAGS=${CFLAGS}' \
+    'EXTRA_LDFLAGS=${LDFLAGS}' \
+    ${@bb.utils.contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes', '', d)} \
+"
+
+# OS_NAME in the makefile defaults to `uname -s`. The behavior for
+# freebsd/netbsd is questionable, so leave it as Linux, which only sets
+# INSTALL=install and BASEDIR=/usr.
+OS_NAME = "Linux"
+
+do_compile_prepend() {
+    # Make sure the recompile is OK
+    rm -f ${B}/.depend
+}
+
+do_install(){
+    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
+    mkdir -p ${D}${sysconfdir}/logrotate.d
+    mkdir -p ${D}${sysconfdir}/cron.daily
+    mkdir -p ${D}${localstatedir}/lib
+    install -p -m 644 examples/logrotate-default ${D}${sysconfdir}/logrotate.conf
+    install -p -m 755 examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate
+    touch ${D}${localstatedir}/lib/logrotate.status
+}
diff --git a/recipes-extended/monit/monit_5.12.2.bb b/recipes-extended/monit/monit_5.22.0.bb
index ddd2ea9..3ad3074 100644
--- a/recipes-extended/monit/monit_5.12.2.bb
+++ b/recipes-extended/monit/monit_5.22.0.bb
@@ -2,26 +2,34 @@ DESCRIPTION = "Monit"
 HOMEPAGE = "http://mmonit.com/"
 LICENSE = "AGPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-DEPENDS = "libpam"
+DEPENDS = "libpam zlib openssl"
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "http://mmonit.com/monit/dist/monit-5.12.2.tar.gz \
+SRC_URI = "http://mmonit.com/monit/dist/monit-5.22.0.tar.gz \
            file://monitrc \
            file://monit.init \
            file://monit.default \
            "
 
-SRC_URI[md5sum] = "5f5cf4c18b42e8091b49b4e07cf972ce"
-SRC_URI[sha256sum] = "8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c"
+SRC_URI[md5sum] = "768a637b8d23b6cbce271a8ff125c61f"
+SRC_URI[sha256sum] = "9fc58b5e3caafd64f0b6fff3e65ae757239fab37d04fb33efce177da15176183"
 
-inherit autotools
+inherit autotools-brokensep
 
 EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \
                 --with-ssl-incl-dir=${STAGING_INCDIR} \
                 "
 
-EXTRA_OECONF_append_armv5 = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
+# Regenerate autoconfig generated aclocal.m4/m4 contained in the tarball
+EXTRA_AUTORECONF += " --force"
+
+do_configure_prepend() {
+    rm ${S}/aclocal.m4
+    rm -Rf ${S}/m4
+}
+
+EXTRA_OECONF_append_arm = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
 
 inherit update-rc.d
 
diff --git a/recipes-extended/multitech/sms-utils.inc b/recipes-extended/multitech/sms-utils.inc
index 9deea31..5a13eff 100644
--- a/recipes-extended/multitech/sms-utils.inc
+++ b/recipes-extended/multitech/sms-utils.inc
@@ -10,7 +10,7 @@ SRCREV = "${PV}"
 SRC_URI = "git://git.multitech.net/sms-utils.git;protocol=git"
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools-brokensep
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes-extended/sudo/sudo/privacy b/recipes-extended/sudo/sudo/privacy
new file mode 100644
index 0000000..7c03615
--- /dev/null
+++ b/recipes-extended/sudo/sudo/privacy
@@ -0,0 +1 @@
+Defaults      lecture = never
diff --git a/recipes-extended/sudo/sudo/sudoers.patch b/recipes-extended/sudo/sudo/sudoers.patch
new file mode 100644
index 0000000..aed0f10
--- /dev/null
+++ b/recipes-extended/sudo/sudo/sudoers.patch
@@ -0,0 +1,21 @@
+diff -uprN old/plugins/sudoers/sudoers.in new/plugins/sudoers/sudoers.in
+--- old/plugins/sudoers/sudoers.in	2015-10-31 18:34:59.000000000 -0500
++++ new/plugins/sudoers/sudoers.in	2017-04-20 10:32:19.530931283 -0500
+@@ -57,7 +57,7 @@
+ # Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
+ ##
+ ## Uncomment to use a hard-coded PATH instead of the user's to find commands
+-# Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
++Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ##
+ ## Uncomment to send mail if the user does not enter the correct password.
+ # Defaults mail_badpass
+@@ -85,7 +85,7 @@ root ALL=(ALL) ALL
+ # %wheel ALL=(ALL) NOPASSWD: ALL
+ 
+ ## Uncomment to allow members of group sudo to execute any command
+-# %sudo	ALL=(ALL) ALL
++%sudo	ALL=(ALL) ALL
+ 
+ ## Uncomment to allow any user to run sudo if they know the password
+ ## of the user they are running the command as (root by default).
diff --git a/recipes-extended/sudo/sudo_%.bbappend b/recipes-extended/sudo/sudo_%.bbappend
new file mode 100644
index 0000000..a1e4b04
--- /dev/null
+++ b/recipes-extended/sudo/sudo_%.bbappend
@@ -0,0 +1,12 @@
+SRC_URI += "file://sudoers.patch \
+            file://privacy"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+
+CONFFILES_${PN} += "${sysconfdir}/sudoers.d/privacy"
+
+do_install_append() {
+    install -D -m 644 ${WORKDIR}/privacy ${D}/${sysconfdir}/sudoers.d
+}
+
diff --git a/recipes-extended/uvccapture/uvccapture_0.5.bb b/recipes-extended/uvccapture/uvccapture_0.5.bb
index 57fe424..92e781e 100644
--- a/recipes-extended/uvccapture/uvccapture_0.5.bb
+++ b/recipes-extended/uvccapture/uvccapture_0.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM="file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r1"
 
-inherit autotools
+inherit autotools-brokensep
 
 SRC_URI = "http://staticwave.ca/source/uvccapture/${PN}-${PV}.tar.bz2 \
 		   file://uvccapture_use_videodev2.patch \
diff --git a/recipes-java/openjdk/openjdk-7/jvm.cfg b/recipes-java/openjdk/openjdk-8/jvm.cfg
index 5a21e4e..5a21e4e 100644
--- a/recipes-java/openjdk/openjdk-7/jvm.cfg
+++ b/recipes-java/openjdk/openjdk-8/jvm.cfg
diff --git a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend b/recipes-java/openjdk/openjdk-8_102b14.bbappend
index c7a6e78..4a258d2 100644
--- a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend
+++ b/recipes-java/openjdk/openjdk-8_102b14.bbappend
@@ -3,4 +3,4 @@
 # openjdk-7 recipe is prepending to FILESPATH, so use
 # FILESPATH instead of FILESEXTRAPATH or our file doesn't
 # get picked up
-FILESPATH_prepend := "${THISDIR}/openjdk-7:"
+FILESPATH_prepend := "${THISDIR}/openjdk-8:"
diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb b/recipes-navigation/gpsd/gpsd_3.16.bb
index baeeb0b..4a428fc 100644
--- a/recipes-navigation/gpsd/gpsd_3.16.bb
+++ b/recipes-navigation/gpsd/gpsd_3.16.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools"
 PROVIDES = "virtual/gpsd"
 PR="m2"
+RDEPENDS_gpsd-conf += "bash"
 
 EXTRANATIVEPATH += "chrpath-native"
 
diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
index a020f90..d06be09 100644
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
+++ b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
@@ -9,16 +9,18 @@ DEPENDS = "ruby"
 
 PR = "r2"
 
-# tag v1.1.0
-SRCREV = "709e385f6d20aaadc7f3252af59250336d27e607"
+# tag v1.3.0
+SRCREV = "2781dbb1ffbf33d7c65478aa25dad5f954d0d3bf"
 
 SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/native/*.c
-  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
+  rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1)
+  ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c
+  ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
 }
 
 do_install() {
diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
index b3210e6..82998bc 100644
--- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb
+++ b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
@@ -1,20 +1,20 @@
 DESCRIPTION = "Ruby bindings for the SQLite3 embedded database"
-HOMEPAGE = "https://github.com/luislavena/sqlite3-ruby"
-LICENSE = "custom-freely-distributable"
+HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec"
 SECTION = "console/utils"
 PRIORITY = "optional"
 
 DEPENDS = "ruby sqlite3"
 
-PR = "r0"
-
-SRC_URI = "git://github.com/luislavena/sqlite3-ruby.git;tag=v${PV};protocol=git"
-
+SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;branch=1-3-stable;tag=v${PV}"
 S = "${WORKDIR}/git"
 
+# Position independent code for shared lib
+CFLAGS += "-fPIC"
+
 do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/sqlite3/*.c
+  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-2.2.0 -I${STAGING_INCDIR}/ruby-2.2.0/arm-linux-gnueabi -c ext/sqlite3/*.c -DHAVE_RB_INTEGER_PACK
   ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3
 }
 
diff --git a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend b/recipes-ruby/ruby/ruby_%.bbappend
index b31d44c..b31d44c 100644
--- a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend
+++ b/recipes-ruby/ruby/ruby_%.bbappend
diff --git a/recipes-support/libesmtp/libesmtp_1.0.6.bb b/recipes-support/libesmtp/libesmtp_1.0.6.bxb
index e421e63..e421e63 100644
--- a/recipes-support/libesmtp/libesmtp_1.0.6.bb
+++ b/recipes-support/libesmtp/libesmtp_1.0.6.bxb
diff --git a/recipes-support/libmpsse/libmpsse_1.3.bb b/recipes-support/libmpsse/libmpsse_1.3.bb
index e534281..f1d9723 100644
--- a/recipes-support/libmpsse/libmpsse_1.3.bb
+++ b/recipes-support/libmpsse/libmpsse_1.3.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "08f2a0025074720d40e29430089b1ab78d764756cc5d2bcb3148d98131
 
 S = "${WORKDIR}/libmpsse-${PV}/src"
 
-inherit autotools
+inherit autotools-brokensep
 
 EXTRA_OECONF += "--disable-python"
 CFLAGS += "-DLIBFTDI1=1"
diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
index b3c7313..c289d30 100644
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ b/recipes-support/multitech/jsparser_0.3.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "MultiTech Command Line JSON Parser"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "jsoncpp libmts"
+RDEPENDS_${PN} += "bash"
 
 PR = "r0"
 SRCREV="${PV}"
@@ -12,9 +13,8 @@ SRC_URI = "git://git.multitech.net/jsparser;branch=master \
 
 S = "${WORKDIR}/git"
 
-inherit autotools
-
 do_install_append() {
+    oe_runmake install DESTDIR=${D}
     install -d ${D}/usr/bin
     install -m 755 ${WORKDIR}/jspp ${D}/usr/bin/jspp
 }
diff --git a/recipes-support/ntp/files/logtime.patch b/recipes-support/ntp/files/logtime.patch
index 6b104ce..bb253f4 100644
--- a/recipes-support/ntp/files/logtime.patch
+++ b/recipes-support/ntp/files/logtime.patch
@@ -1,13 +1,9 @@
-  Create a test to log time since boot MONOTONIC_RAW or uptime
-  and the REALTIME clock (UTC)
-  Not real sure how the build should work.  To build logtime
-  do bitbake -c devshell ntp
-  Then cd clockstuff, and to:
-  make logtime
-==============================================================
-diff -Naur old/clockstuff/logtime.c new/clockstuff/logtime.c
---- old/clockstuff/logtime.c	1969-12-31 18:00:00.000000000 -0600
-+++ new/clockstuff/logtime.c	2017-01-27 16:55:46.420307603 -0600
+# The logtime test is used to compare the kernel realtime
+# clock and the kernel monotonic clock, so that leap
+# second may be observed.
+diff -Naru old/tests/ntpd/logtime.c new/tests/ntpd/logtime.c
+--- old/tests/ntpd/logtime.c	1969-12-31 18:00:00.000000000 -0600
++++ new/tests/ntpd/logtime.c	2017-05-30 13:22:11.827179154 -0500
 @@ -0,0 +1,44 @@
 +#include <time.h>
 +#include <stdio.h>
@@ -53,27 +49,25 @@ diff -Naur old/clockstuff/logtime.c new/clockstuff/logtime.c
 +	}	
 +
 +}
-diff -Naur old/clockstuff/Makefile.am new/clockstuff/Makefile.am
---- old/clockstuff/Makefile.am	2017-01-27 16:50:58.929973639 -0600
-+++ new/clockstuff/Makefile.am	2017-01-27 16:53:22.625139584 -0600
-@@ -1,7 +1,7 @@
- #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
- AUTOMAKE_OPTIONS = 
--noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
--EXTRA_PROGRAMS = propdelay chutest clktest
-+noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@ @LOGTIME@
-+EXTRA_PROGRAMS = propdelay chutest clktest logtime
+diff -Naru old/tests/ntpd/Makefile.am new/tests/ntpd/Makefile.am
+--- old/tests/ntpd/Makefile.am	2017-05-30 13:31:45.124160267 -0500
++++ new/tests/ntpd/Makefile.am	2017-05-30 16:53:59.784755988 -0500
+@@ -29,6 +29,7 @@
+ 	test-ntp_restrict	\
+ 	test-ntp_scanner	\
+ 	test-ntp_signd		\
++        logtime		        \
+ 	$(NULL)
  
- INCLUDES = -I$(top_srcdir)/include
- # We need -lm (and perhaps $(COMPAT) for propdelay, -lntp for {chu,clk}test
-diff -Naur old/configure.ac new/configure.ac
---- old/configure.ac	2017-01-27 17:59:46.940532782 -0600
-+++ new/configure.ac	2017-01-27 17:55:26.626841232 -0600
-@@ -4115,6 +4115,7 @@
- AC_SUBST([PROPDELAY])	dnl Set to "propdelay"
- AC_SUBST([CHUTEST])	dnl Set to "chutest"
- AC_SUBST([CLKTEST])	dnl Set to "clktest"
-+AC_SUBST([LOGTIME])	dnl Set to "logtime"
  
- AC_SUBST([MAKE_ADJTIMED])
- AC_MSG_CHECKING([if we want HP-UX adjtimed support])
+@@ -191,8 +192,8 @@
+ ## check-libntp.mf - automake fragment
+ ## slightly adapted for deeper directory
+ 
+-BUILT_SOURCES	+= check-libntpd check-libntp check-libunity
+-CLEANFILES	+= check-libntpd check-libntp check-libunity
++BUILT_SOURCES	+= check-libntpd check-libntp check-libunity logtime
++CLEANFILES	+= check-libntpd check-libntp check-libunity logtime
+ 
+ check-libntpd: ../../ntpd/libntpd.a
+ 	@echo stamp > $@
diff --git a/recipes-support/ntp/files/ntp.conf.patch b/recipes-support/ntp/files/ntp.conf.patch
index bb1dcfe..1a40d24 100644
--- a/recipes-support/ntp/files/ntp.conf.patch
+++ b/recipes-support/ntp/files/ntp.conf.patch
@@ -1,11 +1,11 @@
-diff -Naur old/ntp.conf new/ntp.conf
---- old/ntp.conf	2017-02-02 19:09:54.524791189 -0600
-+++ new/ntp.conf	2017-02-02 19:06:41.744669788 -0600
+diff -Naru orig.new/ntp.conf up/ntp.conf
+--- orig.new/ntp.conf	2017-05-30 10:44:16.311034239 -0500
++++ up/ntp.conf	2017-05-30 10:37:42.837793409 -0500
 @@ -1,16 +1,47 @@
 -# This is the most basic ntp configuration file
  # The driftfile must remain in a place specific to this
  # machine - it records the machine specific clock error
--driftfile /etc/ntp.drift
+-driftfile /var/lib/ntp/drift
 +# Driftfile must be in a directory owned by ntp
 +driftfile /var/lib/ntp/ntp.drift
 +
diff --git a/recipes-support/ntp/files/ntpd-init.patch b/recipes-support/ntp/files/ntpd-init.patch
index 2ef7e0b..1890e07 100644
--- a/recipes-support/ntp/files/ntpd-init.patch
+++ b/recipes-support/ntp/files/ntpd-init.patch
@@ -1,17 +1,23 @@
-diff -Naur old/ntpd new/ntpd
---- old/ntpd	2017-02-06 09:21:52.607908299 -0600
-+++ new/ntpd	2017-02-06 09:22:52.417169090 -0600
-@@ -1,6 +1,8 @@
+diff -Naru old/ntpd up/ntpd
+--- old/ntpd	2017-05-30 11:08:30.368920821 -0500
++++ up/ntpd	2017-05-30 11:52:42.965527343 -0500
+@@ -1,4 +1,4 @@
 -#! /bin/sh
 +#! /bin/bash
- #
+ 
+ ### BEGIN INIT INFO
+ # Provides:        ntp
+@@ -9,7 +9,9 @@
+ # Short-Description: Start NTP daemon
+ ### END INIT INFO
+ 
 +. /etc/default/ntpd
  PATH=/sbin:/bin:/usr/bin:/usr/sbin
 +GNSSRST=/sys/devices/platform/mts-io/gnss-reset
  
- # ntpd	init.d script for ntpdc from ntp.isc.org
- test -x /usr/sbin/ntpd -a -r /etc/ntp.conf || exit 0
-@@ -18,13 +20,29 @@
+ DAEMON=/usr/sbin/ntpd
+ PIDFILE=/var/run/ntpd.pid
+@@ -34,13 +36,35 @@
  	}
  }
  startdaemon(){
@@ -20,7 +26,7 @@ diff -Naur old/ntpd new/ntpd
 -	# this.  If ntpd seems to disappear after a while assume TICKADJ
 -	# above is set to a totally incorrect value.
 -	echo -n "Starting ntpd: "
--	start-stop-daemon --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@"
+-	start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
 -	echo "done"
 +	/usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd --test -- -u ntp:ntp -p /var/run/ntp.pid "$@" \
 +	  || return 1
@@ -32,7 +38,7 @@ diff -Naur old/ntpd new/ntpd
 +		   # use the ntpd one shot option to get to less than
 +		   # 250mS error so that we don't waste time adjusting the clock.
 +		   /usr/sbin/ntpd -gq
-+		   /usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@"
++		   start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
 +		else
 +		  # Need a GPS fix before startint ntp.  Try again later.
 +		  /usr/sbin/start-stop-daemon -b -n z1e9d3qb -N -20 --start -x /bin/bash -- -c "sleep $GPSD_WAIT_TIME;/etc/init.d/ntpd start"
@@ -43,17 +49,21 @@ diff -Naur old/ntpd new/ntpd
 +	    ntpd -gq
 +	    shift
 +	  fi
-+	  /usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@"
++	  # The -g option allows ntpd to step the time to correct it just
++	  # once.  The daemon will exit if the clock drifts too much after
++	  # this.  If ntpd seems to disappear after a while assume TICKADJ
++	  # above is set to a totally incorrect value.
++	  echo -n "Starting ntpd: "
++	  start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
++	  echo "done"
 +	fi
  }
  stopdaemon(){
  	echo -n "Stopping ntpd: "
-@@ -34,24 +52,38 @@
+@@ -50,6 +74,20 @@
  
  case "$1" in
    start)
--  	settick
--	startdaemon -g
 +	if ! [[ $ENABLED =~ ^[yY][eE][sS]$ ]] ; then
 +		exit 0
 +	fi
@@ -68,29 +78,6 @@ diff -Naur old/ntpd new/ntpd
 +			chown ntp:ntp ${STATSDIR} >/dev/null 2>&1
 +		fi
 +	fi
-+	settick
-+	startdaemon -g $CONFIGOPT
- 	;;
-   stop)
--  	stopdaemon
-+	stopdaemon
- 	;;
-   force-reload)
--  	stopdaemon
--  	settick
-+	stopdaemon
-+	settick
+   	settick
  	startdaemon -g
  	;;
-   restart)
--  	# Don't reset the tick here
-+	# Don't reset the tick here
- 	stopdaemon
- 	startdaemon -g
- 	;;
-   reload)
--  	# Must do this by hand, but don't do -g
-+	# Must do this by hand, but don't do -g
- 	stopdaemon
- 	startdaemon
- 	;;
diff --git a/recipes-support/ntp/ntp_4.2.6p5.bbappend b/recipes-support/ntp/ntp_%.bbappend
index 8460fda..6ce3cb2 100644
--- a/recipes-support/ntp/ntp_4.2.6p5.bbappend
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -1,11 +1,13 @@
 PR .= ".mlinux2"
 
-SRC_URI += " file://ntpd-init.patch;patchdir=.. \
-             file://ntp.conf.patch;patchdir=.. \
-             file://ntpd-default \
-             file://logtime.patch \
+SRC_URI += " file://ntpd-default \
+    file://ntp.conf.patch;patchdir=.. \
+    file://ntpd-init.patch;patchdir=.. \
+    file://logtime.patch \
 		"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+RDEPENDS_${PN} += "bash"
 
 python do_patch_prepend () {
     import os
diff --git a/scripts/build-feed-extras.sh b/scripts/build-feed-extras.sh
index 4b111c8..fb58eca 100755
--- a/scripts/build-feed-extras.sh
+++ b/scripts/build-feed-extras.sh
@@ -4,7 +4,7 @@
 FS_PACKAGES="sshfs-fuse fuse-exfat exfat-utils"
 NET_PACKAGES="wget netcat ipsec-tools openvpn iftop dnsmasq strongswan stunnel tunctl ethtool"
 UTIL_PACKAGES="logrotate fatrace stressapptest gawk rsyslog zip gnupg rrdtool"
-DEV_PACKAGES="node-red mono gdb git vim python-pip python-pyopenssl"
+DEV_PACKAGES="node-red mono gdb git vim python-pip python-pyopenssl openjdk-8"
 SUP_PACKAGES="pps-tools setserial"
 
 bitbake linux-firmware $FS_PACKAGES $NET_PACKAGES $UTIL_PACKAGES $DEV_PACKAGES $SUP_PACKAGES