[Buildroot] [git commit branch/2017.02.x] package/nbd: fix utilities locations

Peter Korsgaard peter at korsgaard.com
Mon Mar 13 23:19:34 UTC 2017


commit: https://git.buildroot.net/buildroot/commit/?id=b3442f2fe397bbd33f9ab745ff2601a8994a7153
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2017.02.x

Currently, the code expects both the client and server to be in
/usr/bin, while the client is in /usr/sbin

Fix that.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
(cherry picked from commit 4aabbeb245794862e8434317e885d6d028d23679)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/nbd/nbd.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index d91c2d7..a763d83 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -19,14 +19,14 @@ NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no
 endif
 
 ifneq ($(BR2_NBD_CLIENT),y)
-NBD_TOREMOVE += nbd-client
+NBD_TOREMOVE += /usr/sbin/nbd-client
 endif
 ifneq ($(BR2_NBD_SERVER),y)
-NBD_TOREMOVE += nbd-server
+NBD_TOREMOVE += /usr/bin/nbd-server
 endif
 
 define NBD_CLEANUP_AFTER_INSTALL
-	rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(NBD_TOREMOVE))
+	rm -f $(addprefix $(TARGET_DIR), $(NBD_TOREMOVE))
 endef
 
 NBD_POST_INSTALL_TARGET_HOOKS += NBD_CLEANUP_AFTER_INSTALL


More information about the buildroot mailing list