misc tweaks
PATCH 5/8 busybox: add ifup's ifstate dir to package
In reply to Bernhard Reutner-Fischerifupdown stores its ifstate into CONFIG_IFIPDOWN_IFSTATE_PATH. Fixes:
ifup: can't open '/var/run/ifstate': No such file or directory
--- meta/recipes-core/busybox/busybox.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-core/busybox/busybox.inc +4 -0
@@ -199,6 +199,10 @@ do_install () { install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf fi fi + IFUPDOWN_IFSTATE_PATH=`awk '/^CONFIG_IFUPDOWN_IFSTATE_PATH/{split($0,x,/=/);p=x[2];gsub("\"","",p);print p;}' ${WORKDIR}/defconfig` + if test -n "$IFUPDOWN_IFSTATE_PATH"; then + install -m 0755 -d ${D}/"$IFUPDOWN_IFSTATE_PATH" + fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir} }
Signature · 1 line
1.7.10.4
cover misc tweaks
some hunks for busybox and uclibc.
Build-tested qemu{arm,mips,i386,x86_64,ppc} micro-image.
The following changes since commit 3b1beb8b15b8e3e397b3aa8320490103d4f29bac:
dropbear: fix RPROVIDES (2013-02-04 23:19:55 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib aldot/fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=aldot/fixes
Bernhard Reutner-Fischer (8):
base.bbclass: Commentary typo fix
uclibc: add c6x arch
uclibc: turn on kernel module support Revert "Add ptest for glib."
busybox: add ifup's ifstate dir to package
busybox: update-modules script needs id(1) base.bbclass: remove redundant setting of MAKE
create-pull-request: Error message on missing -u
meta/classes/base.bbclass | 3 +- meta/recipes-core/busybox/busybox.inc | 5 ++ meta/recipes-core/busybox/busybox_1.20.2.bb | 2 +- .../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 -------------------- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 - meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 22 ------- meta/recipes-core/uclibc/uclibc-config.inc | 1 + meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 2 + scripts/create-pull-request | 5 +- 9 files changed, 13 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/run-ptest
Signature · 1 line
1.7.10.4
PATCH 1/8 base.bbclass: Commentary typo fix
--- meta/classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/base.bbclass +1 -1
@@ -160,7 +160,7 @@ def pkgarch_mapping(d): d.setVar("TUNE_PKGARCH", "armv7a") def preferred_ml_updates(d): - # If any PREFERRED_PROVIDER or PREFERRED_VERSIONS are set, + # If any PREFERRED_PROVIDER or PREFERRED_VERSION are set, # we need to mirror these variables in the multilib case; # likewise the PNBLACKLIST flags. multilibs = d.getVar('MULTILIBS', True) or ""
Signature · 1 line
1.7.10.4
PATCH 3/8 uclibc: turn on kernel module support
In reply to Bernhard Reutner-Fischer--- meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-core/uclibc/uclibc-git/uClibc.distro +2 -0
@@ -157,6 +157,8 @@ WARNINGS="-Wall" DO_C99_MATH=y UCLIBC_HAS_LONG_DOUBLE_MATH=y UCLIBC_HAS_FENV=y +UCLIBC_LINUX_MODULE_26=y +# UCLIBC_LINUX_MODULE_24 is not set UCLIBC_LINUX_SPECIFIC=y UCLIBC_HAS_REALTIME=y UCLIBC_HAS_ADVANCED_REALTIME=y
Signature · 1 line
1.7.10.4
PATCH 2/8 uclibc: add c6x arch
In reply to Bernhard Reutner-Fischer--- meta/recipes-core/uclibc/uclibc-config.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/uclibc/uclibc-config.inc +1 -0
@@ -9,6 +9,7 @@ alpha \ arm \ avr32 \ bfin \ +c6x \ cris \ e1 \ frv \
Signature · 1 line
1.7.10.4
PATCH 4/8 Revert "Add ptest for glib."
In reply to Bernhard Reutner-FischerThis reverts commit dec6f912d68f52748f645b6af411f189cf464f85.
This breaks core-image-sato-sdk for TCLIBC="uclibc".
--- .../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 -------------------- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 - meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 22 ------- 3 files changed, 86 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/run-ptest
meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch deleted +0 -61
@@ -1,61 +0,0 @@ -Add 'ptest' target to Makefile, to run tests without checking dependencies. -Add 'install-ptest' target, to copy needed files to ptest dir. - -Signed-off-by: Björn Stenberg <[email protected]> -Upstream-status: Pending ---- - Makefile.decl | 43 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - ---- a/Makefile.decl 2012-03-12 01:42:39.000000000 +0100 -+++ b/Makefile.decl 2012-11-26 13:42:08.436865192 +0100 -@@ -25,6 +25,49 @@ - test-nonrecursive: - endif - -+ptest: ptest-nonrecursive -+ @ for subdir in $(SUBDIRS) .; do \ -+ test -d "$$subdir" -a "$$subdir" != "." -a "$$subdir" != "po" && \ -+ ( test -d $$subdir && cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) \ -+ done -+ -+ptest-nonrecursive: -+ @test -z "${TEST_PROGS}" || ${GTESTER} --keep-going --verbose ${TEST_PROGS} -+ -+install-ptest: install-ptest-nonrecursive -+ @test -z "$(SUBDIRS)" || for subdir in $(SUBDIRS); do \ -+ test "$$subdir" == "." || \ -+ (cd $$subdir && $(MAKE) DESTDIR=$(DESTDIR)/$$subdir $@ ) \ -+ done -+ -+# install files used for ptest: -+# - copy EXTRA_DIST (for test data in glib/tests) -+# - run dist-hook (for glib/tests/bookmarks/ and glib/tests/markups) -+# - copy TEST_PROGS (the test programs) -+# - copy INSTALL_PROGS (for glib/gtester) -+# - avoid libtool wrappers by copying binaries from .libs -+# - strip Makefile: target from all Makefiles -+install-ptest-nonrecursive: -+ @mkdir -p $(DESTDIR) -+ @if [ -n "${TEST_PROGS}" ]; then \ -+ if [ -n "${EXTRA_DIST}" ]; then \ -+ cp ${EXTRA_DIST} $(DESTDIR); \ -+ fi; \ -+ grep -q dist-hook: Makefile && \ -+ $(MAKE) distdir=$(DESTDIR) dist-hook; \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${TEST_PROGS} $(DESTDIR); \ -+ fi; -+ @if [ -n "${INSTALL_PROGS}" ]; then \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${INSTALL_PROGS} $(DESTDIR); \ -+ fi -+ @test -f Makefile && sed 's/^Makefile:/_Makefile:/' <Makefile >$(DESTDIR)/Makefile -+ - # test-report: run tests in subdirs and generate report - # perf-report: run tests in subdirs with -m perf and generate report - # full-report: like test-report: with -m perf and -m slow
meta/recipes-core/glib-2.0/glib-2.0/run-ptest deleted +0 -3
@@ -1,3 +0,0 @@ -#!/bin/sh - -make -k ptest
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0 -22
@@ -13,8 +13,6 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://glib-2.0_fix_for_x32.patch \ file://obsolete_automake_macros.patch \ - file://Makefile-ptest.patch \ - file://run-ptest \ " SRC_URI[md5sum] = "a4ca31e258273c3761e3de2edd607661" SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"
@@ -22,24 +20,6 @@ SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f4161 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \ - eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - " - do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in }
@@ -56,6 +36,4 @@ do_install_append() { if [ -f ${D}${bindir}/glib-mkenums ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums fi - - ptest_do_install }
Signature · 1 line
1.7.10.4
PATCH 7/8 base.bbclass: remove redundant setting of MAKE
In reply to Bernhard Reutner-Fischeroe_runmake() tried to set MAKE a second time, remove it since this is (nowadays?) redundant WRT the normal export MAKE= in the generated scripts.
--- meta/classes/base.bbclass | 1 - 1 file changed, 1 deletion(-)
meta/classes/base.bbclass +0 -1
@@ -54,7 +54,6 @@ die() { } oe_runmake() { - if [ x"$MAKE" = x ]; then MAKE=make; fi bbnote ${MAKE} ${EXTRA_OEMAKE} "$@" ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed" }
Signature · 1 line
1.7.10.4
PATCH 8/8 create-pull-request: Error message on missing -u
In reply to Bernhard Reutner-FischerThe script was erroring out without a hint on what failed.
--- scripts/create-pull-request | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/create-pull-request +3 -2
@@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2010-2011, Intel Corporation. +# Copyright (c) 2010-2013, Intel Corporation. # All Rights Reserved # # This program is free software; you can redistribute it and/or modify
@@ -124,8 +124,9 @@ if [ -z "$BRANCH" ]; then BRANCH=$(git branch | grep -e "^\* " | cut -d' ' -f2) echo "NOTE: Assuming remote branch '$BRANCH', use -b to override." fi - + if [ -z "$REMOTE_URL" ]; then + echo "ERROR: Missing parameter -u, no git remote!" usage exit 1 fi
Signature · 1 line
1.7.10.4
PATCH 6/8 busybox: update-modules script needs id(1)
In reply to Bernhard Reutner-FischerThe update-modules script calls id(1), so turn on id in this case. Bump PR.
--- meta/recipes-core/busybox/busybox.inc | 1 + meta/recipes-core/busybox/busybox_1.20.2.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/busybox/busybox.inc +1 -0
@@ -59,6 +59,7 @@ def features_to_busybox_settings(d): busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) busybox_cfg('wifi', distro_features, 'CONFIG_RFKILL', cnf, rem) busybox_cfg('bluetooth', distro_features, 'CONFIG_RFKILL', cnf, rem) + busybox_cfg('update-modules', distro_features, 'CONFIG_ID', cnf, rem) return "\n".join(cnf), "\n".join(rem) # X, Y = ${@features_to_uclibc_settings(d)}
meta/recipes-core/busybox/busybox_1.20.2.bb +1 -1
@@ -1,5 +1,5 @@ require busybox.inc -PR = "r5" +PR = "r6" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://B921600.patch \
Signature · 1 line
1.7.10.4
Re: [PATCH 6/8] busybox: update-modules script needs id(1)
Quoted 8 lines · Bernhard Reutner-Fischer
The update-modules script calls id(1), so turn on id in this case. Bump PR.
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- meta/recipes-core/busybox/busybox.inc | 1 + meta/recipes-core/busybox/busybox_1.20.2.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
Wasn't update-modules just removed from OECore?
Cheers,
Richard
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Bernhard Reutner-FischerQuoted 4 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
Quoted 8 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- .../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 -------------------- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 - meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 22 ------- 3 files changed, 86 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/run-ptest
How about we fix ptest for glib? The revert isn't really the direction we want to take the project. At least discussing this with Björn (cc'd) and/or filing a bug would be a good idea before we move to reverting it.
Cheers,
Richard
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Bernhard Reutner-FischerQuoted 3 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
Ouch. How about we fix it instead of reverting this?
Ross
Re: [PATCH 6/8] busybox: update-modules script needs id(1)
In reply to Richard PurdieQuoted 11 lines · Richard Purdie
Quoted 8 lines · Bernhard Reutner-Fischer
The update-modules script calls id(1), so turn on id in this case. Bump PR.
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- meta/recipes-core/busybox/busybox.inc | 1 + meta/recipes-core/busybox/busybox_1.20.2.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)Wasn't update-modules just removed from OECore?
could be, i am still at 8dd608dac1e5658197078d002dc1b3dc8ac83184 here because i feared that unrelated stuff will fail again on me (see the Revert in this series for one example).
Please disregard this hunk if it is moot by now..
cheers,
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Bernhard Reutner-FischerQuoted 4 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
What's the issue? Is it fixable instead of reverting the ptest patch? I think this would be the wrong approach to this kind of issue as we want to expand the usage of ptest.
Thanks
Sau!
Quoted 131 lines
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- .../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 -------------------- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 - meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 22 ------- 3 files changed, 86 deletions(-)delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patchdelete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/run-ptestmeta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch deleted +0
-61@@ -1,61 +0,0 @@ -Add 'ptest' target to Makefile, to run tests without checking dependencies. -Add 'install-ptest' target, to copy needed files to ptest dir. - -Signed-off-by: Björn Stenberg <[email protected]> -Upstream-status: Pending ---- - Makefile.decl | 43 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - ---- a/Makefile.decl 2012-03-12 01:42:39.000000000 +0100 -+++ b/Makefile.decl 2012-11-26 13:42:08.436865192 +0100 -@@ -25,6 +25,49 @@ - test-nonrecursive: - endif - -+ptest: ptest-nonrecursive -+ @ for subdir in $(SUBDIRS) .; do \ -+ test -d "$$subdir" -a "$$subdir" != "." -a "$$subdir" != "po" && \ -+ ( test -d $$subdir && cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) \ -+ done -+ -+ptest-nonrecursive: -+ @test -z "${TEST_PROGS}" || ${GTESTER} --keep-going --verbose ${TEST_PROGS} -+ -+install-ptest: install-ptest-nonrecursive -+ @test -z "$(SUBDIRS)" || for subdir in $(SUBDIRS); do \ -+ test "$$subdir" == "." || \ -+ (cd $$subdir && $(MAKE) DESTDIR=$(DESTDIR)/$$subdir $@ ) \ -+ done -+ -+# install files used for ptest: -+# - copy EXTRA_DIST (for test data in glib/tests) -+# - run dist-hook (for glib/tests/bookmarks/ and glib/tests/markups) -+# - copy TEST_PROGS (the test programs) -+# - copy INSTALL_PROGS (for glib/gtester) -+# - avoid libtool wrappers by copying binaries from .libs -+# - strip Makefile: target from all Makefiles -+install-ptest-nonrecursive: -+ @mkdir -p $(DESTDIR) -+ @if [ -n "${TEST_PROGS}" ]; then \ -+ if [ -n "${EXTRA_DIST}" ]; then \ -+ cp ${EXTRA_DIST} $(DESTDIR); \ -+ fi; \ -+ grep -q dist-hook: Makefile && \ -+ $(MAKE) distdir=$(DESTDIR) dist-hook; \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${TEST_PROGS} $(DESTDIR); \ -+ fi; -+ @if [ -n "${INSTALL_PROGS}" ]; then \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${INSTALL_PROGS} $(DESTDIR); \ -+ fi -+ @test -f Makefile && sed 's/^Makefile:/_Makefile:/' <Makefile >$(DESTDIR)/Makefile -+ - # test-report: run tests in subdirs and generate report - # perf-report: run tests in subdirs with -m perf and generate report - # full-report: like test-report: with -m perf and -m slowmeta/recipes-core/glib-2.0/glib-2.0/run-ptest deleted +0
-3@@ -1,3 +0,0 @@ -#!/bin/sh - -make -k ptestmeta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-22@@ -13,8 +13,6 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://glib-2.0_fix_for_x32.patch \ file://obsolete_automake_macros.patch \ - file://Makefile-ptest.patch \ - file://run-ptest \ " SRC_URI[md5sum] = "a4ca31e258273c3761e3de2edd607661" SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"@@ -22,24 +20,6 @@ SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f4161 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \ - eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - " - do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in }@@ -56,6 +36,4 @@ do_install_append() { if [ -f ${D}${bindir}/glib-mkenums ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums fi - - ptest_do_install }
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Burton, RossQuoted 7 lines · Ross
Quoted 3 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
Ouch. How about we fix it instead of reverting this?
I do not have time to look into this, sorry. But yes, of course fixing it for real would be better..
thanks,
Re: [PATCH 4/8] Revert "Add ptest for glib."
Quoted 2 lines · Bernhard Reutner-Fischer
I do not have time to look into this, sorry. But yes, of course fixing it for real would be better..
Sharing the log of the failure would help immensely.
Ross
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Saul WoldQuoted 7 lines · Saul Wold
Quoted 5 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
What's the issue? Is it fixable instead of reverting the ptest patch? I
The issue is that it incorrectly and unconditionally pulls in eglibc stuff:
-RDEPENDS_${PN}-ptest += "\
- eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \ - eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \
- "
Quoted 2 lines
think this would be the wrong approach to this kind of issue as we want to expand the usage of ptest.
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Burton, RossQuoted 6 lines · Ross
Quoted 2 lines · Bernhard Reutner-Fischer
I do not have time to look into this, sorry. But yes, of course fixing it for real would be better..
Sharing the log of the failure would help immensely.
The uncompressed log is about 50MB, i put it here (still 1.2MB):
http://busybox.net/~aldot/oe/mk.all.20130118-1442.53.log.xz
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Bernhard Reutner-FischerQuoted 19 lines · Bernhard Reutner-Fischer
Quoted 7 lines · Saul Wold
Quoted 5 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
What's the issue? Is it fixable instead of reverting the ptest patch? I
The issue is that it incorrectly and unconditionally pulls in eglibc stuff:
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-7-RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f4161 · line 41
Quoted 10 lines
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-10- eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - "
Bjorn,
Do you have some time to look at this and see if you can make use of TCLIBC to use the correct library and locale package info based on which libc is being used?
I guess you did not originally think about the uclibc case.
Thanks
Sau!
Quoted 4 lines
Quoted 2 lines
think this would be the wrong approach to this kind of issue as we want to expand the usage of ptest.
Re: [PATCH 4/8] Revert "Add ptest for glib."
Quoted 35 lines · Saul Wold
Quoted 24 lines · Bernhard Reutner-Fischer
Quoted 9 lines · Saul Wold
Quoted 6 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
What's the issue? Is it fixable instead of reverting the ptest patch? I
The issue is that it incorrectly and unconditionally pulls in eglibc stuff:
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-7-RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f4161 · line 41
Quoted 10 lines
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-10- eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - "
Quoted 5 lines
Bjorn,
Do you have some time to look at this and see if you can make use of TCLIBC to use the correct library and locale package info based on which libc is being used?
would most likely DTRT, yep.
I'm curious what you would need from uClibc to satisfy that ptest thing? What does it do, what is it good for? :)
RDEPENDS_${PN}-ptest += "\
tzdata \
tzdata-americas \
tzdata-asia \
tzdata-europe \
tzdata-posix \
python-pygobject \
python-dbus \
"
RDEPENDS_${PN}-ptest_append_libc-eglibc = "\
eglibc-gconv-utf-16 \
eglibc-charmap-utf-8 \
eglibc-gconv-cp1255 \
eglibc-charmap-cp1255 \
eglibc-gconv-utf-32 \
eglibc-gconv-utf-7 \
eglibc-charmap-invariant \
eglibc-localedata-translit-cjk-variants \
"RDEPENDS_${PN}-ptest_append_libc-eglibc = "did not look"
TIA && cheers,
Re: [PATCH 4/8] Revert "Add ptest for glib."
Quoted 36 lines · Bernhard Reutner-Fischer
Quoted 35 lines · Saul Wold
Quoted 34 lines · Bernhard Reutner-Fischer
Quoted 9 lines · Saul Wold
Quoted 6 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
What's the issue? Is it fixable instead of reverting the ptest patch? I
The issue is that it incorrectly and unconditionally pulls in eglibc stuff:
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-17-RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \ - eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - "
Quoted 7 lines
Quoted 5 lines
Bjorn,
Do you have some time to look at this and see if you can make use of TCLIBC to use the correct library and locale package info based on which libc is being used?
would most likely DTRT, yep.
Well, given that i see e.g. glibc-gconv-utf-16 nowhere in openembedded-core i suspect they are misplaced and should live in the layer that provides them.
Quoted 2 lines
I'm curious what you would need from uClibc to satisfy that ptest thing? What does it do, what is it good for? :)
Is e.g. glibc-gconv-utf-16 locale support or something like that?
thanks,
Quoted 23 lines
RDEPENDS_${PN}-ptest += "\ tzdata \ tzdata-americas \ tzdata-asia \ tzdata-europe \ tzdata-posix \ python-pygobject \ python-dbus \ " RDEPENDS_${PN}-ptest_append_libc-eglibc = "\ eglibc-gconv-utf-16 \ eglibc-charmap-utf-8 \ eglibc-gconv-cp1255 \ eglibc-charmap-cp1255 \ eglibc-gconv-utf-32 \ eglibc-gconv-utf-7 \ eglibc-charmap-invariant \ eglibc-localedata-translit-cjk-variants \ "RDEPENDS_${PN}-ptest_append_libc-eglibc = "did not look"
TIA && cheers,
Re: [PATCH 4/8] Revert "Add ptest for glib."
Quoted 44 lines · Bernhard Reutner-Fischer
Quoted 42 lines · Bernhard Reutner-Fischer
Quoted 40 lines · Saul Wold
Quoted 24 lines · Bernhard Reutner-Fischer
Quoted 9 lines · Saul Wold
Quoted 6 lines · Bernhard Reutner-Fischer
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
What's the issue? Is it fixable instead of reverting the ptest patch? I
The issue is that it incorrectly and unconditionally pulls in eglibc stuff:
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-7-RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f4161 · line 41
Quoted 10 lines
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-10- eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - "Bjorn,
Do you have some time to look at this and see if you can make use of TCLIBC to use the correct library and locale package info based on which libc is being used?
Quoted 6 lines
Quoted 1 line
would most likely DTRT, yep.
Well, given that i see e.g. glibc-gconv-utf-16 nowhere in openembedded-core i suspect they are misplaced and should live in the layer that provides them.
It's a DYNAMIC package built in eglibc-locale.inc.
Quoted 3 lines
Quoted 2 lines
I'm curious what you would need from uClibc to satisfy that ptest thing? What does it do, what is it good for? :)
Bjorn question at this point!
Quoted 2 lines
Is e.g. glibc-gconv-utf-16 locale support or something like that?
probably, could the uclibc-gconv provide equivalent?
Sau!
Quoted 26 lines
thanks,
Quoted 23 lines
RDEPENDS_${PN}-ptest += "\ tzdata \ tzdata-americas \ tzdata-asia \ tzdata-europe \ tzdata-posix \ python-pygobject \ python-dbus \ " RDEPENDS_${PN}-ptest_append_libc-eglibc = "\ eglibc-gconv-utf-16 \ eglibc-charmap-utf-8 \ eglibc-gconv-cp1255 \ eglibc-charmap-cp1255 \ eglibc-gconv-utf-32 \ eglibc-gconv-utf-7 \ eglibc-charmap-invariant \ eglibc-localedata-translit-cjk-variants \ "RDEPENDS_${PN}-ptest_append_libc-eglibc = "did not look"
TIA && cheers,
Re: [PATCH 4/8] Revert "Add ptest for glib."
Quoted 70 lines · Saul Wold
Quoted 55 lines · Bernhard Reutner-Fischer
Quoted 52 lines · Bernhard Reutner-Fischer
Quoted 48 lines · Saul Wold
Quoted 29 lines · Bernhard Reutner-Fischer
Quoted 6 lines · Saul Wold
Quoted 3 lines · Bernhard Reutner-Fischer
Quoted 6 lines
Quoted 4 lines
This reverts commit
dec6f912d68f52748f645b6af411f189cf464f85.This breaks core-image-sato-sdk for TCLIBC="uclibc".
What's the issue? Is it fixable instead of reverting the ptest patch? I
The issue is that it incorrectly and unconditionally pulls in eglibc stuff:
(quoted diff) +0
-7-RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \Review
Quoted 10 lines
(quoted diff) +0
-10- eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - "Bjorn,
Do you have some time to look at this and see if you can make use of TCLIBC
to use the correct library and locale package info based on which libc is
being used?Quoted 7 lines
Quoted 1 line
would most likely DTRT, yep.
Well, given that i see e.g. glibc-gconv-utf-16 nowhere in openembedded-core i suspect they are misplaced and should live in the layer that provides them.
It's a DYNAMIC package built in eglibc-locale.inc.
Quoted 4 lines
Quoted 2 lines
I'm curious what you would need from uClibc to satisfy that ptest thing? What does it do, what is it good for? :)
Quoted 7 lines
Bjorn question at this point!
Quoted 2 lines
Is e.g. glibc-gconv-utf-16 locale support or something like that?
probably, could the uclibc-gconv provide equivalent?
split the ptest recipe out into its own and make it eglibc only recipe locales and gconv stuff wont fly with uclibc
Quoted 37 lines
Sau!
Quoted 28 lines
thanks,
Quoted 24 lines
RDEPENDS_${PN}-ptest += "\ tzdata \ tzdata-americas \ tzdata-asia \ tzdata-europe \ tzdata-posix \ python-pygobject \ python-dbus \ " RDEPENDS_${PN}-ptest_append_libc-eglibc = "\ eglibc-gconv-utf-16 \ eglibc-charmap-utf-8 \ eglibc-gconv-cp1255 \ eglibc-charmap-cp1255 \ eglibc-gconv-utf-32 \ eglibc-gconv-utf-7 \ eglibc-charmap-invariant \ eglibc-localedata-translit-cjk-variants \ "RDEPENDS_${PN}-ptest_append_libc-eglibc = "did not look"
TIA && cheers,
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Saul WoldQuoted 17 lines · Saul Wold
Quoted 7 lines
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-7-RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f4161 · line 41
Quoted 10 lines
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +0
-10- eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - "
Quoted 5 lines
Do you have some time to look at this and see if you can make use of TCLIBC to use the correct library and locale package info based on which libc is being used?
I guess you did not originally think about the uclibc case.
Correct, I did not.
The list of packages added by ptest are things that are used by the glib test suite. Without this data, some tests will fail.
I'll look into making it more uclibc friendly.
Signature · 1 line
Björn
Re: [PATCH 4/8] Revert "Add ptest for glib."
In reply to Bernhard Reutner-FischerQuoted 2 lines · Bernhard Reutner-Fischer
The uncompressed log is about 50MB, i put it here (still 1.2MB):
http://busybox.net/~aldot/oe/mk.all.20130118-1442.53.log.xz
Can I ask how you worked around the iconv RPATH issue?
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2669
Signature · 1 line
Björn
Re: [PATCH 5/8] busybox: add ifup's ifstate dir to package
In reply to Bernhard Reutner-FischerQuoted 14 lines · Bernhard Reutner-Fischer
ifupdown stores its ifstate into
CONFIG_IFIPDOWN_IFSTATE_PATH. Fixes:
ifup: can't open '/var/run/ifstate': No such file or directorySigned-off-by Bernhard Reutner-Fischer <[email protected]>--- meta/recipes-core/busybox/busybox.inc | 4 ++++ 1 file changed, 4 insertions(+)meta/recipes-core/busybox/busybox.inc +0
-0
meta/recipes-core/busybox/busybox.inc do_install () { · line 203
Quoted 5 lines
meta/recipes-core/busybox/busybox.inc +2
-0@@ -199,6 +199,10 @@ do_install () { install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf fi fi + IFUPDOWN_IFSTATE_PATH=`awk '/^CONFIG_IFUPDOWN_IFSTATE_PATH/{split($0,x,/=/);p=x[2];gsub("\"","",p);print p;}' ${WORKDIR}/defconfig` + if test -n "$IFUPDOWN_IFSTATE_PATH"; then
Should this also be ${D} in the test, other wise you might be testing the host!
Sau!
Quoted 6 lines
meta/recipes-core/busybox/busybox.inc +2
-0+ install -m 0755 -d ${D}/"$IFUPDOWN_IFSTATE_PATH" + fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir} }
Re: [PATCH 5/8] busybox: add ifup's ifstate dir to package
Quoted 10 lines · Saul Wold
Quoted 9 lines · Bernhard Reutner-Fischer
ifupdown stores its ifstate into
CONFIG_IFIPDOWN_IFSTATE_PATH. Fixes:
ifup: can't open '/var/run/ifstate': No such file or directorySigned-off-by Bernhard Reutner-Fischer <[email protected]>--- meta/recipes-core/busybox/busybox.inc | 4 ++++ 1 file changed, 4 insertions(+)
Quoted 12 lines
meta/recipes-core/busybox/busybox.inc do_install () { · line 203
Quoted 10 lines
meta/recipes-core/busybox/busybox.inc +2
-0@@ -199,6 +199,10 @@ do_install () { install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf fi fi + IFUPDOWN_IFSTATE_PATH=`awk '/^CONFIG_IFUPDOWN_IFSTATE_PATH/{split($0,x,/=/);p=x[2];gsub("\"","",p);print p;}' ${WORKDIR}/defconfig` + if test -n "$IFUPDOWN_IFSTATE_PATH"; thenShould this also be ${D} in the test, other wise you might be testing the host!
WORKDIR is correct, see meta/conf/bitbake.conf setting WORKDIR. thanks,
Quoted 10 lines
Sau!
Quoted 6 lines
meta/recipes-core/busybox/busybox.inc +2
-0+ install -m 0755 -d ${D}/"$IFUPDOWN_IFSTATE_PATH" + fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir} }