* [PATCH] opkg-utils: allow disabling update-alternatives
@ 2014-08-08 9:37 Sujith H
2014-08-08 18:11 ` Saul Wold
0 siblings, 1 reply; 12+ messages in thread
From: Sujith H @ 2014-08-08 9:37 UTC (permalink / raw)
To: openembedded-core; +Cc: Sujith H
From: Sujith H <Sujith_Haridasan@mentor.com>
This is needed to deal with the situation where we're using ipk packaging, so
opkg-utils must be built regardless of what update-alternatives provider we
prefer. The downside to the current implementation is the need to adjust
PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that way.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 693c216..287bf53 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -19,11 +19,15 @@ TARGET_CC_ARCH += "${LDFLAGS}"
PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
PYTHONRDEPS_class-native = ""
-PACKAGECONFIG = "python"
+PACKAGECONFIG = "python update-alternatives"
PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
+PACKAGECONFIG[update-alternatives] = ",,,"
do_install() {
oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+ if ${@'true' if 'update-alternatives' not in PACKAGECONFIG.split() else 'false'}; then
+ rm -f "${D}${bindir}/update-alternatives"
+ fi
}
PACKAGES =+ "update-alternatives-opkg"
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] opkg-utils: allow disabling update-alternatives
2014-08-08 9:37 [PATCH] opkg-utils: allow disabling update-alternatives Sujith H
@ 2014-08-08 18:11 ` Saul Wold
2014-08-11 10:16 ` sujith h
0 siblings, 1 reply; 12+ messages in thread
From: Saul Wold @ 2014-08-08 18:11 UTC (permalink / raw)
To: Sujith H, openembedded-core; +Cc: Sujith H
On 08/08/2014 02:37 AM, Sujith H wrote:
> From: Sujith H <Sujith_Haridasan@mentor.com>
>
> This is needed to deal with the situation where we're using ipk packaging, so
> opkg-utils must be built regardless of what update-alternatives provider we
> prefer. The downside to the current implementation is the need to adjust
> PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that way.
>
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
> ---
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 693c216..287bf53 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -19,11 +19,15 @@ TARGET_CC_ARCH += "${LDFLAGS}"
> PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
> PYTHONRDEPS_class-native = ""
>
> -PACKAGECONFIG = "python"
> +PACKAGECONFIG = "python update-alternatives"
> PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
> +PACKAGECONFIG[update-alternatives] = ",,,"
>
> do_install() {
> oe_runmake PREFIX=${prefix} DESTDIR=${D} install
> + if ${@'true' if 'update-alternatives' not in PACKAGECONFIG.split() else 'false'}; then
> + rm -f "${D}${bindir}/update-alternatives"
> + fi
Would @bb.utils.contains() be better here? I think that is the correct
thing to use.
Sau!
> }
>
> PACKAGES =+ "update-alternatives-opkg"
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] opkg-utils: allow disabling update-alternatives
2014-08-08 18:11 ` Saul Wold
@ 2014-08-11 10:16 ` sujith h
0 siblings, 0 replies; 12+ messages in thread
From: sujith h @ 2014-08-11 10:16 UTC (permalink / raw)
To: Saul Wold; +Cc: Sujith H, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2140 bytes --]
On Fri, Aug 8, 2014 at 11:41 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 08/08/2014 02:37 AM, Sujith H wrote:
>
>> From: Sujith H <Sujith_Haridasan@mentor.com>
>>
>> This is needed to deal with the situation where we're using ipk
>> packaging, so
>> opkg-utils must be built regardless of what update-alternatives provider
>> we
>> prefer. The downside to the current implementation is the need to adjust
>> PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that
>> way.
>>
>> Signed-off-by: Christopher Larson <kergoth@gmail.com>
>> Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
>> ---
>> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>> b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>> index 693c216..287bf53 100644
>> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>> @@ -19,11 +19,15 @@ TARGET_CC_ARCH += "${LDFLAGS}"
>> PYTHONRDEPS = "python python-shell python-io python-math python-crypt
>> python-logging python-fcntl python-subprocess python-pickle
>> python-compression python-textutils python-stringold"
>> PYTHONRDEPS_class-native = ""
>>
>> -PACKAGECONFIG = "python"
>> +PACKAGECONFIG = "python update-alternatives"
>> PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
>> +PACKAGECONFIG[update-alternatives] = ",,,"
>>
>> do_install() {
>> oe_runmake PREFIX=${prefix} DESTDIR=${D} install
>> + if ${@'true' if 'update-alternatives' not in
>> PACKAGECONFIG.split() else 'false'}; then
>> + rm -f "${D}${bindir}/update-alternatives"
>> + fi
>>
> Would @bb.utils.contains() be better here? I think that is the correct
> thing to use.
>
>
Sure.
> Sau!
>
> }
>>
>> PACKAGES =+ "update-alternatives-opkg"
>>
>>
--
സുജിത് ഹരിദാസന്
Bangalore
<Project>Contributor to KDE project
http://fci.wikia.com/wiki/Anti-DRM-Campaign
<Blog> http://sujithh.info
[-- Attachment #2: Type: text/html, Size: 3729 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] opkg-utils: allow disabling update-alternatives
@ 2014-08-11 10:12 Sujith H
0 siblings, 0 replies; 12+ messages in thread
From: Sujith H @ 2014-08-11 10:12 UTC (permalink / raw)
To: openembedded-core; +Cc: Sujith H
From: Sujith H <Sujith_Haridasan@mentor.com>
This is needed to deal with the situation where we're using ipk packaging, so
opkg-utils must be built regardless of what update-alternatives provider we
prefer. The downside to the current implementation is the need to adjust
PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that way.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 693c216..6fe04ea 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -19,11 +19,15 @@ TARGET_CC_ARCH += "${LDFLAGS}"
PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
PYTHONRDEPS_class-native = ""
-PACKAGECONFIG = "python"
+PACKAGECONFIG = "python update-alternatives"
PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
+PACKAGECONFIG[update-alternatives] = ",,,"
do_install() {
oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+ if ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'false', 'true')}; then
+ rm -f "${D}${bindir}/update-alternatives"
+ fi
}
PACKAGES =+ "update-alternatives-opkg"
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] opkg-utils: allow disabling update-alternatives
2014-08-07 9:24 Sujith H
2014-08-07 9:31 ` sujith h
@ 2014-08-07 19:36 ` Saul Wold
1 sibling, 0 replies; 12+ messages in thread
From: Saul Wold @ 2014-08-07 19:36 UTC (permalink / raw)
To: Sujith H, openembedded-core; +Cc: Sujith H
On 08/07/2014 02:24 AM, Sujith H wrote:
> From: Sujith H <Sujith_Haridasan@mentor.com>
>
> This is needed to deal with the situation where we're using ipk packaging, so
> opkg-utils must be built regardless of what update-alternatives provider we
> prefer. The downside to the current implementation is the need to adjust
> PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that way.
>
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
> ---
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 693c216..9364740 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
> PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
> PYTHONRDEPS_class-native = ""
>
> -PACKAGECONFIG = "python"
> +PACKAGECONFIG = "python update-alternatives"
> PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
> +PACKAGECONFIG[update-alternatives] = ",,,"
> +
> +PROVIDES += "${@'virtual/update-alternatives' if 'update-alternatives' in PACKAGECONFIG.split() else ''}"
>
Is there not still a PROVIDES line above that has the
virtual/update-alternative that needs to be removed?
Sau!
> do_install() {
> oe_runmake PREFIX=${prefix} DESTDIR=${D} install
> + if ${@'true' if 'update-alternatives' not in PACKAGECONFIG.split() else 'false'}; then
> + rm -f "${D}${bindir}/update-alternatives"
> + fi
> }
>
> PACKAGES =+ "update-alternatives-opkg"
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] opkg-utils: allow disabling update-alternatives
2014-08-07 9:24 Sujith H
@ 2014-08-07 9:31 ` sujith h
2014-08-07 19:36 ` Saul Wold
1 sibling, 0 replies; 12+ messages in thread
From: sujith h @ 2014-08-07 9:31 UTC (permalink / raw)
To: openembedded-core; +Cc: Paul Eggleton
[-- Attachment #1: Type: text/plain, Size: 2185 bytes --]
Hi Paul Eggleton,
On Thu, Aug 7, 2014 at 2:54 PM, Sujith H <sujith.h@gmail.com> wrote:
> From: Sujith H <Sujith_Haridasan@mentor.com>
>
> This is needed to deal with the situation where we're using ipk packaging,
> so
> opkg-utils must be built regardless of what update-alternatives provider we
> prefer. The downside to the current implementation is the need to adjust
> PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that
> way.
>
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
> ---
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 693c216..9364740 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
> PYTHONRDEPS = "python python-shell python-io python-math python-crypt
> python-logging python-fcntl python-subprocess python-pickle
> python-compression python-textutils python-stringold"
> PYTHONRDEPS_class-native = ""
>
> -PACKAGECONFIG = "python"
> +PACKAGECONFIG = "python update-alternatives"
> PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
> +PACKAGECONFIG[update-alternatives] = ",,,"
> +
> +PROVIDES += "${@'virtual/update-alternatives' if 'update-alternatives' in
> PACKAGECONFIG.split() else ''}"
>
> do_install() {
> oe_runmake PREFIX=${prefix} DESTDIR=${D} install
> + if ${@'true' if 'update-alternatives' not in
> PACKAGECONFIG.split() else 'false'}; then
> + rm -f "${D}${bindir}/update-alternatives"
> + fi
> }
>
> PACKAGES =+ "update-alternatives-opkg"
> --
> 1.8.4
>
>
In this change I am adding it to PROVIDES only if its required. Hope this
change looks ok?
Thanks,
Sujith H
--
സുജിത് ഹരിദാസന്
Bangalore
<Project>Contributor to KDE project
http://fci.wikia.com/wiki/Anti-DRM-Campaign
<Blog> http://sujithh.info
[-- Attachment #2: Type: text/html, Size: 3580 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] opkg-utils: allow disabling update-alternatives
@ 2014-08-07 9:24 Sujith H
2014-08-07 9:31 ` sujith h
2014-08-07 19:36 ` Saul Wold
0 siblings, 2 replies; 12+ messages in thread
From: Sujith H @ 2014-08-07 9:24 UTC (permalink / raw)
To: openembedded-core; +Cc: Sujith H
From: Sujith H <Sujith_Haridasan@mentor.com>
This is needed to deal with the situation where we're using ipk packaging, so
opkg-utils must be built regardless of what update-alternatives provider we
prefer. The downside to the current implementation is the need to adjust
PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that way.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 693c216..9364740 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
PYTHONRDEPS_class-native = ""
-PACKAGECONFIG = "python"
+PACKAGECONFIG = "python update-alternatives"
PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
+PACKAGECONFIG[update-alternatives] = ",,,"
+
+PROVIDES += "${@'virtual/update-alternatives' if 'update-alternatives' in PACKAGECONFIG.split() else ''}"
do_install() {
oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+ if ${@'true' if 'update-alternatives' not in PACKAGECONFIG.split() else 'false'}; then
+ rm -f "${D}${bindir}/update-alternatives"
+ fi
}
PACKAGES =+ "update-alternatives-opkg"
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] opkg-utils: allow disabling update-alternatives
2014-08-06 13:28 ` sujith h
@ 2014-08-06 13:53 ` Paul Eggleton
0 siblings, 0 replies; 12+ messages in thread
From: Paul Eggleton @ 2014-08-06 13:53 UTC (permalink / raw)
To: sujith h; +Cc: Sujith H, openembedded-core
On Wednesday 06 August 2014 18:58:11 sujith h wrote:
> On Wed, Aug 6, 2014 at 6:08 PM, Paul Eggleton <paul.eggleton@linux.intel.com
> > wrote:
> >
> > On Wednesday 06 August 2014 17:34:09 Sujith H wrote:
> > > From: Sujith H <Sujith_Haridasan@mentor.com>
> > >
> > > This is needed to deal with the situation where we're using ipk
> >
> > packaging,
> >
> > > so opkg-utils must be built regardless of what update-alternatives
> >
> > provider
> >
> > > we prefer. The downside to the current implementation is the need to
> >
> > adjust
> >
> > > PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit
> > > that
> > > way.
> > >
> > > Signed-off-by: Christopher Larson <kergoth@gmail.com>
> > > Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
> > > ---
> > >
> > > meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
> > > 1 file changed, 7 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> > > b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index
> >
> > 693c216..952fce4
> >
> > > 100644
> > > --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> > > +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> > > @@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
> > >
> > > PYTHONRDEPS = "python python-shell python-io python-math python-crypt
> > >
> > > python-logging python-fcntl python-subprocess python-pickle
> > > python-compression python-textutils python-stringold"
> > > PYTHONRDEPS_class-native = ""
> > >
> > > -PACKAGECONFIG = "python"
> > > +PACKAGECONFIG = "python update-alternatives"
> > >
> > > PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
> > >
> > > +PACKAGECONFIG[update-alternatives] = ",,,"
> > > +
> > > +PROVIDES_remove = "${@'virtual/update-alternatives' if
> > > 'update-alternatives' not in PACKAGECONFIG.split() else ''}"
> >
> > If we have to do this, rather than using _remove here could we simply make
> > adding it conditional?
>
> Isn't _remove itself conditional? Pardon me if my understanding is wrong.
What I mean is, this value gets added to PROVIDES here in the same recipe.
Rather than unconditionally adding it then conditionally removing it, why not
just conditionally add it?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] opkg-utils: allow disabling update-alternatives
2014-08-06 12:38 ` Paul Eggleton
@ 2014-08-06 13:28 ` sujith h
2014-08-06 13:53 ` Paul Eggleton
0 siblings, 1 reply; 12+ messages in thread
From: sujith h @ 2014-08-06 13:28 UTC (permalink / raw)
To: Paul Eggleton; +Cc: Sujith H, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2162 bytes --]
On Wed, Aug 6, 2014 at 6:08 PM, Paul Eggleton <paul.eggleton@linux.intel.com
> wrote:
> On Wednesday 06 August 2014 17:34:09 Sujith H wrote:
> > From: Sujith H <Sujith_Haridasan@mentor.com>
> >
> > This is needed to deal with the situation where we're using ipk
> packaging,
> > so opkg-utils must be built regardless of what update-alternatives
> provider
> > we prefer. The downside to the current implementation is the need to
> adjust
> > PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that
> > way.
> >
> > Signed-off-by: Christopher Larson <kergoth@gmail.com>
> > Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
> > ---
> > meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> > b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index
> 693c216..952fce4
> > 100644
> > --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> > +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> > @@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
> > PYTHONRDEPS = "python python-shell python-io python-math python-crypt
> > python-logging python-fcntl python-subprocess python-pickle
> > python-compression python-textutils python-stringold"
> > PYTHONRDEPS_class-native = ""
> >
> > -PACKAGECONFIG = "python"
> > +PACKAGECONFIG = "python update-alternatives"
> > PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
> > +PACKAGECONFIG[update-alternatives] = ",,,"
> > +
> > +PROVIDES_remove = "${@'virtual/update-alternatives' if
> > 'update-alternatives' not in PACKAGECONFIG.split() else ''}"
>
> If we have to do this, rather than using _remove here could we simply make
> adding it conditional?
>
Isn't _remove itself conditional? Pardon me if my understanding is wrong.
>
> Cheers,
> Paul
>
> --
>
> Paul Eggleton
> Intel Open Source Technology Centre
>
--
സുജിത് ഹരിദാസന്
Bangalore
<Project>Contributor to KDE project
http://fci.wikia.com/wiki/Anti-DRM-Campaign
<Blog> http://sujithh.info
[-- Attachment #2: Type: text/html, Size: 3612 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] opkg-utils: allow disabling update-alternatives
2014-08-06 12:04 Sujith H
@ 2014-08-06 12:38 ` Paul Eggleton
2014-08-06 13:28 ` sujith h
0 siblings, 1 reply; 12+ messages in thread
From: Paul Eggleton @ 2014-08-06 12:38 UTC (permalink / raw)
To: Sujith H, Sujith H; +Cc: openembedded-core
On Wednesday 06 August 2014 17:34:09 Sujith H wrote:
> From: Sujith H <Sujith_Haridasan@mentor.com>
>
> This is needed to deal with the situation where we're using ipk packaging,
> so opkg-utils must be built regardless of what update-alternatives provider
> we prefer. The downside to the current implementation is the need to adjust
> PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that
> way.
>
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
> ---
> meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index 693c216..952fce4
> 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
> PYTHONRDEPS = "python python-shell python-io python-math python-crypt
> python-logging python-fcntl python-subprocess python-pickle
> python-compression python-textutils python-stringold"
> PYTHONRDEPS_class-native = ""
>
> -PACKAGECONFIG = "python"
> +PACKAGECONFIG = "python update-alternatives"
> PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
> +PACKAGECONFIG[update-alternatives] = ",,,"
> +
> +PROVIDES_remove = "${@'virtual/update-alternatives' if
> 'update-alternatives' not in PACKAGECONFIG.split() else ''}"
If we have to do this, rather than using _remove here could we simply make
adding it conditional?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] opkg-utils: allow disabling update-alternatives
@ 2014-08-06 12:04 Sujith H
2014-08-06 12:38 ` Paul Eggleton
0 siblings, 1 reply; 12+ messages in thread
From: Sujith H @ 2014-08-06 12:04 UTC (permalink / raw)
To: openembedded-core; +Cc: Sujith H
From: Sujith H <Sujith_Haridasan@mentor.com>
This is needed to deal with the situation where we're using ipk packaging, so
opkg-utils must be built regardless of what update-alternatives provider we
prefer. The downside to the current implementation is the need to adjust
PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that way.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 693c216..952fce4 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
PYTHONRDEPS_class-native = ""
-PACKAGECONFIG = "python"
+PACKAGECONFIG = "python update-alternatives"
PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
+PACKAGECONFIG[update-alternatives] = ",,,"
+
+PROVIDES_remove = "${@'virtual/update-alternatives' if 'update-alternatives' not in PACKAGECONFIG.split() else ''}"
do_install() {
oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+ if ${@'true' if 'update-alternatives' not in PACKAGECONFIG.split() else 'false'}; then
+ rm -f "${D}${bindir}/update-alternatives"
+ fi
}
PACKAGES =+ "update-alternatives-opkg"
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] opkg-utils: allow disabling update-alternatives
@ 2014-08-06 12:00 Sujith H
0 siblings, 0 replies; 12+ messages in thread
From: Sujith H @ 2014-08-06 12:00 UTC (permalink / raw)
To: openembedded-core; +Cc: Sujith H
From: Sujith H <Sujith_Haridasan@mentor.com>
This is needed to deal with the situation where we're using ipk packaging, so
opkg-utils must be built regardless of what update-alternatives provider we
prefer. The downside to the current implementation is the need to adjust
PACKAGECONFIG as well as PREFERRED_PROVIDER, but it is more explicit that way.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 693c216..952fce4 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -19,11 +19,17 @@ TARGET_CC_ARCH += "${LDFLAGS}"
PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
PYTHONRDEPS_class-native = ""
-PACKAGECONFIG = "python"
+PACKAGECONFIG = "python update-alternatives"
PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
+PACKAGECONFIG[update-alternatives] = ",,,"
+
+PROVIDES_remove = "${@'virtual/update-alternatives' if 'update-alternatives' not in PACKAGECONFIG.split() else ''}"
do_install() {
oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+ if ${@'true' if 'update-alternatives' not in PACKAGECONFIG.split() else 'false'}; then
+ rm -f "${D}${bindir}/update-alternatives"
+ fi
}
PACKAGES =+ "update-alternatives-opkg"
--
1.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-08-11 10:16 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-08 9:37 [PATCH] opkg-utils: allow disabling update-alternatives Sujith H
2014-08-08 18:11 ` Saul Wold
2014-08-11 10:16 ` sujith h
-- strict thread matches above, loose matches on Subject: below --
2014-08-11 10:12 Sujith H
2014-08-07 9:24 Sujith H
2014-08-07 9:31 ` sujith h
2014-08-07 19:36 ` Saul Wold
2014-08-06 12:04 Sujith H
2014-08-06 12:38 ` Paul Eggleton
2014-08-06 13:28 ` sujith h
2014-08-06 13:53 ` Paul Eggleton
2014-08-06 12:00 Sujith H
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.