From patchwork Mon Feb 1 05:21:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 576335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 92D26140BCD for ; Mon, 1 Feb 2016 16:21:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CC2788940B; Mon, 1 Feb 2016 05:21:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L+9NsOquv2aI; Mon, 1 Feb 2016 05:21:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EAF6789332; Mon, 1 Feb 2016 05:21:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 13E671C11B9 for ; Mon, 1 Feb 2016 05:21:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0F68988C73 for ; Mon, 1 Feb 2016 05:21:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 85aFEcwee6He for ; Mon, 1 Feb 2016 05:21:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B40CD889DC for ; Mon, 1 Feb 2016 05:21:48 +0000 (UTC) Received: from fwd31.aul.t-online.de (fwd31.aul.t-online.de [172.20.26.136]) by mailout11.t-online.de (Postfix) with SMTP id F124C1115D for ; Mon, 1 Feb 2016 06:21:45 +0100 (CET) Received: from fli4l.lan.fli4l (TcZOU4ZO8hcTy7JS0qQ3zdG+4Hdt6tPMGRXe3D+qr5euRpi0ixywE6F11JQ1I57wBC@[84.191.217.252]) by fwd31.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1aQ6vi-044yzg0; Mon, 1 Feb 2016 06:21:38 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:41392 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.86) (envelope-from ) id 1aQ6vh-0007om-Uc; Mon, 01 Feb 2016 06:21:38 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 1 Feb 2016 06:21:36 +0100 Message-Id: <1454304096-22841-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.7.0 X-ID: TcZOU4ZO8hcTy7JS0qQ3zdG+4Hdt6tPMGRXe3D+qr5euRpi0ixywE6F11JQ1I57wBC X-TOI-MSGID: c730b7bd-d3d1-4bbc-bf67-53487080b97f Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] package/procps-ng: Fix install, procps-ng does not use /usr/bin anymore 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" We do not need to move binaries around anymore since this commit: https://gitlab.com/procps-ng/procps/commit/430b559ba2826f80dffa840622ae0fc744000b13 Fixes http://autobuild.buildroot.net/results/ab7/ab7ed83d60823c1b023c7b76fcbe9c20d537ed4c// Signed-off-by: Bernd Kuhls --- package/procps-ng/procps-ng.mk | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index e0e89c4..febe5fb 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -19,18 +19,6 @@ 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)