* [krogoth][PATCH] useradd: Fix infinite build loop
@ 2016-09-29 1:27 Denys Dmytriyenko
2016-09-29 1:33 ` Denys Dmytriyenko
0 siblings, 1 reply; 2+ messages in thread
From: Denys Dmytriyenko @ 2016-09-29 1:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
From: Richard Purdie <richard.purdie@linuxfoundation.org>
http://git.openembedded.org/openembedded-core-contrib/commit/?id=642c6cf0b6a0371de476513162bd0cefa9c438b3
introduces a problem if the USERADD_PARAM variable has trailing
whitespace as the code infinitely loops causing build hangs.
Add a similar sed expression to $remaining to avoid this.
(From OE-Core rev: d6241e4c94a0a72acfc57e96a59918c0b2146d65)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta/classes/useradd.bbclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 67dae88..28dd341 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -55,14 +55,14 @@ if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then
# Invoke multiple instances of groupadd for parameter lists
# separated by ';'
opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
- remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2-`
+ remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
while test "x$opts" != "x"; do
perform_groupadd "$SYSROOT" "$OPT $opts"
if test "x$opts" = "x$remaining"; then
break
fi
opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
- remaining=`echo "$remaining" | cut -d ';' -f 2-`
+ remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
done
fi
@@ -71,14 +71,14 @@ if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then
# Invoke multiple instances of useradd for parameter lists
# separated by ';'
opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
- remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2-`
+ remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
while test "x$opts" != "x"; do
perform_useradd "$SYSROOT" "$OPT $opts"
if test "x$opts" = "x$remaining"; then
break
fi
opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
- remaining=`echo "$remaining" | cut -d ';' -f 2-`
+ remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
done
fi
@@ -87,14 +87,14 @@ if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then
# Invoke multiple instances of groupmems for parameter lists
# separated by ';'
opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
- remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2-`
+ remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
while test "x$opts" != "x"; do
perform_groupmems "$SYSROOT" "$OPT $opts"
if test "x$opts" = "x$remaining"; then
break
fi
opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
- remaining=`echo "$remaining" | cut -d ';' -f 2-`
+ remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
done
fi
}
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [krogoth][PATCH] useradd: Fix infinite build loop
2016-09-29 1:27 [krogoth][PATCH] useradd: Fix infinite build loop Denys Dmytriyenko
@ 2016-09-29 1:33 ` Denys Dmytriyenko
0 siblings, 0 replies; 2+ messages in thread
From: Denys Dmytriyenko @ 2016-09-29 1:33 UTC (permalink / raw)
To: openembedded-core
Richard,
Can you please merge this ASAP to unbreak krogoth. Thanks a lot!
On Wed, Sep 28, 2016 at 09:27:35PM -0400, Denys Dmytriyenko wrote:
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> http://git.openembedded.org/openembedded-core-contrib/commit/?id=642c6cf0b6a0371de476513162bd0cefa9c438b3
> introduces a problem if the USERADD_PARAM variable has trailing
> whitespace as the code infinitely loops causing build hangs.
>
> Add a similar sed expression to $remaining to avoid this.
>
> (From OE-Core rev: d6241e4c94a0a72acfc57e96a59918c0b2146d65)
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta/classes/useradd.bbclass | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
> index 67dae88..28dd341 100644
> --- a/meta/classes/useradd.bbclass
> +++ b/meta/classes/useradd.bbclass
> @@ -55,14 +55,14 @@ if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then
> # Invoke multiple instances of groupadd for parameter lists
> # separated by ';'
> opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
> - remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2-`
> + remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
> while test "x$opts" != "x"; do
> perform_groupadd "$SYSROOT" "$OPT $opts"
> if test "x$opts" = "x$remaining"; then
> break
> fi
> opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
> - remaining=`echo "$remaining" | cut -d ';' -f 2-`
> + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
> done
> fi
>
> @@ -71,14 +71,14 @@ if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then
> # Invoke multiple instances of useradd for parameter lists
> # separated by ';'
> opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
> - remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2-`
> + remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
> while test "x$opts" != "x"; do
> perform_useradd "$SYSROOT" "$OPT $opts"
> if test "x$opts" = "x$remaining"; then
> break
> fi
> opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
> - remaining=`echo "$remaining" | cut -d ';' -f 2-`
> + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
> done
> fi
>
> @@ -87,14 +87,14 @@ if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then
> # Invoke multiple instances of groupmems for parameter lists
> # separated by ';'
> opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
> - remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2-`
> + remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
> while test "x$opts" != "x"; do
> perform_groupmems "$SYSROOT" "$OPT $opts"
> if test "x$opts" = "x$remaining"; then
> break
> fi
> opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'`
> - remaining=`echo "$remaining" | cut -d ';' -f 2-`
> + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'`
> done
> fi
> }
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-29 1:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-29 1:27 [krogoth][PATCH] useradd: Fix infinite build loop Denys Dmytriyenko
2016-09-29 1:33 ` Denys Dmytriyenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox