domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util-linux: Fix taskset conflict with busybox

Browse Source 
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: 3c3d797c4d ("busybox: enable taskset by default")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2023-05-18 20:07:24 +02:00
parent 45082d4e51
commit 2f11a89140
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/utils/util-linux/Makefile
View File

@@ -485,6 +485,7 @@ endef
define Package/taskset define Package/taskset
$(call Package/util-linux/Default) $(call Package/util-linux/Default)
TITLE:=set or retrieve a process's CPU affinity TITLE:=set or retrieve a process's CPU affinity
ALTERNATIVES:=200:/usr/bin/taskset:/usr/bin/util-linux-taskset
endef endef
define Package/taskset/description define Package/taskset/description
@@ -851,7 +852,7 @@ endef
define Package/taskset/install define Package/taskset/install
$(INSTALL_DIR) $(1)/usr/bin $(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 endef
define Package/unshare/install define Package/unshare/install