From 30162ca76c6bc1b4bafe20dd3ec2956a41405148 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 20 Jan 2017 16:14:21 +0100 Subject: [PATCH] cloudconnector: simplify recipe for static library For the moment the cloudconnector is provided only as static library, so the recipe can be simplified. https://jira.digi.com/browse/DEL-3523 Signed-off-by: Javier Viguera --- .../packagegroups/packagegroup-dey-core.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index ab8f2f455..d8201c7dd 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -32,7 +32,7 @@ RDEPENDS_${PN} = "\ busybox \ busybox-acpid \ busybox-static-nodes \ - cloudconnector-bin \ + cloudconnector \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "${VIRTUAL-RUNTIME_touchscreen}", "",d)} \ diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index 024116826..57c0c679a 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -14,19 +14,16 @@ SRC_URI = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh;branch=${SRCBRA S = "${WORKDIR}/git" +inherit pkgconfig + do_install() { oe_runmake DESTDIR=${D} install } -PACKAGES =+ "${PN}-bin ${PN}-cert" +PACKAGES =+ "${PN}-cert" -FILES_${PN}-bin += "${sysconfdir}/cc.conf" FILES_${PN}-cert = "${sysconfdir}/ssl/certs/Digi_Int-ca-cert-public.crt" -CONFFILES_${PN}-bin += "${sysconfdir}/cc.conf" - -DEBIAN_NOAUTONAME_${PN}-bin = "1" -DEBIAN_NOAUTONAME_${PN}-cert = "1" +CONFFILES_${PN} += "${sysconfdir}/cc.conf" RDEPENDS_${PN} = "${PN}-cert" -RDEPENDS_${PN}-bin = "${PN}-cert"