Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tatiana Leon 2017-06-13 11:19:54 +02:00
parent ab909175f0
commit 78843e5cba
2 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta-digi-dey/recipes-aws/awsiotsdk-c/awsiotsdk-c_2.1.1.bb
View File

@ -54,36 +54,15 @@ do_configure() {
do_install() { do_install() {
oe_runmake DESTDIR=${D} install oe_runmake DESTDIR=${D} install
# Check if certificate variables are defined and files exist. # Install certificates only if they exist.
if [ -z "${AWS_IOT_CERTS_DIR}" ]; then if [ -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_ROOT_CA_FILENAME}" ] && \
bberror "Undefined variable AWS_IOT_CERTS_DIR. Define it in your project 'local.conf'." [ -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_CERTIFICATE_FILENAME}" ] && \
return -1 [ -f "${AWS_IOT_CERTS_DIR}/${AWS_IOT_PRIVATE_KEY_FILENAME}" ]; then
elif [ ! -d "${AWS_IOT_CERTS_DIR}" ]; then install -m 0644 "${AWS_IOT_CERTS_DIR}/${AWS_IOT_ROOT_CA_FILENAME}" ${D}${sysconfdir}/ssl/certs/
bberror "Unable to find defined AWS_IOT_CERTS_DIR ('${AWS_IOT_CERTS_DIR}')." install -m 0644 "${AWS_IOT_CERTS_DIR}/${AWS_IOT_CERTIFICATE_FILENAME}" ${D}${sysconfdir}/ssl/certs/
return -1 install -m 0644 "${AWS_IOT_CERTS_DIR}/${AWS_IOT_PRIVATE_KEY_FILENAME}" ${D}${sysconfdir}/ssl/certs/
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
fi 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" ALLOW_EMPTY_${PN} = "1"

2
meta-digi-dey/recipes-digi/dey-examples/awsiotsdk-demo_git.bb
View File

@ -45,7 +45,5 @@ do_install() {
oe_runmake DESTDIR=${D} install oe_runmake DESTDIR=${D} install
} }
RDEPENDS_${PN} = "awsiotsdk-c-cert"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"