From patchwork Fri Oct 17 12:34:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karoly Kasza X-Patchwork-Id: 400520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 1B1571400B2 for ; Fri, 17 Oct 2014 23:34:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4A10F339DE; Fri, 17 Oct 2014 12:34:29 +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 XRpMRkePLJeX; Fri, 17 Oct 2014 12:34:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E164D339E6; Fri, 17 Oct 2014 12:34:26 +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 42DFC1C20E2 for ; Fri, 17 Oct 2014 12:34:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3134A339D7 for ; Fri, 17 Oct 2014 12:34:25 +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 GZ2xjdTANoVH for ; Fri, 17 Oct 2014 12:34:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by silver.osuosl.org (Postfix) with ESMTPS id F10AB33161 for ; Fri, 17 Oct 2014 12:34:22 +0000 (UTC) Received: by mail-wi0-f180.google.com with SMTP id em10so1123815wid.7 for ; Fri, 17 Oct 2014 05:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KnFBG145tP1hni3WtlQZ8ojMa5UtGrTSYt3MeM4T+Rw=; b=OqN7Xefz+U8lXd03vMkR2weIZcNI4AL1VBs229V63MYtDkminPxAMeoKjV78TBqiIO hbKHNNngPlXmoyiapNpIdOpq4MhuZcT942jtEto6sIkzlbri0Hlu0BJgpfRFbplK6z0a ffNJerQBX/Iaq8TRG/uHniinFfvk7P2YVZJ+AzqvoZJgC6N2Ge+3eQKsCFJIsiMQ0Gql Iebv7hr9lv+jTw2poFQO92kO46YhiAH1g7RiIW2BK8ta3j4NX68BAq05LfbUxRl/70+1 brJyc9g7qqmq5vOSyyGI2lesKYODwaDfb/xyuhAjsXj1G9dOGY8h0Pt52l2ukjkotuP2 jspg== X-Received: by 10.180.208.100 with SMTP id md4mr13643015wic.53.1413549261520; Fri, 17 Oct 2014 05:34:21 -0700 (PDT) Received: from localhost.localdomain (mllnC3E4ABB5.fixip.t-online.hu. [195.228.171.181]) by mx.google.com with ESMTPSA id gt7sm5507490wib.18.2014.10.17.05.34.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Oct 2014 05:34:21 -0700 (PDT) From: Karoly Kasza To: buildroot@buildroot.org Date: Fri, 17 Oct 2014 14:34:09 +0200 Message-Id: <1413549250-2753-2-git-send-email-kaszak@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1413549250-2753-1-git-send-email-kaszak@gmail.com> References: <1413549250-2753-1-git-send-email-kaszak@gmail.com> Cc: ps.report@gmx.net, yann.morin.1998@free.fr Subject: [Buildroot] [PATCH 1/2] util-linux: option to enable fdisk for host build 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" Enable the building of fdisk utility in util-linux host build. Signed-off-by: Karoly Kasza --- package/util-linux/Config.in.host | 9 ++++++ .../util-linux/util-linux-004-enable-fdisk.patch | 34 ++++++++++++++++++++ package/util-linux/util-linux.mk | 5 +++ 3 files changed, 48 insertions(+) create mode 100644 package/util-linux/util-linux-004-enable-fdisk.patch diff --git a/package/util-linux/Config.in.host b/package/util-linux/Config.in.host index f73dc43..1451d15 100644 --- a/package/util-linux/Config.in.host +++ b/package/util-linux/Config.in.host @@ -6,3 +6,12 @@ config BR2_PACKAGE_HOST_UTIL_LINUX Things like mkfs, mkswap, swapon, fdisk, mount, dmesg, etc... http://www.kernel.org/pub/linux/utils/util-linux/ + +if BR2_PACKAGE_HOST_UTIL_LINUX + +config BR2_PACKAGE_HOST_UTIL_LINUX_FDISK + bool "enable fdisk" + help + Enable compiling fdisk + +endif diff --git a/package/util-linux/util-linux-004-enable-fdisk.patch b/package/util-linux/util-linux-004-enable-fdisk.patch new file mode 100644 index 0000000..5faf1bb --- /dev/null +++ b/package/util-linux/util-linux-004-enable-fdisk.patch @@ -0,0 +1,34 @@ +Add options to enable/disable libfdisk and fdisk + +This is needed to be able to just build an fdisk binary +for the host package. + +Signed-off-by: Karoly Kasza + +--- util-linux-2.25.1.orig/configure.ac 2014-10-11 13:47:52.000000000 +0200 ++++ util-linux-2.25.1/configure.ac 2014-10-11 13:45:50.065076171 +0200 +@@ -820,12 +820,22 @@ + dnl + dnl libfdisk is enabled at all times if possible + dnl +-UL_BUILD_INIT([libfdisk], [check]) ++# this behaviour changed for buildroot, along with fdisk ++AC_ARG_ENABLE([libfdisk], ++ AS_HELP_STRING([--disable-libfdisk], [do not build libfdisk]), ++ [], [UL_DEFAULT_ENABLE([libfdisk], [check])] ++) ++UL_BUILD_INIT([libfdisk]) + UL_REQUIRES_BUILD([libfdisk], [libuuid]) + UL_REQUIRES_BUILD([libfdisk], [libsmartcols]) + AM_CONDITIONAL([BUILD_LIBFDISK], [test "x$build_libfdisk" = xyes]) + +-UL_BUILD_INIT([fdisk], [check]) ++ ++AC_ARG_ENABLE([fdisk], ++ AS_HELP_STRING([--disable-fdisk], [do not build fdisk]), ++ [], [UL_DEFAULT_ENABLE([fdisk], [check])] ++) ++UL_BUILD_INIT([fdisk]) + UL_REQUIRES_BUILD([fdisk], [libfdisk]) + AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes]) + diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index ebbab61..5335ff4 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -97,6 +97,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --disable-libblkid --disable-libmount \ --disable-all-programs --without-ncurses +# Build host fdisk if selected +ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX_FDISK),y) +HOST_UTIL_LINUX_CONF_OPTS += --enable-fdisk --enable-libfdisk --enable-libsmartcols +endif + # Avoid building the tools if they are disabled since we can't install on # a per-directory basis. ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),)