[PATCH] texinfo: don't create dependency on INHERIT variable

[PATCH] texinfo: don't create dependency on INHERIT variable

[Martin Jansa]

* we don't want the do_package signature depending on INHERIT variable
* e.g. just adding the own-mirrors causes texinfo to rebuild:
  # bitbake-diffsigs BUILD/sstate-diff/*/*/texinfo/*do_package.sig*
  basehash changed from 015df2fd8e396cc1e15622dbac843301 to 9f1d06c4f238c70a99ccb6d8da348b6a
  Variable INHERIT value changed from
  ' rm_work blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'
  to
  ' rm_work own-mirrors blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/texinfo/texinfo_6.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/texinfo/texinfo_6.0.bb b/meta/recipes-extended/texinfo/texinfo_6.0.bb
index 8fb715a..b0a6975 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.0.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.0.bb
@@ -9,8 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 PROVIDES_append_class-native = " texinfo-replacement-native"
 
+DOC_COMPRESS_ENABLED = "${@ '1' if 'compress_doc' in (d.getVar('INHERIT', True) or '').split() else '0' }"
+DOC_COMPRESS_ENABLED[vardepvalue] = "${DOC_COMPRESS_ENABLED}"
+
 def compress_pkg(d):
-    if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
+    if d.getVar("DOC_COMPRESS_ENABLED", True) == "1":
          compress = d.getVar("DOC_COMPRESS", True)
          if compress == "gz":
              return "gzip"
-- 
2.6.3

Re: [PATCH] texinfo: don't create dependency on INHERIT variable

[Richard Purdie]

On Fri, 2015-12-04 at 21:47 +0100, Martin Jansa wrote:
> * we don't want the do_package signature depending on INHERIT variable
> * e.g. just adding the own-mirrors causes texinfo to rebuild:
>   # bitbake-diffsigs BUILD/sstate-diff/*/*/texinfo/*do_package.sig*
>   basehash changed from 015df2fd8e396cc1e15622dbac843301 to 9f1d06c4f238c70a99ccb6d8da348b6a
>   Variable INHERIT value changed from
>   ' rm_work blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'
>   to
>   ' rm_work own-mirrors blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-extended/texinfo/texinfo_6.0.bb | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/texinfo/texinfo_6.0.bb b/meta/recipes-extended/texinfo/texinfo_6.0.bb
> index 8fb715a..b0a6975 100644
> --- a/meta/recipes-extended/texinfo/texinfo_6.0.bb
> +++ b/meta/recipes-extended/texinfo/texinfo_6.0.bb
> @@ -9,8 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>  
>  PROVIDES_append_class-native = " texinfo-replacement-native"
>  
> +DOC_COMPRESS_ENABLED = "${@ '1' if 'compress_doc' in (d.getVar('INHERIT', True) or '').split() else '0' }"
> +DOC_COMPRESS_ENABLED[vardepvalue] = "${DOC_COMPRESS_ENABLED}"
> +
>  def compress_pkg(d):
> -    if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
> +    if d.getVar("DOC_COMPRESS_ENABLED", True) == "1":

Could we use:

if bb.data.inherits_class("compress_doc", d):

?

Cheers,

Richard

Re: [PATCH] texinfo: don't create dependency on INHERIT variable

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2055 bytes --]

Probably yes, I don't know why it was written in this way before and I've
just blindly followed it to fix the issue I was seeing.

v2 coming soon.

On Sat, Dec 5, 2015 at 12:55 AM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Fri, 2015-12-04 at 21:47 +0100, Martin Jansa wrote:
> > * we don't want the do_package signature depending on INHERIT variable
> > * e.g. just adding the own-mirrors causes texinfo to rebuild:
> >   # bitbake-diffsigs BUILD/sstate-diff/*/*/texinfo/*do_package.sig*
> >   basehash changed from 015df2fd8e396cc1e15622dbac843301 to
> 9f1d06c4f238c70a99ccb6d8da348b6a
> >   Variable INHERIT value changed from
> >   ' rm_work blacklist blacklist report-error ${PACKAGE_CLASSES}
> ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'
> >   to
> >   ' rm_work own-mirrors blacklist blacklist report-error
> ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}
> sanity'
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/recipes-extended/texinfo/texinfo_6.0.bb | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-extended/texinfo/texinfo_6.0.bb
> b/meta/recipes-extended/texinfo/texinfo_6.0.bb
> > index 8fb715a..b0a6975 100644
> > --- a/meta/recipes-extended/texinfo/texinfo_6.0.bb
> > +++ b/meta/recipes-extended/texinfo/texinfo_6.0.bb
> > @@ -9,8 +9,11 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> >
> >  PROVIDES_append_class-native = " texinfo-replacement-native"
> >
> > +DOC_COMPRESS_ENABLED = "${@ '1' if 'compress_doc' in
> (d.getVar('INHERIT', True) or '').split() else '0' }"
> > +DOC_COMPRESS_ENABLED[vardepvalue] = "${DOC_COMPRESS_ENABLED}"
> > +
> >  def compress_pkg(d):
> > -    if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
> > +    if d.getVar("DOC_COMPRESS_ENABLED", True) == "1":
>
> Could we use:
>
> if bb.data.inherits_class("compress_doc", d):
>
> ?
>
> Cheers,
>
> Richard
>
>

[-- Attachment #2: Type: text/html, Size: 3156 bytes --]

[PATCHv2][master] texinfo: don't create dependency on INHERIT variable

[Martin Jansa]

* we don't want the do_package signature depending on INHERIT variable
* e.g. just adding the own-mirrors causes texinfo to rebuild:
  # bitbake-diffsigs BUILD/sstate-diff/*/*/texinfo/*do_package.sig*
  basehash changed from 015df2fd8e396cc1e15622dbac843301 to 9f1d06c4f238c70a99ccb6d8da348b6a
  Variable INHERIT value changed from
  ' rm_work blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'
  to
  ' rm_work own-mirrors blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/texinfo/texinfo_6.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/texinfo/texinfo_6.0.bb b/meta/recipes-extended/texinfo/texinfo_6.0.bb
index 8fb715a..a8702cf 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.0.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 PROVIDES_append_class-native = " texinfo-replacement-native"
 
 def compress_pkg(d):
-    if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
+    if bb.data.inherits_class('compress_doc', d):
          compress = d.getVar("DOC_COMPRESS", True)
          if compress == "gz":
              return "gzip"
-- 
2.6.3