From patchwork Fri Jul 31 23:56:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 502770 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id C7DE21402A7 for ; Sat, 1 Aug 2015 09:57:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 15A7B8B210; Fri, 31 Jul 2015 23:57:24 +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 cyKH814AMiMw; Fri, 31 Jul 2015 23:57:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 35DCD89FF6; Fri, 31 Jul 2015 23:57:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 10D9C1C1F85 for ; Fri, 31 Jul 2015 23:57:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0D2018AB79 for ; Fri, 31 Jul 2015 23:57:15 +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 GWK2ZuG6di6V for ; Fri, 31 Jul 2015 23:57:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5BE4E8AB78 for ; Fri, 31 Jul 2015 23:57:14 +0000 (UTC) Received: by pdbbh15 with SMTP id bh15so49649269pdb.1 for ; Fri, 31 Jul 2015 16:57:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=otSM/dXkX/uWtW1fd4T0CxhEZJm1UpOSX3Ais3Kb4AI=; b=EyqLRAD5Y/3W0byUhXI0mBwQMnmfePUWOzXrXl1qU8s/aWC1vXn6bUZ7cHgLA6xYgx 9vwCXJ6j0VgQhWsqK7nkK/D7XQz6T3f3p+seefhcvOT11I9qUvO5XVtFbWjxlH4YXihk F70QmKHaTRDwjVntNBX14VLyOOHx7X9445Tpk6q565IrJDXjtTK5dCqzzywHAOMhqGw8 iBICeWyZg7uBncro1brfPhxhFmPSWfdrxoAHf6W2ndLdCbPk433eEFKZSD/wrPoFY36K F+W5q2n6UalAAppuLl0/1g+1urTWFrar5DHT1rXLYy1kdizj068CgzkQIcQGl3dFlQba qPBw== X-Gm-Message-State: ALoCoQmeSilyZyGtfNw4sl1p7x6SLf5gNSD5uNUM6aBUpxyA+z7TJaggsy6KQgf/NBlH7ZoyxYmW X-Received: by 10.70.30.161 with SMTP id t1mr12777960pdh.138.1438387034030; Fri, 31 Jul 2015 16:57:14 -0700 (PDT) Received: from xflame.vonkarman.net ([64.145.76.194]) by smtp.gmail.com with ESMTPSA id xf6sm72597pbc.70.2015.07.31.16.57.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Jul 2015 16:57:11 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Fri, 31 Jul 2015 16:56:57 -0700 Message-Id: <1438387017-10597-3-git-send-email-christian@paral.in> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438387017-10597-1-git-send-email-christian@paral.in> References: <1438387017-10597-1-git-send-email-christian@paral.in> Cc: Christian Stewart Subject: [Buildroot] [PATCH v1 3/3] aufs-util: new package 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" Adding the aufs-util utilities. Uses the linux header version settings to guess the correct version of aufs-util but ultimately relies on the user to enter the correct version of aufs-util to use. Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/aufs-util/Config.in | 34 ++++++++++++++++++++++++++++++++++ package/aufs-util/aufs-util.mk | 30 ++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 package/aufs-util/Config.in create mode 100644 package/aufs-util/aufs-util.mk diff --git a/package/Config.in b/package/Config.in index 43c58ca..9bb4993 100644 --- a/package/Config.in +++ b/package/Config.in @@ -148,6 +148,7 @@ endif endmenu menu "Filesystem and flash utilities" + source "package/aufs-util/Config.in" source "package/btrfs-progs/Config.in" source "package/cifs-utils/Config.in" source "package/cpio/Config.in" diff --git a/package/aufs-util/Config.in b/package/aufs-util/Config.in new file mode 100644 index 0000000..2b999aa --- /dev/null +++ b/package/aufs-util/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_AUFS_UTIL + bool "aufs-util" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_LINUX_KERNEL + help + Aufs command line utilities. + Needs a kernel with aufs support. A kernel + extension package is available. + + http://sourceforge.net/p/aufs/aufs-util/ + +# While we don't build from the kernel headers +# we can get a default value here +config BR2_PACKAGE_AUFS_UTIL_VERSION + string "aufs-util branch" + depends on BR2_PACKAGE_AUFS_UTIL + help + Aufs-util repository branch to use. Must match kernel version. + default "3.0" if BR2_KERNEL_HEADERS_3_0 + default "3.2" if BR2_KERNEL_HEADERS_3_2 + default "3.2" if BR2_KERNEL_HEADERS_3_4 + default "3.9" if BR2_KERNEL_HEADERS_3_10 || BR2_KERNEL_HEADERS_3_11 || BR2_KERNEL_HEADERS_3_12 || BR2_KERNEL_HEADERS_3_13 + default "3.14" if BR2_KERNEL_HEADERS_3_14 || BR2_KERNEL_HEADERS_3_15 || BR2_KERNEL_HEADERS_3_16 || BR2_KERNEL_HEADERS_3_17 || BR2_KERNEL_HEADERS_3_18 || BR2_KERNEL_HEADERS_3_19 + default "4.0" if BR2_KERNEL_HEADERS_4_0 || BR2_KERNEL_HEADERS_4_1 + +comment "aufs-util needs a linux kernel" + depends on BR2_USE_MMU + depends on !BR2_LINUX_KERNEL + +comment "aufs-util needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/aufs-util/aufs-util.mk b/package/aufs-util/aufs-util.mk new file mode 100644 index 0000000..0733aa9 --- /dev/null +++ b/package/aufs-util/aufs-util.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# aufs-util +# +################################################################################ + +# linux-headers +AUFS_UTIL_VERSION = aufs$(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION)) +AUFS_UTIL_SITE = git://git.code.sf.net/p/aufs/aufs-util +AUFS_UTIL_DEPENDENCIES = linux +AUFS_UTIL_LICENSE = GNU +AUFS_UTIL_LICENSE_FILES = COPYING + +# Slight hack for a bug with aufsmvdown +# Remove user setting from install command +define AUFS_UTIL_CONFIGURE_CMDS + $(SED) 's/\.a\[/\.stbr\[/g' $(@D)/aumvdown.c + $(SED) 's/\-o root \-g root //g' $(@D)/Makefile +endef + +define AUFS_UTIL_BUILD_CMDS + $(MAKE) -C $(LINUX_BUILDDIR) headers_install + $(MAKE) -C $(@D) CPPFLAGS="-I $(LINUX_BUILDDIR)/usr/include/" HOSTCC="$(CC)" HOSTLD="$(LD)" INSTALL="$(INSTALL)" all +endef + +define AUFS_UTIL_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install +endef + +$(eval $(generic-package))