summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-06-04 10:02:28 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2018-06-04 10:02:28 +0200
commit34f641cb51b5b27ed55bb6ec9536230c0d081120 (patch)
tree789bfd8bd2198ba6ddb0e0cf24924a310f3c7adb
parentf00803eb16ab636885757a41f2720bc4ba760820 (diff)
parent4c4f51f6269c0bd6243dce81eea049e4a073de30 (diff)
downloadmeta-updater-34f641cb51b5b27ed55bb6ec9536230c0d081120.tar.gz
Merge remote-tracking branch 'github/rocko' into bugfix/implicit-and-certs-master
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb1
-rw-r--r--recipes-sota/ostree/ostree_git.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 3a3ca56..8dc4b31 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -99,6 +99,7 @@ FILES_${PN}-examples = " \
99 " 99 "
100 100
101FILES_${PN}-host-tools = " \ 101FILES_${PN}-host-tools = " \
102 ${bindir}/aktualizr-repo \
102 ${bindir}/aktualizr_cert_provider \ 103 ${bindir}/aktualizr_cert_provider \
103 ${bindir}/aktualizr_implicit_writer \ 104 ${bindir}/aktualizr_implicit_writer \
104 ${bindir}/garage-deploy \ 105 ${bindir}/garage-deploy \
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index bfe16e9..afb767f 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
11SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6" 11SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6"
12 12
13PV = "v2017.13" 13PV = "v2017.13"
14PR = "1" 14PR = "2"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17