From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] libkmod: fix dependency on BUSYBOX_MODPROBE_SMALL
Date: Sat, 29 Mar 2014 10:29:23 +0100 [thread overview]
Message-ID: <20140329092923.GD10959@pengutronix.de> (raw)
In-Reply-To: <1395910589-20059-1-git-send-email-alex.aring@gmail.com>
On Thu, Mar 27, 2014 at 09:56:29AM +0100, Alexander Aring wrote:
> 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.
Thanks, applied.
Michael
>
> 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
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2014-03-29 9:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-27 8:56 Alexander Aring
2014-03-29 9:29 ` Michael Olbrich [this message]
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=20140329092923.GD10959@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--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