[PATCH 1/2] quilt: Export missing QUILT_PC variable in ptest Makefile

[PATCH 1/2] quilt: Export missing QUILT_PC variable in ptest Makefile

[Trevor Gamblin]

From: Trevor Gamblin <trevor.gamblin@windriver.com>

The quilt ptest uses a custom Makefile to implement the
"make check" rule, but the ptest Makefile does not export
the value QUILT_PC, which is user-settable and normally
defaults to ".pc". This causes failures e.g. import.test
with "rm -rf patches/ %{QUILT_PC}/", evaluating to
"rm -rf patches/ /" if the variable is not set by the
Makefile.

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
---
 meta/recipes-devtools/quilt/quilt/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/quilt/quilt/Makefile b/meta/recipes-devtools/quilt/quilt/Makefile
index 7b3ac8a..1f6cd24 100644
--- a/meta/recipes-devtools/quilt/quilt/Makefile
+++ b/meta/recipes-devtools/quilt/quilt/Makefile
@@ -2,7 +2,8 @@ PATH :=         $(CURDIR)/bin:$(CURDIR)/compat:$(PATH)
 QUILT_DIR :=    $(CURDIR)/quilt
 QUILTRC :=      $(CURDIR)/test/test.quiltrc
 export QUILT_DIR QUILTRC
-CHECK_ENV := P=patches/; _P=../patches/; export P _P
+CHECK_ENV := P=patches/; _P=../patches/; export P _P;
+CHECK_ENV += QUILT_PC=.pc; export QUILT_PC
 -include test/.depend
 
 check-% : test/%.test
-- 
2.7.4

[PATCH 2/2] quilt: added less to RDEPENDS list

[Trevor Gamblin]

From: Trevor Gamblin <trevor.gamblin@windriver.com>

The quilt "series" option relies on "less -R", but
BusyBox's implementation of less does not provide -R. It
could be determined how to enable it in busybox's recipe,
but given the use case it likely isn't needed.

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
---
 meta/recipes-devtools/quilt/quilt.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index dcba62c..433e9b4 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -78,7 +78,7 @@ FILES_guards = "${bindir}/guards"
 FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
 FILES_guards-doc = "${mandir}/man1/guards.1"
 
-RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux"
+RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux less"
 RDEPENDS_${PN}_class-native = "diffstat-native patch-native bzip2-native"
 
 RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
-- 
2.7.4

Re: [PATCH 2/2] quilt: added less to RDEPENDS list

[Randy MacLeod]

Re: [OE-core] [PATCH 2/2] quilt: added less to RDEPENDS list

s/added/add/

When in Rome:
$ cd .../oe-core
$ git log --oneline -10000 | grep -i add | wc -l
1376

$ git log --oneline -10000 | grep -i added | wc -l
19

On 8/21/19 4:01 PM, Trevor Gamblin wrote:
> From: Trevor Gamblin <trevor.gamblin@windriver.com>
> 
> The quilt "series" option relies on "less -R", but > BusyBox's implementation of less does not provide -R. It
> could be determined how to enable it in busybox's recipe,
> but given the use case it likely isn't needed.

That statement could be misleading, try:

The quilt "series" option relies on "less -R" but since
that option is not enabled by busybox in oe-core by default
so hard-code the dependency on 'less'.

 From 'man less':
    -r or --raw-control-chars
       Causes "raw" control characters to be displayed. ...
    -R or --RAW-CONTROL-CHARS
       Like -r, but only ANSI "color" escape sequences are
       output in "raw" form.  ...

In 2018, BusyBox's less added:
    8528d3d4f less: optional support of -R
but it is not enable by default for oe-core. While we could
enable the option, all known use-cases involve larger, more
developer-oriented recipes such as quilt or man pages.

---

I maintain that we need to resist adding one more wafer-thin
200 byte config to our default busybox config to avoid bloat
over the years. We wouldn't want the busybox package to burst!

../Randy

 > could be determined how to enable it in busybox's recipe,
 > but given the use case it likely isn't needed.
> 
> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   meta/recipes-devtools/quilt/quilt.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
> index dcba62c..433e9b4 100644
> --- a/meta/recipes-devtools/quilt/quilt.inc
> +++ b/meta/recipes-devtools/quilt/quilt.inc
> @@ -78,7 +78,7 @@ FILES_guards = "${bindir}/guards"
>   FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
>   FILES_guards-doc = "${mandir}/man1/guards.1"
>   
> -RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux"
> +RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux less"
>   RDEPENDS_${PN}_class-native = "diffstat-native patch-native bzip2-native"
>   
>   RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
> 


-- 
# Randy MacLeod
# Wind River Linux

Re: [PATCH 2/2] quilt: added less to RDEPENDS list

[Andre McCurdy]

On Wed, Aug 21, 2019 at 7:43 PM Randy MacLeod
<randy.macleod@windriver.com> wrote:
>
> Re: [OE-core] [PATCH 2/2] quilt: added less to RDEPENDS list
>
> s/added/add/
>
> When in Rome:
> $ cd .../oe-core
> $ git log --oneline -10000 | grep -i add | wc -l
> 1376
>
> $ git log --oneline -10000 | grep -i added | wc -l
> 19
>
> On 8/21/19 4:01 PM, Trevor Gamblin wrote:
> > From: Trevor Gamblin <trevor.gamblin@windriver.com>
> >
> > The quilt "series" option relies on "less -R", but > BusyBox's implementation of less does not provide -R. It
> > could be determined how to enable it in busybox's recipe,
> > but given the use case it likely isn't needed.
>
> That statement could be misleading, try:
>
> The quilt "series" option relies on "less -R" but since
> that option is not enabled by busybox in oe-core by default
> so hard-code the dependency on 'less'.

Still sounds awkward. Try:

  The quilt "series" option relies on "less -R" but, since that option
is not enabled by busybox in oe-core by default, hard-code the
dependency on 'less'.

Or:

  The quilt "series" option relies on "less -R". That option is not
enabled by busybox in oe-core by default so hard-code the dependency
on 'less'.

>  From 'man less':
>     -r or --raw-control-chars
>        Causes "raw" control characters to be displayed. ...
>     -R or --RAW-CONTROL-CHARS
>        Like -r, but only ANSI "color" escape sequences are
>        output in "raw" form.  ...
>
> In 2018, BusyBox's less added:
>     8528d3d4f less: optional support of -R
> but it is not enable by default for oe-core. While we could
> enable the option, all known use-cases involve larger, more
> developer-oriented recipes such as quilt or man pages.
>
> ---
>
> I maintain that we need to resist adding one more wafer-thin
> 200 byte config to our default busybox config to avoid bloat
> over the years. We wouldn't want the busybox package to burst!
>
> ../Randy
>
>  > could be determined how to enable it in busybox's recipe,
>  > but given the use case it likely isn't needed.
> >
> > Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> > ---
> >   meta/recipes-devtools/quilt/quilt.inc | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
> > index dcba62c..433e9b4 100644
> > --- a/meta/recipes-devtools/quilt/quilt.inc
> > +++ b/meta/recipes-devtools/quilt/quilt.inc
> > @@ -78,7 +78,7 @@ FILES_guards = "${bindir}/guards"
> >   FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
> >   FILES_guards-doc = "${mandir}/man1/guards.1"
> >
> > -RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux"
> > +RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux less"
> >   RDEPENDS_${PN}_class-native = "diffstat-native patch-native bzip2-native"
> >
> >   RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
> >
>
>
> --
> # Randy MacLeod
> # Wind River Linux
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 1/2] quilt: Export missing QUILT_PC variable in ptest Makefile

[Randy MacLeod]

    quilt: Export missing QUILT_PC variable in ptest Makefile
is over the 50 character suggested short summary limit:
    quilt: Export QUILT_PC variable in ptest Makefile
works. :)

On 8/21/19 4:01 PM, Trevor Gamblin wrote:
> From: Trevor Gamblin <trevor.gamblin@windriver.com>
> 
> The quilt ptest uses a custom Makefile to implement the
> "make check" rule, but the ptest Makefile does not export
> the value QUILT_PC, which is user-settable and normally
s/value/variable/
> defaults to ".pc". This causes failures e.g. import.test
> with "rm -rf patches/ %{QUILT_PC}/", evaluating to
> "rm -rf patches/ /" if the variable is not set by the
> Makefile. 

Add that:

These ptests broke in:
   73d6034f6b quilt: update to 0.66
when the upstream quilt developers enabled users to specify
their own QUILT_PC string.

../Randy


> 
> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   meta/recipes-devtools/quilt/quilt/Makefile | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/quilt/quilt/Makefile b/meta/recipes-devtools/quilt/quilt/Makefile
> index 7b3ac8a..1f6cd24 100644
> --- a/meta/recipes-devtools/quilt/quilt/Makefile
> +++ b/meta/recipes-devtools/quilt/quilt/Makefile
> @@ -2,7 +2,8 @@ PATH :=         $(CURDIR)/bin:$(CURDIR)/compat:$(PATH)
>   QUILT_DIR :=    $(CURDIR)/quilt
>   QUILTRC :=      $(CURDIR)/test/test.quiltrc
>   export QUILT_DIR QUILTRC
> -CHECK_ENV := P=patches/; _P=../patches/; export P _P
> +CHECK_ENV := P=patches/; _P=../patches/; export P _P;
> +CHECK_ENV += QUILT_PC=.pc; export QUILT_PC
>   -include test/.depend
>   
>   check-% : test/%.test
> 


-- 
# Randy MacLeod
# Wind River Linux