diff options
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-native_git.bb | 6 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_common.inc | 2 | ||||
-rw-r--r-- | recipes-sota/sota-tools/sota-tools_git.bb | 24 |
3 files changed, 5 insertions, 27 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-native_git.bb b/recipes-sota/aktualizr/aktualizr-native_git.bb index 59479fd..b89e9de 100644 --- a/recipes-sota/aktualizr/aktualizr-native_git.bb +++ b/recipes-sota/aktualizr/aktualizr-native_git.bb | |||
@@ -1,16 +1,18 @@ | |||
1 | require aktualizr_common.inc | 1 | require aktualizr_common.inc |
2 | 2 | ||
3 | DEPENDS = "boost-native openssl-native libarchive-native libsodium-native" | 3 | DEPENDS = "boost-native glib-2.0-native curl-native openssl-native libarchive-native libsodium-native" |
4 | 4 | ||
5 | inherit native | 5 | inherit native |
6 | 6 | ||
7 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_OSTREE=OFF -DAKTUALIZR_VERSION=${PV}" | 7 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF -DAKTUALIZR_VERSION=${PV}" |
8 | 8 | ||
9 | do_install_append () { | 9 | do_install_append () { |
10 | rm ${D}${bindir}/aktualizr | 10 | rm ${D}${bindir}/aktualizr |
11 | rm ${D}${bindir}/aktualizr_cert_provider | 11 | rm ${D}${bindir}/aktualizr_cert_provider |
12 | rm ${D}${bindir}/garage-deploy | ||
12 | } | 13 | } |
13 | 14 | ||
14 | FILES_${PN} = " \ | 15 | FILES_${PN} = " \ |
15 | ${bindir}/aktualizr_implicit_writer \ | 16 | ${bindir}/aktualizr_implicit_writer \ |
17 | ${bindir}/garage-push \ | ||
16 | " | 18 | " |
diff --git a/recipes-sota/aktualizr/aktualizr_common.inc b/recipes-sota/aktualizr/aktualizr_common.inc index 7ed3614..79c5e37 100644 --- a/recipes-sota/aktualizr/aktualizr_common.inc +++ b/recipes-sota/aktualizr/aktualizr_common.inc | |||
@@ -11,7 +11,7 @@ PR = "7" | |||
11 | SRC_URI = " \ | 11 | SRC_URI = " \ |
12 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ | 12 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ |
13 | " | 13 | " |
14 | SRCREV = "59c276c1d4800d025594b53900ee964533695731" | 14 | SRCREV = "67c4f44c4136d16871726449502e3926098e8524" |
15 | BRANCH ?= "master" | 15 | BRANCH ?= "master" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
diff --git a/recipes-sota/sota-tools/sota-tools_git.bb b/recipes-sota/sota-tools/sota-tools_git.bb deleted file mode 100644 index 5403d9a..0000000 --- a/recipes-sota/sota-tools/sota-tools_git.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | DESCRIPTION = "Utility to push data to a server" | ||
2 | LICENSE = "MPL-2.0" | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea" | ||
5 | |||
6 | S = "${WORKDIR}/git" | ||
7 | |||
8 | SRC_URI = "gitsm://github.com/advancedtelematic/sota-tools.git;branch=master" | ||
9 | SRCREV = "216cb84db98e9b0f8c6c1c407f480c5dd0b3cf62" | ||
10 | |||
11 | inherit cmake | ||
12 | |||
13 | DEPENDS = "boost glib-2.0 curl libarchive" | ||
14 | |||
15 | BBCLASSEXTEND = "native" | ||
16 | |||
17 | FILES_${PN} = "${bindir}/garage-push" | ||
18 | |||
19 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF" | ||
20 | |||
21 | do_install() { | ||
22 | install -d ${D}/${bindir} | ||
23 | install -m 755 garage-push ${D}/${bindir} | ||
24 | } | ||