diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-05-17 17:01:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 17:01:01 +0200 |
| commit | 94ac0d0f8d2a1b321c755837209120f7186a363f (patch) | |
| tree | 91d497f953fe5d1f79a69d0b078f0ba079ba0434 | |
| parent | b736d4a17013acda7dc03fd02edeac8e37848b66 (diff) | |
| parent | d073dd4243405e4d1cda2264f810cb863dd0fbb8 (diff) | |
| download | meta-updater-94ac0d0f8d2a1b321c755837209120f7186a363f.tar.gz | |
Merge pull request #314 from advancedtelematic/feat/bump-embed-sql
Remove aktualizr-common because schemas are embedded
| -rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 452a128..58f2fd5 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
| @@ -22,7 +22,7 @@ SRC_URI = " \ | |||
| 22 | file://aktualizr-secondary.socket \ | 22 | file://aktualizr-secondary.socket \ |
| 23 | file://aktualizr-serialcan.service \ | 23 | file://aktualizr-serialcan.service \ |
| 24 | " | 24 | " |
| 25 | SRCREV = "fe766d1b9fb42f74394aa3abd9ac80221669f67c" | 25 | SRCREV = "3b89858cf8ce9a8331cc4e6a5d2b5783d2eb7ae9" |
| 26 | BRANCH ?= "master" | 26 | BRANCH ?= "master" |
| 27 | 27 | ||
| 28 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
| @@ -80,7 +80,7 @@ do_install_append_class-native () { | |||
| 80 | install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir} | 80 | install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir} |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | PACKAGES =+ " ${PN}-common ${PN}-examples ${PN}-host-tools ${PN}-secondary " | 83 | PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-secondary " |
| 84 | 84 | ||
| 85 | FILES_${PN} = " \ | 85 | FILES_${PN} = " \ |
| 86 | ${bindir}/aktualizr \ | 86 | ${bindir}/aktualizr \ |
| @@ -91,10 +91,6 @@ FILES_${PN} = " \ | |||
| 91 | ${sysconfdir}/sota/conf.d \ | 91 | ${sysconfdir}/sota/conf.d \ |
| 92 | " | 92 | " |
| 93 | 93 | ||
| 94 | FILES_${PN}-common = " \ | ||
| 95 | ${libdir}/sota/schemas \ | ||
| 96 | " | ||
| 97 | |||
| 98 | FILES_${PN}-examples = " \ | 94 | FILES_${PN}-examples = " \ |
| 99 | ${libdir}/sota/demo_secondary.json \ | 95 | ${libdir}/sota/demo_secondary.json \ |
| 100 | ${bindir}/example-interface \ | 96 | ${bindir}/example-interface \ |
| @@ -120,8 +116,4 @@ FILES_${PN}-secondary = " \ | |||
| 120 | ${systemd_unitdir}/system/aktualizr-secondary.service \ | 116 | ${systemd_unitdir}/system/aktualizr-secondary.service \ |
| 121 | " | 117 | " |
| 122 | 118 | ||
| 123 | # Both primary and secondary need the SQL Schemas | ||
| 124 | RDEPENDS_${PN}_class-target =+ "${PN}-common" | ||
| 125 | RDEPENDS_${PN}-secondary_class-target =+ "${PN}-common" | ||
| 126 | |||
| 127 | # vim:set ts=4 sw=4 sts=4 expandtab: | 119 | # vim:set ts=4 sw=4 sts=4 expandtab: |
