Patchwork [meta-oe] polkit: Remove authentication override as it is handled in OE-Core

login
register
mail settings
Submitter Otavio Salvador
Date March 8, 2013, 6:50 p.m.
Message ID <1362768637-29343-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/45733/
State Accepted, archived
Commit d928d6c88530f60d9db6b19a1046fc1dc5e575ae
Headers show

Comments

Otavio Salvador - March 8, 2013, 6:50 p.m.
OE-Core now handles the detection of authentication so we don't need
to do it here. The bbappend file is kept to provide the upgrade path
only, or the revision would go backwards.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-extended/polkit/polkit_0.104.bbappend | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
Paul Eggleton - March 8, 2013, 10:48 p.m.
On Friday 08 March 2013 15:50:37 Otavio Salvador wrote:
> OE-Core now handles the detection of authentication so we don't need
> to do it here. The bbappend file is kept to provide the upgrade path
> only, or the revision would go backwards.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta-oe/recipes-extended/polkit/polkit_0.104.bbappend | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend index
> ea82e37..ceb2b6b 100644
> --- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> +++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> @@ -1,8 +1 @@
> -PRINC := "${@int(PRINC) + 4}"
> -
> -POLKITAUTH ??= "consolekit"
> -
> -PACKAGECONFIG += "${POLKITAUTH}"
> -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
> -# there is no --enable/--disable option for consolekit and it's not picked
> by shlibs, so add it to RDEPENDS -PACKAGECONFIG[consolekit] =
> ",,,consolekit"
> +PRINC := "${@int(PRINC) + 5}"

Can't we just bump PR in OE-Core?

Cheers,
Paul
Martin Jansa - March 9, 2013, 6:30 a.m.
On Fri, Mar 08, 2013 at 10:48:17PM +0000, Paul Eggleton wrote:
> On Friday 08 March 2013 15:50:37 Otavio Salvador wrote:
> > OE-Core now handles the detection of authentication so we don't need
> > to do it here. The bbappend file is kept to provide the upgrade path
> > only, or the revision would go backwards.
> > 
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> >  meta-oe/recipes-extended/polkit/polkit_0.104.bbappend | 9 +--------
> >  1 file changed, 1 insertion(+), 8 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> > b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend index
> > ea82e37..ceb2b6b 100644
> > --- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> > +++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> > @@ -1,8 +1 @@
> > -PRINC := "${@int(PRINC) + 4}"
> > -
> > -POLKITAUTH ??= "consolekit"
> > -
> > -PACKAGECONFIG += "${POLKITAUTH}"
> > -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
> > -# there is no --enable/--disable option for consolekit and it's not picked
> > by shlibs, so add it to RDEPENDS -PACKAGECONFIG[consolekit] =
> > ",,,consolekit"
> > +PRINC := "${@int(PRINC) + 5}"
> 
> Can't we just bump PR in OE-Core?

we dont know which oe-core and meta-oe revisions are used together and
this needs to be applied in both at the same time.. so no, we need to
wait for PE/PV change in oe-core.
Otavio Salvador - March 9, 2013, 11:59 a.m.
On Sat, Mar 9, 2013 at 3:30 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Mar 08, 2013 at 10:48:17PM +0000, Paul Eggleton wrote:
>> On Friday 08 March 2013 15:50:37 Otavio Salvador wrote:
>> > OE-Core now handles the detection of authentication so we don't need
>> > to do it here. The bbappend file is kept to provide the upgrade path
>> > only, or the revision would go backwards.
>> >
>> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> > ---
>> >  meta-oe/recipes-extended/polkit/polkit_0.104.bbappend | 9 +--------
>> >  1 file changed, 1 insertion(+), 8 deletions(-)
>> >
>> > diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
>> > b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend index
>> > ea82e37..ceb2b6b 100644
>> > --- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
>> > +++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
>> > @@ -1,8 +1 @@
>> > -PRINC := "${@int(PRINC) + 4}"
>> > -
>> > -POLKITAUTH ??= "consolekit"
>> > -
>> > -PACKAGECONFIG += "${POLKITAUTH}"
>> > -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
>> > -# there is no --enable/--disable option for consolekit and it's not picked
>> > by shlibs, so add it to RDEPENDS -PACKAGECONFIG[consolekit] =
>> > ",,,consolekit"
>> > +PRINC := "${@int(PRINC) + 5}"
>>
>> Can't we just bump PR in OE-Core?
>
> we dont know which oe-core and meta-oe revisions are used together and
> this needs to be applied in both at the same time.. so no, we need to
> wait for PE/PV change in oe-core.

I agree with Martin here; we cannot know which version combination
user is using so we cannot do that.
Paul Eggleton - March 10, 2013, 8:42 p.m.
On Saturday 09 March 2013 07:30:59 Martin Jansa wrote:
> On Fri, Mar 08, 2013 at 10:48:17PM +0000, Paul Eggleton wrote:
> > On Friday 08 March 2013 15:50:37 Otavio Salvador wrote:
> > > OE-Core now handles the detection of authentication so we don't need
> > > to do it here. The bbappend file is kept to provide the upgrade path
> > > only, or the revision would go backwards.
> > > 
> > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > > ---
> > > 
> > >  meta-oe/recipes-extended/polkit/polkit_0.104.bbappend | 9 +--------
> > >  1 file changed, 1 insertion(+), 8 deletions(-)
> > > 
> > > diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> > > b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend index
> > > ea82e37..ceb2b6b 100644
> > > --- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> > > +++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> > > @@ -1,8 +1 @@
> > > -PRINC := "${@int(PRINC) + 4}"
> > > -
> > > -POLKITAUTH ??= "consolekit"
> > > -
> > > -PACKAGECONFIG += "${POLKITAUTH}"
> > > -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
> > > -# there is no --enable/--disable option for consolekit and it's not
> > > picked
> > > by shlibs, so add it to RDEPENDS -PACKAGECONFIG[consolekit] =
> > > ",,,consolekit"
> > > +PRINC := "${@int(PRINC) + 5}"
> > 
> > Can't we just bump PR in OE-Core?
> 
> we dont know which oe-core and meta-oe revisions are used together and
> this needs to be applied in both at the same time.. so no, we need to
> wait for PE/PV change in oe-core.

I guess you're probably right. Yet another reason to never add any more 
bbappends to meta-oe.

Cheers,
Paul
Ross Burton - March 11, 2013, 3:10 a.m.
On 10 March 2013 13:42, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
>> we dont know which oe-core and meta-oe revisions are used together and
>> this needs to be applied in both at the same time.. so no, we need to
>> wait for PE/PV change in oe-core.
>
> I guess you're probably right. Yet another reason to never add any more
> bbappends to meta-oe.

For what it's worth I've got a series I'm about to submit to
oe-core/meta-oe that removes polkit from oe-core and moves it to
meta-oe, so this problem will just disappear then as we can bump PR in
meta-oe.

(the background being that polkit is entirely optional, and new
upstreams require a JS interpretter)

Ross

Patch

diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
index ea82e37..ceb2b6b 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
@@ -1,8 +1 @@ 
-PRINC := "${@int(PRINC) + 4}"
-
-POLKITAUTH ??= "consolekit"
-
-PACKAGECONFIG += "${POLKITAUTH}"
-PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
-# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
-PACKAGECONFIG[consolekit] = ",,,consolekit"
+PRINC := "${@int(PRINC) + 5}"