From patchwork Wed Jan 13 16:05:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 567042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id A2439140307 for ; Thu, 14 Jan 2016 03:06:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 94E918C558; Wed, 13 Jan 2016 16:06:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F8WecbR1Eo63; Wed, 13 Jan 2016 16:06:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B4F4B8C4A3; Wed, 13 Jan 2016 16:06:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2692D1C0F8E for ; Wed, 13 Jan 2016 16:06:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 575C5890D1 for ; Wed, 13 Jan 2016 16:06:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N-W62HO2nJhR for ; Wed, 13 Jan 2016 16:06:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by whitealder.osuosl.org (Postfix) with ESMTP id 774388C4A3 for ; Wed, 13 Jan 2016 16:06:07 +0000 (UTC) Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Websense Email Security Gateway with ESMTPS id 512266CEFE8B; Wed, 13 Jan 2016 16:06:04 +0000 (GMT) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by HHMAIL01.hh.imgtec.org (10.100.10.19) with Microsoft SMTP Server (TLS) id 14.3.235.1; Wed, 13 Jan 2016 16:06:06 +0000 Received: from vriera-linux.le.imgtec.org (192.168.154.36) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 13 Jan 2016 16:06:06 +0000 From: Vicente Olivert Riera To: Date: Wed, 13 Jan 2016 16:05:59 +0000 Message-ID: <1452701159-22362-1-git-send-email-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 2.4.10 MIME-Version: 1.0 X-Originating-IP: [192.168.154.36] Cc: thomas.petazzoni@free-electrons.com, yann.morin.1998@free.fr Subject: [Buildroot] [PATCH] procps-ng: install binaries in /bin and /sbin X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This way the busybox counterparts are overwritten and we will not end up with procps-ng binaries in /usr/bin and /usr/sbin, and busybox symlinks for the same tools in /bin and /sbin. Signed-off-by: Vicente Olivert Riera --- package/procps-ng/procps-ng.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 07e98b9..62c7534 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -19,6 +19,18 @@ PROCPS_NG_GETTEXTIZE = YES # wins the fight over who gets to have their utils actually installed. ifeq ($(BR2_PACKAGE_BUSYBOX),y) PROCPS_NG_DEPENDENCIES += busybox +# Also overwrite the remaining busybox symlinks for tools which are now +# provided by procps-ng and got installed in /usr/bin instead of /bin. +# Currently these tools are only pidof and watch. We only need to do +# this if the /usr/bin and /bin directories are not merged. +ifeq ($(BR2_ROOTFS_MERGED_USR),) +define PROCPS_NG_MOVE_BINARIES + for i in pidof watch; do \ + mv $(TARGET_DIR)/usr/bin/$$i $(TARGET_DIR)/bin/; \ + done +endef +PROCPS_NG_POST_INSTALL_TARGET_HOOKS += PROCPS_NG_MOVE_BINARIES +endif endif ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) @@ -40,8 +52,8 @@ PROCPS_NG_CONF_OPTS += \ --exec-prefix=/ \ --sysconfdir=/etc \ --libdir=/usr/lib \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin + --bindir=/bin \ + --sbindir=/sbin # Allows unicode characters to show in 'watch' ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)