diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-05-18 20:07:24 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-05-19 22:42:31 +0200 |
| commit | 2f11a89140030b51397199083b34b0e13ba9cbc6 (patch) | |
| tree | 278e5eac34624a4278fe4c4136e4788ed9b21039 | |
| parent | 45082d4e51935bb3e8eab255dd69c87f6f9310b0 (diff) | |
| download | upstream-2f11a89140030b51397199083b34b0e13ba9cbc6.tar.gz upstream-2f11a89140030b51397199083b34b0e13ba9cbc6.tar.bz2 upstream-2f11a89140030b51397199083b34b0e13ba9cbc6.zip | |
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@hauke-m.de>
| -rw-r--r-- | package/utils/util-linux/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
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 |