From patchwork Thu Mar 7 20:45:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 225938 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 939962C0350 for ; Fri, 8 Mar 2013 07:46:04 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 96475101E9D; Thu, 7 Mar 2013 20:45:48 +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 AKWX3BW6f+3G; Thu, 7 Mar 2013 20:45:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AA0E010101C; Thu, 7 Mar 2013 20:45:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 483A48F75E for ; Thu, 7 Mar 2013 20:46:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9F8BF3069B for ; Thu, 7 Mar 2013 20:45:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X4DDasAuu8S6 for ; Thu, 7 Mar 2013 20:45:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by silver.osuosl.org (Postfix) with ESMTP id E6B0420200 for ; Thu, 7 Mar 2013 20:45:56 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id D4649B5D; Thu, 7 Mar 2013 21:45:57 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4CDB911A1 for ; Thu, 7 Mar 2013 21:45:44 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 7 Mar 2013 21:45:25 +0100 Message-Id: <1362689131-1479-4-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362689131-1479-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1362689131-1479-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH v2 3/8] gptfdisk: ensure that the package always builds/installs something 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 Until now, selecting just the gptfdisk package would do something. If wouldn't build anything at all, and wouldn't install anything. This is rather odd. So now, we ensure that at least one of the two tools that gptfdisk can build and install is selected. This allows use to factorize a bit the select of util-linux in Config.in, and remove the if condition in the makefile that was preventing the package from being built if no tools was selected. Signed-off-by: Thomas Petazzoni --- package/gptfdisk/Config.in | 7 +++---- package/gptfdisk/gptfdisk.mk | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in index 7851dc3..0d7e358 100644 --- a/package/gptfdisk/Config.in +++ b/package/gptfdisk/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_GPTFDISK depends on BR2_LARGEFILE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # util-linux + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + select BR2_PACKAGE_GPTFDISK_GDISK if !BR2_PACKAGE_GPTFDISK_SGDISK help GPT fdisk (consisting of the gdisk and sgdisk programs) is a text-mode partitioning tool that works on Globally Unique Identifier @@ -14,8 +17,6 @@ config BR2_PACKAGE_GPTFDISK config BR2_PACKAGE_GPTFDISK_GDISK bool "interactive gdisk" depends on BR2_PACKAGE_GPTFDISK - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Install the interactive GUID partition table (GPT) manipulator /usr/sbin/gdisk which is modelled after and quite similar in use @@ -24,8 +25,6 @@ config BR2_PACKAGE_GPTFDISK_GDISK config BR2_PACKAGE_GPTFDISK_SGDISK bool "command line sgdisk" depends on BR2_PACKAGE_GPTFDISK - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_POPT help Install the command-line GUID partition table (GPT) manipulator diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 7755a30..2d3cb1a 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -10,8 +10,6 @@ GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk -ifneq ($(GPTFDISK_TARGETS_y),) - GPTFDISK_DEPENDENCIES += util-linux ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) GPTFDISK_DEPENDENCIES += popt @@ -33,6 +31,4 @@ define GPTFDISK_UNINSTALL_TARGET_CMDS rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(GPTFDISK_TARGETS_y)) endef -endif - $(eval $(generic-package))