* [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used
@ 2019-02-17 14:51 Peter Kjellerstedt
2019-02-17 14:51 ` [PATCH 2/3] libc-package.bbclass: Only extract wanted files in prep_locale_tree() Peter Kjellerstedt
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Peter Kjellerstedt @ 2019-02-17 14:51 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
meta/classes/libc-package.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 0b4c666a74..60000a9547 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -68,8 +68,8 @@ do_prep_locale_tree() {
gunzip $i
done
tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir}
- if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then
- tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir}
+ if [ -f ${STAGING_LIBDIR_NATIVE}/libgcc_s.* ]; then
+ tar -cf - -C ${STAGING_LIBDIR_NATIVE} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir}
fi
install -m 0755 ${LOCALETREESRC}${bindir}/localedef $treedir/${base_bindir}
}
@@ -278,7 +278,7 @@ python package_do_split_gconvs () {
qemu_options = d.getVar('QEMU_OPTIONS')
cmd = "PSEUDO_RELOADED=YES PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \
- -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \
+ -E LD_LIBRARY_PATH=%s %s %s${base_bindir}/localedef %s" % \
(path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts)
commands["%s/%s" % (outputpath, name)] = cmd
--
2.12.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] libc-package.bbclass: Only extract wanted files in prep_locale_tree()
2019-02-17 14:51 [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Peter Kjellerstedt
@ 2019-02-17 14:51 ` Peter Kjellerstedt
2019-02-17 14:51 ` [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task Peter Kjellerstedt
2019-02-17 22:52 ` [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Richard Purdie
2 siblings, 0 replies; 7+ messages in thread
From: Peter Kjellerstedt @ 2019-02-17 14:51 UTC (permalink / raw)
To: openembedded-core
prep_locale_tree() predates the usrmerge DISTRO_FEATURE, which meant it
was not prepared for the case when ${base_libdir} == ${libdir}. This
lead to it extracting files and directories where it shouldn't.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
meta/classes/libc-package.bbclass | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 60000a9547..ee598905b0 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -67,7 +67,12 @@ do_prep_locale_tree() {
for i in $treedir/${datadir}/i18n/charmaps/*gz; do
gunzip $i
done
- tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir}
+ # The extract pattern "./l*.so*" is carefully selected so that it will
+ # match ld*.so and lib*.so*, but not any files in the gconv directory
+ # (if it exists). This makes sure we only unpack the files we need.
+ # This is important in case usrmerge is set in DISTRO_FEATURES, which
+ # means ${base_libdir} == ${libdir}.
+ tar -cf - -C ${LOCALETREESRC}${base_libdir} -p . | tar -xf - -C $treedir/${base_libdir} './l*.so*'
if [ -f ${STAGING_LIBDIR_NATIVE}/libgcc_s.* ]; then
tar -cf - -C ${STAGING_LIBDIR_NATIVE} -p libgcc_s.* | tar -xf - -C $treedir/${base_libdir}
fi
--
2.12.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task
2019-02-17 14:51 [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Peter Kjellerstedt
2019-02-17 14:51 ` [PATCH 2/3] libc-package.bbclass: Only extract wanted files in prep_locale_tree() Peter Kjellerstedt
@ 2019-02-17 14:51 ` Peter Kjellerstedt
2019-02-18 1:21 ` Christopher Larson
2019-02-17 22:52 ` [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Richard Purdie
2 siblings, 1 reply; 7+ messages in thread
From: Peter Kjellerstedt @ 2019-02-17 14:51 UTC (permalink / raw)
To: openembedded-core
The package task for glibc-locale takes a very long time to execute,
especially if using qemu. In that case, a progress meter helps a lot to
show the progress of the task.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
meta/classes/libc-package.bbclass | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index ee598905b0..f1c0545c67 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -348,11 +348,16 @@ python package_do_split_gconvs () {
makefile = oe.path.join(d.getVar("WORKDIR"), "locale-tree", "Makefile")
m = open(makefile, "w")
m.write("all: %s\n\n" % " ".join(commands.keys()))
+ i = 1
+ total = len(commands)
for cmd in commands:
m.write(cmd + ":\n")
+ m.write("\t@echo 'Progress %d/%d'\n" % (i, total))
m.write("\t" + commands[cmd] + "\n\n")
+ i = i + 1
m.close()
d.setVar("EXTRA_OEMAKE", "-C %s ${PARALLEL_MAKE}" % (os.path.dirname(makefile)))
+ d.setVarFlag("oe_runmake", "progress", "outof:Progress\s(\d+)/(\d+)")
bb.note("Executing binary locale generation makefile")
bb.build.exec_func("oe_runmake", d)
bb.note("collecting binary locales from locale tree")
--
2.12.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used
2019-02-17 14:51 [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Peter Kjellerstedt
2019-02-17 14:51 ` [PATCH 2/3] libc-package.bbclass: Only extract wanted files in prep_locale_tree() Peter Kjellerstedt
2019-02-17 14:51 ` [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task Peter Kjellerstedt
@ 2019-02-17 22:52 ` Richard Purdie
2019-02-19 7:03 ` Khem Raj
2 siblings, 1 reply; 7+ messages in thread
From: Richard Purdie @ 2019-02-17 22:52 UTC (permalink / raw)
To: Peter Kjellerstedt, openembedded-core
On Sun, 2019-02-17 at 15:51 +0100, Peter Kjellerstedt wrote:
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> meta/classes/libc-package.bbclass | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
I included this patchset in a run on the autobuilder and its failing:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/66
I know the resulttool failures are my fault but the glibc-locale ones
aren't. I'll abort the build as there are enough failures to know its
doomed and I need a results set for other testing.
Cheers,
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task
2019-02-17 14:51 ` [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task Peter Kjellerstedt
@ 2019-02-18 1:21 ` Christopher Larson
2019-02-18 1:37 ` Peter Kjellerstedt
0 siblings, 1 reply; 7+ messages in thread
From: Christopher Larson @ 2019-02-18 1:21 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]
On Sun, Feb 17, 2019 at 7:51 AM Peter Kjellerstedt <
peter.kjellerstedt@axis.com> wrote:
> The package task for glibc-locale takes a very long time to execute,
> especially if using qemu. In that case, a progress meter helps a lot to
> show the progress of the task.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> meta/classes/libc-package.bbclass | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/meta/classes/libc-package.bbclass
> b/meta/classes/libc-package.bbclass
> index ee598905b0..f1c0545c67 100644
> --- a/meta/classes/libc-package.bbclass
> +++ b/meta/classes/libc-package.bbclass
> @@ -348,11 +348,16 @@ python package_do_split_gconvs () {
> makefile = oe.path.join(d.getVar("WORKDIR"), "locale-tree",
> "Makefile")
> m = open(makefile, "w")
> m.write("all: %s\n\n" % " ".join(commands.keys()))
> + i = 1
> + total = len(commands)
> for cmd in commands:
>
for i, cmd in enumerate(commands):
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1834 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task
2019-02-18 1:21 ` Christopher Larson
@ 2019-02-18 1:37 ` Peter Kjellerstedt
0 siblings, 0 replies; 7+ messages in thread
From: Peter Kjellerstedt @ 2019-02-18 1:37 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
Nice, then I’ve learnt something new today. :)
//Peter
From: Christopher Larson <kergoth@gmail.com>
Sent: den 18 februari 2019 02:21
To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Cc: Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task
On Sun, Feb 17, 2019 at 7:51 AM Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>> wrote:
The package task for glibc-locale takes a very long time to execute,
especially if using qemu. In that case, a progress meter helps a lot to
show the progress of the task.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>>
---
meta/classes/libc-package.bbclass | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index ee598905b0..f1c0545c67 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -348,11 +348,16 @@ python package_do_split_gconvs () {
makefile = oe.path.join(d.getVar("WORKDIR"), "locale-tree", "Makefile")
m = open(makefile, "w")
m.write("all: %s\n\n" % " ".join(commands.keys()))
+ i = 1
+ total = len(commands)
for cmd in commands:
for i, cmd in enumerate(commands):
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 5367 bytes --]
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used
2019-02-17 22:52 ` [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Richard Purdie
@ 2019-02-19 7:03 ` Khem Raj
0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2019-02-19 7:03 UTC (permalink / raw)
To: Richard Purdie
Cc: Peter Kjellerstedt, Patches and discussions about the oe-core layer
I am seeing locale packaging errors too
https://errors.yoctoproject.org/Errors/Build/76954/
On Sun, Feb 17, 2019 at 2:53 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Sun, 2019-02-17 at 15:51 +0100, Peter Kjellerstedt wrote:
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> > meta/classes/libc-package.bbclass | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
>
> I included this patchset in a run on the autobuilder and its failing:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/66
>
> I know the resulttool failures are my fault but the glibc-locale ones
> aren't. I'll abort the build as there are enough failures to know its
> doomed and I need a results set for other testing.
>
> Cheers,
>
> Richard
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-02-19 7:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-17 14:51 [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Peter Kjellerstedt
2019-02-17 14:51 ` [PATCH 2/3] libc-package.bbclass: Only extract wanted files in prep_locale_tree() Peter Kjellerstedt
2019-02-17 14:51 ` [PATCH 3/3] libc-package.bbclass: Add a progress meter for the package task Peter Kjellerstedt
2019-02-18 1:21 ` Christopher Larson
2019-02-18 1:37 ` Peter Kjellerstedt
2019-02-17 22:52 ` [PATCH 1/3] libc-package.bbclass: Correct a few paths for when usrmerge is used Richard Purdie
2019-02-19 7:03 ` Khem Raj
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.