diff options
| author | cajun-rat <phil@advancedtelematic.com> | 2017-11-09 09:47:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-09 09:47:52 +0100 |
| commit | 41254c4d19c4c8aa6489195f210a0633e6d3f759 (patch) | |
| tree | 82f8f70d3c9fd6fc4a2b29ac9e645d5ed5ab5001 | |
| parent | cbb8f8ff4e231f1842089fa6eaecf382e3673619 (diff) | |
| parent | f1689ba27ff8940e57573ad195d349e84be5732a (diff) | |
| download | meta-updater-41254c4d19c4c8aa6489195f210a0633e6d3f759.tar.gz | |
Merge pull request #164 from advancedtelematic/fix/pro-4254-cacert-path
Explicitly include ca-certificates as a dependency for garage-push
| -rw-r--r-- | classes/image_types_ostree.bbclass | 2 | ||||
| -rw-r--r-- | recipes-support/ca-certificates/ca-certificates_%.bbappend | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 1f8e195..dcc6fc9 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -159,7 +159,7 @@ IMAGE_CMD_ostree () { | |||
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | IMAGE_TYPEDEP_ostreepush = "ostree" | 161 | IMAGE_TYPEDEP_ostreepush = "ostree" |
| 162 | IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot" | 162 | IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot " |
| 163 | IMAGE_CMD_ostreepush () { | 163 | IMAGE_CMD_ostreepush () { |
| 164 | # Print warnings if credetials are not set or if the file has not been found. | 164 | # Print warnings if credetials are not set or if the file has not been found. |
| 165 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 165 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
diff --git a/recipes-support/ca-certificates/ca-certificates_%.bbappend b/recipes-support/ca-certificates/ca-certificates_%.bbappend new file mode 100644 index 0000000..afaadfd --- /dev/null +++ b/recipes-support/ca-certificates/ca-certificates_%.bbappend | |||
| @@ -0,0 +1 @@ | |||
| SYSROOT_DIRS += "/etc" | |||