From patchwork Thu Mar 22 15:03:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 148265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B4F9FB6F13 for ; Fri, 23 Mar 2012 02:03:38 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C3F83A03BE; Thu, 22 Mar 2012 15:03:37 +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 cmJPeoXvvfUp; Thu, 22 Mar 2012 15:03:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BB514A03A8; Thu, 22 Mar 2012 15:03:31 +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 D0E7B8F78D for ; Thu, 22 Mar 2012 15:03:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C36958E2E2 for ; Thu, 22 Mar 2012 15:03:28 +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 zNog0vGLVo19 for ; Thu, 22 Mar 2012 15:03:26 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by whitealder.osuosl.org (Postfix) with ESMTP id 88D308DE07 for ; Thu, 22 Mar 2012 15:03:26 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 7CEA39693E; Thu, 22 Mar 2012 15:03:26 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Thu, 22 Mar 2012 16:03:12 +0100 X-Git-Refname: refs/heads/master X-Git-Oldrev: d0c4b0266491ae06d3b423a28bda50336a82bb5a X-Git-Newrev: 78f5ac2908b30aa6f67583a355e058d6703755ac Message-Id: <20120322150326.7CEA39693E@busybox.osuosl.org> Subject: [Buildroot] [git commit] kmod: add option to install module utilities 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 commit: http://git.buildroot.net/buildroot/commit/?id=78f5ac2908b30aa6f67583a355e058d6703755ac branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master And ensure optional zlib+xz dependencies gets picked up. Signed-off-by: Peter Korsgaard --- package/kmod/Config.in | 6 ++++++ package/kmod/kmod.mk | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/package/kmod/Config.in b/package/kmod/Config.in index c5e8ca8..6fdd92c 100644 --- a/package/kmod/Config.in +++ b/package/kmod/Config.in @@ -4,3 +4,9 @@ config BR2_PACKAGE_KMOD handle kernel modules http://git.kernel.org/?p=utils/kernel/kmod/kmod.git + +config BR2_PACKAGE_KMOD_TOOLS + bool "kmod utilities" + help + Install kmod module utilities (depmod, insmod, lsmod, + modinfo, modprobe, rmmod). diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index f71087c..55cbdbb 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,4 +4,30 @@ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/ KMOD_INSTALL_STAGING = YES KMOD_DEPENDENCIES = host-pkg-config +ifeq ($(BR2_PACKAGE_ZLIB),y) +KMOD_DEPENDENCIES += zlib +KMOD_CONF_OPT += --with-zlib +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +KMOD_DEPENDENCIES += xz +KMOD_CONF_OPT += --with-xz +endif + +ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y) +# take precedence over busybox / module-init-tools implementations +KMOD_DEPENDENCIES += \ + $(if $(BR2_PACKAGE_BUSYBOX),busybox) \ + $(if $(BR2_PACKAGE_MODULE_INIT_TOOLS),module-init-tools) + +define KMOD_INSTALL_TOOLS + for i in depmod insmod lsmod modinfo modprobe rmmod; \ + do ln -sf ../usr/bin/kmod $(TARGET_DIR)/sbin/$$i; done +endef + +KMOD_POST_INSTALL_TARGET_HOOKS += KMOD_INSTALL_TOOLS +else +KMOD_CONF_OPT += --disable-tools +endif + $(eval $(call AUTOTARGETS))