diff options
author | Anton Gerasimov <anton@advancedtelematic.com> | 2017-02-24 17:53:10 +0100 |
---|---|---|
committer | Anton Gerasimov <anton@advancedtelematic.com> | 2017-02-24 17:53:10 +0100 |
commit | e92b269f27ac2337afc1a8d8af86bc747dd31f5e (patch) | |
tree | 8625f4f5b8aea6b75733c92f11cb35a441721ff1 | |
parent | f38fc412321c9cb6c17110d8a8aa6183823b0122 (diff) | |
download | meta-updater-e92b269f27ac2337afc1a8d8af86bc747dd31f5e.tar.gz |
Fix several critical bugs in morty
-rw-r--r-- | classes/image_types_ostree.bbclass | 2 | ||||
-rw-r--r-- | recipes-sota/rvi-sota-client/rvi-sota-client_git.bb | 3 | ||||
-rw-r--r-- | 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 | |||
4 | 4 | ||
5 | IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ | 5 | IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ |
6 | virtual/kernel:do_deploy \ | 6 | virtual/kernel:do_deploy \ |
7 | ${OSTREE_INITRAMFS_IMAGE}:do_image_ext4" | 7 | ${OSTREE_INITRAMFS_IMAGE}:do_image_complete" |
8 | 8 | ||
9 | export OSTREE_REPO | 9 | export OSTREE_REPO |
10 | export OSTREE_BRANCHNAME | 10 | 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 | |||
101 | 101 | ||
102 | SYSTEMD_SERVICE_${PN} = "sota_client.service" | 102 | SYSTEMD_SERVICE_${PN} = "sota_client.service" |
103 | 103 | ||
104 | DEPENDS += " openssl " | 104 | DEPENDS += " openssl dbus" |
105 | RDEPENDS_${PN} = " libcrypto \ | 105 | RDEPENDS_${PN} = " libcrypto \ |
106 | libssl \ | 106 | libssl \ |
107 | dbus \ | ||
108 | bash \ | 107 | bash \ |
109 | lshw \ | 108 | lshw \ |
110 | jq \ | 109 | 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 = "\ | |||
12 | -DBUILD_CLAR=OFF \ | 12 | -DBUILD_CLAR=OFF \ |
13 | -DSHA1_TYPE="builtin" \ | 13 | -DSHA1_TYPE="builtin" \ |
14 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | 14 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ |
15 | -DBUILD_SHARED_LIBS=OFF \ | 15 | -DBUILD_SHARED_LIBS=ON \ |
16 | -DBUILD_EXAMPLES=OFF \ | 16 | -DBUILD_EXAMPLES=OFF \ |
17 | " | 17 | " |
18 | 18 | ||