[ptxdist] [PATCH 1/2] qt4: install bearer plugins only when network is selected

[ptxdist] [PATCH 1/2] qt4: install bearer plugins only when network is selected

[Hubert Feurstein]

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
 rules/qt4.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/qt4.make b/rules/qt4.make
index 95712a7..c1174f2 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -553,7 +553,7 @@ ifdef PTXCONF_QT4_BUILD_SVG
 		/usr/plugins/iconengines/libqsvgicon.$(QT4_PLUGIN_EXT))
 endif
 
-ifndef PTXCONF_QT4_BUILD_NETWORK
+ifdef PTXCONF_QT4_BUILD_NETWORK
 	@$(call install_copy, qt4, 0, 0, 0644, -, \
 		/usr/plugins/bearer/libqgenericbearer.$(QT4_PLUGIN_EXT))
 	@$(call install_copy, qt4, 0, 0, 0644, -, \
-- 
1.8.1.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] qt4: install libqnmbearer only when networkmanager is selected

[Hubert Feurstein]

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
 rules/qt4.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/qt4.make b/rules/qt4.make
index c1174f2..b5ae03a 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -556,9 +556,11 @@ endif
 ifdef PTXCONF_QT4_BUILD_NETWORK
 	@$(call install_copy, qt4, 0, 0, 0644, -, \
 		/usr/plugins/bearer/libqgenericbearer.$(QT4_PLUGIN_EXT))
+ifdef PTXCONF_NETWORKMANAGER
 	@$(call install_copy, qt4, 0, 0, 0644, -, \
 		/usr/plugins/bearer/libqnmbearer.$(QT4_PLUGIN_EXT))
 endif
+endif
 ifdef PTXCONF_QT4_BUILD_PHONON
 	@$(call install_copy, qt4, 0, 0, 0644, -, \
 		/usr/plugins/phonon_backend/libphonon_gstreamer.$(QT4_PLUGIN_EXT))
-- 
1.8.1.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/2] qt4: install libqnmbearer only when networkmanager is selected

[Michael Olbrich]

On Mon, Mar 25, 2013 at 05:54:19PM +0100, Hubert Feurstein wrote:
> Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
> ---
>  rules/qt4.make | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/rules/qt4.make b/rules/qt4.make
> index c1174f2..b5ae03a 100644
> --- a/rules/qt4.make
> +++ b/rules/qt4.make
> @@ -556,9 +556,11 @@ endif
>  ifdef PTXCONF_QT4_BUILD_NETWORK
>  	@$(call install_copy, qt4, 0, 0, 0644, -, \
>  		/usr/plugins/bearer/libqgenericbearer.$(QT4_PLUGIN_EXT))
> +ifdef PTXCONF_NETWORKMANAGER

This is not good. I try to avoid using symbols from other packages because
that break the detection when a package needs to be rebuild.

Why this change anyways? The library is not that large to make a
difference. Does it behave badly if NetworkManager is not present?

Anyways, if this is really necessary then create a QT4_NETWORKMANAGER
options, with no prompt and "default NETWORKMANAGER"

Michael

>  	@$(call install_copy, qt4, 0, 0, 0644, -, \
>  		/usr/plugins/bearer/libqnmbearer.$(QT4_PLUGIN_EXT))
>  endif
> +endif
>  ifdef PTXCONF_QT4_BUILD_PHONON
>  	@$(call install_copy, qt4, 0, 0, 0644, -, \
>  		/usr/plugins/phonon_backend/libphonon_gstreamer.$(QT4_PLUGIN_EXT))
> -- 
> 1.8.1.3
> 
> 
> -- 
> 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