diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-03-27 09:56:29 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-03-28 11:29:43 +0100 |
| commit | 2d97518bb8d6e0781752a56ac5018147d9635b4d (patch) | |
| tree | d849b4f4012c5f2847431b52e0419aaa8badeec4 /rules/libkmod.in | |
| parent | 6dd86ce3de8b528ec17c87da197942376225d391 (diff) | |
| download | ptxdist-2d97518bb8d6e0781752a56ac5018147d9635b4d.tar.gz ptxdist-2d97518bb8d6e0781752a56ac5018147d9635b4d.tar.xz | |
libkmod: fix dependency on BUSYBOX_MODPROBE_SMALL
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 <alex.aring@gmail.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libkmod.in')
| -rw-r--r-- | rules/libkmod.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/libkmod.in b/rules/libkmod.in index 4d5a9d8ff..1660f7c4b 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 |