From be9dfcd5cb2410e13c98de3670f2d4a276bf526d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 24 Apr 2018 17:27:02 -0700 Subject: [PATCH] sys-apps/coreutils: Add symlink-usr USE flag From: Michael Marineau [Rebase to latest] Signed-off-by: Geoff Levand --- .../sys-apps/coreutils/coreutils-8.28-r1.ebuild | 6 +++--- .../coreos-overlay/sys-apps/coreutils/metadata.xml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/coreutils-8.28-r1.ebuild index 9397aebfcb..24fd3c2cac 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/coreutils-8.28-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/coreutils-8.28-r1.ebuild @@ -25,7 +25,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz LICENSE="GPL-3" SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux" -IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr" +IUSE="acl caps gmp hostname kill multicall nls selinux static symlink-usr test userland_BSD vanilla xattr" LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) @@ -166,7 +166,7 @@ src_install() { insinto /etc newins src/dircolors.hin DIR_COLORS - if [[ ${USERLAND} == "GNU" ]] ; then + if [[ ${USERLAND} == "GNU" ]] && ! use symlink-usr; then cd "${ED%/}"/usr/bin || die dodir /bin # move critical binaries into /bin (required by FHS) @@ -185,7 +185,7 @@ src_install() { for x in ${com} uname ; do dosym ../../bin/${x} /usr/bin/${x} done - else + elif [[ ${USERLAND} != "GNU" ]] ; then # For now, drop the man pages, collides with the ones of the system. rm -rf "${ED%/}"/usr/share/man fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/metadata.xml index 9241968a46..01c0ed67ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/coreutils/metadata.xml @@ -12,6 +12,7 @@ Build the hostname program Build the kill program Build all tools into a single `coreutils` program akin to busybox to save space + Make sym links /bin to /usr/bin cpe:/a:gnu:coreutils