summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <phil@advancedtelematic.com>2018-02-02 15:09:28 +0100
committerGitHub <noreply@github.com>2018-02-02 15:09:28 +0100
commitb4ce615da3c313c51dd37210dec00a95582951a2 (patch)
treec6cd5c4130c165c49d96d6e833e6ef76380375a7
parente408922dccefca6cfe103be2dce18d7bcc004f1e (diff)
parent2d3e4530c07df2ad0cab16d90ede7f9c482c7022 (diff)
downloadmeta-updater-b4ce615da3c313c51dd37210dec00a95582951a2.tar.gz
Merge pull request #250 from advancedtelematic/bugfix/rocko-update-ostree
Bugfix/rocko update ostree
-rw-r--r--CONTRIBUTING.adoc4
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 7255a72..69509c3 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -10,6 +10,6 @@ We welcome pull requests from everyone. Here are some notes that are useful for
10| `require classes/sota_bleeding.inc` | Always build the latest master of Aktualizr 10| `require classes/sota_bleeding.inc` | Always build the latest master of Aktualizr
11| `BRANCH_pn-aktualizr = "mybranch"` 11| `BRANCH_pn-aktualizr = "mybranch"`
12`BRANCH_pn-aktualizr-native = "mybranch"` | Build `mybranch` of Aktualizr (note that both of these need to be set). This will normally be used with `require classes/sota_bleeding.inc` 12`BRANCH_pn-aktualizr-native = "mybranch"` | Build `mybranch` of Aktualizr (note that both of these need to be set). This will normally be used with `require classes/sota_bleeding.inc`
13| `SRCREV_pn-aktualizr = "1004efa3f86cef90c012b34620992b5762b741e3"`
14`SRCREV_pn-aktualizr-native = "1004efa3f86cef90c012b34620992b5762b741e3"` | Build the specified revision of Aktualizr (note that both of these need to be set).
13| `TOOLCHAIN_HOST_TASK_append = " nativesdk-cmake "` | Use with `bitbake -c populate_sdk core-image-minimal` to build a SDK 15| `TOOLCHAIN_HOST_TASK_append = " nativesdk-cmake "` | Use with `bitbake -c populate_sdk core-image-minimal` to build a SDK
14
15
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index beaf893..3bbedb8 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -21,7 +21,7 @@ SRC_URI = " \
21 file://aktualizr.service \ 21 file://aktualizr.service \
22 file://aktualizr-serialcan.service \ 22 file://aktualizr-serialcan.service \
23 " 23 "
24SRCREV = "07d73645231681848bd943074498581e930d8582" 24SRCREV = "23eb094a8b3faaac7c0b2a85f902c67804a7d3d3"
25BRANCH ?= "master" 25BRANCH ?= "master"
26 26
27S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"