[OE-core] base-files: Upgrade causes circular symbolic link for /run
I am on poky/dizzy and I am testing upgrading of some systems with older firmware. I am using sysvinit for an init and opkg for a package manager. I am having an issue with the /run directory which I believe I have traced down to this commit: http://git.openembedded.org/openembedded-core/commit/meta/recipes-core/base-files?id=0e326280a15b0f2c4ef2ef4ec441f63f55b75873 Before this commit, the symbolic links for /run are as follows: /run -> /var/run /var/run -> volatile/run When I upgrade an older system with dizzy HEAD, the symbolic links are as follows: /run -> /var/run /var/run -> ../run This makes /run and /var/run inaccessible since it is a circular symbolic link. As expected, there are a few things that aren't working right because /run cannot be used. Has anyone else had this experience? If so, how did you work around it? Thanks, Bryan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] python3: Upgrade from 3.3.3 to 3.4.2
Modifies:
python3-native_3.3.3.bb -> python3-native_3.4.2.bb: Updates checksums, version,
patches
and SRC_URIs to use xz format, LICENSE did not change, dates were updated, adds
fix for
ctypes/libffi needed for pip <- required since Python 3.4 (see PEP #453).
python3_3.3.3.bb -> python3_3.4.2.bb: Updates checksums, version, patches and
SRC_URIs
to use xz format, adds fix for ctypes/libffi, fixes oe_multilib_header() call,
adds python3-core as RDEPENDS to python3-misc to avoid QA issue.
generate-manifest-3.4.py - > generate-manifest-3.4.py: fixes reprlib,
adds _sitebuiltins and _collections_abc <- formerly part of collections,
separated since 3.4
python-3.3-manifest.inc -> python-3.4-manifest.inc
Rebases:
12-distutils-prefix-is-inside-staging-area.patch
python-3.3-multilib.patch
04-default-is-optimized.patch
avoid-ncursesw-include-path.patch
Deletes (fixed upstream):
fix-ast.h-dependency.patch
python3-fix-build-error-with-Readline-6.3.patch
06-ctypes-libffi-fix-configure.patch
remove_sqlite_rpath.patch
[YOCTO #6857]
Signed-off-by: Alejandro Hernandez
---
...on-3.3-manifest.inc => python-3.4-manifest.inc} | 126 +++
...on3-native_3.3.3.bb => python3-native_3.4.2.bb} | 17 +-
.../python/python3/04-default-is-optimized.patch | 39 ++---
...2-distutils-prefix-is-inside-staging-area.patch | 29 ++--
.../python3/avoid-ncursesw-include-path.patch | 30 ++--
.../python/python3/python-3.3-multilib.patch | 180 +++--
.../python/{python3_3.3.3.bb => python3_3.4.2.bb} | 21 ++-
...te-manifest-3.3.py => generate-manifest-3.4.py} | 8 +-
8 files changed, 222 insertions(+), 228 deletions(-)
rename meta/recipes-devtools/python/{python-3.3-manifest.inc =>
python-3.4-manifest.inc} (50%)
rename meta/recipes-devtools/python/{python3-native_3.3.3.bb =>
python3-native_3.4.2.bb} (80%)
rename meta/recipes-devtools/python/{python3_3.3.3.bb => python3_3.4.2.bb}
(93%)
rename scripts/contrib/python/{generate-manifest-3.3.py =>
generate-manifest-3.4.py} (98%)
diff --git a/meta/recipes-devtools/python/python-3.3-manifest.inc
b/meta/recipes-devtools/python/python-3.4-manifest.inc
similarity index 50%
rename from meta/recipes-devtools/python/python-3.3-manifest.inc
rename to meta/recipes-devtools/python/python-3.4-manifest.inc
index 61119c6..fa61556 100644
--- a/meta/recipes-devtools/python/python-3.3-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.4-manifest.inc
@@ -1,6 +1,6 @@
# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I
regenerate the file.
-# Generator: '../../../scripts/contrib/python/generate-manifest-3.3.py'
Version 20140131 (C) 2002-2010 Michael 'Mickey' Lauer
+# Generator: './generate-manifest-3.4.py' Version 20140131 (C) 2002-2010
Michael 'Mickey' Lauer
# Visit the Python for Embedded Systems Site =>
http://www.Vanille.de/projects/python.spy
@@ -11,51 +11,51 @@ PACKAGES="${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-codecs
${PN}-compile ${PN}-comp
SUMMARY_${PN}-2to3="Python automated Python 2 to 3 code translator"
RDEPENDS_${PN}-2to3="${PN}-core"
-FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python3.3/lib2to3 "
+FILES_${PN}-2to3="${bindir}/2to3 ${libdir}/python3.4/lib2to3 "
SUMMARY_${PN}-audio="Python Audio Handling"
RDEPENDS_${PN}-audio="${PN}-core"
-FILES_${PN}-audio="${libdir}/python3.3/wave.* ${libdir}/python3.3/chunk.*
${libdir}/python3.3/sndhdr.* ${libdir}/python3.3/lib-dynload/ossaudiodev.*.so
${libdir}/python3.3/lib-dynload/audioop.*.so ${libdir}/python3.3/audiodev.*
${libdir}/python3.3/sunaudio.* ${libdir}/python3.3/sunau.*
${libdir}/python3.3/toaiff.* "
+FILES_${PN}-audio="${libdir}/python3.4/wave.* ${libdir}/python3.4/chunk.*
${libdir}/python3.4/sndhdr.* ${libdir}/python3.4/lib-dynload/ossaudiodev.*.so
${libdir}/python3.4/lib-dynload/audioop.*.so ${libdir}/python3.4/audiodev.*
${libdir}/python3.4/sunaudio.* ${libdir}/python3.4/sunau.*
${libdir}/python3.4/toaiff.* "
SUMMARY_${PN}-codecs="Python codecs, encodings & i18n support"
RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang"
-FILES_${PN}-codecs="${libdir}/python3.3/codecs.* ${libdir}/python3.3/encodings
${libdir}/python3.3/gettext.* ${libdir}/python3.3/locale.*
${libdir}/python3.3/lib-dynload/_locale.*.so
${libdir}/python3.3/lib-dynload/_codecs*
${libdir}/python3.3/lib-dynload/_multibytecodec.*.so
${libdir}/python3.3/lib-dynload/unicodedata.*.so
${libdir}/python3.3/stringprep.* ${libdir}/python3.3/xdrlib.* "
+FILES_${PN}-codecs="${libdir}/python3.4/codecs.* ${libdir}/python3.4/encodings
${libdir}/python3.4/gettext.* ${libdir}/python3.4/locale.*
${libdir}/python3.4/lib-dynload/_locale.*.so
${libdir}/python3.4/lib-dynload/_codecs*
${libdir}/python3.4/lib-dynload/_multibytecodec.*.so
${libdir}/python3.4/lib-dynload/unicodedata.*.so
${libdir}/python3.4/stringprep.* ${libdir}/python3.4/xdrlib.* "
SUMMARY_${PN}-compile="Python bytecode compilation support"
RDEPENDS_${PN}-compile="${PN}-core"
-FILES_${PN}-compile="${libdir}/py
[OE-core] [PATCH 0/1] python3: Upgrade from 3.3.3 to 3.4.2 rebase
Rebased the previous submitted patch to upgrade Python from 3.3.3 to 3.4.2
The following changes since commit 7fb6a6e907e5803597b2e12ba7047c46e57dba26:
upstream_tracking.inc: Add no-update reason for gdk-pixbuf (2015-04-09
10:01:48 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib hsalejandro/py3upRebasedApril
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=hsalejandro/py3upRebasedApril
Alejandro Hernandez (1):
python3: Upgrade from 3.3.3 to 3.4.2
...on-3.3-manifest.inc => python-3.4-manifest.inc} | 126 +++
...on3-native_3.3.3.bb => python3-native_3.4.2.bb} | 17 +-
.../python/python3/04-default-is-optimized.patch | 39 ++---
...2-distutils-prefix-is-inside-staging-area.patch | 29 ++--
.../python3/avoid-ncursesw-include-path.patch | 30 ++--
.../python/python3/python-3.3-multilib.patch | 180 +++--
.../python/{python3_3.3.3.bb => python3_3.4.2.bb} | 21 ++-
...te-manifest-3.3.py => generate-manifest-3.4.py} | 8 +-
8 files changed, 222 insertions(+), 228 deletions(-)
rename meta/recipes-devtools/python/{python-3.3-manifest.inc =>
python-3.4-manifest.inc} (50%)
rename meta/recipes-devtools/python/{python3-native_3.3.3.bb =>
python3-native_3.4.2.bb} (80%)
rename meta/recipes-devtools/python/{python3_3.3.3.bb => python3_3.4.2.bb}
(93%)
rename scripts/contrib/python/{generate-manifest-3.3.py =>
generate-manifest-3.4.py} (98%)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] lsb: provide lsb-core-ARCH
Some lsb packages depend on correct lsb-core-ARCH package being
installed (or rather provided) on the target file system. Provide this
package name by main lsb package.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/recipes-extended/lsb/lsb_4.1.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb
b/meta/recipes-extended/lsb/lsb_4.1.bb
index 1ae1e26..c3a79c0 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -4,6 +4,10 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb";
LICENSE = "GPLv2+"
PR = "r2"
+LSB_CORE = "lsb-core-${TARGET_ARCH}"
+LSB_CORE_i586 = "lsb-core-ia32"
+RPROVIDES_${PN} += "${LSB_CORE}"
+
# lsb_release needs getopt
RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt}"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] groff: add runtime dependency on sed
This is to suppress the following QA warning:
groff-1.22.2: groff requires /bin/sed, but no providers in its RDEPENDS
[file-rdeps]
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/recipes-extended/groff/groff_1.22.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb
b/meta/recipes-extended/groff/groff_1.22.2.bb
index 6e84587..dd345b7 100644
--- a/meta/recipes-extended/groff/groff_1.22.2.bb
+++ b/meta/recipes-extended/groff/groff_1.22.2.bb
@@ -17,6 +17,7 @@ SRC_URI[sha256sum] =
"380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a1
DEPENDS = "groff-native"
DEPENDS_class-native = ""
+RDEPENDS_${PN} += "sed"
inherit autotools texinfo
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] bitbake.conf: add sed-native to ASSUME_PROVIDED
There is no reason to build sed for the host, however now: ERROR: Nothing RPROVIDES 'sed-native' (but virtual:native:/OE/sources/openembedded-core/meta/recipes-extended/groff/groff_1.22.2.bb RDEPENDS on or otherwise requires it) Signed-off-by: Dmitry Eremin-Solenikov --- meta/conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f3586da..2b3c110 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -171,6 +171,7 @@ ASSUME_PROVIDED = "\ virtual/libintl-native \ texinfo-native \ bash-native \ +sed-native \ " # gzip-native should be listed above? -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] security_flags.inc: add more exceptions
Add few more exceptions from other layers as noted during custom image
builds.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/conf/distro/include/security_flags.inc | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/security_flags.inc
b/meta/conf/distro/include/security_flags.inc
index 21e1a53..f977c8e 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -58,8 +58,10 @@ SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-libpcap = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-libproxy = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-libvirt = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-lttng-ust = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-lvm2 = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-openssl = "${SECURITY_NO_PIE_CFLAGS}"
@@ -69,14 +71,18 @@ SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-python-imaging = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-python-smartpm = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-rrdtool = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-valgrind = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-webkit-gtk = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
-# These 2 have text relco errors with the pie options enabled
+# These have text relco errors with the pie options enabled
SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-lxc = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-mozjs = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-openldap = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}"
TARGET_CFLAGS_append = " ${SECURITY_CFLAGS}"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [wic][PATCH] wic: Implement --build-rootfs command line option
On Wed, Apr 08, 2015 at 07:18:40PM -0300, João Henrique Ferreira de Freitas wrote: > > Hi Ed, > > I liked. > > Two points: > > - How about if user sets INHERIT = "rm_work"? I mean the image > recipe will be rm, right? I always put my images in RM_WORK_EXCLUDE > so wic can use it. > rm_work removes artifacts required by wic. Wic will complain that rootfs can't be found. There is a bug about i https://bugzilla.yoctoproject.org/show_bug.cgi?id=7042 I closed it as not a bug as wic uses build artifacts by design. > - What will be the behavior if: wic create test-image-4Gb -e > test-image --rootfs rootfs1=test-image --rootfs > rootfs2=bringup-image -f. A believed that only 'test-image' will be > build. Right? > I don't fully understand command line options in your example, but generally you're right. wic will take image name from -e option and run "bitbake test-image" in this case. Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH] wic: Add argv argument to main
Make it possible to call wic as an API from tests passing command line parameters as arguments to main. This is yet another enabler for wic unit testing. Signed-off-by: Ed Bartosh --- scripts/wic | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/wic b/scripts/wic index fd4a678..5bedd90 100755 --- a/scripts/wic +++ b/scripts/wic @@ -279,13 +279,13 @@ def start_logging(loglevel): logging.basicConfig(filname='wic.log', filemode='w', level=loglevel) -def main(): +def main(argv): parser = optparse.OptionParser(version="wic version %s" % __version__, usage=wic_usage) parser.disable_interspersed_args() -(options, args) = parser.parse_args() +(options, args) = parser.parse_args(argv) if len(args): if args[0] == "help": @@ -298,7 +298,7 @@ def main(): if __name__ == "__main__": try: -ret = main() +ret = main(sys.argv[1:]) except Exception: ret = 1 import traceback -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] elfutils: fix an incorrect patch for 0.161
The original uclibc-support.patch is not compatible with elfutils-0.161.
It should be corrected through adjusting context.
So regenerate a new patch for elfutils-0.161, rename the patch for
elfutils-0.148, and put them into respective directories.
Signed-off-by: Junling Zheng
---
.../uclibc-support-for-elfutils-0.148.patch} | 0
.../uclibc-support-for-elfutils-0.161.patch| 106 +
meta/recipes-devtools/elfutils/elfutils_0.148.bb | 2 +-
meta/recipes-devtools/elfutils/elfutils_0.161.bb | 2 +-
4 files changed, 108 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/elfutils/{elfutils/uclibc-support.patch =>
elfutils-0.148/uclibc-support-for-elfutils-0.148.patch} (100%)
create mode 100644
meta/recipes-devtools/elfutils/elfutils-0.161/uclibc-support-for-elfutils-0.161.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils/uclibc-support.patch
b/meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support-for-elfutils-0.148.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils/uclibc-support.patch
rename to
meta/recipes-devtools/elfutils/elfutils-0.148/uclibc-support-for-elfutils-0.148.patch
diff --git
a/meta/recipes-devtools/elfutils/elfutils-0.161/uclibc-support-for-elfutils-0.161.patch
b/meta/recipes-devtools/elfutils/elfutils-0.161/uclibc-support-for-elfutils-0.161.patch
new file mode 100644
index 000..f1533bf
--- /dev/null
+++
b/meta/recipes-devtools/elfutils/elfutils-0.161/uclibc-support-for-elfutils-0.161.patch
@@ -0,0 +1,106 @@
+From 3daec2dd11a04955f95e8f65a48820103d84dbec Mon Sep 17 00:00:00 2001
+From: Junling Zheng
+Date: Thu, 9 Apr 2015 12:12:49 +
+Subject: [PATCH] uclibc support for elfutils 0.161
+
+on uclibc systems libintl and libuargp are separate from libc.
+so they need to be specified on commandline when we use proxy-libintl
+then libintl is a static archive so it should be listed last since
+elfutils does not respect disable-nls we need to link in libintl
+
+We add a new option --enable-uclibc which will be used to control
+the uclibc specific configurations during build.
+
+Upstream-Status: Inappropriate [uclibc specific]
+
+Signed-off-by: Khem Raj
+Signed-off-by: Junling Zheng
+[Junling Zheng:
+ - adjust context
+]
+---
+ configure.ac | 8
+ libcpu/Makefile.am | 4
+ libdw/Makefile.am | 7 ++-
+ libelf/Makefile.am | 5 +
+ 4 files changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a1ad6db..81fc33f 100644
+--- a/configure.ac
b/configure.ac
+@@ -70,6 +70,14 @@ AS_IF([test "$use_locks" = yes],
+
+ AH_TEMPLATE([USE_LOCKS], [Defined if libraries should be thread-safe.])
+
++AC_ARG_ENABLE([uclibc],
++AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]),
++use_uclibc=yes, use_uclibc=no)
++AM_CONDITIONAL(USE_UCLIBC, test "$use_uclibc" = yes)
++AS_IF([test "$use_uclibc" = yes], [AC_DEFINE(USE_UCLIBC)])
++
++AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.])
++
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_YACC
+diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am
+index 3beccf3..9ba6c04 100644
+--- a/libcpu/Makefile.am
b/libcpu/Makefile.am
+@@ -80,6 +80,10 @@ i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
+ i386_lex.o: i386_parse.h
+ i386_gendis_LDADD = $(libeu) -lm
+
++if USE_UCLIBC
++i386_gendis_LDADD += -luargp -lintl
++endif
++
+ i386_parse.h: i386_parse.c ;
+
+ EXTRA_DIST = defs/i386
+diff --git a/libdw/Makefile.am b/libdw/Makefile.am
+index 887da6b..d31b428 100644
+--- a/libdw/Makefile.am
b/libdw/Makefile.am
+@@ -102,6 +102,11 @@ endif
+ libdw_pic_a_SOURCES =
+ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
+
++libdw_so_LDLIBS =
++if USE_UCLIBC
++libdw_so_LDLIBS += -lintl -luargp
++endif
++
+ libdw_so_SOURCES =
+ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a
\
+ ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
+@@ -112,7 +117,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a
../libdwelf/libdwelf_pic.a \
+ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
+ -Wl,--version-script,$<,--no-undefined \
+ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
+- -ldl $(zip_LIBS)
++ -ldl $(zip_LIBS) $(libdw_so_LDLIBS)
+ @$(textrel_check)
+ ln -fs $@ $@.$(VERSION)
+
+diff --git a/libelf/Makefile.am b/libelf/Makefile.am
+index afcb2aa..02836a1 100644
+--- a/libelf/Makefile.am
b/libelf/Makefile.am
+@@ -93,7 +93,12 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c
elf_fill.c \
+ libelf_pic_a_SOURCES =
+ am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
+
++
+ libelf_so_LDLIBS =
++if USE_UCLIBC
++libelf_so_LDLIBS += -lintl -luargp
++endif
++
+ if USE_LOCKS
+ libelf_so_LDLIBS += -lpthread
+ endif
+--
+1.8.3.4
+
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 1
Re: [OE-core] [PATCH] systemd: v219 with stable fixes
Good! When will this patch be merged with master? Thanks and best regards On Ter, 2015-04-07 at 12:33 -0700, Khem Raj wrote: > this looks ok > > > On Apr 7, 2015, at 6:10 AM, Bottazzini, Bruno > > wrote: > > > > Ping > > > >> On Qua, 2015-04-01 at 14:14 -0700, Khem Raj wrote: > >>> I will try it out. give me a day > >>> > On Apr 1, 2015, at 2:08 PM, Bottazzini, Bruno > wrote: > > Khem, > > Could you verify this patch and see if this satisfies what you have > pointed previously ? > > Do you think this patch is ready to go to master ? > > Regards, > > On Ter, 2015-03-31 at 17:25 -0300, Otavio Salvador wrote: > > I am not a heavy user of systemd so I prefer other people (Khem?) to > > comment on this ... > > > > On Tue, Mar 31, 2015 at 5:21 PM, Bottazzini, Bruno > > wrote: > >> Ping > >> > >> On Seg, 2015-03-30 at 15:13 -0300, Bruno Bottazzini wrote: > >>> Adding patches that fix bugs for 219 version. > >>> This will get the same consistency of the stable systemd 219 version. > >>> > >>> More details: > >>> http://cgit.freedesktop.org/systemd/systemd-stable/log/?h=v219-stable > >>> --- > >>> ...remote-fix-certificate-status-memory-leak.patch | 31 + > >>> ...ournal-remote-fix-client_cert-memory-leak.patch | 35 + > >>> ...0003-tmpfiles-Fix-parse_acl-error-message.patch | 28 + > >>> ...-test-utf8-fix-utf16-tests-on-BE-machines.patch | 26 + > >>> ...iles-avoid-creating-duplicate-acl-entries.patch | 131 +++ > >>> .../0006-shared-time-util-fix-gcc5-warning.patch | 32 + > >>> ...time-test-infinity-parsing-in-nanoseconds.patch | 36 + > >>> .../0008-bootchart-fix-default-init-path.patch | 44 + > >>> ...emctl-bump-NOFILE-only-for-systemctl_main.patch | 44 + > >>> ...0-Make-root-s-home-directory-configurable.patch | 89 +- > >>> ...-util-avoid-freeing-uninitialized-pointer.patch | 37 + > >>> ...11-bootchart-svg-fix-checking-of-list-end.patch | 28 + > >>> ...md-add-getrandom-syscall-numbers-for-MIPS.patch | 38 + > >>> ...aker-dependencies-between-mount-and-devic.patch | 33 + > >>> ...topping-due-to-BindsTo-log-which-unit-cau.patch | 43 + > >>> ...grade-message-about-sysctl-overrides-to-d.patch | 30 + > >>> ...l-add-some-hints-how-to-override-settings.patch | 39 + > >>> .../0017-core-rework-device-state-logic.patch | 912 > >>> + > >>> .../0018-core-fix-return-value-on-OOM.patch| 26 + > >>> ...e-x-machine-unix-prefix-for-the-container.patch | 33 + > >>> ...0-shared-AFS-is-also-a-network-filesystem.patch | 25 + > >>> ...downgrade-unit-type-not-supported-message.patch | 31 + > >>> ...ournal-remote-fix-saving-of-binary-fields.patch | 97 +++ > >>> ...ix-Inappropriate-ioctl-for-device-on-ext4.patch | 37 + > >>> ...eplace-VLA-with-alloca-to-make-llvm-happy.patch | 53 ++ > >>> ...ietly-ignore-ACLs-on-unsupported-filesyst.patch | 84 ++ > >>> ...-assume-ac-when-sys-class-power_supply-is.patch | 30 + > >>> meta/recipes-core/systemd/systemd_219.bb | 33 +- > >>> 28 files changed, 2050 insertions(+), 55 deletions(-) > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0001-journal-remote-fix-certificate-status-memory-leak.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0002-journal-remote-fix-client_cert-memory-leak.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0003-tmpfiles-Fix-parse_acl-error-message.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0004-test-utf8-fix-utf16-tests-on-BE-machines.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0005-tmpfiles-avoid-creating-duplicate-acl-entries.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0006-shared-time-util-fix-gcc5-warning.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0007-test-time-test-infinity-parsing-in-nanoseconds.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0008-bootchart-fix-default-init-path.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0009-systemctl-bump-NOFILE-only-for-systemctl_main.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0010-acl-util-avoid-freeing-uninitialized-pointer.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0011-bootchart-svg-fix-checking-of-list-end.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0012-systemd-add-getrandom-syscall-numbers-for-MIPS.patch > >>> create mode 100644 > >>> meta/recipes-core/systemd/systemd/0013-unit-use-weaker-dependencies-between-mount-and-devic.patch > >>> create mode 100644 > >>> meta/recipes-core
[OE-core] [wic][PATCH] wic: Use __file__ instead of sys.argv[0]
Using __file__ makes the code work independently of the way it's loaded. In some cases wic can be imported by another program without executing it. sys.argv[0] would not contain path to the wic in such a cases. This is an enabler for unit testing with nose framework. Signed-off-by: Ed Bartosh --- scripts/wic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wic b/scripts/wic index dcf1a55..fd4a678 100755 --- a/scripts/wic +++ b/scripts/wic @@ -38,7 +38,7 @@ import optparse import logging # External modules -scripts_path = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0]))) +scripts_path = os.path.abspath(os.path.dirname(__file__)) lib_path = scripts_path + '/lib' bitbake_path = os.path.join(scripts_path, '../bitbake/lib') sys.path = sys.path + [lib_path, bitbake_path] -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/7] libepoxy: Add as GTK+ 3.16 requirement
On 9 April 2015 at 15:16, Jussi Kukkonen wrote:
> Libepoxy is a OpenGL function pointer management library required by
> GTK 3.16.
>
> Signed-off-by: Jussi Kukkonen
> ---
> meta/recipes-graphics/libepoxy/libepoxy_1.2.bb | 16
> 1 file changed, 16 insertions(+)
> create mode 100644 meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
>
> diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
> b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
> new file mode 100644
> index 000..4357331
> --- /dev/null
> +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
> @@ -0,0 +1,16 @@
> +SUMMARY = "OpenGL function pointer management library"
> +HOMEPAGE = "https://github.com/anholt/libepoxy/";
> +SECTION = "libs"
> +
> +LICENSE = "MIT"
Something I forgot from the cover letter: epoxy is covered by two
different licenses (see
https://github.com/anholt/libepoxy/blob/master/COPYING) and while both
look exactly like MIT to me (the Khronos one just replaces "Software"
with "Materials"), I thought it's appropriate to mention... Do I need
to add another license variant or do something else?
> +LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
> +
> +
> +SRC_URI = "git://github.com/anholt/libepoxy.git"
> +SRCREV="7422de5b4be7b19d789136b3bb5f932de42db27c"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit autotools pkgconfig
> +
> +DEPENDS = "util-macros"
> --
> 2.1.4
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] gtk+3: Upgrade to 3.16.0
* Drop --disable-gtk2-dependency and the patch for
gtk/native/Makefile.am: gtk-update-icon-cache is no longer used at
build time and as a result the option was removed.
* Add dependency to libepoxy
* Add dependency to virtual/mesa for wayland-egl
* Package new binaries gtk3-icon-browser and gtk-encode-symbolic-svg
* Patch configure.ac to prevent include path poisoning
Signed-off-by: Jussi Kukkonen
---
meta/recipes-gnome/gtk+/gtk+3.inc | 14 -
...ve-includedir-poisoning-from-configure.ac.patch | 34 ++
.../gtk+/gtk+3/fix-flags-for-native.patch | 33 -
.../gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.0.bb} | 6 ++--
4 files changed, 44 insertions(+), 43 deletions(-)
create mode 100644
meta/recipes-gnome/gtk+/gtk+3/Remove-includedir-poisoning-from-configure.ac.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.0.bb} (73%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc
b/meta/recipes-gnome/gtk+/gtk+3.inc
index 3e36676..3823fb3 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/";
SECTION = "libs"
DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
- docbook-utils-native gdk-pixbuf-native"
+ docbook-utils-native gdk-pixbuf-native libepoxy"
LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
@@ -22,10 +22,7 @@ do_configure_prepend() {
ln -s ${TARGET_PREFIX}libtool libtool
}
-# Forcibly disable the GTK+ 2 dependency as we don't want to natively build the
-# entire GTK+ stack, or need GTK+ 2 for gtk-update-icon-cache.
EXTRA_OECONF += " \
- --disable-gtk2-dependency \
--disable-glibtest \
--disable-xinerama \
--enable-modules \
@@ -37,7 +34,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES",
"x11", "x11", "", d)}
${@bb.utils.contains("DISTRO_FEATURES", "wayland",
"wayland", "", d)}"
PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk
fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender
libxcomposite libxfixes"
-PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon"
+PACKAGECONFIG[wayland] =
"--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon
virtual/mesa"
do_install_append() {
mv ${D}${bindir}/gtk-update-icon-cache
${D}${bindir}/gtk-update-icon-cache-3.0
@@ -48,12 +45,14 @@ LIBV = "3.0.0"
FILES_${PN}-demo = "${bindir}/gtk3-demo \
${bindir}/gtk3-demo-application \
+${bindir}/gtk3-icon-browser \
${bindir}/gtk3-widget-factory \
${datadir}/gtk-3.0/demo \
${datadir}/applications/gtk3-demo.desktop \
+${datadir}/applications/gtk3-icon-browser.desktop \
${datadir}/applications/gtk3-widget-factory.desktop \
-${datadir}/icons/hicolor/*/apps/gtk3-demo.png \
-${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png"
+${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \
+${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png"
# The demo uses PNG files and mime type sniffing, so ensure that these
# dependencies are present.
@@ -62,6 +61,7 @@ RDEPENDS_${PN}-demo += "gdk-pixbuf-loader-png
shared-mime-info"
FILES_${PN} = "${bindir}/gtk-update-icon-cache-3.0 \
${bindir}/gtk-query-immodules-3.0 \
${bindir}/gtk-launch \
+ ${bindir}/gtk-encode-symbolic-svg \
${libdir}/lib*${SOLIBS} \
${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \
${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \
diff --git
a/meta/recipes-gnome/gtk+/gtk+3/Remove-includedir-poisoning-from-configure.ac.patch
b/meta/recipes-gnome/gtk+/gtk+3/Remove-includedir-poisoning-from-configure.ac.patch
new file mode 100644
index 000..37cd724
--- /dev/null
+++
b/meta/recipes-gnome/gtk+/gtk+3/Remove-includedir-poisoning-from-configure.ac.patch
@@ -0,0 +1,34 @@
+From b5091089aa9c48574563ec6fd61b22e18e584d6a Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen
+Date: Thu, 2 Apr 2015 16:16:41 +0300
+Subject: [PATCH] Remove includedir poisoning from configure.ac
+
+configure.ac tries to workaround pkg-config dropping the default include
+directories, but ends up poisoning the sysroot includedirs with system
+ones.
+
+Issue is filed upstream at
+https://bugzilla.gnome.org/show_bug.cgi?id=747445
+
+Upstream-Status: Submitted
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 38126da..a6c1058 100644
+--- a/configure.ac
b/configure.ac
+@@ -348,8
[OE-core] [PATCH 3/7] atk: Upgrade to 2.16.0
Signed-off-by: Jussi Kukkonen
---
meta/recipes-support/atk/{atk_2.14.0.bb => atk_2.16.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{atk_2.14.0.bb => atk_2.16.0.bb} (79%)
diff --git a/meta/recipes-support/atk/atk_2.14.0.bb
b/meta/recipes-support/atk/atk_2.16.0.bb
similarity index 79%
rename from meta/recipes-support/atk/atk_2.14.0.bb
rename to meta/recipes-support/atk/atk_2.16.0.bb
index e0e9be3..e29469b 100644
--- a/meta/recipes-support/atk/atk_2.14.0.bb
+++ b/meta/recipes-support/atk/atk_2.16.0.bb
@@ -14,8 +14,8 @@ inherit gnomebase gtk-doc
GNOME_COMPRESS_TYPE = "xz"
-SRC_URI[archive.md5sum] = "ecb7ca8469a5650581b1227d78051b8b"
-SRC_URI[archive.sha256sum] =
"2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad"
+SRC_URI[archive.md5sum] = "c7c5002bd6e58b4723a165f1bf312116"
+SRC_URI[archive.sha256sum] =
"095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562"
BBCLASSEXTEND = "native"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] libepoxy: Add as GTK+ 3.16 requirement
Libepoxy is a OpenGL function pointer management library required by
GTK 3.16.
Signed-off-by: Jussi Kukkonen
---
meta/recipes-graphics/libepoxy/libepoxy_1.2.bb | 16
1 file changed, 16 insertions(+)
create mode 100644 meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
new file mode 100644
index 000..4357331
--- /dev/null
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
@@ -0,0 +1,16 @@
+SUMMARY = "OpenGL function pointer management library"
+HOMEPAGE = "https://github.com/anholt/libepoxy/";
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
+
+
+SRC_URI = "git://github.com/anholt/libepoxy.git"
+SRCREV="7422de5b4be7b19d789136b3bb5f932de42db27c"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+DEPENDS = "util-macros"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] glib-networking: Upgrade to 2.44.0
Signed-off-by: Jussi Kukkonen
---
meta-yocto/conf/distro/include/upstream_tracking.inc | 1 -
.../{glib-networking_2.38.0.bb => glib-networking_2.44.0.bb} | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.38.0.bb =>
glib-networking_2.44.0.bb} (88%)
diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc
b/meta-yocto/conf/distro/include/upstream_tracking.inc
index b36ad36..8b95ebb 100644
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -57,7 +57,6 @@ RECIPE_NO_UPDATE_REASON_pn-createrepo = "Versions after 0.9.*
use YUM, so we hol
RECIPE_NO_UPDATE_REASON_pn-db= "API compatibility issue"
RECIPE_NO_UPDATE_REASON_pn-dbus = "D-BUS 1.9.x is the development version, not
stable."
RECIPE_NO_UPDATE_REASON_pn-gawk = "Version 4.1.0 requires Automake 1.13, but
have 1.12.6"
-RECIPE_NO_UPDATE_REASON_pn-glib-networking = "Pending Glib-2.0 Update"
RECIPE_NO_UPDATE_REASON_pn-gnome-desktop = "waiting for the sato gtk3 port"
RECIPE_NO_UPDATE_REASON_pn-gnome-icon-theme = "waiting for the sato gtk3 port"
RECIPE_NO_UPDATE_REASON_pn-gnome-keyring = "waiting for the sato gtk3 port"
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
index b9ba2d6..848bf53 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.38.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.44.0.bb
@@ -11,8 +11,8 @@ DEPENDS = "glib-2.0 intltool-native"
GNOME_COMPRESS_TYPE = "xz"
-SRC_URI[archive.md5sum] = "a22907deed3d956860d83aa3233e86ff"
-SRC_URI[archive.sha256sum] =
"a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d"
+SRC_URI[archive.md5sum] = "6989b20cf3b26dd5ae272e04a9acb0b3"
+SRC_URI[archive.sha256sum] =
"8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"
PACKAGECONFIG ??= "ca-certificates gnutls"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] at-spi2-atk: Upgrade to 2.16.0
Signed-off-by: Jussi Kukkonen
---
.../atk/{at-spi2-atk_2.14.1.bb => at-spi2-atk_2.16.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{at-spi2-atk_2.14.1.bb =>
at-spi2-atk_2.16.0.bb} (79%)
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.14.1.bb
b/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
similarity index 79%
rename from meta/recipes-support/atk/at-spi2-atk_2.14.1.bb
rename to meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
index 2391389..d8379c1 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.14.1.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.16.0.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=e9f288ba982d60518f375b5898283886"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "5c6a085249a6d4e792ead86dca183504"
-SRC_URI[sha256sum] =
"058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb"
+SRC_URI[md5sum] = "8936488c8cdce0e158f80b2e247527f9"
+SRC_URI[sha256sum] =
"78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9"
DEPENDS = "dbus glib-2.0 atk at-spi2-core"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] cairo: Upgrade to 1.14.2
Signed-off-by: Jussi Kukkonen
---
meta/recipes-graphics/cairo/{cairo_1.12.18.bb => cairo_1.14.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/cairo/{cairo_1.12.18.bb => cairo_1.14.2.bb} (92%)
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.18.bb
b/meta/recipes-graphics/cairo/cairo_1.14.2.bb
similarity index 92%
rename from meta/recipes-graphics/cairo/cairo_1.12.18.bb
rename to meta/recipes-graphics/cairo/cairo_1.14.2.bb
index fd0bd8c..3272eb3 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.18.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.14.2.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz";
-SRC_URI[md5sum] = "8e4ff32b82c3b39387eb6f5c59ef848e"
-SRC_URI[sha256sum] =
"dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6"
+SRC_URI[md5sum] = "e1cdfaf1c6c995c4d4c54e07215b0118"
+SRC_URI[sha256sum] =
"c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb"
PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] at-spi2-core: Upgrade to 2.16.0
* Add new org.a11y.atspi.Registry D-Bus service file
Signed-off-by: Jussi Kukkonen
---
.../atk/{at-spi2-core_2.14.1.bb => at-spi2-core_2.16.0.bb} | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-support/atk/{at-spi2-core_2.14.1.bb =>
at-spi2-core_2.16.0.bb} (68%)
diff --git a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
b/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
similarity index 68%
rename from meta/recipes-support/atk/at-spi2-core_2.14.1.bb
rename to meta/recipes-support/atk/at-spi2-core_2.16.0.bb
index 1a1ce6c..49ec46f 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.16.0.bb
@@ -6,8 +6,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a"
-SRC_URI[sha256sum] =
"eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a25712f46ce657"
+SRC_URI[md5sum] = "be6eeea370f913b7639b609913b2cf02"
+SRC_URI[sha256sum] =
"1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0"
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
@@ -17,4 +17,5 @@ REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OECONF = "--disable-introspection --disable-xevie
--with-dbus-daemondir=${bindir}"
-FILES_${PN} += "${datadir}/dbus-1/services/*.service"
+FILES_${PN} += "${datadir}/dbus-1/services/*.service \
+${datadir}/dbus-1/accessibility-services/*.service"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] Upgrade GTK+3 and dependencies
These upgrades depend on the GLib upgrade (2.44.0) sent earlier by
Robert Yang (in git.openembedded.org/openembedded-core-contrib rbt/PU).
The patchset includes many 'firsts' for me so feedback is welcome.
Things of note:
* virtual/mesa is used as dependency when gtk+3 needs wayland-egl -- is
this correct?
* The libepoxy recipe is new. Patching the dependency out of GTK+ might
be possible but epoxy is quite small so I assumed adding a recipe is
ok.
The following changes since commit 7fb6a6e907e5803597b2e12ba7047c46e57dba26:
upstream_tracking.inc: Add no-update reason for gdk-pixbuf (2015-04-09
10:01:48 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/update-gtk3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/update-gtk3
Jussi Kukkonen (7):
glib-networking: Upgrade to 2.44.0
cairo: Upgrade to 1.14.2
atk: Upgrade to 2.16.0
at-spi2-core: Upgrade to 2.16.0
at-spi2-atk: Upgrade to 2.16.0
libepoxy: Add as GTK+ 3.16 requirement
gtk+3: Upgrade to 3.16.0
.../conf/distro/include/upstream_tracking.inc | 1 -
...working_2.38.0.bb => glib-networking_2.44.0.bb} | 4 +--
meta/recipes-gnome/gtk+/gtk+3.inc | 14 -
...ve-includedir-poisoning-from-configure.ac.patch | 34 ++
.../gtk+/gtk+3/fix-flags-for-native.patch | 33 -
.../gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.0.bb} | 6 ++--
.../cairo/{cairo_1.12.18.bb => cairo_1.14.2.bb}| 4 +--
meta/recipes-graphics/libepoxy/libepoxy_1.2.bb | 16 ++
...at-spi2-atk_2.14.1.bb => at-spi2-atk_2.16.0.bb} | 4 +--
...-spi2-core_2.14.1.bb => at-spi2-core_2.16.0.bb} | 7 +++--
.../atk/{atk_2.14.0.bb => atk_2.16.0.bb} | 4 +--
11 files changed, 72 insertions(+), 55 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.38.0.bb =>
glib-networking_2.44.0.bb} (88%)
create mode 100644
meta/recipes-gnome/gtk+/gtk+3/Remove-includedir-poisoning-from-configure.ac.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-flags-for-native.patch
rename meta/recipes-gnome/gtk+/{gtk+3_3.12.2.bb => gtk+3_3.16.0.bb} (73%)
rename meta/recipes-graphics/cairo/{cairo_1.12.18.bb => cairo_1.14.2.bb} (92%)
create mode 100644 meta/recipes-graphics/libepoxy/libepoxy_1.2.bb
rename meta/recipes-support/atk/{at-spi2-atk_2.14.1.bb =>
at-spi2-atk_2.16.0.bb} (79%)
rename meta/recipes-support/atk/{at-spi2-core_2.14.1.bb =>
at-spi2-core_2.16.0.bb} (68%)
rename meta/recipes-support/atk/{atk_2.14.0.bb => atk_2.16.0.bb} (79%)
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gst-player: Fix typo
The subtitle (shown in desktop icon) should say Basic media player -not- Basic media plaer Signed-off-by: Gary Thomas --- meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop index 9eb6ada..9fd207b 100644 --- a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop +++ b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Media Player -Comment=Basic media plaer +Comment=Basic media player Icon=audio-player TryExec=gtk-play Exec=gtk-play -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/6] kmod: upgrade to 20
On Wed, 2015-04-08 at 18:24 +0800, Chen Qi wrote: > The following patches are rebased. > -- Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch > -- avoid_parallel_tests.patch > > The following patch is added to solve a parallel build bug. > -- 0001-Makefile.am-fix-parallel-build-problem.patch > > Signed-off-by: Chen Qi > --- > meta/recipes-kernel/kmod/kmod.inc | 5 ++-- > ...01-Makefile.am-fix-parallel-build-problem.patch | 29 + > ...alling-bswap_-instead-of-htobe-and-be-toh.patch | 15 +-- > .../kmod/kmod/avoid_parallel_tests.patch | 30 > ++ > 4 files changed, 57 insertions(+), 22 deletions(-) > create mode 100644 > meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch Doesn't seem to build: https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/250/steps/BuildImages_1/logs/stdio Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH] wic:code cleanup: No space allowed
Fixed pylint warning
'No space allowed around keyword argument assignment'
Signed-off-by: Ed Bartosh
---
scripts/lib/wic/imager/baseimager.py | 8 ++---
scripts/lib/wic/imager/direct.py | 10 +++---
scripts/lib/wic/kickstart/__init__.py | 14
scripts/lib/wic/msger.py | 10 +++---
scripts/lib/wic/utils/fs_related.py| 2 +-
scripts/lib/wic/utils/misc.py | 2 +-
scripts/lib/wic/utils/oe/misc.py | 8 ++---
scripts/lib/wic/utils/partitionedfs.py | 8 ++---
scripts/wic| 58 +-
9 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/scripts/lib/wic/imager/baseimager.py
b/scripts/lib/wic/imager/baseimager.py
index 2075358..0afbc2c 100644
--- a/scripts/lib/wic/imager/baseimager.py
+++ b/scripts/lib/wic/imager/baseimager.py
@@ -42,7 +42,7 @@ class BaseImageCreator(object):
def __del__(self):
self.cleanup()
-def __init__(self, createopts = None):
+def __init__(self, createopts=None):
"""Initialize an ImageCreator instance.
ks -- a pykickstart.KickstartParser instance; this instance will be
@@ -131,8 +131,8 @@ class BaseImageCreator(object):
self.workdir = os.path.join(self.tmpdir, "build")
if not os.path.exists(self.workdir):
os.makedirs(self.workdir)
-self.__builddir = tempfile.mkdtemp(dir = self.workdir,
- prefix = "imgcreate-")
+self.__builddir = tempfile.mkdtemp(dir=self.workdir,
+ prefix="imgcreate-")
except OSError, (err, msg):
raise CreatorError("Failed create build directory in %s: %s" %
(self.tmpdir, msg))
@@ -178,7 +178,7 @@ class BaseImageCreator(object):
self._cleanup()
-shutil.rmtree(self.__builddir, ignore_errors = True)
+shutil.rmtree(self.__builddir, ignore_errors=True)
self.__builddir = None
self.__clean_tmpdir()
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index c7e1c6c..0e687bd 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -269,11 +269,11 @@ class DirectImageCreator(BaseImageCreator):
p.source_file,
p.fstype,
p.label,
- fsopts = p.fsopts,
- boot = p.active,
- align = p.align,
- no_table = p.no_table,
- part_type = p.part_type)
+ fsopts=p.fsopts,
+ boot=p.active,
+ align=p.align,
+ no_table=p.no_table,
+ part_type=p.part_type)
self._restore_fstab(fstab)
diff --git a/scripts/lib/wic/kickstart/__init__.py
b/scripts/lib/wic/kickstart/__init__.py
index 1095921..111723b 100644
--- a/scripts/lib/wic/kickstart/__init__.py
+++ b/scripts/lib/wic/kickstart/__init__.py
@@ -68,7 +68,7 @@ def read_kickstart(path):
return ks
-def get_image_size(ks, default = None):
+def get_image_size(ks, default=None):
__size = 0
for p in ks.handler.partition.partitions:
if p.mountpoint == "/" and p.size:
@@ -78,40 +78,40 @@ def get_image_size(ks, default = None):
else:
return default
-def get_image_fstype(ks, default = None):
+def get_image_fstype(ks, default=None):
for p in ks.handler.partition.partitions:
if p.mountpoint == "/" and p.fstype:
return p.fstype
return default
-def get_image_fsopts(ks, default = None):
+def get_image_fsopts(ks, default=None):
for p in ks.handler.partition.partitions:
if p.mountpoint == "/" and p.fsopts:
return p.fsopts
return default
-def get_timeout(ks, default = None):
+def get_timeout(ks, default=None):
if not hasattr(ks.handler.bootloader, "timeout"):
return default
if ks.handler.bootloader.timeout is None:
return default
return int(ks.handler.bootloader.timeout)
-def get_kernel_args(ks, default = "ro rd.live.image"):
+def get_kernel_args(ks, default="ro rd.live.image"):
if not hasattr(ks.handler.bootloader, "appendLine"):
return default
if ks.handler.bootloader.appendLine is None:
return default
return "%s %s" %(default, ks.handler.bootloader.appendLine)
-def get_menu_args(ks, default = ""):
+def get_menu_args(ks, default=""):
if not hasattr(ks.handler.bootloader, "menus"):
return default
if ks.handler.bootloader.menus in (None, ""):
return default
return "%s" % ks.handler
Re: [OE-core] [PATCHv2] fontcache: allow to pass different fontconfig cache dir
On Thu, Apr 09, 2015 at 11:12:30AM +0100, Richard Purdie wrote:
> On Tue, 2015-04-07 at 13:21 +0200, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa
> > ---
> > v2: added --with-cache-dir to fontconfig EXTRA_OECONF in case that was
> > what Ross wanted
> >
> > meta/classes/fontcache.bbclass| 4 ++--
> > meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | 4 +++-
> > scripts/postinst-intercepts/update_font_cache | 4 +---
> > 3 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
> > index dfbdfa1..d122387 100644
> > --- a/meta/classes/fontcache.bbclass
> > +++ b/meta/classes/fontcache.bbclass
> > @@ -8,11 +8,11 @@ inherit qemu
> >
> > FONT_PACKAGES ??= "${PN}"
> > FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
> > -
> > +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
]> > fontcache_common() {
> > if [ "x$D" != "x" ] ; then
> > $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG}
> > mlprefix=${MLPREFIX} bindir=${bindir} \
> > - libdir=${libdir} base_libdir=${base_libdir}
> > localstatedir=${localstatedir}
> > + libdir=${libdir} base_libdir=${base_libdir}
> > fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
> > else
> > fc-cache
> > fi
> > diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > index 797b321..7c5b4b4 100644
> > --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > @@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
> >
> > inherit autotools pkgconfig
> >
> > -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
> > +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> > +
> > +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts
> > --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
> >
> > BBCLASSEXTEND = "native"
> > diff --git a/scripts/postinst-intercepts/update_font_cache
> > b/scripts/postinst-intercepts/update_font_cache
> > index 3907f25..c8c6018 100644
> > --- a/scripts/postinst-intercepts/update_font_cache
> > +++ b/scripts/postinst-intercepts/update_font_cache
> > @@ -2,6 +2,4 @@
> >
> > PSEUDO_UNLOAD=1 qemuwrapper -L $D -E
> > LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> > $D${bindir}/fc-cache --sysroot=$D
> > -chown -R root:root $D${localstatedir}/cache/fontconfig
> > -
> > -
> > +chown -R root:root $D${fontconfigcachedir}
>
> This looks better but what sets fontconfigcachedir ?
It's passed in intercept call in fontcache.bbclass like other variables
used here.
People who want to change the value should do so from global scope, so
that the same value is used in fontconfig_2.11.1.bb and
fontcache.bbclass.
Once this is merged in master, I would like to see it in dizzy (and
fido) branches together with other fontconfig related fixes.
Thanks
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 02/24] mtd-utils: update to latest and fix static inlining
On Mon, 2015-04-06 at 17:36 +, Khem Raj wrote:
> use static storage class instead of extern for inline functions
> and remove duplicate definitions as a result
This says what this does but not why. Upstream-Status is also missing.
Cheers,
Richard
> Change-Id: I72e8c5f19dff656c18f719d1e9e2ca697c9a856f
> Signed-off-by: Khem Raj
> ---
> ...emove-duplicate-hashtable_iterator_value-.patch | 56
> ++
> meta/recipes-devtools/mtd/mtd-utils_git.bb | 1 +
> 2 files changed, 57 insertions(+)
> create mode 100644
> meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
>
> diff --git
> a/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
>
> b/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
> new file mode 100644
> index 000..695f020
> --- /dev/null
> +++
> b/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch
> @@ -0,0 +1,56 @@
> +From b856ff35c20124ceae40bbc4d32584df47618c96 Mon Sep 17 00:00:00 2001
> +From: Khem Raj
> +Date: Wed, 25 Feb 2015 09:28:26 +
> +Subject: [PATCH] hashtable: Remove duplicate
> + hashtable_iterator_value/hashtable_iterator_key
> +
> +Signed-off-by: Khem Raj
> +---
> + mkfs.ubifs/hashtable/hashtable_itr.c | 12
> + 1 file changed, 12 deletions(-)
> +
> +Index: git/mkfs.ubifs/hashtable/hashtable_itr.h
> +===
> +--- git.orig/mkfs.ubifs/hashtable/hashtable_itr.h
> git/mkfs.ubifs/hashtable/hashtable_itr.h
> +@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h);
> + /* hashtable_iterator_key
> + * - return the value of the (key,value) pair at the current position */
> +
> +-extern inline void *
> ++static inline void *
> + hashtable_iterator_key(struct hashtable_itr *i)
> + {
> + return i->e->k;
> +@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_
> +
> /*/
> + /* value - return the value of the (key,value) pair at the current position
> */
> +
> +-extern inline void *
> ++static inline void *
> + hashtable_iterator_value(struct hashtable_itr *i)
> + {
> + return i->e->v;
> +Index: git/mkfs.ubifs/hashtable/hashtable_itr.c
> +===
> +--- git.orig/mkfs.ubifs/hashtable/hashtable_itr.c
> git/mkfs.ubifs/hashtable/hashtable_itr.c
> +@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h)
> + }
> +
> +
> /*/
> +-/* key - return the key of the (key,value) pair at the current
> position */
> +-/* value- return the value of the (key,value) pair at the current
> position */
> +-
> +-void *
> +-hashtable_iterator_key(struct hashtable_itr *i)
> +-{ return i->e->k; }
> +-
> +-void *
> +-hashtable_iterator_value(struct hashtable_itr *i)
> +-{ return i->e->v; }
> +-
> +-/*/
> + /* advance - advance the iterator to the next element
> + * returns zero if advanced to end of table */
> +
> diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb
> b/meta/recipes-devtools/mtd/mtd-utils_git.bb
> index 12daffe..f991ea1 100644
> --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
> +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
> @@ -13,6 +13,7 @@ SRCREV = "9f107132a6a073cce37434ca9cda6917dd8d866b"
> SRC_URI = "git://git.infradead.org/mtd-utils.git \
> file://add-exclusion-to-mkfs-jffs2-git-2.patch \
> file://fix-armv7-neon-alignment.patch \
> +
> file://0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch \
> "
>
> S = "${WORKDIR}/git/"
> --
> 2.1.4
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] fontcache: allow to pass different fontconfig cache dir
On Tue, 2015-04-07 at 13:21 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa
> ---
> v2: added --with-cache-dir to fontconfig EXTRA_OECONF in case that was
> what Ross wanted
>
> meta/classes/fontcache.bbclass| 4 ++--
> meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | 4 +++-
> scripts/postinst-intercepts/update_font_cache | 4 +---
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
> index dfbdfa1..d122387 100644
> --- a/meta/classes/fontcache.bbclass
> +++ b/meta/classes/fontcache.bbclass
> @@ -8,11 +8,11 @@ inherit qemu
>
> FONT_PACKAGES ??= "${PN}"
> FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
> -
> +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> fontcache_common() {
> if [ "x$D" != "x" ] ; then
> $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG}
> mlprefix=${MLPREFIX} bindir=${bindir} \
> - libdir=${libdir} base_libdir=${base_libdir}
> localstatedir=${localstatedir}
> + libdir=${libdir} base_libdir=${base_libdir}
> fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
> else
> fc-cache
> fi
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> index 797b321..7c5b4b4 100644
> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> @@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
>
> inherit autotools pkgconfig
>
> -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
> +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> +
> +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts
> --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
>
> BBCLASSEXTEND = "native"
> diff --git a/scripts/postinst-intercepts/update_font_cache
> b/scripts/postinst-intercepts/update_font_cache
> index 3907f25..c8c6018 100644
> --- a/scripts/postinst-intercepts/update_font_cache
> +++ b/scripts/postinst-intercepts/update_font_cache
> @@ -2,6 +2,4 @@
>
> PSEUDO_UNLOAD=1 qemuwrapper -L $D -E
> LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> $D${bindir}/fc-cache --sysroot=$D
> -chown -R root:root $D${localstatedir}/cache/fontconfig
> -
> -
> +chown -R root:root $D${fontconfigcachedir}
This looks better but what sets fontconfigcachedir ?
Cheers,
Richard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer
On Thursday 09 April 2015 15:10:57 Yi Zhao wrote:
> Use absolute path instead of relative path for meta-skeleton.
> Otherwise the case would fail if the builddir outside the poky source
> tree.
>
> Signed-off-by: Yi Zhao
> ---
> meta/lib/oeqa/selftest/bblayers.py |9 +
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/meta/lib/oeqa/selftest/bblayers.py
> b/meta/lib/oeqa/selftest/bblayers.py index 5b046d0..3a18029 100644
> --- a/meta/lib/oeqa/selftest/bblayers.py
> +++ b/meta/lib/oeqa/selftest/bblayers.py
> @@ -6,7 +6,7 @@ import shutil
>
> import oeqa.utils.ftools as ftools
> from oeqa.selftest.base import oeSelfTest
> -from oeqa.utils.commands import runCmd
> +from oeqa.utils.commands import runCmd, get_bb_var
> from oeqa.utils.decorators import testcase
>
> class BitbakeLayers(oeSelfTest):
> @@ -44,15 +44,16 @@ class BitbakeLayers(oeSelfTest):
> self.assertTrue(find_in_contents)
>
> def test_bitbakelayers_add_remove(self):
> +test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton')
> result = runCmd('bitbake-layers show-layers')
> self.assertNotIn('meta-skeleton', result.output, 'This test cannot
> run with meta-skeleton in bblayers.conf') -result =
> runCmd('bitbake-layers add-layer ../meta-skeleton') +result =
> runCmd('bitbake-layers add-layer %s' % test_layer) result =
> runCmd('bitbake-layers show-layers')
> self.assertIn('meta-skeleton', result.output)
> -result = runCmd('bitbake-layers remove-layer ../meta-skeleton')
> +result = runCmd('bitbake-layers remove-layer %s' % test_layer)
> result = runCmd('bitbake-layers show-layers')
> self.assertNotIn('meta-skeleton', result.output)
> -result = runCmd('bitbake-layers add-layer ../meta-skeleton')
> +result = runCmd('bitbake-layers add-layer %s' % test_layer)
> result = runCmd('bitbake-layers show-layers')
> self.assertIn('meta-skeleton', result.output)
> result = runCmd('bitbake-layers remove-layer */meta-skeleton')
Acked-by: Paul Eggleton
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] oeqa/oetest.py: use bb logging
Plain print has two drawbacks:
- the output is handled by different processes, causing the message
about found tests to appear randomly after the result of the initial
tests
- the output is not part of the bitbake console output
Affects image testing with testimage.bbclass.
Signed-off-by: Patrick Ohly
---
meta/lib/oeqa/oetest.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 0b7e7dc..a3c5c1d 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -11,6 +11,7 @@ import os, re, mmap
import unittest
import inspect
import subprocess
+import bb
from oeqa.utils.decorators import LogResults
def loadTests(tc, type="runtime"):
@@ -33,8 +34,8 @@ def loadTests(tc, type="runtime"):
def runTests(tc, type="runtime"):
suite = loadTests(tc, type)
-print("Test modules %s" % tc.testslist)
-print("Found %s tests" % suite.countTestCases())
+bb.note("Test modules %s" % tc.testslist)
+bb.note("Found %s tests" % suite.countTestCases())
runner = unittest.TextTestRunner(verbosity=2)
result = runner.run(suite)
--
1.8.4.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] testimage: sort modules based on dependencies
TEST_SUITES="auto" is useful to run all suitable tests without
having to hard-code the list. However, it did not take test
dependencies into account, which can be an issue for tests
which really depend on some other test to run first.
To fix this, modules get loaded in the order determined by
TESTS_SUITES, but then get re-ordered based on dependencies
derived from @skipUnlessPassed before running them. The original
order is used to break ties when there are no dependencies, so
reordering only occurs when really necessary.
@skipUnlessPassed gets extended such that it makes the test name
a method depends on available for inspection by the test loader
in oetest.py.
Unfortunately Python's unittest offers no API to inspect tests
in a TestSuite, so the code has to rely on implementation details
to find all tests. The worst that can happen when the implementation
changes is that tests are not found and reordering does not happen.
Signed-off-by: Patrick Ohly
---
meta/classes/testimage.bbclass| 6 -
meta/lib/oeqa/oetest.py | 56 ---
meta/lib/oeqa/utils/decorators.py | 1 +
3 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 6831738..dc163c7 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -16,7 +16,11 @@
# The test names are the module names in meta/lib/oeqa/runtime.
# Each name in TEST_SUITES represents a required test for the image. (no
skipping allowed)
# Appending "auto" means that it will try to run all tests that are suitable
for the image (each test decides that on it's own).
-# Note that order in TEST_SUITES is important (it's the order tests run) and
it influences tests dependencies.
+# Note that order in TEST_SUITES is relevant: tests are run in an order such
that
+# tests mentioned in @skipUnlessPassed run before the tests that depend on
them,
+# but without such dependencies, tests run in the order in which they are
listed
+# in TEST_SUITES.
+#
# A layer can add its own tests in lib/oeqa/runtime, provided it extends
BBPATH as normal in its layer.conf.
# TEST_LOG_DIR contains a command ssh log and may contain infromation about
what command is running, output and return codes and for qemu a boot log till
login.
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index a3c5c1d..da9556a 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -27,9 +27,59 @@ def loadTests(tc, type="runtime"):
setattr(oeTest, "tc", tc)
testloader = unittest.TestLoader()
testloader.sortTestMethodsUsing = None
-suite = testloader.loadTestsFromNames(tc.testslist)
-
-return suite
+suites = [testloader.loadTestsFromName(name) for name in tc.testslist]
+
+def getTests(test):
+'''Return all individual tests executed when running the suite.'''
+# Unfortunately unittest does not have an API for this, so we have
+# to rely on implementation details. This only needs to work
+# for TestSuite containing TestCase.
+method = getattr(test, '_testMethodName', None)
+if method:
+# leaf case: a TestCase
+yield test
+else:
+# Look into TestSuite.
+tests = getattr(test, '_tests', [])
+for t1 in tests:
+for t2 in getTests(t1):
+yield t2
+
+# Determine dependencies between suites by looking for @skipUnlessPassed
+# method annotations. Suite A depends on suite B if any method in A
+# depends on a method on B.
+for suite in suites:
+suite.dependencies = []
+suite.depth = 0
+for test in getTests(suite):
+methodname = getattr(test, '_testMethodName', None)
+if methodname:
+method = getattr(test, methodname)
+depends_on = getattr(method, '_depends_on', None)
+if depends_on:
+for dep_suite in suites:
+if depends_on in [getattr(t, '_testMethodName', None)
for t in getTests(dep_suite)]:
+if dep_suite not in suite.dependencies and \
+ dep_suite is not suite:
+suite.dependencies.append(dep_suite)
+break
+else:
+bb.warn("Test %s was declared as
@skipUnlessPassed('%s') but that test is either not defined or not active. Will
run the test anyway." %
+(test, depends_on))
+# Use brute-force topological sort to determine ordering. Sort by
+# depth (higher depth = must run later), with original ordering to
+# break ties.
+def set_suite_depth(suite):
+for dep in suite.dependencies:
+new_depth = set_suite_depth(dep) + 1
+if new_depth > suite.depth:
+suite.dept
[OE-core] [PATCH 0/3] testimage improvements
I recently started using testimage.bbclass with an image using systemd and found some issues: - inconsistent output - systemd tests failing due to missing avahi in image - tests not run in desired order when using TEST_SUITES="auto" The following changes since commit 6333186e9764b2c269a2b3869956860fa8fde2b1: binutils: Fix packaging now gold is always built (2015-04-08 23:10:57 +0100) are available in the git repository at: git://github.com/pohly/openembedded-core master https://github.com/pohly/openembedded-core/tree/master Patrick Ohly (3): oeqa/oetest.py: use bb logging oeqa/runtime/systemd.py: skip instead of failing without avahi testimage: sort modules based on dependencies meta/classes/testimage.bbclass| 6 +++- meta/lib/oeqa/oetest.py | 61 +++ meta/lib/oeqa/runtime/systemd.py | 7 + meta/lib/oeqa/utils/decorators.py | 1 + 4 files changed, 69 insertions(+), 6 deletions(-) -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] oeqa/runtime/systemd.py: skip instead of failing without avahi
The SystemdServiceTests assume that avahi-daemon is installed,
which is not necessarily the case depending on the image being
tested.
Better check this dependency before starting the tests and skip
them if the service is not installed. This has to be done for
each test instead of for the entire module, because other
tests in the module can run without avavi.
Signed-off-by: Patrick Ohly
---
meta/lib/oeqa/runtime/systemd.py | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/lib/oeqa/runtime/systemd.py b/meta/lib/oeqa/runtime/systemd.py
index 5935edd..c74394c 100644
--- a/meta/lib/oeqa/runtime/systemd.py
+++ b/meta/lib/oeqa/runtime/systemd.py
@@ -67,13 +67,19 @@ class SystemdBasicTests(SystemdTest):
class SystemdServiceTests(SystemdTest):
+def check_for_avahi(self):
+if not self.hasPackage('avahi-daemon'):
+raise unittest.SkipTest("Testcase dependency not met: need
avahi-daemon installed on target")
+
@skipUnlessPassed('test_systemd_basic')
def test_systemd_status(self):
+self.check_for_avahi()
self.systemctl('status --full', 'avahi-daemon.service')
@testcase(695)
@skipUnlessPassed('test_systemd_status')
def test_systemd_stop_start(self):
+self.check_for_avahi()
self.systemctl('stop', 'avahi-daemon.service')
self.systemctl('is-active', 'avahi-daemon.service', expected=3,
verbose=True)
self.systemctl('start','avahi-daemon.service')
@@ -82,6 +88,7 @@ class SystemdServiceTests(SystemdTest):
@testcase(696)
@skipUnlessPassed('test_systemd_basic')
def test_systemd_disable_enable(self):
+self.check_for_avahi()
self.systemctl('disable', 'avahi-daemon.service')
self.systemctl('is-enabled', 'avahi-daemon.service', expected=1)
self.systemctl('enable', 'avahi-daemon.service')
--
1.8.4.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] gst-ffmpeg: fix internal-libav builds with inherit autotools-brokensep
Building the internal copy of ffmpeg is broken when using S!=B, so
inherit autotools-brokensep
Signed-off-by: Koen Kooi
---
meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
index e1a13c4..b5c838f 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -14,7 +14,7 @@ LICENSE_FLAGS = "commercial"
HOMEPAGE = "http://www.gstreamer.net/";
DEPENDS = "gstreamer gst-plugins-base zlib bzip2 yasm-native libpostproc"
-inherit autotools pkgconfig
+inherit autotools-brokensep pkgconfig
SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
file://lower-rank.diff \
--
1.9.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] gst-ffmpeg: fix libav-9.patch
The patch has a stray '>' in an #incude directive leading to build failures when used. Signed-off-by: Koen Kooi --- meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch index 9055b34..1860752 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav-9.patch @@ -111,7 +111,7 @@ diff -uNr gst-ffmpeg-0.10.13.orig/ext/ffmpeg/gstffmpegcodecmap.c gst-ffmpeg-0.10 #include #ifdef HAVE_FFMPEG_UNINSTALLED #include -+#include > ++#include #else #include +#include -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] gst-ffmpeg: remove bogus patch that leads to build failures
'0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch'
patches the internal copy of ffmpeg with a hunk that generates a compile
failure because AV_PIX_FMT_YUV422P is undefined.
Signed-off-by: Koen Kooi
---
...check-width-more-completely-avoid-out-of-.patch | 30 --
.../gstreamer/gst-ffmpeg_0.10.13.bb| 1 -
2 files changed, 31 deletions(-)
delete mode 100644
meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch
diff --git
a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch
b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch
deleted file mode 100644
index 6b60d16..000
---
a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-gst-ffmpeg: huffyuvdec: check width more completely, avoid out of array
- accesses
-
-Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
-
-Upstream-Status: Backport
-
-Signed-off-by: Michael Niedermayer
- libavcodec/huffyuv.c |5 -
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
-index 6e88114..ca5bcd8 100644
a/gst-libs/ext/libav/libavcodec/huffyuv.c
-+++ b/gst-libs/ext/libav/libavcodec/huffyuv.c
-@@ -526,6 +526,10 @@ s->bgr32=1;
- assert(0);
- }
-
-+if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P &&
avctx->width%4) {
-+av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 this
colorspace and predictor\n");
-+return AVERROR_INVALIDDATA;
-+}
- alloc_temp(s);
-
- //av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n",
s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced);
---
-1.7.5.4
-
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
index 219feaa..e1a13c4 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -46,7 +46,6 @@ SRC_URI =
"http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0001-avcodec-rpza-Perform-pointer-advance-and-checks-befo.patch \
file://gst-ffmpeg-CVE-2013-0855.patch \
file://0001-qdm2dec-fix-buffer-overflow.patch \
-
file://0001-huffyuvdec-check-width-more-completely-avoid-out-of-.patch \
file://0001-smackerdec-Check-that-the-last-indexes-are-within-th.patch \
file://0001-avcodec-dsputil-fix-signedness-in-sizeof-comparissio.patch \
file://0001-error-concealment-initialize-block-index.patch \
--
1.9.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] oeqa/targetcontrol: Add support for poky-tiny in QemuTarget.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/targetcontrol.py | 33 -
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 1f4770f..9a681a3 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -12,6 +12,7 @@ import traceback
import sys
from oeqa.utils.sshcontrol import SSHControl
from oeqa.utils.qemurunner import QemuRunner
+from oeqa.utils.qemutinyrunner import QemuTinyRunner
from oeqa.controllers.testtargetloader import TestTargetLoader
from abc import ABCMeta, abstractmethod
@@ -110,7 +111,7 @@ class BaseTarget(object):
class QemuTarget(BaseTarget):
-supported_image_fstypes = ['ext3', 'ext4']
+supported_image_fstypes = ['ext3', 'ext4', 'cpio.gz']
def __init__(self, d):
@@ -120,14 +121,25 @@ class QemuTarget(BaseTarget):
self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" %
self.datetime)
self.origrootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True),
d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype)
self.rootfs = os.path.join(self.testdir, d.getVar("IMAGE_LINK_NAME",
True) + '-testimage.' + self.image_fstype)
-
-self.runner = QemuRunner(machine=d.getVar("MACHINE", True),
-rootfs=self.rootfs,
-tmpdir = d.getVar("TMPDIR", True),
-deploy_dir_image = d.getVar("DEPLOY_DIR_IMAGE", True),
-display = d.getVar("BB_ORIGENV",
False).getVar("DISPLAY", True),
-logfile = self.qemulog,
-boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT",
True)))
+self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True),
d.getVar("KERNEL_IMAGETYPE") + '-' + d.getVar('MACHINE') + '.bin')
+
+if d.getVar("DISTRO", True) == "poky-tiny":
+self.runner = QemuTinyRunner(machine=d.getVar("MACHINE", True),
+rootfs=self.rootfs,
+tmpdir = d.getVar("TMPDIR", True),
+deploy_dir_image = d.getVar("DEPLOY_DIR_IMAGE",
True),
+display = d.getVar("BB_ORIGENV",
False).getVar("DISPLAY", True),
+logfile = self.qemulog,
+kernel = self.kernel,
+boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT",
True)))
+else:
+self.runner = QemuRunner(machine=d.getVar("MACHINE", True),
+rootfs=self.rootfs,
+tmpdir = d.getVar("TMPDIR", True),
+deploy_dir_image = d.getVar("DEPLOY_DIR_IMAGE",
True),
+display = d.getVar("BB_ORIGENV",
False).getVar("DISPLAY", True),
+logfile = self.qemulog,
+boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT",
True)))
def deploy(self):
try:
@@ -167,6 +179,9 @@ class QemuTarget(BaseTarget):
else:
raise bb.build.FuncFailed("%s - FAILED to re-start qemu - check
the task log and the boot log" % self.pn)
+def run_serial(self, command):
+return self.runner.run_serial(command)
+
class SimpleRemoteTarget(BaseTarget):
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] oeqa/runtime: Boot test for poky-tiny.
Bug 6705.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/runtime/_qemutiny.py | 9 +
1 file changed, 9 insertions(+)
create mode 100644 meta/lib/oeqa/runtime/_qemutiny.py
diff --git a/meta/lib/oeqa/runtime/_qemutiny.py
b/meta/lib/oeqa/runtime/_qemutiny.py
new file mode 100644
index 000..a3c29f3
--- /dev/null
+++ b/meta/lib/oeqa/runtime/_qemutiny.py
@@ -0,0 +1,9 @@
+import unittest
+from oeqa.oetest import oeRuntimeTest
+from oeqa.utils.qemutinyrunner import *
+
+class QemuTinyTest(oeRuntimeTest):
+
+def test_boot_tiny(self):
+(status, output) = self.target.run_serial('uname -a')
+self.assertTrue("yocto-tiny" in output, msg="Cannot detect poky tiny
boot!")
\ No newline at end of file
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] oeqa/utils: Add runner for poky-tiny qemu.
The connection and commands are done via serial.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/utils/qemutinyrunner.py | 170 ++
1 file changed, 170 insertions(+)
create mode 100644 meta/lib/oeqa/utils/qemutinyrunner.py
diff --git a/meta/lib/oeqa/utils/qemutinyrunner.py
b/meta/lib/oeqa/utils/qemutinyrunner.py
new file mode 100644
index 000..4f95101
--- /dev/null
+++ b/meta/lib/oeqa/utils/qemutinyrunner.py
@@ -0,0 +1,170 @@
+# Copyright (C) 2015 Intel Corporation
+#
+# Released under the MIT license (see COPYING.MIT)
+
+# This module provides a class for starting qemu images of poky tiny.
+# It's used by testimage.bbclass.
+
+import subprocess
+import os
+import time
+import signal
+import re
+import socket
+import select
+import bb
+from qemurunner import QemuRunner
+
+class QemuTinyRunner(QemuRunner):
+
+def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image,
logfile, kernel, boottime):
+
+# Popen object for runqemu
+self.runqemu = None
+# pid of the qemu process that runqemu will start
+self.qemupid = None
+# target ip - from the command line
+self.ip = None
+# host ip - where qemu is running
+self.server_ip = None
+
+self.machine = machine
+self.rootfs = rootfs
+self.display = display
+self.tmpdir = tmpdir
+self.deploy_dir_image = deploy_dir_image
+self.logfile = logfile
+self.boottime = boottime
+
+self.runqemutime = 60
+self.socketfile = "console.sock"
+self.server_socket = None
+self.kernel = kernel
+
+
+def create_socket(self):
+tries = 3
+while tries > 0:
+try:
+self.server_socket = socket.socket(socket.AF_UNIX,
socket.SOCK_STREAM)
+self.server_socket.connect(self.socketfile)
+bb.note("Created listening socket for qemu serial console.")
+tries = 0
+except socket.error, msg:
+self.server_socket.close()
+bb.fatal("Failed to create listening socket.")
+tries -= 1
+
+def log(self, msg):
+if self.logfile:
+with open(self.logfile, "a") as f:
+f.write("%s" % msg)
+
+def start(self, qemuparams = None):
+
+if self.display:
+os.environ["DISPLAY"] = self.display
+else:
+bb.error("To start qemu I need a X desktop, please set DISPLAY
correctly (e.g. DISPLAY=:1)")
+return False
+if not os.path.exists(self.rootfs):
+bb.error("Invalid rootfs %s" % self.rootfs)
+return False
+if not os.path.exists(self.tmpdir):
+bb.error("Invalid TMPDIR path %s" % self.tmpdir)
+return False
+else:
+os.environ["OE_TMPDIR"] = self.tmpdir
+if not os.path.exists(self.deploy_dir_image):
+bb.error("Invalid DEPLOY_DIR_IMAGE path %s" %
self.deploy_dir_image)
+return False
+else:
+os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image
+
+# Set this flag so that Qemu doesn't do any grabs as SDL grabs interact
+# badly with screensavers.
+os.environ["QEMU_DONT_GRAB"] = "1"
+self.qemuparams = '--append "root=/dev/ram0 console=ttyS0" -nographic
-serial unix:%s,server,nowait' % self.socketfile
+
+launch_cmd = 'qemu-system-i386 -kernel %s -initrd %s %s' %
(self.kernel, self.rootfs, self.qemuparams)
+self.runqemu =
subprocess.Popen(launch_cmd,shell=True,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,preexec_fn=os.setpgrp)
+
+bb.note("runqemu started, pid is %s" % self.runqemu.pid)
+bb.note("waiting at most %s seconds for qemu pid" % self.runqemutime)
+endtime = time.time() + self.runqemutime
+while not self.is_alive() and time.time() < endtime:
+time.sleep(1)
+
+if self.is_alive():
+bb.note("qemu started - qemu procces pid is %s" % self.qemupid)
+self.create_socket()
+else:
+bb.note("Qemu pid didn't appeared in %s seconds" %
self.runqemutime)
+output = self.runqemu.stdout
+self.stop()
+bb.note("Output from runqemu:\n%s" % output.read())
+return False
+
+return self.is_alive()
+
+def run_serial(self, command):
+self.server_socket.sendall(command+'\n')
+data = ''
+status = 0
+stopread = False
+endtime = time.time()+5
+while time.time()http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] oeqa/runtime/rpm: Added new decorators for existing automated tests.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/runtime/rpm.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/runtime/rpm.py b/meta/lib/oeqa/runtime/rpm.py
index 0529992..4ca193b 100644
--- a/meta/lib/oeqa/runtime/rpm.py
+++ b/meta/lib/oeqa/runtime/rpm.py
@@ -13,6 +13,7 @@ def setUpModule():
class RpmBasicTest(oeRuntimeTest):
+@testcase(960)
@skipUnlessPassed('test_ssh')
def test_rpm_help(self):
(status, output) = self.target.run('rpm --help')
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] oeqa/runtime/parselogs: Added new decorators for existing automated tests.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/runtime/parselogs.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/runtime/parselogs.py
b/meta/lib/oeqa/runtime/parselogs.py
index 7721912..e9ccd0c 100644
--- a/meta/lib/oeqa/runtime/parselogs.py
+++ b/meta/lib/oeqa/runtime/parselogs.py
@@ -185,6 +185,7 @@ class ParseLogsTest(oeRuntimeTest):
(status, dmesg) = self.target.run("dmesg")
(status, dmesg2) = self.target.run("echo \""+str(dmesg)+"\" >
/tmp/dmesg_output.log")
+@testcase(1059)
@skipUnlessPassed('test_ssh')
def test_parselogs(self):
self.write_dmesg()
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] oeqa/runtime/smart: Added new decorators for existing automated tests.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/runtime/smart.py | 4
1 file changed, 4 insertions(+)
diff --git a/meta/lib/oeqa/runtime/smart.py b/meta/lib/oeqa/runtime/smart.py
index dba3bd6..e978227 100644
--- a/meta/lib/oeqa/runtime/smart.py
+++ b/meta/lib/oeqa/runtime/smart.py
@@ -30,6 +30,7 @@ class SmartBasicTest(SmartTest):
def test_smart_help(self):
self.smart('--help')
+@testcase(968)
def test_smart_version(self):
self.smart('--version')
@@ -77,12 +78,15 @@ class SmartRepoTest(SmartTest):
self.repolist.append(arch)
self.smart('update')
+@testcase(969)
def test_smart_channel_help(self):
self.smart('channel --help')
+@testcase(970)
def test_smart_channel_list(self):
self.smart('channel --list')
+@testcase(971)
def test_smart_channel_show(self):
self.smart('channel --show')
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] oeqa/runtime/ping: Added new decorators for existing automated tests.
Signed-off-by: Lucian Musat --- meta/lib/oeqa/runtime/ping.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/runtime/ping.py b/meta/lib/oeqa/runtime/ping.py index a73c724..80c4601 100644 --- a/meta/lib/oeqa/runtime/ping.py +++ b/meta/lib/oeqa/runtime/ping.py @@ -3,9 +3,11 @@ import unittest import sys import time from oeqa.oetest import oeRuntimeTest +from oeqa.utils.decorators import * class PingTest(oeRuntimeTest): +@testcase(964) def test_ping(self): output = '' count = 0 -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] oeqa/runtime/connman: Added new decorators for existing automated tests.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/runtime/connman.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/runtime/connman.py b/meta/lib/oeqa/runtime/connman.py
index cc537f7..bd9dba3 100644
--- a/meta/lib/oeqa/runtime/connman.py
+++ b/meta/lib/oeqa/runtime/connman.py
@@ -16,6 +16,7 @@ class ConnmanTest(oeRuntimeTest):
else:
return "Unable to get status or logs for %s" % service
+@testcase(961)
@skipUnlessPassed('test_ssh')
def test_connmand_help(self):
(status, output) = self.target.run('/usr/sbin/connmand --help')
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] oeqa/runtime/ldd: Added new decorators for existing automated tests.
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/runtime/ldd.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/runtime/ldd.py b/meta/lib/oeqa/runtime/ldd.py
index bce56c4..47b3885 100644
--- a/meta/lib/oeqa/runtime/ldd.py
+++ b/meta/lib/oeqa/runtime/ldd.py
@@ -8,6 +8,7 @@ def setUpModule():
class LddTest(oeRuntimeTest):
+@testcase(962)
@skipUnlessPassed('test_ssh')
def test_ldd_exists(self):
(status, output) = self.target.run('which ldd')
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer
Use absolute path instead of relative path for meta-skeleton.
Otherwise the case would fail if the builddir outside the poky source
tree.
Signed-off-by: Yi Zhao
---
meta/lib/oeqa/selftest/bblayers.py |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/selftest/bblayers.py
b/meta/lib/oeqa/selftest/bblayers.py
index 5b046d0..3a18029 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -6,7 +6,7 @@ import shutil
import oeqa.utils.ftools as ftools
from oeqa.selftest.base import oeSelfTest
-from oeqa.utils.commands import runCmd
+from oeqa.utils.commands import runCmd, get_bb_var
from oeqa.utils.decorators import testcase
class BitbakeLayers(oeSelfTest):
@@ -44,15 +44,16 @@ class BitbakeLayers(oeSelfTest):
self.assertTrue(find_in_contents)
def test_bitbakelayers_add_remove(self):
+test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton')
result = runCmd('bitbake-layers show-layers')
self.assertNotIn('meta-skeleton', result.output, 'This test cannot run
with meta-skeleton in bblayers.conf')
-result = runCmd('bitbake-layers add-layer ../meta-skeleton')
+result = runCmd('bitbake-layers add-layer %s' % test_layer)
result = runCmd('bitbake-layers show-layers')
self.assertIn('meta-skeleton', result.output)
-result = runCmd('bitbake-layers remove-layer ../meta-skeleton')
+result = runCmd('bitbake-layers remove-layer %s' % test_layer)
result = runCmd('bitbake-layers show-layers')
self.assertNotIn('meta-skeleton', result.output)
-result = runCmd('bitbake-layers add-layer ../meta-skeleton')
+result = runCmd('bitbake-layers add-layer %s' % test_layer)
result = runCmd('bitbake-layers show-layers')
self.assertIn('meta-skeleton', result.output)
result = runCmd('bitbake-layers remove-layer */meta-skeleton')
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] security_flags.inc: disable PIE for bash due to issues in mkbuiltins
> On Apr 8, 2015, at 2:59 AM, Richard Purdie
> wrote:
>
> On Tue, 2015-04-07 at 16:53 -0400, Denys Dmytriyenko wrote:
>> From: Denys Dmytriyenko
>>
>> As bash builds a native tool called mkbuiltins, it fails with PIE flags:
>>
>> ld: mkbuiltins.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be
>> used when making a shared object; recompile with -fPIC
>>
>> Affects at least version 3.2 of bash.
>
> I am a little worried about this one. Which architecture were you
> building for and is this just 3.x of bash or 4.x as well? I'd like to
> understand why we haven't seen this before…
If its a tool used during building bash, then you need to adjust
CFLAGS_FOR_BUILD
and make sure that bash’s build system is not mixing things up. I am not sure
if we need to disable PIE completely, there should be a better fix for this.
>
> Cheers,
>
> Richard
>
>> Signed-off-by: Denys Dmytriyenko
>> ---
>> meta/conf/distro/include/security_flags.inc | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/meta/conf/distro/include/security_flags.inc
>> b/meta/conf/distro/include/security_flags.inc
>> index 21e1a53..3401c4b 100644
>> --- a/meta/conf/distro/include/security_flags.inc
>> +++ b/meta/conf/distro/include/security_flags.inc
>> @@ -16,6 +16,7 @@ SECURITY_CFLAGS_pn-lttng-tools_arm =
>> "${SECURITY_NO_PIE_CFLAGS}"
>> SECURITY_CFLAGS_pn-elfutils_arm = "${SECURITY_NO_PIE_CFLAGS}"
>>
>> SECURITY_CFLAGS_pn-aspell = "${SECURITY_NO_PIE_CFLAGS}"
>> +SECURITY_CFLAGS_pn-bash = "${SECURITY_NO_PIE_CFLAGS}"
>> SECURITY_CFLAGS_pn-beecrypt = "${SECURITY_NO_PIE_CFLAGS}"
>> SECURITY_CFLAGS_pn-blktrace = "${SECURITY_NO_PIE_CFLAGS}"
>> # Curl seems to check for FORTIFY_SOURCE in CFLAGS, but even assigned
>> --
>> 2.2.0
>>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
