From 6e12274ad0008e13ca43e022409860aa89e061d1 Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Wed, 25 Oct 2017 17:28:39 +0200
Subject: Remerge aktualizr recipes.

I found the trick to allow specifiying target vs native variables and
tasks. It's a bit wordy but better than having three separate files for
the aktualizr recipe.

Oddly and annoyingly, while only "aktualizr" must be specified in
sota_bleeding.inc, both "BRANCH_pn-aktualizr" and
"BRANCH_pn-aktualizr-native" must be specified in local.conf to
correctly use a given branch.
---
 recipes-sota/aktualizr/aktualizr-native_git.bb | 18 ----------
 recipes-sota/aktualizr/aktualizr_common.inc    | 19 ----------
 recipes-sota/aktualizr/aktualizr_git.bb        | 50 ++++++++++++++++++++------
 3 files changed, 40 insertions(+), 47 deletions(-)
 delete mode 100644 recipes-sota/aktualizr/aktualizr-native_git.bb
 delete mode 100644 recipes-sota/aktualizr/aktualizr_common.inc

(limited to 'recipes-sota/aktualizr')

diff --git a/recipes-sota/aktualizr/aktualizr-native_git.bb b/recipes-sota/aktualizr/aktualizr-native_git.bb
deleted file mode 100644
index 70ebdf0..0000000
--- a/recipes-sota/aktualizr/aktualizr-native_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require aktualizr_common.inc
-
-DEPENDS = "boost-native glib-2.0-native curl-native openssl-native libarchive-native libsodium-native"
-
-inherit native
-
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF -DAKTUALIZR_VERSION=${PV}"
-
-do_install_append () {
-    rm -f ${D}${bindir}/aktualizr
-    rm -f ${D}${bindir}/aktualizr_cert_provider
-    rm -f ${D}${bindir}/garage-deploy
-}
-
-FILES_${PN} = " \
-                ${bindir}/aktualizr_implicit_writer \
-                ${bindir}/garage-push \
-                "
diff --git a/recipes-sota/aktualizr/aktualizr_common.inc b/recipes-sota/aktualizr/aktualizr_common.inc
deleted file mode 100644
index 79c5e37..0000000
--- a/recipes-sota/aktualizr/aktualizr_common.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Aktualizr SOTA Client"
-DESCRIPTION = "SOTA Client application written in C++"
-HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
-SECTION = "base"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
-
-PV = "1.0+git${SRCPV}"
-PR = "7"
-
-SRC_URI = " \
-  git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
-  "
-SRCREV = "67c4f44c4136d16871726449502e3926098e8524"
-BRANCH ?= "master"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 7c65eb7..470c9bf 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -1,22 +1,52 @@
-require aktualizr_common.inc
+SUMMARY = "Aktualizr SOTA Client"
+DESCRIPTION = "SOTA Client application written in C++"
+HOMEPAGE = "https://github.com/advancedtelematic/aktualizr"
+SECTION = "base"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "boost curl jansson openssl libarchive libsodium ostree"
-RDEPENDS_${PN} = "lshw"
+DEPENDS = "boost curl openssl libarchive libsodium "
+DEPENDS_append_class-target = "jansson ostree ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' libp11', '', d)} "
+DEPENDS_append_class-native = "glib-2.0-native "
 
-DEPENDS_append = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' libp11', '', d)}"
-RDEPENDS_${PN}_append = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)}"
-RDEPENDS_${PN}_append = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm-test', ' softhsm softhsm-testtoken', '', d)}"
+RDEPENDS_${PN}_class-target = "lshw "
+RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} "
+RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm-test', ' softhsm softhsm-testtoken', '', d)} "
 
-inherit systemd
+PV = "1.0+git${SRCPV}"
+PR = "7"
 
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_OSTREE=ON ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} -DAKTUALIZR_VERSION=${PV}"
+SRC_URI = " \
+  git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
+  "
+SRCREV = "67c4f44c4136d16871726449502e3926098e8524"
+BRANCH ?= "master"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+BBCLASSEXTEND =+ "native"
+
+EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DAKTUALIZR_VERSION=${PV} "
+EXTRA_OECMAKE_append_class-target = "-DBUILD_OSTREE=ON ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} "
+EXTRA_OECMAKE_append_class-native = "-DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF "
 
 do_install_append () {
     rm -f ${D}${bindir}/aktualizr_cert_provider
-    rm -f ${D}${bindir}/aktualizr_implicit_writer
     rm -f ${D}${bindir}/garage-deploy
 }
+do_install_append_class-target () {
+    rm -f ${D}${bindir}/aktualizr_implicit_writer
+}
+do_install_append_class-native () {
+    rm -f ${D}${bindir}/aktualizr
+}
 
-FILES_${PN} = " \
+FILES_${PN}_class-target = " \
                 ${bindir}/aktualizr \
                 "
+FILES_${PN}_class-native = " \
+                ${bindir}/aktualizr_implicit_writer \
+                ${bindir}/garage-push \
+                "
-- 
cgit v1.2.3-54-g00ecf