diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2018-05-16 11:16:51 +0200 |
---|---|---|
committer | Laurent Bonnans <laurent.bonnans@here.com> | 2018-05-16 12:37:19 +0200 |
commit | 6cc92819f88ecf79fa9a54b3b21446da61dbab48 (patch) | |
tree | 2cce0b0c79bc0fbea9cb9c1c2bc980fe98c53094 | |
parent | bbbf1fa8d4fb4c806f08ffc09c9b2c57053d456b (diff) | |
download | meta-updater-6cc92819f88ecf79fa9a54b3b21446da61dbab48.tar.gz |
aktualizr_git: remove duplicate installs
If it's in `do_install_append`, no need to also put it in
`do_install_append_class-native`
-rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 95c36fa..452a128 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -55,7 +55,7 @@ EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON \ | |||
55 | do_install_append () { | 55 | do_install_append () { |
56 | rm -fr ${D}${libdir}/systemd | 56 | rm -fr ${D}${libdir}/systemd |
57 | rm -f ${D}${libdir}/sota/sota.toml # Only needed for the Debian package | 57 | rm -f ${D}${libdir}/sota/sota.toml # Only needed for the Debian package |
58 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 58 | install -d ${D}${libdir}/sota |
59 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml | 59 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml |
60 | install -m 0644 ${S}/config/sota_autoprov_primary.toml ${D}/${libdir}/sota/sota_autoprov_primary.toml | 60 | install -m 0644 ${S}/config/sota_autoprov_primary.toml ${D}/${libdir}/sota/sota_autoprov_primary.toml |
61 | install -m 0644 ${S}/config/sota_hsm_prov.toml ${D}/${libdir}/sota/sota_hsm_prov.toml | 61 | install -m 0644 ${S}/config/sota_hsm_prov.toml ${D}/${libdir}/sota/sota_hsm_prov.toml |
@@ -65,6 +65,7 @@ do_install_append () { | |||
65 | install -d ${D}${systemd_unitdir}/system | 65 | install -d ${D}${systemd_unitdir}/system |
66 | install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket | 66 | install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket |
67 | install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service | 67 | install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service |
68 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
68 | install -m 0700 -d ${D}${sysconfdir}/sota/conf.d | 69 | install -m 0700 -d ${D}${sysconfdir}/sota/conf.d |
69 | } | 70 | } |
70 | 71 | ||
@@ -75,12 +76,6 @@ do_install_append_class-target () { | |||
75 | } | 76 | } |
76 | 77 | ||
77 | do_install_append_class-native () { | 78 | do_install_append_class-native () { |
78 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml | ||
79 | install -m 0644 ${S}/config/sota_autoprov_primary.toml ${D}/${libdir}/sota/sota_autoprov_primary.toml | ||
80 | install -m 0644 ${S}/config/sota_hsm_prov.toml ${D}/${libdir}/sota/sota_hsm_prov.toml | ||
81 | install -m 0644 ${S}/config/sota_implicit_prov.toml ${D}/${libdir}/sota/sota_implicit_prov.toml | ||
82 | install -m 0644 ${S}/config/sota_implicit_prov_ca.toml ${D}/${libdir}/sota/sota_implicit_prov_ca.toml | ||
83 | |||
84 | install -m 0755 ${B}/src/sota_tools/garage-sign/bin/* ${D}${bindir} | 79 | install -m 0755 ${B}/src/sota_tools/garage-sign/bin/* ${D}${bindir} |
85 | 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} |
86 | } | 81 | } |