scripts/atomic: change 'fold' to 'grep'

Message ID 20181204214713.5812-1-anders.roxell@linaro.org
State New
Headers show
Series
  • scripts/atomic: change 'fold' to 'grep'
Related show

Commit Message

Anders Roxell Dec. 4, 2018, 9:47 p.m.
Some distibutions and build systems doesn't include 'fold' from
coreutils default.

.../scripts/atomic/atomic-tbl.sh: line 183: fold: command not found

Rework to use 'grep' instead of 'fold' to use a dependency that is
already used a lot in the kernel.

Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Suggested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 scripts/atomic/atomic-tbl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.19.2

Comments

Will Deacon Dec. 6, 2018, 3:52 p.m. | #1
[+ Ingo and Mark]

On Tue, Dec 04, 2018 at 10:47:13PM +0100, Anders Roxell wrote:
> Some distibutions and build systems doesn't include 'fold' from

> coreutils default.

> 

> .../scripts/atomic/atomic-tbl.sh: line 183: fold: command not found

> 

> Rework to use 'grep' instead of 'fold' to use a dependency that is

> already used a lot in the kernel.

> 

> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>

> Suggested-by: Will Deacon <will.deacon@arm.com>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> ---

>  scripts/atomic/atomic-tbl.sh | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/scripts/atomic/atomic-tbl.sh b/scripts/atomic/atomic-tbl.sh

> index 9d6be538a987..81d5c32039dd 100755

> --- a/scripts/atomic/atomic-tbl.sh

> +++ b/scripts/atomic/atomic-tbl.sh

> @@ -180,7 +180,7 @@ gen_proto_variants()

>  #gen_proto(meta, ...)

>  gen_proto() {

>  	local meta="$1"; shift

> -	for m in $(echo "${meta}" | fold -w1); do

> +	for m in $(echo "${meta}" | grep -o .); do

>  		gen_proto_variants "${m}" "$@"

>  	done


Acked-by: Will Deacon <will.deacon@arm.com>


Ingo -- please can you take this one via -tip?

Cheers,

Will
Ingo Molnar Dec. 6, 2018, 4:15 p.m. | #2
* Will Deacon <will.deacon@arm.com> wrote:

> [+ Ingo and Mark]

> 

> On Tue, Dec 04, 2018 at 10:47:13PM +0100, Anders Roxell wrote:

> > Some distibutions and build systems doesn't include 'fold' from

> > coreutils default.

> > 

> > .../scripts/atomic/atomic-tbl.sh: line 183: fold: command not found

> > 

> > Rework to use 'grep' instead of 'fold' to use a dependency that is

> > already used a lot in the kernel.

> > 

> > Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>

> > Suggested-by: Will Deacon <will.deacon@arm.com>

> > Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> > ---

> >  scripts/atomic/atomic-tbl.sh | 2 +-

> >  1 file changed, 1 insertion(+), 1 deletion(-)

> > 

> > diff --git a/scripts/atomic/atomic-tbl.sh b/scripts/atomic/atomic-tbl.sh

> > index 9d6be538a987..81d5c32039dd 100755

> > --- a/scripts/atomic/atomic-tbl.sh

> > +++ b/scripts/atomic/atomic-tbl.sh

> > @@ -180,7 +180,7 @@ gen_proto_variants()

> >  #gen_proto(meta, ...)

> >  gen_proto() {

> >  	local meta="$1"; shift

> > -	for m in $(echo "${meta}" | fold -w1); do

> > +	for m in $(echo "${meta}" | grep -o .); do

> >  		gen_proto_variants "${m}" "$@"

> >  	done

> 

> Acked-by: Will Deacon <will.deacon@arm.com>

> 

> Ingo -- please can you take this one via -tip?


I'm still waiting for a reply to my previous concerns expressed in:

   Re: [tip:locking/core] locking/atomics: Check generated headers are up-to-date
   <20181128083057.GA7879@gmail.com>

Will remove it from linux-next if there's no good resolution for this 
cycle.

Thanks,

	Ingo
Mark Rutland Dec. 10, 2018, 5:52 p.m. | #3
Hi Ingo,

On Thu, Dec 06, 2018 at 05:15:28PM +0100, Ingo Molnar wrote:
> 

> * Will Deacon <will.deacon@arm.com> wrote:

> 

> > [+ Ingo and Mark]

> > 

> > On Tue, Dec 04, 2018 at 10:47:13PM +0100, Anders Roxell wrote:

> > > Some distibutions and build systems doesn't include 'fold' from

> > > coreutils default.

> > > 

> > > .../scripts/atomic/atomic-tbl.sh: line 183: fold: command not found

> > > 

> > > Rework to use 'grep' instead of 'fold' to use a dependency that is

> > > already used a lot in the kernel.

> > > 

> > > Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>

> > > Suggested-by: Will Deacon <will.deacon@arm.com>

> > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> > > ---

> > >  scripts/atomic/atomic-tbl.sh | 2 +-

> > >  1 file changed, 1 insertion(+), 1 deletion(-)

> > > 

> > > diff --git a/scripts/atomic/atomic-tbl.sh b/scripts/atomic/atomic-tbl.sh

> > > index 9d6be538a987..81d5c32039dd 100755

> > > --- a/scripts/atomic/atomic-tbl.sh

> > > +++ b/scripts/atomic/atomic-tbl.sh

> > > @@ -180,7 +180,7 @@ gen_proto_variants()

> > >  #gen_proto(meta, ...)

> > >  gen_proto() {

> > >  	local meta="$1"; shift

> > > -	for m in $(echo "${meta}" | fold -w1); do

> > > +	for m in $(echo "${meta}" | grep -o .); do

> > >  		gen_proto_variants "${m}" "$@"

> > >  	done

> > 

> > Acked-by: Will Deacon <will.deacon@arm.com>

> > 

> > Ingo -- please can you take this one via -tip?

> 

> I'm still waiting for a reply to my previous concerns expressed in:

> 

>    Re: [tip:locking/core] locking/atomics: Check generated headers are up-to-date

>    <20181128083057.GA7879@gmail.com>

> 

> Will remove it from linux-next if there's no good resolution for this 

> cycle.


I've just sent a couple of patches for that; please see:

https://lkml.kernel.org/r/20181210175035.45096-1-mark.rutland@arm.com

Thanks,
Mark.

Patch

diff --git a/scripts/atomic/atomic-tbl.sh b/scripts/atomic/atomic-tbl.sh
index 9d6be538a987..81d5c32039dd 100755
--- a/scripts/atomic/atomic-tbl.sh
+++ b/scripts/atomic/atomic-tbl.sh
@@ -180,7 +180,7 @@  gen_proto_variants()
 #gen_proto(meta, ...)
 gen_proto() {
 	local meta="$1"; shift
-	for m in $(echo "${meta}" | fold -w1); do
+	for m in $(echo "${meta}" | grep -o .); do
 		gen_proto_variants "${m}" "$@"
 	done
 }