diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-10-09 19:24:28 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-10-09 19:24:28 +0000 |
commit | 7abb95e1a4b84c4535f41ffb6636fede823bc7d2 (patch) | |
tree | ee75c57cf4a66707a8410bbf1f20f218ec7d9ba0 | |
parent | 5ebf85a616357eef1f367ff25d412472977a470d (diff) | |
download | meta-cloud-services-7abb95e1a4b84c4535f41ffb6636fede823bc7d2.tar.gz |
gluster-fs: WORKDIR -> UNPACKDIR transition
Sources are now found in UNPACKDIR, so we need to adjust
the do_install of glusterfs appropriately.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-extended/glusterfs/glusterfs.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc index c5f21c7..305727e 100644 --- a/recipes-extended/glusterfs/glusterfs.inc +++ b/recipes-extended/glusterfs/glusterfs.inc | |||
@@ -69,7 +69,7 @@ PACKAGECONFIG[tcmalloc] = ",--without-tcmalloc,," | |||
69 | 69 | ||
70 | do_install:append() { | 70 | do_install:append() { |
71 | install -d ${D}${sysconfdir}/init.d | 71 | install -d ${D}${sysconfdir}/init.d |
72 | install -m 0755 ${WORKDIR}/glusterd.init \ | 72 | install -m 0755 ${UNPACKDIR}/glusterd.init \ |
73 | ${D}${sysconfdir}/init.d/glusterd | 73 | ${D}${sysconfdir}/init.d/glusterd |
74 | 74 | ||
75 | if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then | 75 | if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then |
@@ -90,7 +90,7 @@ EOF | |||
90 | 90 | ||
91 | # Install systemd service files | 91 | # Install systemd service files |
92 | install -d ${D}${systemd_system_unitdir} | 92 | install -d ${D}${systemd_system_unitdir} |
93 | install -m 0644 ${WORKDIR}/glusterd.service ${D}${systemd_system_unitdir} | 93 | install -m 0644 ${UNPACKDIR}/glusterd.service ${D}${systemd_system_unitdir} |
94 | sed -i -e 's#@SBINDIR@#${sbindir}#g' \ | 94 | sed -i -e 's#@SBINDIR@#${sbindir}#g' \ |
95 | -e 's#@base_bindir@#${base_bindir}#g' \ | 95 | -e 's#@base_bindir@#${base_bindir}#g' \ |
96 | -e 's#@localstatedir@#${localstatedir}#g' \ | 96 | -e 's#@localstatedir@#${localstatedir}#g' \ |