summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-05-05 09:15:12 +0200
committerGitHub <noreply@github.com>2020-05-05 09:15:12 +0200
commit17db2e6685b568f717b29e00b2a417a43d13800c (patch)
tree6907a7a61118ac3bd2dfa3e8a3c029f1527af19f
parent62fbb2b1ba053635f154e5a041eb4c797f501514 (diff)
parentd9bf3df678030a210fde0dca9206f60ad571fd70 (diff)
downloadmeta-updater-17db2e6685b568f717b29e00b2a417a43d13800c.tar.gz
Merge pull request #718 from advancedtelematic/feat/dunfell/2020.6
Feat/dunfell/2020.6
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb8
-rw-r--r--recipes-sota/aktualizr/files/10-resource-control.conf1
2 files changed, 5 insertions, 4 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index f4c4a34..a46eab0 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -17,7 +17,7 @@ PRIVATE_LIBS_${PN}-ptest = "libaktualizr.so libaktualizr_secondary.so"
17PV = "1.0+git${SRCPV}" 17PV = "1.0+git${SRCPV}"
18PR = "7" 18PR = "7"
19 19
20GARAGE_SIGN_PV = "0.7.0-94-g9df6b17" 20GARAGE_SIGN_PV = "0.7.1"
21 21
22SRC_URI = " \ 22SRC_URI = " \
23 gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \ 23 gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH};name=aktualizr \
@@ -29,10 +29,10 @@ SRC_URI = " \
29 ${@ d.expand("https://tuf-cli-releases.ota.here.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \ 29 ${@ d.expand("https://tuf-cli-releases.ota.here.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0;name=garagesign") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \
30 " 30 "
31 31
32SRC_URI[garagesign.md5sum] = "1b9c8191f181b2cb7be9723280878a8d" 32SRC_URI[garagesign.md5sum] = "febc186527b324b23c5be3affcf90e54"
33SRC_URI[garagesign.sha256sum] = "401b54ad640c9f54d615bcc250f8863853f2428e490019092a2c176793c8212f" 33SRC_URI[garagesign.sha256sum] = "a87c3f39d61492d6f813754159ed7ef1e59966c15726edef4cd188a63cde60d6"
34 34
35SRCREV = "20aa2e7785466c75f23e40ab2bd424a4a71ac8ec" 35SRCREV = "a6392dec3fb9dda3cb8ab8aa10a81b2c0494cb3c"
36BRANCH ?= "master" 36BRANCH ?= "master"
37 37
38S = "${WORKDIR}/git" 38S = "${WORKDIR}/git"
diff --git a/recipes-sota/aktualizr/files/10-resource-control.conf b/recipes-sota/aktualizr/files/10-resource-control.conf
index 254713c..5c5a593 100644
--- a/recipes-sota/aktualizr/files/10-resource-control.conf
+++ b/recipes-sota/aktualizr/files/10-resource-control.conf
@@ -4,3 +4,4 @@ CPUWeight=@CPU_WEIGHT@
4MemoryAccounting=true 4MemoryAccounting=true
5MemoryHigh=@MEMORY_HIGH@ 5MemoryHigh=@MEMORY_HIGH@
6MemoryMax=@MEMORY_MAX@ 6MemoryMax=@MEMORY_MAX@
7IPAccounting=true