Initial commit of Yocto 2.1 changes

23 files changed, 7 insertions, 30 deletions

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 1ad1f27..17b68c0 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -30,7 +30,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages to add to images
-DISTRO_EXTRA_RDEPENDS += "mlinux-version"
+#DISTRO_EXTRA_RDEPENDS += "mlinux-version"
 
 # add mlinux source mirror
 INHERIT += "mlinux-mirrors"
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/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.bb b/recipes-connectivity/ppp/ppp_2.4.7.bb
index 881c40e..4d9094c 100644
--- a/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -34,7 +34,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
 SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30"
 
-inherit autotools
+inherit autotools-brokensep
 
 TARGET_CC_ARCH += " ${LDFLAGS}"
 EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}"
diff --git a/recipes-core/busybox/busybox_1.22.1.bbappend b/recipes-core/busybox/busybox_%.bbappend
index 40094e9..40094e9 100644
--- a/recipes-core/busybox/busybox_1.22.1.bbappend
+++ b/recipes-core/busybox/busybox_%.bbappend
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/mlinux/mlinux-version.bb b/recipes-core/mlinux/mlinux-version.bb.orig
index f2debe1..f2debe1 100644
--- a/recipes-core/mlinux/mlinux-version.bb
+++ b/recipes-core/mlinux/mlinux-version.bb.orig
diff --git a/recipes-core/udev/udev-182/cellular_radios.rules b/recipes-core/udev/eudev-3.1.5/cellular_radios.rules
index fd36bbd..aa05e96 100644
--- a/recipes-core/udev/udev-182/cellular_radios.rules
+++ b/recipes-core/udev/eudev-3.1.5/cellular_radios.rules
@@ -14,13 +14,6 @@ ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6"
-# LAT3, LVW3 and LEU3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="02", SYMLINK+="modem1"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="04", SYMLINK+="modem2"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem3"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
 # EV3
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
@@ -41,9 +34,6 @@ ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}"
 # H5: ttyACM0, ttyACM3
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
-# LAT3, LVW3 and LEU3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
 # EV3: ttyUSB2, ttyUSB3
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1"
diff --git a/recipes-core/udev/udev-182/init b/recipes-core/udev/eudev-3.1.5/init
index bd716b0..bd716b0 100644
--- a/recipes-core/udev/udev-182/init
+++ b/recipes-core/udev/eudev-3.1.5/init
diff --git a/recipes-core/udev/udev-182/mtcap/mtcap.rules b/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
index a0dc9fb..a0dc9fb 100644
--- a/recipes-core/udev/udev-182/mtcap/mtcap.rules
+++ b/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
diff --git a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
index 376486b..376486b 100644
--- a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules
+++ b/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
diff --git a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
index 5d528e6..5d528e6 100644
--- a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules
+++ b/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
diff --git a/recipes-core/udev/udev-182/udev-cache.default b/recipes-core/udev/eudev-3.1.5/udev-cache.default
index b1aa63f..b1aa63f 100644
--- a/recipes-core/udev/udev-182/udev-cache.default
+++ b/recipes-core/udev/eudev-3.1.5/udev-cache.default
diff --git a/recipes-core/udev/udev_182.bbappend b/recipes-core/udev/eudev_3.1.5.bbappend
index e793d1d..e793d1d 100644
--- a/recipes-core/udev/udev_182.bbappend
+++ b/recipes-core/udev/eudev_3.1.5.bbappend
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-extended/lighttpd/lighttpd_1.4.33.bbappend b/recipes-extended/lighttpd/lighttpd_%.bbappend
index 473a113..473a113 100644
--- a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
+++ b/recipes-extended/lighttpd/lighttpd_%.bbappend
diff --git a/recipes-extended/logrotate/logrotate_3.8.7.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend
index efebecb..efebecb 100644
--- a/recipes-extended/logrotate/logrotate_3.8.7.bbappend
+++ b/recipes-extended/logrotate/logrotate_%.bbappend
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-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/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
index b3c7313..e5e2687 100644
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ b/recipes-support/multitech/jsparser_0.3.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://git.multitech.net/jsparser;branch=master \
 
 S = "${WORKDIR}/git"
 
-inherit autotools
-
 do_install_append() {
     install -d ${D}/usr/bin
     install -m 755 ${WORKDIR}/jspp ${D}/usr/bin/jspp
diff --git a/recipes-support/ntp/ntp_4.2.6p5.bbappend b/recipes-support/ntp/ntp_%.bbappend
index 8460fda..6546de2 100644
--- a/recipes-support/ntp/ntp_4.2.6p5.bbappend
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -1,9 +1,6 @@
 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 \
 		"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files"