From 027d3cc633d970cebf52f30e537b8a2b70c7c173 Mon Sep 17 00:00:00 2001 From: Hans Dedecker <dedeckeh@gmail.com> Date: Sat, 18 Apr 2020 10:34:10 +0200 Subject: [PATCH] binutils: add ALTERNATIVES for strings (FS#3001) Don't move strings anymore to /bin/strings to avoid clash with busybox /usr/bin/strings but move it to /usr/bin/binutils-strings. Use ALTERNATIVES support to install it as /usr/bin/strings Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> (cherry picked from commit 5f126c541a743e2ff5d8f406128d477ab5a509b4) --- package/devel/binutils/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile index 291f45205a..e04611f5d3 100644 --- a/package/devel/binutils/Makefile +++ b/package/devel/binutils/Makefile @@ -49,6 +49,7 @@ define Package/binutils CATEGORY:=Development TITLE:=binutils DEPENDS:=+objdump +ar + ALTERNATIVES:=200:/usr/bin/strings:/usr/bin/binutils-strings endef define Package/objdump @@ -114,7 +115,7 @@ endef define Package/binutils/install $(INSTALL_DIR) $(1)/usr $(1)/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/ - mv $(1)/usr/bin/strings $(1)/bin/strings + mv $(1)/usr/bin/strings $(1)/usr/bin/binutils-strings rm -f $(1)/usr/bin/objdump rm -f $(1)/usr/bin/ar endef -- 2.25.1