* [PATCH] util-linux: fix alternatives setting for switch-root
@ 2018-10-13 4:40 Randy MacLeod
2018-10-14 15:03 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Randy MacLeod @ 2018-10-13 4:40 UTC (permalink / raw)
To: openembedded-core
The alternative setting for switch_root belongs to the util-linux-switch_root
package instead of the util-linux package. Fix this problem to avoid
a dangling symlink:
/usr/bin/switch_root-> /usr/bin/switch_root.util-linux
on target and in the sdk.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 60ac9c2006..9d424158fd 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -206,7 +206,7 @@ do_install_append_class-native () {
ALTERNATIVE_PRIORITY = "80"
ALTERNATIVE_${PN} = " \
- dmesg kill more mkswap blockdev pivot_root switch_root \
+ dmesg kill more mkswap blockdev pivot_root \
hexdump last lastb logger mesg renice wall \
setsid chrt flock utmpdump eject nologin taskset fallocate \
fsfreeze nsenter \
@@ -218,7 +218,6 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
-ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
@@ -294,6 +293,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
ALTERNATIVE_util-linux-unshare = "unshare"
ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
+ALTERNATIVE_util-linux-switch_root = "switch_root"
+ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+
BBCLASSEXTEND = "native nativesdk"
python do_package_prepend () {
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] util-linux: fix alternatives setting for switch-root
2018-10-13 4:40 [PATCH] util-linux: fix alternatives setting for switch-root Randy MacLeod
@ 2018-10-14 15:03 ` Richard Purdie
2018-10-16 23:24 ` [PATCH v2] " Randy MacLeod
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2018-10-14 15:03 UTC (permalink / raw)
To: Randy MacLeod, openembedded-core
On Sat, 2018-10-13 at 00:40 -0400, Randy MacLeod wrote:
> The alternative setting for switch_root belongs to the util-linux-
> switch_root
> package instead of the util-linux package. Fix this problem to avoid
> a dangling symlink:
> /usr/bin/switch_root-> /usr/bin/switch_root.util-linux
> on target and in the sdk.
>
> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
> ---
> meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
Sorry, but:
https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/50374/raw
https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/50423/raw
Seems to trigger on deb builds for some reason, probably package
installation order related?
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] util-linux: fix alternatives setting for switch-root
2018-10-14 15:03 ` Richard Purdie
@ 2018-10-16 23:24 ` Randy MacLeod
2018-10-16 23:24 ` Randy MacLeod
0 siblings, 1 reply; 6+ messages in thread
From: Randy MacLeod @ 2018-10-16 23:24 UTC (permalink / raw)
To: openembedded-core
V2:
Fixed typo in previous version:
-ALTERNATIVE_util-linux-switch-root
+ALTERNATIVE_util-linux-switch-root
in keeping with the existing package name.
Adding util-linux-switch-root to an image works and
the dangling symlink in the sdk is also gone.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] util-linux: fix alternatives setting for switch-root
2018-10-16 23:24 ` [PATCH v2] " Randy MacLeod
@ 2018-10-16 23:24 ` Randy MacLeod
2018-10-19 13:37 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Randy MacLeod @ 2018-10-16 23:24 UTC (permalink / raw)
To: openembedded-core
The alternative setting for switch_root belongs to the util-linux-switch-root
package instead of the util-linux package. Fix this problem to avoid
a dangling symlink:
/usr/bin/switch_root-> /usr/bin/switch_root.util-linux
on target and in the sdk.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 60ac9c2006..3d8b3ff592 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -206,7 +206,7 @@ do_install_append_class-native () {
ALTERNATIVE_PRIORITY = "80"
ALTERNATIVE_${PN} = " \
- dmesg kill more mkswap blockdev pivot_root switch_root \
+ dmesg kill more mkswap blockdev pivot_root \
hexdump last lastb logger mesg renice wall \
setsid chrt flock utmpdump eject nologin taskset fallocate \
fsfreeze nsenter \
@@ -218,7 +218,6 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
-ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
@@ -294,6 +293,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
ALTERNATIVE_util-linux-unshare = "unshare"
ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
+ALTERNATIVE_util-linux-switch-root = "switch_root"
+ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
+
BBCLASSEXTEND = "native nativesdk"
python do_package_prepend () {
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] util-linux: fix alternatives setting for switch-root
2018-10-16 23:24 ` Randy MacLeod
@ 2018-10-19 13:37 ` Richard Purdie
2018-10-19 13:44 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2018-10-19 13:37 UTC (permalink / raw)
To: Randy MacLeod, openembedded-core
On Tue, 2018-10-16 at 19:24 -0400, Randy MacLeod wrote:
> The alternative setting for switch_root belongs to the util-linux-
> switch-root
> package instead of the util-linux package. Fix this problem to avoid
> a dangling symlink:
> /usr/bin/switch_root-> /usr/bin/switch_root.util-linux
> on target and in the sdk.
>
> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
> ---
> meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
As far as I can tell, this still breaks on the autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/13/builds/125/steps/7/logs/step1b
https://autobuilder.yoctoproject.org/typhoon/#/builders/13/builds/125/steps/7/logs/step2b
https://autobuilder.yoctoproject.org/typhoon/#/builders/21/builds/132/steps/7/logs/step1b
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] util-linux: fix alternatives setting for switch-root
2018-10-19 13:37 ` Richard Purdie
@ 2018-10-19 13:44 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2018-10-19 13:44 UTC (permalink / raw)
To: Randy MacLeod, openembedded-core
On Fri, 2018-10-19 at 14:37 +0100, Richard Purdie wrote:
> On Tue, 2018-10-16 at 19:24 -0400, Randy MacLeod wrote:
> > The alternative setting for switch_root belongs to the util-linux-
> > switch-root
> > package instead of the util-linux package. Fix this problem to
> > avoid
> > a dangling symlink:
> > /usr/bin/switch_root-> /usr/bin/switch_root.util-linux
> > on target and in the sdk.
> >
> > Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
> > ---
> > meta/recipes-core/util-linux/util-linux.inc | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
>
> As far as I can tell, this still breaks on the autobuilder:
>
>
https://autobuilder.yoctoproject.org/typhoon/#/builders/13/builds/125/steps/7/logs/step1b
>
https://autobuilder.yoctoproject.org/typhoon/#/builders/13/builds/125/steps/7/logs/step2b
>
https://autobuilder.yoctoproject.org/typhoon/#/builders/21/builds/132/steps/7/logs/step1b
It also appears I did merge the v2 so master is now broken and it
doesn't cleanly revert due to other patches against util-linux :(
If someone could figure out why its breaking for debian packaging and
help get it fixed that would be most appreciated!
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-19 13:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-13 4:40 [PATCH] util-linux: fix alternatives setting for switch-root Randy MacLeod
2018-10-14 15:03 ` Richard Purdie
2018-10-16 23:24 ` [PATCH v2] " Randy MacLeod
2018-10-16 23:24 ` Randy MacLeod
2018-10-19 13:37 ` Richard Purdie
2018-10-19 13:44 ` Richard Purdie
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.