Mark Hatle : util-linux: use new update-alternatives

oe-commits Applied Martin Jansa 3 participants 7 messages Jun 28, 2012 – Jul 21, 2012 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20120530110534.15D7110219@opal

Martin Jansa

author

2012-06-28 19:23 UTC #1 lore raw

Quoted 8 lines · On Wed, May 30, 2012 at 11:05:32AM +0000, [email protected] 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 <[email protected]>
Date:   Mon May 21 12:42:34 2012 -0500

Quoted 8 lines

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 <[email protected]>

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,

Quoted 13 lines

---
 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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Mark Hatle

2012-06-28 19:54 UTC #2 lore raw

Quoted 16 lines · Martin Jansa

Quoted 15 lines · On Wed, May 30, 2012 at 11:05:32AM +0000, [email protected] 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 <[email protected]>
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.)

Quoted 6 lines

Quoted 1 line
Signed-off-by Mark Hatle <[email protected]>
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

Quoted 25 lines

anyone seen it too?
Cheers,
Quoted 7 lines
---
  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(-)
Quoted 6 lines
Diff: http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Martin Jansa

author

2012-06-28 20:17 UTC #3 lore raw

Quoted 19 lines · Mark Hatle

Quoted 18 lines · Martin Jansa
Quoted 16 lines · On Wed, May 30, 2012 at 11:05:32AM +0000, [email protected] 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 <[email protected]>
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 <[email protected]>

Quoted 8 lines

Quoted 4 lines
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,

Quoted 35 lines

--Mark
Quoted 20 lines
anyone seen it too?
Cheers,
Quoted 7 lines
---
  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(-)
Quoted 6 lines
Diff: http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Mark Hatle

2012-06-28 20:42 UTC #4 lore raw

Quoted 29 lines · Martin Jansa

Quoted 19 lines · Mark Hatle
Quoted 18 lines · Martin Jansa
Quoted 16 lines · On Wed, May 30, 2012 at 11:05:32AM +0000, [email protected] 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 <[email protected]>
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 <[email protected]>
Quoted 8 lines
Quoted 4 lines
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.)

Quoted 5 lines

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

Quoted 45 lines

Cheers,
Quoted 31 lines
--Mark
Quoted 20 lines
anyone seen it too?
Cheers,
Quoted 7 lines
---
   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(-)
Quoted 6 lines
Diff: http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Martin Jansa

author

2012-06-28 21:03 UTC #5 lore raw

Quoted 30 lines · Mark Hatle

Quoted 29 lines · Martin Jansa
Quoted 27 lines · Mark Hatle
Quoted 16 lines · Martin Jansa
Quoted 15 lines · On Wed, May 30, 2012 at 11:05:32AM +0000, [email protected] 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 <[email protected]>
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.)
Quoted 6 lines
Quoted 1 line
Signed-off-by Mark Hatle <[email protected]>
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.)

Quoted 8 lines

Quoted 5 lines
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,

Quoted 58 lines

But when I set this up originally, the intent was to follow what BB was doing.
--Mark
Quoted 40 lines
Cheers,
Quoted 31 lines
--Mark
Quoted 20 lines
anyone seen it too?
Cheers,
Quoted 7 lines
---
   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(-)
Quoted 6 lines
Diff: http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=55c01de28a28a4cfe16d36663c190a874ef2e85d
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-07-20 11:00 UTC #6 lore raw

PATCH 1/1 util-linux: register reset u-a to bindir like busybox does

In reply to Martin Jansa

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

Signed-off-by Martin Jansa <[email protected]>

---
 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(-)

meta/recipes-core/util-linux/util-linux.inc +2 -1

index 688a5be..00e5d7c 100644
@@ -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"

meta/recipes-core/util-linux/util-linux_2.21.2.bb +1 -1

index 7f2c2a9..0f5fdc6 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.21"
-PR = "r0"
+PR = "r1"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+

Signature · 1 line

1.7.8.6

Saul Wold

Applied

2012-07-21 00:34 UTC #7 lore raw

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

Quoted 28 lines · Martin Jansa

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

Signed-off-by Martin Jansa <[email protected]>

---
  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(-)

meta/recipes-core/util-linux/util-linux.inc +2 -1

index 688a5be..00e5d7c 100644
@@ -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"

meta/recipes-core/util-linux/util-linux_2.21.2.bb +0 -0

index 7f2c2a9..0f5fdc6 100644

meta/recipes-core/util-linux/util-linux_2.21.2.bb line 5

Quoted 6 lines

meta/recipes-core/util-linux/util-linux_2.21.2.bb +1 -1

@@ -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!