From patchwork Thu Apr 26 10:15:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 155225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 86B2EB6FA5 for ; Thu, 26 Apr 2012 20:15:50 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2534B895F5; Thu, 26 Apr 2012 10:15:45 +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 P9gv2QOn-Nar; Thu, 26 Apr 2012 10:15:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DF7E984D87; Thu, 26 Apr 2012 10:15:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 820EC8F753 for ; Thu, 26 Apr 2012 10:15:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 713B984D87 for ; Thu, 26 Apr 2012 10:15:39 +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 wATDPFiQqkNK for ; Thu, 26 Apr 2012 10:15:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id 108FE858A5 for ; Thu, 26 Apr 2012 10:15:37 +0000 (UTC) Received: from asgard (host21.200-117-174.telecom.net.ar [200.117.174.21]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.4/8.14.4) with ESMTP id q3QAFXOA019288 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 26 Apr 2012 07:15:35 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1335435336; bh=MAnywOoSVJzNBe95yTMNrOIvezk9HCoV9TwuCmCVQfc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=u37WLqzivTsCLHpiP4ZUYvT/Zz/Q1j/aKrBykJan8FseXynongPNVGOeol8Uu/MVV ON5NDXu34lZRIPcgMVh8XhOYclms+1VRB1uu9LpxJJy/EG0z46e7I2jbZH2aTspFMY ldnqrA+CTggksr/P9NbEJak1YxYo9mFsYrZzh3MM= Received: by asgard (sSMTP sendmail emulation); Thu, 26 Apr 2012 07:15:32 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 26 Apr 2012 07:15:24 -0300 Message-Id: <1335435324-18792-2-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1335435324-18792-1-git-send-email-gustavo@zacarias.com.ar> References: <1335435324-18792-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 2/2] lsof: add busybox tweaks X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Since busybox 1.20+ includes a lsof applet make sure lsof gets built after busybox so that we get the full-blown version if both are enabled. Also hide the lsof package unless BUSYBOX_SHOW_OTHERS is true. Signed-off-by: Gustavo Zacarias --- package/Config.in | 2 ++ package/lsof/lsof.mk | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/Config.in b/package/Config.in index 64fce62..7f9b234 100644 --- a/package/Config.in +++ b/package/Config.in @@ -24,7 +24,9 @@ source "package/dmalloc/Config.in" source "package/kexec/Config.in" source "package/latencytop/Config.in" source "package/lmbench/Config.in" +if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/lsof/Config.in" +endif source "package/ltp-testsuite/Config.in" source "package/lttng-babeltrace/Config.in" source "package/lttng-modules/Config.in" diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index c07fb2d..7bc22c0 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -8,6 +8,9 @@ LSOF_VERSION = 4.85 LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2 LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ +# Make certain full-blown lsof gets built after the busybox version (1.20+) +LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) + BR2_LSOF_CFLAGS = ifeq ($(BR2_LARGEFILE),) BR2_LSOF_CFLAGS += -U_FILE_OFFSET_BITS