Re: [oe-commits] Mark Hatle : util-linux: use new update-alternatives

Re: [oe-commits] Mark Hatle : util-linux: use new update-alternatives

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

On Wed, May 30, 2012 at 11:05:32AM +0000, git@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 55c01de28a28a4cfe16d36663c190a874ef2e85d
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
> 
> Author: Mark Hatle <mark.hatle@windriver.com>
> Date:   Mon May 21 12:42:34 2012 -0500
> 
> util-linux: use new update-alternatives
> 
> In addition to switching to the new update-alternatives, it was discovered
> that the sln, shutdown, halt, reboot and related commands were never generated.
> Remove these from the list.  (These appear to have been removed from util-linux
> some time ago.)
> 
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

This seems to break u-a for reset while upgrading from older image:

update-alternatives: Error: cannot register alternative reset to
/bin/reset since it is already registered to /usr/bin/reset

anyone seen it too?

Cheers,

> 
> ---
> 
>  meta/recipes-core/util-linux/util-linux.inc       |  212 +++++----------------
>  meta/recipes-core/util-linux/util-linux_2.21.1.bb |    2 +-
>  2 files changed, 45 insertions(+), 169 deletions(-)
> 
> Diff:   http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
> 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [oe-commits] Mark Hatle : util-linux: use new update-alternatives

[Mark Hatle]

On 6/28/12 2:12 PM, Martin Jansa wrote:
> On Wed, May 30, 2012 at 11:05:32AM +0000, git@git.openembedded.org wrote:
>> Module: openembedded-core.git
>> Branch: master
>> Commit: 55c01de28a28a4cfe16d36663c190a874ef2e85d
>> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
>>
>> Author: Mark Hatle <mark.hatle@windriver.com>
>> Date:   Mon May 21 12:42:34 2012 -0500
>>
>> util-linux: use new update-alternatives
>>
>> In addition to switching to the new update-alternatives, it was discovered
>> that the sln, shutdown, halt, reboot and related commands were never generated.
>> Remove these from the list.  (These appear to have been removed from util-linux
>> some time ago.)
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>
> This seems to break u-a for reset while upgrading from older image:
>
> update-alternatives: Error: cannot register alternative reset to
> /bin/reset since it is already registered to /usr/bin/reset

Can you figure out what registered it as /usr/bin/reset?  As far as I'm aware 
the reset command should be in /bin...  (Sounds like this may simply be an 
ordering thing.)

--Mark

> anyone seen it too?
>
> Cheers,
>
>>
>> ---
>>
>>   meta/recipes-core/util-linux/util-linux.inc       |  212 +++++----------------
>>   meta/recipes-core/util-linux/util-linux_2.21.1.bb |    2 +-
>>   2 files changed, 45 insertions(+), 169 deletions(-)
>>
>> Diff:   http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
>>
>> _______________________________________________
>> Openembedded-commits mailing list
>> Openembedded-commits@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [oe-commits] Mark Hatle : util-linux: use new update-alternatives

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2631 bytes --]

On Thu, Jun 28, 2012 at 02:43:28PM -0500, Mark Hatle wrote:
> On 6/28/12 2:12 PM, Martin Jansa wrote:
> > On Wed, May 30, 2012 at 11:05:32AM +0000, git@git.openembedded.org wrote:
> >> Module: openembedded-core.git
> >> Branch: master
> >> Commit: 55c01de28a28a4cfe16d36663c190a874ef2e85d
> >> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
> >>
> >> Author: Mark Hatle <mark.hatle@windriver.com>
> >> Date:   Mon May 21 12:42:34 2012 -0500
> >>
> >> util-linux: use new update-alternatives
> >>
> >> In addition to switching to the new update-alternatives, it was discovered
> >> that the sln, shutdown, halt, reboot and related commands were never generated.
> >> Remove these from the list.  (These appear to have been removed from util-linux
> >> some time ago.)
> >>
> >> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> >
> > This seems to break u-a for reset while upgrading from older image:
> >
> > update-alternatives: Error: cannot register alternative reset to
> > /bin/reset since it is already registered to /usr/bin/reset
> 
> Can you figure out what registered it as /usr/bin/reset?  As far as I'm aware 
> the reset command should be in /bin...  (Sounds like this may simply be an 
> ordering thing.)

seems like busybox did..

SHR root@Nokia-N900 / $ cat /var/lib/opkg/alternatives/reset 
/usr/bin/reset
../../bin/busybox 50

Cheers,

> 
> --Mark
> 
> > anyone seen it too?
> >
> > Cheers,
> >
> >>
> >> ---
> >>
> >>   meta/recipes-core/util-linux/util-linux.inc       |  212 +++++----------------
> >>   meta/recipes-core/util-linux/util-linux_2.21.1.bb |    2 +-
> >>   2 files changed, 45 insertions(+), 169 deletions(-)
> >>
> >> Diff:   http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
> >>
> >> _______________________________________________
> >> Openembedded-commits mailing list
> >> Openembedded-commits@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
> >
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [oe-commits] Mark Hatle : util-linux: use new update-alternatives

[Mark Hatle]

On 6/28/12 3:06 PM, Martin Jansa wrote:
> On Thu, Jun 28, 2012 at 02:43:28PM -0500, Mark Hatle wrote:
>> On 6/28/12 2:12 PM, Martin Jansa wrote:
>>> On Wed, May 30, 2012 at 11:05:32AM +0000, git@git.openembedded.org wrote:
>>>> Module: openembedded-core.git
>>>> Branch: master
>>>> Commit: 55c01de28a28a4cfe16d36663c190a874ef2e85d
>>>> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
>>>>
>>>> Author: Mark Hatle <mark.hatle@windriver.com>
>>>> Date:   Mon May 21 12:42:34 2012 -0500
>>>>
>>>> util-linux: use new update-alternatives
>>>>
>>>> In addition to switching to the new update-alternatives, it was discovered
>>>> that the sln, shutdown, halt, reboot and related commands were never generated.
>>>> Remove these from the list.  (These appear to have been removed from util-linux
>>>> some time ago.)
>>>>
>>>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>>>
>>> This seems to break u-a for reset while upgrading from older image:
>>>
>>> update-alternatives: Error: cannot register alternative reset to
>>> /bin/reset since it is already registered to /usr/bin/reset
>>
>> Can you figure out what registered it as /usr/bin/reset?  As far as I'm aware
>> the reset command should be in /bin...  (Sounds like this may simply be an
>> ordering thing.)
>
> seems like busybox did..
>
> SHR root@Nokia-N900 / $ cat /var/lib/opkg/alternatives/reset
> /usr/bin/reset
> ../../bin/busybox 50

Is that the current busybox?  If so, then util-linux is incorrect.  It should be 
matching the behavior of busybox -- unless of course busybox has a bug.  ;)


But when I set this up originally, the intent was to follow what BB was doing.

--Mark

> Cheers,
>
>>
>> --Mark
>>
>>> anyone seen it too?
>>>
>>> Cheers,
>>>
>>>>
>>>> ---
>>>>
>>>>    meta/recipes-core/util-linux/util-linux.inc       |  212 +++++----------------
>>>>    meta/recipes-core/util-linux/util-linux_2.21.1.bb |    2 +-
>>>>    2 files changed, 45 insertions(+), 169 deletions(-)
>>>>
>>>> Diff:   http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
>>>>
>>>> _______________________________________________
>>>> Openembedded-commits mailing list
>>>> Openembedded-commits@lists.openembedded.org
>>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
>>>
>>>
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>>
>>
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [oe-commits] Mark Hatle : util-linux: use new update-alternatives

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3885 bytes --]

On Thu, Jun 28, 2012 at 03:32:07PM -0500, Mark Hatle wrote:
> On 6/28/12 3:06 PM, Martin Jansa wrote:
> > On Thu, Jun 28, 2012 at 02:43:28PM -0500, Mark Hatle wrote:
> >> On 6/28/12 2:12 PM, Martin Jansa wrote:
> >>> On Wed, May 30, 2012 at 11:05:32AM +0000, git@git.openembedded.org wrote:
> >>>> Module: openembedded-core.git
> >>>> Branch: master
> >>>> Commit: 55c01de28a28a4cfe16d36663c190a874ef2e85d
> >>>> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
> >>>>
> >>>> Author: Mark Hatle <mark.hatle@windriver.com>
> >>>> Date:   Mon May 21 12:42:34 2012 -0500
> >>>>
> >>>> util-linux: use new update-alternatives
> >>>>
> >>>> In addition to switching to the new update-alternatives, it was discovered
> >>>> that the sln, shutdown, halt, reboot and related commands were never generated.
> >>>> Remove these from the list.  (These appear to have been removed from util-linux
> >>>> some time ago.)
> >>>>
> >>>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> >>>
> >>> This seems to break u-a for reset while upgrading from older image:
> >>>
> >>> update-alternatives: Error: cannot register alternative reset to
> >>> /bin/reset since it is already registered to /usr/bin/reset
> >>
> >> Can you figure out what registered it as /usr/bin/reset?  As far as I'm aware
> >> the reset command should be in /bin...  (Sounds like this may simply be an
> >> ordering thing.)
> >
> > seems like busybox did..
> >
> > SHR root@Nokia-N900 / $ cat /var/lib/opkg/alternatives/reset
> > /usr/bin/reset
> > ../../bin/busybox 50
> 
> Is that the current busybox?  If so, then util-linux is incorrect.  It should be 
> matching the behavior of busybox -- unless of course busybox has a bug.  ;)

yes
SHRZ root@zjama ~ $ grep reset /etc/busybox.links
/usr/bin/reset

I do not track every BB release.. so it's possible that they changed
lately, but I haven't seen any busybox which should cause this, that's
why I've replied on this commit..

Cheers,

> 
> 
> But when I set this up originally, the intent was to follow what BB was doing.
> 
> --Mark
> 
> > Cheers,
> >
> >>
> >> --Mark
> >>
> >>> anyone seen it too?
> >>>
> >>> Cheers,
> >>>
> >>>>
> >>>> ---
> >>>>
> >>>>    meta/recipes-core/util-linux/util-linux.inc       |  212 +++++----------------
> >>>>    meta/recipes-core/util-linux/util-linux_2.21.1.bb |    2 +-
> >>>>    2 files changed, 45 insertions(+), 169 deletions(-)
> >>>>
> >>>> Diff:   http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
> >>>>
> >>>> _______________________________________________
> >>>> Openembedded-commits mailing list
> >>>> Openembedded-commits@lists.openembedded.org
> >>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
> >>>
> >>>
> >>>
> >>> _______________________________________________
> >>> Openembedded-core mailing list
> >>> Openembedded-core@lists.openembedded.org
> >>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >>>
> >>
> >>
> >>
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCH] util-linux: register reset u-a to bindir like busybox does

[Martin Jansa]

* fixes http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/024586.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |    3 ++-
 meta/recipes-core/util-linux/util-linux_2.21.2.bb |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 688a5be..00e5d7c 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -136,7 +136,8 @@ ALTERNATIVE_${PN} += "setsid chrt flock hwclock"
 ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
 ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
 ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
-ALTERNATIVE_LINK_NAME[reset] = "${base_bindir}/reset"
+ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
+ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
 ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
 ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
 ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
index 7f2c2a9..0f5fdc6 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.21"
-PR = "r0"
+PR = "r1"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
-- 
1.7.8.6

Re: [PATCH] util-linux: register reset u-a to bindir like busybox does

[Saul Wold]

On 07/20/2012 03:49 AM, Martin Jansa wrote:
> * fixes http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/024586.html
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   meta/recipes-core/util-linux/util-linux.inc       |    3 ++-
>   meta/recipes-core/util-linux/util-linux_2.21.2.bb |    2 +-
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 688a5be..00e5d7c 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -136,7 +136,8 @@ ALTERNATIVE_${PN} += "setsid chrt flock hwclock"
>   ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
>   ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
>   ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
> -ALTERNATIVE_LINK_NAME[reset] = "${base_bindir}/reset"
> +ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
> +ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
>   ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
>   ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
>   ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
> diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
> index 7f2c2a9..0f5fdc6 100644
> --- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
> +++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
> @@ -1,5 +1,5 @@
>   MAJOR_VERSION = "2.21"
> -PR = "r0"
> +PR = "r1"
>   require util-linux.inc
>
>   # note that `lscpu' is under GPLv3+
>

Merged into OE-Core

Thanks
	Sau!