[openwrt/openwrt] util-linux: Fix taskset conflict with busybox

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2f11a89140030b51397199083b34b0e13ba9cbc6

commit 2f11a89140030b51397199083b34b0e13ba9cbc6
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Thu May 18 20:07:24 2023 +0200

    util-linux: Fix taskset conflict with busybox
    
    This fixes the following error:
     * check_data_file_clashes: Package taskset wants to install file build_dir/target-powerpc_8548_musl/root-mpc85xx/usr/bin/taskset
            But that file is already provided by package  * busybox
     * opkg_install_cmd: Cannot install package taskset.
    
    Fixes: 3c3d797c4dad ("busybox: enable taskset by default")
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/utils/util-linux/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index e14d816a42..8dab621390 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -485,6 +485,7 @@ endef
 define Package/taskset
 $(call Package/util-linux/Default)
   TITLE:=set or retrieve a process's CPU affinity
+  ALTERNATIVES:=200:/usr/bin/taskset:/usr/bin/util-linux-taskset
 endef
 
 define Package/taskset/description
@@ -851,7 +852,7 @@ endef
 
 define Package/taskset/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/taskset $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/taskset $(1)/usr/bin/util-linux-taskset
 endef
 
 define Package/unshare/install