diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2023-05-15 19:40:03 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-05-15 16:32:23 -0700 |
| commit | f55fecc25b6baf671bad3cbde2a7f808e2c8faea (patch) | |
| tree | 2ea4af391330de70adf8f0e64b1bb248cb4dfd25 | |
| parent | 44fbe5a318a35c0444a220957c9790a897b5f3d7 (diff) | |
| download | meta-openembedded-f55fecc25b6baf671bad3cbde2a7f808e2c8faea.tar.gz | |
etcd: don't hardcode /usr/lib in do_install
* I don't know anything about etcd including why we need these binaries duplicated
in libdir and bindir, but use ${libdir} instead of hardcoded /usr/lib to fix
do_install with multilib enabled when libdir is /usr/lib64 and it was failing
with:
DEBUG: Executing shell function do_install
ls: cannot access 'etcd/3.5.7-r0/build/bin/linux_arm64/': No such file or directory
install: cannot stat 'etcd/3.5.7-r0/image/usr/lib/go/src/go.etcd.io/etcd/v3/bin/etcd': No such file or directory
WARNING: exit code 1 from a shell command.
* the error from ls is unrelated, fixed in:
https://lists.openembedded.org/g/openembedded-core/message/181269
* also reported on github:
https://github.com/openembedded/meta-openembedded/pull/616
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/etcd/etcd_3.5.7.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb index 9a8b9861f2..0794158a52 100644 --- a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb +++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb | |||
| @@ -59,9 +59,9 @@ SYSTEMD_SERVICE:${PN}:append = " etcd.service etcd-new.service etcd-new.path" | |||
| 59 | 59 | ||
| 60 | do_install:append() { | 60 | do_install:append() { |
| 61 | install -d ${D}${bindir}/ | 61 | install -d ${D}${bindir}/ |
| 62 | install -m 0755 ${D}/usr/lib/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} | 62 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} |
| 63 | install -m 0755 ${D}/usr/lib/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} | 63 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} |
| 64 | install -m 0755 ${D}/usr/lib/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} | 64 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} |
| 65 | install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d | 65 | install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d |
| 66 | install -d ${D}${systemd_system_unitdir} | 66 | install -d ${D}${systemd_system_unitdir} |
| 67 | install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/ | 67 | install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/ |
