From 8e7e0bde7f9624e624a9895cc34e6c7acdabb1a6 Mon Sep 17 00:00:00 2001 From: Huangbin Zhan Date: Tue, 27 Oct 2020 05:43:43 +0800 Subject: [PATCH] coreutils: Add alternatives support for chcon Avoid conflict with package busybox-selinux Signed-off-by: Huangbin Zhan --- utils/coreutils/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile index 88bc2f0648..66805d9024 100644 --- a/utils/coreutils/Makefile +++ b/utils/coreutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_VERSION:=8.32 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/coreutils @@ -42,19 +42,19 @@ DIR_BIN := \ touch true uname DIR_USR_BIN := \ - basename cksum comm cut dirname du env expand expr factor fold groups \ - head hostid id install logname md5sum mkfifo nl nohup nproc od paste \ - printf readlink realpath seq sha1sum sha256sum sha512sum shred shuf \ - sort split sum tac tail tee test timeout tr truncate tty unexpand uniq \ - unlink uptime users wc who whoami yes + basename chcon cksum comm cut dirname du env expand expr factor fold \ + groups head hostid id install logname md5sum mkfifo nl nohup nproc od \ + paste printf readlink realpath seq sha1sum sha256sum sha512sum shred \ + shuf sort split sum tac tail tee test timeout tr truncate tty unexpand \ + uniq unlink uptime users wc who whoami yes DIR_USR_SBIN := \ chroot # BusyBox does not provide these yet DIR_OTHERS := \ - base32 b2sum basenc chcon csplit dir dircolors fmt join numfmt pathchk \ - pinky pr ptx runcon sha224sum sha384sum stdbuf tsort vdir + base32 b2sum basenc csplit dir dircolors fmt join numfmt pathchk pinky \ + pr ptx runcon sha224sum sha384sum stdbuf tsort vdir $(eval $(foreach a,$(DIR_BIN),ALTS_$(a):=300:/bin/$(a):/usr/bin/gnu-$(a)$(newline))) $(eval $(foreach a,$(DIR_USR_BIN),ALTS_$(a):=300:/usr/bin/$(a):/usr/bin/gnu-$(a)$(newline))) -- 2.30.2