From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-bk0-x235.google.com ([2a00:1450:4008:c01::235]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WT67J-0002Ez-Hx for ptxdist@pengutronix.de; Thu, 27 Mar 2014 09:57:12 +0100 Received: by mail-bk0-f53.google.com with SMTP id r7so716335bkg.26 for ; Thu, 27 Mar 2014 01:56:47 -0700 (PDT) From: Alexander Aring Date: Thu, 27 Mar 2014 09:56:29 +0100 Message-Id: <1395910589-20059-1-git-send-email-alex.aring@gmail.com> Subject: [ptxdist] [PATCH] libkmod: fix dependency on BUSYBOX_MODPROBE_SMALL Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Alexander Aring If BUSYBOX_MODPROBE_SMALL it will install modprobe, rmmod and insmod. The current libkmod doesn't check on this so I got a: * check_data_file_clashes: Package busybox wants to install file * .../build-target/image-root-tgz/sbin/modprobe But that file is already provided by package * libkmod * check_data_file_clashes: Package busybox wants to install file * .../build-target/image-root-tgz/sbin/insmod But that file is already provided by package * libkmod * check_data_file_clashes: Package busybox wants to install file * .../build-target/image-root-tgz/sbin/rmmod But that file is already provided by package * libkmod * opkg_install_cmd: Cannot install package busybox. This patch fix this issue. Signed-off-by: Alexander Aring --- rules/libkmod.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rules/libkmod.in b/rules/libkmod.in index 4d5a9d8..1660f7c 100644 --- a/rules/libkmod.in +++ b/rules/libkmod.in @@ -17,24 +17,24 @@ config LIBKMOD_TOOLS config LIBKMOD_INSMOD bool prompt "Install insmod" - depends on !BUSYBOX_INSMOD || ALLYES + depends on (!BUSYBOX_INSMOD && !BUSYBOX_MODPROBE_SMALL) || ALLYES select LIBKMOD_TOOLS help simple program to insert a module into the Linux Kernel comment "BusyBox' insmod is selected!" - depends on BUSYBOX_INSMOD + depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE_SMALL config LIBKMOD_RMMOD bool prompt "Install rmmod" - depends on !BUSYBOX_RMMOD || ALLYES + depends on (!BUSYBOX_RMMOD && !BUSYBOX_MODPROBE_SMALL) || ALLYES select LIBKMOD_TOOLS help simple program to remove a module from the Linux Kernel comment "BusyBox' rmmod is selected!" - depends on BUSYBOX_RMMOD + depends on BUSYBOX_RMMOD || BUSYBOX_MODPROBE_SMALL config LIBKMOD_LSMOD bool @@ -61,13 +61,13 @@ comment "BusyBox' modinfo is selected!" config LIBKMOD_MODPROBE bool prompt "Install modprobe" - depends on !BUSYBOX_MODPROBE || ALLYES + depends on (!BUSYBOX_MODPROBE && !BUSYBOX_MODPROBE_SMALL) || ALLYES select LIBKMOD_TOOLS help program to add and remove modules from the Linux Kernel comment "BusyBox' modprobe is selected!" - depends on BUSYBOX_MODPROBE + depends on BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL config LIBKMOD_DEPMOD bool -- 1.9.1 -- ptxdist mailing list ptxdist@pengutronix.de