From: Alexander Aring <alex.aring@gmail.com>
To: ptxdist@pengutronix.de
Cc: Alexander Aring <alex.aring@gmail.com>
Subject: [ptxdist] [PATCH] libkmod: fix dependency on BUSYBOX_MODPROBE_SMALL
Date: Thu, 27 Mar 2014 09:56:29 +0100 [thread overview]
Message-ID: <1395910589-20059-1-git-send-email-alex.aring@gmail.com> (raw)
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>
---
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
next reply other threads:[~2014-03-27 8:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-27 8:56 Alexander Aring [this message]
2014-03-29 9:29 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395910589-20059-1-git-send-email-alex.aring@gmail.com \
--to=alex.aring@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox