* [PATCH 1/5] bc: Use texinfo class
@ 2020-01-28 15:16 Richard Purdie
2020-01-28 15:16 ` [PATCH 2/5] glibc-package.inc: Remove warnings about unpacked directories Richard Purdie
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Richard Purdie @ 2020-01-28 15:16 UTC (permalink / raw)
To: openembedded-core
This recipe uses makeinfo so inherit the class which can provide it.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-extended/bc/bc_1.07.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb
index 4a51302492d..61fc6486538 100644
--- a/meta/recipes-extended/bc/bc_1.07.1.bb
+++ b/meta/recipes-extended/bc/bc_1.07.1.bb
@@ -18,7 +18,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc"
SRC_URI[sha256sum] = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"
-inherit autotools texinfo update-alternatives
+inherit autotools texinfo update-alternatives texinfo
PACKAGECONFIG ??= "readline"
PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/5] glibc-package.inc: Remove warnings about unpacked directories
2020-01-28 15:16 [PATCH 1/5] bc: Use texinfo class Richard Purdie
@ 2020-01-28 15:16 ` Richard Purdie
2020-01-28 15:16 ` [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix Richard Purdie
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2020-01-28 15:16 UTC (permalink / raw)
To: openembedded-core
If documemtation generation is disabled, the recipe throws warnings about
unpackaged files. Avoid this.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-core/glibc/glibc-package.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index ede9e9b9096..d2667f54a11 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -213,6 +213,8 @@ stash_locale_cleanup () {
rm -rf $cleanupdir${libdir}/gconv
rm -rf $cleanupdir${localedir}
rm -rf $cleanupdir${datadir}/locale
+ rmdir --ignore-fail-on-non-empty $cleanupdir${datadir}
+
if [ "${libdir}" != "${exec_prefix}/lib" ] && [ "${root_prefix}/lib" != "${exec_prefix}/lib" ]; then
if [ -d "$cleanupdir${exec_prefix}/lib" ]; then
if [ -z "${ARCH_DYNAMIC_LOADER}" -o \
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix
2020-01-28 15:16 [PATCH 1/5] bc: Use texinfo class Richard Purdie
2020-01-28 15:16 ` [PATCH 2/5] glibc-package.inc: Remove warnings about unpacked directories Richard Purdie
@ 2020-01-28 15:16 ` Richard Purdie
2020-01-29 2:00 ` Khem Raj
2020-01-28 15:16 ` [PATCH 4/5] texinfo: Only build texinfo when api-docs enabled Richard Purdie
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Richard Purdie @ 2020-01-28 15:16 UTC (permalink / raw)
To: openembedded-core
Now we have recipe specific sysroots we don't need this native path
prefix. It was breaking the crosssdk/cross-canadian cases and causing
bugs, removing it is the simplest solution.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/texinfo.bbclass | 4 +---
.../texinfo-dummy-native/texinfo-dummy-native.bb | 2 --
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass
index 6b0def0eac4..72091c733e5 100644
--- a/meta/classes/texinfo.bbclass
+++ b/meta/classes/texinfo.bbclass
@@ -10,9 +10,7 @@ TEXDEP = "texinfo-native"
TEXDEP_class-native = "texinfo-dummy-native"
TEXDEP_class-cross = "texinfo-dummy-native"
DEPENDS_append = " ${TEXDEP}"
-PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
-PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
# libtool-cross doesn't inherit cross
TEXDEP_pn-libtool-cross = "texinfo-dummy-native"
-PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
+
diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
index 1254bc89b48..3e6dfb0f1b9 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
+++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
@@ -9,8 +9,6 @@ SRC_URI = "file://template.py file://COPYING"
S = "${WORKDIR}"
-NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
-
inherit native
do_install_name() {
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/5] texinfo: Only build texinfo when api-docs enabled
2020-01-28 15:16 [PATCH 1/5] bc: Use texinfo class Richard Purdie
2020-01-28 15:16 ` [PATCH 2/5] glibc-package.inc: Remove warnings about unpacked directories Richard Purdie
2020-01-28 15:16 ` [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix Richard Purdie
@ 2020-01-28 15:16 ` Richard Purdie
2020-01-28 15:16 ` [PATCH 5/5] bitbake.conf/sanity: Drop makeinfo as being required on buildhost Richard Purdie
2020-01-28 15:58 ` [PATCH 1/5] bc: Use texinfo class Jacob Kroon
4 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2020-01-28 15:16 UTC (permalink / raw)
To: openembedded-core
Also fix the crosssdk and cross-canadian cases.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/texinfo.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass
index 72091c733e5..ba1dd4994e1 100644
--- a/meta/classes/texinfo.bbclass
+++ b/meta/classes/texinfo.bbclass
@@ -6,9 +6,11 @@
# Texinfo recipe, you can remove texinfo-native from ASSUME_PROVIDED and
# makeinfo from SANITY_REQUIRED_UTILITIES.
-TEXDEP = "texinfo-native"
+TEXDEP = "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'texinfo-native', 'texinfo-dummy-native', d)}"
TEXDEP_class-native = "texinfo-dummy-native"
TEXDEP_class-cross = "texinfo-dummy-native"
+TEXDEP_class-crosssdk = "texinfo-dummy-native"
+TEXDEP_class-cross-canadian = "texinfo-dummy-native"
DEPENDS_append = " ${TEXDEP}"
# libtool-cross doesn't inherit cross
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/5] bitbake.conf/sanity: Drop makeinfo as being required on buildhost
2020-01-28 15:16 [PATCH 1/5] bc: Use texinfo class Richard Purdie
` (2 preceding siblings ...)
2020-01-28 15:16 ` [PATCH 4/5] texinfo: Only build texinfo when api-docs enabled Richard Purdie
@ 2020-01-28 15:16 ` Richard Purdie
2020-01-28 15:58 ` [PATCH 1/5] bc: Use texinfo class Jacob Kroon
4 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2020-01-28 15:16 UTC (permalink / raw)
To: openembedded-core
This is a long standing 'odd' dependency which we've meant to
resolve. We shouldn't need it and it introduces reproducability issues.
We already have texinfo-dummy-native and texinfo-native which can
provide it but the work to remove the hosttool was never completed.
After cleaning up texinfo.bbclass, this can now be removed with
minimal impact on build time.
[YOCTO #13753]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/sanity.bbclass | 2 +-
meta/conf/bitbake.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 5c2f8f9d755..cca5cdad170 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -2,7 +2,7 @@
# Sanity check the users setup for common misconfigurations
#
-SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \
+SANITY_REQUIRED_UTILITIES ?= "patch diffstat git bzip2 tar \
gzip gawk chrpath wget cpio perl file which"
def bblayers_conf_file(d):
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b6aa9f33e92..259c50bdc2e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -487,7 +487,7 @@ HOSTTOOLS += " \
[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \
cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \
fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \
- head hostname iconv id install ld ldd ln ls make makeinfo md5sum mkdir mknod \
+ head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \
mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd \
python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \
sleep sort split stat strings strip tail tar tee test touch tr true uname \
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/5] bc: Use texinfo class
2020-01-28 15:16 [PATCH 1/5] bc: Use texinfo class Richard Purdie
` (3 preceding siblings ...)
2020-01-28 15:16 ` [PATCH 5/5] bitbake.conf/sanity: Drop makeinfo as being required on buildhost Richard Purdie
@ 2020-01-28 15:58 ` Jacob Kroon
2020-01-28 16:18 ` Richard Purdie
4 siblings, 1 reply; 10+ messages in thread
From: Jacob Kroon @ 2020-01-28 15:58 UTC (permalink / raw)
To: openembedded-core
On 1/28/20 4:16 PM, Richard Purdie wrote:
> This recipe uses makeinfo so inherit the class which can provide it.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-extended/bc/bc_1.07.1.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb
> index 4a51302492d..61fc6486538 100644
> --- a/meta/recipes-extended/bc/bc_1.07.1.bb
> +++ b/meta/recipes-extended/bc/bc_1.07.1.bb
> @@ -18,7 +18,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
> SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc"
> SRC_URI[sha256sum] = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"
>
> -inherit autotools texinfo update-alternatives
> +inherit autotools texinfo update-alternatives texinfo
>
Looks like it already inherits texinfo ^^^
> PACKAGECONFIG ??= "readline"
> PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/5] bc: Use texinfo class
2020-01-28 15:58 ` [PATCH 1/5] bc: Use texinfo class Jacob Kroon
@ 2020-01-28 16:18 ` Richard Purdie
0 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2020-01-28 16:18 UTC (permalink / raw)
To: Jacob Kroon, openembedded-core
On Tue, 2020-01-28 at 16:58 +0100, Jacob Kroon wrote:
> On 1/28/20 4:16 PM, Richard Purdie wrote:
> > This recipe uses makeinfo so inherit the class which can provide
> > it.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/recipes-extended/bc/bc_1.07.1.bb | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-
> > extended/bc/bc_1.07.1.bb
> > index 4a51302492d..61fc6486538 100644
> > --- a/meta/recipes-extended/bc/bc_1.07.1.bb
> > +++ b/meta/recipes-extended/bc/bc_1.07.1.bb
> > @@ -18,7 +18,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
> > SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc"
> > SRC_URI[sha256sum] =
> > "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"
> >
> > -inherit autotools texinfo update-alternatives
> > +inherit autotools texinfo update-alternatives texinfo
> >
>
> Looks like it already inherits texinfo ^^^
Er, yes! :)
The class wasn't working originally so we can just ignore this patch.
Cheers,
Richard
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix
2020-01-28 15:16 ` [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix Richard Purdie
@ 2020-01-29 2:00 ` Khem Raj
2020-01-29 11:59 ` Richard Purdie
0 siblings, 1 reply; 10+ messages in thread
From: Khem Raj @ 2020-01-29 2:00 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
it perhaps is the reason for most of failures seen here
https://errors.yoctoproject.org/Errors/Build/97736/
perhaps we need to explicitly inherit gettext in these recipes ?
On Tue, Jan 28, 2020 at 7:17 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Now we have recipe specific sysroots we don't need this native path
> prefix. It was breaking the crosssdk/cross-canadian cases and causing
> bugs, removing it is the simplest solution.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/classes/texinfo.bbclass | 4 +---
> .../texinfo-dummy-native/texinfo-dummy-native.bb | 2 --
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass
> index 6b0def0eac4..72091c733e5 100644
> --- a/meta/classes/texinfo.bbclass
> +++ b/meta/classes/texinfo.bbclass
> @@ -10,9 +10,7 @@ TEXDEP = "texinfo-native"
> TEXDEP_class-native = "texinfo-dummy-native"
> TEXDEP_class-cross = "texinfo-dummy-native"
> DEPENDS_append = " ${TEXDEP}"
> -PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
> -PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
>
> # libtool-cross doesn't inherit cross
> TEXDEP_pn-libtool-cross = "texinfo-dummy-native"
> -PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
> +
> diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
> index 1254bc89b48..3e6dfb0f1b9 100644
> --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
> +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
> @@ -9,8 +9,6 @@ SRC_URI = "file://template.py file://COPYING"
>
> S = "${WORKDIR}"
>
> -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
> -
> inherit native
>
> do_install_name() {
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix
2020-01-29 2:00 ` Khem Raj
@ 2020-01-29 11:59 ` Richard Purdie
2020-01-29 16:02 ` Khem Raj
0 siblings, 1 reply; 10+ messages in thread
From: Richard Purdie @ 2020-01-29 11:59 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Tue, 2020-01-28 at 18:00 -0800, Khem Raj wrote:
> it perhaps is the reason for most of failures seen here
>
> https://errors.yoctoproject.org/Errors/Build/97736/
>
> perhaps we need to explicitly inherit gettext in these recipes ?
These patches aren't quite working in master yet but those failures
look like they'd be solved with an "inherit texinfo" added to the
recipes.
Cheers,
Richard
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix
2020-01-29 11:59 ` Richard Purdie
@ 2020-01-29 16:02 ` Khem Raj
0 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2020-01-29 16:02 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
On Wed, Jan 29, 2020 at 4:00 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2020-01-28 at 18:00 -0800, Khem Raj wrote:
> > it perhaps is the reason for most of failures seen here
> >
> > https://errors.yoctoproject.org/Errors/Build/97736/
> >
> > perhaps we need to explicitly inherit gettext in these recipes ?
>
> These patches aren't quite working in master yet but those failures
> look like they'd be solved with an "inherit texinfo" added to the
> recipes.
Right except indent package which is quite unhappy even after that but I
have disabled documentation generation for that now
>
> Cheers,
>
> Richard
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 1307 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-01-30 14:28 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-28 15:16 [PATCH 1/5] bc: Use texinfo class Richard Purdie
2020-01-28 15:16 ` [PATCH 2/5] glibc-package.inc: Remove warnings about unpacked directories Richard Purdie
2020-01-28 15:16 ` [PATCH 3/5] texinfo/texinfo-dummy-native: Drop native path prefix Richard Purdie
2020-01-29 2:00 ` Khem Raj
2020-01-29 11:59 ` Richard Purdie
2020-01-29 16:02 ` Khem Raj
2020-01-28 15:16 ` [PATCH 4/5] texinfo: Only build texinfo when api-docs enabled Richard Purdie
2020-01-28 15:16 ` [PATCH 5/5] bitbake.conf/sanity: Drop makeinfo as being required on buildhost Richard Purdie
2020-01-28 15:58 ` [PATCH 1/5] bc: Use texinfo class Jacob Kroon
2020-01-28 16:18 ` 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.