From 78843e5cba0ee617b2582b06973b6fae5f15d5cb Mon Sep 17 00:00:00 2001
From: Tatiana Leon <tatiana.leon@digi.com>
Date: Tue, 13 Jun 2017 11:19:54 +0200
Subject: [PATCH] aws-iot-sdk: remove certificates dependency

Only copy the certificates to the image if they are provided and exists.

https://jira.digi.com/browse/DEL-4339

Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>
---
 .../awsiotsdk-c/awsiotsdk-c_2.1.1.bb          | 35 ++++---------------
 .../dey-examples/awsiotsdk-demo_git.bb        |  2 --
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb b/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb
index 82f0caddb..ed73c4ac6 100644
--- a/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb
+++ b/meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb
@@ -54,36 +54,15 @@ do_configure() {
 do_install() {
 	oe_runmake DESTDIR=${D} install
 
-	# Check if certificate variables are defined and files exist.
-	if [ -z "${AWS_IOT_CERTS_DIR}" ]; then
-		bberror "Undefined variable AWS_IOT_CERTS_DIR. Define it in your project 'local.conf'."
-		return -1
-	elif [ ! -d "${AWS_IOT_CERTS_DIR}" ]; then
-		bberror "Unable to find defined AWS_IOT_CERTS_DIR ('${AWS_IOT_CERTS_DIR}')."
-		return -1
-	elif [ ! -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_ROOT_CA_FILENAME}" ]; then
-		bberror "Unable to find defined AWS_IOT_ROOT_CA_FILENAME ('${AWS_IOT_ROOT_CA_FILENAME}') in '${AWS_IOT_CERTS_DIR}'."
-		return -1
-	elif [ ! -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_CERTIFICATE_FILENAME}" ]; then
-		bberror "Unable to find defined AWS_IOT_CERTIFICATE_FILENAME ('${AWS_IOT_CERTIFICATE_FILENAME}') in '${AWS_IOT_CERTS_DIR}'."
-		return -1
-	elif [ ! -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_PRIVATE_KEY_FILENAME}" ]; then
-		bberror "Unable to find defined AWS_IOT_PRIVATE_KEY_FILENAME ('${AWS_IOT_PRIVATE_KEY_FILENAME}') in '${AWS_IOT_CERTS_DIR}'."
-		return -1
+	# Install certificates only if they exist.
+	if [ -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_ROOT_CA_FILENAME}" ] && \
+	   [ -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_CERTIFICATE_FILENAME}" ] && \
+	   [ -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_PRIVATE_KEY_FILENAME}" ]; then
+		install -m 0644 "${AWS_IOT_CERTS_DIR}/${AWS_IOT_ROOT_CA_FILENAME}" ${D}${sysconfdir}/ssl/certs/
+		install -m 0644 "${AWS_IOT_CERTS_DIR}/${AWS_IOT_CERTIFICATE_FILENAME}" ${D}${sysconfdir}/ssl/certs/
+		install -m 0644 "${AWS_IOT_CERTS_DIR}/${AWS_IOT_PRIVATE_KEY_FILENAME}" ${D}${sysconfdir}/ssl/certs/
 	fi
-
-	# Install certificates.
-	install -d ${D}${sysconfdir}/ssl/certs
-	install -m 0644 ${AWS_IOT_CERTS_DIR}/${AWS_IOT_ROOT_CA_FILENAME} ${D}${sysconfdir}/ssl/certs/
-	install -m 0644 ${AWS_IOT_CERTS_DIR}/${AWS_IOT_CERTIFICATE_FILENAME} ${D}${sysconfdir}/ssl/certs/
-	install -m 0644 ${AWS_IOT_CERTS_DIR}/${AWS_IOT_PRIVATE_KEY_FILENAME} ${D}${sysconfdir}/ssl/certs/
 }
 
-PACKAGES =+ "${PN}-cert"
-
-FILES_${PN}-cert = "${sysconfdir}/ssl/certs/"
-
-RDEPENDS_${PN} = "${PN}-cert"
-
 ALLOW_EMPTY_${PN} = "1"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
index 156f6eed8..16674b4e0 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
@@ -45,7 +45,5 @@ do_install() {
 	oe_runmake DESTDIR=${D} install
 }
 
-RDEPENDS_${PN} = "awsiotsdk-c-cert"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"