diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2020-05-05 09:14:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-05 09:14:51 +0200 |
commit | b3bc79b0319dcf720fb5a54852d9152f7642a61d (patch) | |
tree | 794aaec043c6c519489d77bc5c4ce37164604fbf /recipes-sota | |
parent | 416a934b0555a1131490644a7edcbb644a934e76 (diff) | |
parent | af272dc44c049ea38ccfb9092e37889e698cb4f8 (diff) | |
download | meta-updater-b3bc79b0319dcf720fb5a54852d9152f7642a61d.tar.gz |
Merge pull request #719 from advancedtelematic/feat/zeus/2020.6
Feat/zeus/2020.6
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 8 | ||||
-rw-r--r-- | recipes-sota/aktualizr/files/10-resource-control.conf | 1 |
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" | |||
17 | PV = "1.0+git${SRCPV}" | 17 | PV = "1.0+git${SRCPV}" |
18 | PR = "7" | 18 | PR = "7" |
19 | 19 | ||
20 | GARAGE_SIGN_PV = "0.7.0-94-g9df6b17" | 20 | GARAGE_SIGN_PV = "0.7.1" |
21 | 21 | ||
22 | SRC_URI = " \ | 22 | SRC_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 | ||
32 | SRC_URI[garagesign.md5sum] = "1b9c8191f181b2cb7be9723280878a8d" | 32 | SRC_URI[garagesign.md5sum] = "febc186527b324b23c5be3affcf90e54" |
33 | SRC_URI[garagesign.sha256sum] = "401b54ad640c9f54d615bcc250f8863853f2428e490019092a2c176793c8212f" | 33 | SRC_URI[garagesign.sha256sum] = "a87c3f39d61492d6f813754159ed7ef1e59966c15726edef4cd188a63cde60d6" |
34 | 34 | ||
35 | SRCREV = "20aa2e7785466c75f23e40ab2bd424a4a71ac8ec" | 35 | SRCREV = "a6392dec3fb9dda3cb8ab8aa10a81b2c0494cb3c" |
36 | BRANCH ?= "master" | 36 | BRANCH ?= "master" |
37 | 37 | ||
38 | S = "${WORKDIR}/git" | 38 | S = "${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@ | |||
4 | MemoryAccounting=true | 4 | MemoryAccounting=true |
5 | MemoryHigh=@MEMORY_HIGH@ | 5 | MemoryHigh=@MEMORY_HIGH@ |
6 | MemoryMax=@MEMORY_MAX@ | 6 | MemoryMax=@MEMORY_MAX@ |
7 | IPAccounting=true | ||