From 9534484050448d6a462173cde273181afd173e7b Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Fri, 23 Nov 2012 18:38:10 +0100
Subject: [PATCH] meta-digi-del: Add del-network feature.

This feature requires the addition of meta-openembedded/meta-oe. The
addition of the meta-oe layers breaks the build as recipes of that layer
change existing recipes. Fixes follow.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 meta-digi-del/classes/del-image.bbclass       |  1 +
 .../tasks/task-del-network.bb                 | 51 +++++++++++++++++++
 .../vsftpd_2.3.5/vsftpd_2.3.5.bbappend        |  4 ++
 .../recipes-core/images/del-image-minimal.bb  |  5 ++
 4 files changed, 61 insertions(+)
 create mode 100644 meta-digi-del/recipes-connectivity/tasks/task-del-network.bb
 create mode 100644 meta-digi-del/recipes-connectivity/vsftpd_2.3.5/vsftpd_2.3.5.bbappend

diff --git a/meta-digi-del/classes/del-image.bbclass b/meta-digi-del/classes/del-image.bbclass
index 5f32aecd2..be97a1c4d 100644
--- a/meta-digi-del/classes/del-image.bbclass
+++ b/meta-digi-del/classes/del-image.bbclass
@@ -4,3 +4,4 @@
 
 PACKAGE_GROUP_del-audio = "task-del-audio"
 PACKAGE_GROUP_del-gstreamer = "task-del-gstreamer"
+PACKAGE_GROUP_del-network = "task-del-network"
diff --git a/meta-digi-del/recipes-connectivity/tasks/task-del-network.bb b/meta-digi-del/recipes-connectivity/tasks/task-del-network.bb
new file mode 100644
index 000000000..cb4e9dd8b
--- /dev/null
+++ b/meta-digi-del/recipes-connectivity/tasks/task-del-network.bb
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2012 Digi International.
+#
+DESCRIPTION = "Network applications task for DEL image"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+ALLOW_EMPTY = "1"
+PR = "r0"
+
+#
+# Set by the machine configuration with packages essential for device bootup
+#
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+
+# Distro can override the following VIRTUAL-RUNTIME providers:
+VIRTUAL-RUNTIME_ftp-server ?= ""
+#VIRTUAL-RUNTIME_ftp-server ?= "vsftpd"
+
+VIRTUAL-RUNTIME_http-server ?= ""
+#VIRTUAL-RUNTIME_http-server ?= "cherokee"
+
+# Choose between ethtool or mii-tool
+VIRTUAL-RUNTIME_network-utils ?= "ethtool"
+#VIRTUAL-RUNTIME_network-utils ?= "net-tools"
+
+VIRTUAL-RUNTIME_snmp-manager ?= ""
+#VIRTUAL-RUNTIME_snmp-manager ?= "net-snmp-server net-snmp-client"
+
+PACKAGES = "\
+	task-del-network \
+	task-del-network-dbg \
+	task-del-network-dev \
+    "
+
+RDEPENDS_task-del-network = "\
+	bridge-utils \
+	socat \
+	ppp \
+	iproute2 \
+	${VIRTUAL-RUNTIME_ftp-server} \
+	${VIRTUAL-RUNTIME_http-server} \
+	${VIRTUAL-RUNTIME_network-utils} \
+	${VIRTUAL-RUNTIME_snmp-manager} \
+	${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-del-network = "\
+    ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
+
+
diff --git a/meta-digi-del/recipes-connectivity/vsftpd_2.3.5/vsftpd_2.3.5.bbappend b/meta-digi-del/recipes-connectivity/vsftpd_2.3.5/vsftpd_2.3.5.bbappend
new file mode 100644
index 000000000..defc4b134
--- /dev/null
+++ b/meta-digi-del/recipes-connectivity/vsftpd_2.3.5/vsftpd_2.3.5.bbappend
@@ -0,0 +1,4 @@
+PR_del = "r0+${DISTRO}.0"
+DEPENDS_append_del += "openssl"
+LDFLAGS_del = "-lcap"
+
diff --git a/meta-digi-del/recipes-core/images/del-image-minimal.bb b/meta-digi-del/recipes-core/images/del-image-minimal.bb
index e13477d80..cf95f9dc7 100644
--- a/meta-digi-del/recipes-core/images/del-image-minimal.bb
+++ b/meta-digi-del/recipes-core/images/del-image-minimal.bb
@@ -12,9 +12,14 @@ LICENSE = "MIT"
 inherit core-image
 inherit del-image
 
+# These features will move to the project's local.conf
+# where they can be customized by platform.
+
+# Only common features to remain here.
 IMAGE_FEATURES = "ssh-server-dropbear"
 IMAGE_FEATURES += "del-audio"
 IMAGE_FEATURES += "del-gstreamer"
+IMAGE_FEATURES += "del-network"
 
 # core-image disables the root password if debug-tweak is not enabled.
 # This override will use the shadow file instead.