From e92b269f27ac2337afc1a8d8af86bc747dd31f5e Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Fri, 24 Feb 2017 17:53:10 +0100 Subject: Fix several critical bugs in morty --- classes/image_types_ostree.bbclass | 2 +- recipes-sota/rvi-sota-client/rvi-sota-client_git.bb | 3 +-- recipes-support/libgit2/libgit2.inc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 8bc0a52..8b3cbcd 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -4,7 +4,7 @@ inherit image IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ virtual/kernel:do_deploy \ - ${OSTREE_INITRAMFS_IMAGE}:do_image_ext4" + ${OSTREE_INITRAMFS_IMAGE}:do_image_complete" export OSTREE_REPO export OSTREE_BRANCHNAME diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb index 459cf6b..c469ac7 100644 --- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb +++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb @@ -101,10 +101,9 @@ SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c SYSTEMD_SERVICE_${PN} = "sota_client.service" -DEPENDS += " openssl " +DEPENDS += " openssl dbus" RDEPENDS_${PN} = " libcrypto \ libssl \ - dbus \ bash \ lshw \ jq \ diff --git a/recipes-support/libgit2/libgit2.inc b/recipes-support/libgit2/libgit2.inc index fe0f647..a0da834 100644 --- a/recipes-support/libgit2/libgit2.inc +++ b/recipes-support/libgit2/libgit2.inc @@ -12,7 +12,7 @@ EXTRA_OECMAKE = "\ -DBUILD_CLAR=OFF \ -DSHA1_TYPE="builtin" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DBUILD_EXAMPLES=OFF \ " -- cgit v1.2.3-54-g00ecf