From patchwork Tue Dec 9 16:03:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karoly Kasza X-Patchwork-Id: 419160 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 4E43614009B for ; Wed, 10 Dec 2014 03:03:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 634A891C55; Tue, 9 Dec 2014 16:03:49 +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 AyF8o2ATfHIi; Tue, 9 Dec 2014 16:03:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3DE4E919FA; Tue, 9 Dec 2014 16:03:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 27D311CE932 for ; Tue, 9 Dec 2014 16:03:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 244AD95C71 for ; Tue, 9 Dec 2014 16:03:39 +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 3q+2ax+Jb0Z6 for ; Tue, 9 Dec 2014 16:03:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by hemlock.osuosl.org (Postfix) with ESMTPS id 195FF95C63 for ; Tue, 9 Dec 2014 16:03:38 +0000 (UTC) Received: by mail-wi0-f169.google.com with SMTP id r20so10600681wiv.2 for ; Tue, 09 Dec 2014 08:03:36 -0800 (PST) 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=uHTTkt/P7G5mQCWWz+pBGfeLeNz0F23kElHOHwuRKJo=; b=hPRZkcWIo96QxHaoDd1CfCRielZJ58DuaEQ2VQiL4x4Wc4wIUF3RFns/dFK1Og8Nex XsKbaR06ly4udF6WUAdsprcvY2BgHbPWhH4qRIM51XBHWxI1sHlyiOsgGHq912lsT63C o3CH4IALZAJk/dfrQALqavvccH1xWS2PfO/gdEWTMgO1N0kRil+6Dw62h7ZUaj7dPZsI 4kG2cH/+JUV2LmDTwWNR3WkUlM3fDhfs+7xZKhqB1IWfAE56k+l+Bft8a3BeZWxRR9O1 8HWzG/3bkSg/Kr2zbBTojn7PQAYafFGcTdH3gZOrRgolUQ5z0hstyJ+SVSnbR642Z92V 7FPQ== X-Received: by 10.180.83.129 with SMTP id q1mr5555108wiy.8.1418141016721; Tue, 09 Dec 2014 08:03:36 -0800 (PST) Received: from localhost.localdomain (mllnC3E4ABB5.fixip.t-online.hu. [195.228.171.181]) by mx.google.com with ESMTPSA id hz9sm2287800wjb.17.2014.12.09.08.03.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Dec 2014 08:03:36 -0800 (PST) From: Karoly Kasza To: buildroot@buildroot.org Date: Tue, 9 Dec 2014 17:03:25 +0100 Message-Id: <1418141008-18739-2-git-send-email-kaszak@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1418141008-18739-1-git-send-email-kaszak@gmail.com> References: <1418141008-18739-1-git-send-email-kaszak@gmail.com> Subject: [Buildroot] [PATCH v2 1/3] util-linux: enable host fdisk 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 for host. Signed-off-by: Karoly Kasza --- Changes v1 -> v2: - Wording. 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..65f4a87 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 "fdisk" + help + Enable compiling fdisk for the host + +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 dc10193..9f70a11 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),)