[OE-core] [PATCH] util-linux: Update to 2.23
Remove license patch as it is integrated upstream. Add backports of upstream loopdev regression fixes. Updated uclibc-__progname-conflict.patch because it didn't apply. Added bash-completion and partx sub-packages. Signed-off-by: Jonathan Liu --- meta/recipes-core/util-linux/util-linux.inc| 5 +- ...-fix-loopcxt_check_size-to-work-with-blkd.patch | 60 + ...etup-use-warn_size-for-regular-files-only.patch | 29 .../util-linux/util-linux/mbsalign-license.patch | 78 -- .../util-linux/uclibc-__progname-conflict.patch| 15 +++-- .../{util-linux_2.22.2.bb => util-linux_2.23.bb} | 11 +-- 6 files changed, 107 insertions(+), 91 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch create mode 100644 meta/recipes-core/util-linux/util-linux/0001-losetup-use-warn_size-for-regular-files-only.patch delete mode 100644 meta/recipes-core/util-linux/util-linux/mbsalign-license.patch rename meta/recipes-core/util-linux/{util-linux_2.22.2.bb => util-linux_2.23.bb} (55%) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index c783385..b4e64b5 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -34,7 +34,8 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd util-linux-libmount util-linux-libmount-dev \ util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ - util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd" + util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd \ + util-linux-partx ${PN}-bash-completion" EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ --disable-makeinstall-chown --enable-elvtune --enable-init \ @@ -52,6 +53,7 @@ EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemds EXTRA_OECONF_append_class-native = " --disable-login --disable-su" +FILES_${PN}-bash-completion += "${datadir}/bash-completion" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_util-linux-agetty = "${base_sbindir}/agetty" @@ -67,6 +69,7 @@ FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-reset = "${base_bindir}/reset" +FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" diff --git a/meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch b/meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch new file mode 100644 index 000..d1093f2 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-lib-loopdev-fix-loopcxt_check_size-to-work-with-blkd.patch @@ -0,0 +1,60 @@ +Upstream-Status: Backport +Signed-off-by: Jonathan Liu + +From e3b6cb87e0ba1304fa07ec316784de1c6243b28e Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Mon, 13 May 2013 10:54:41 +0200 +Subject: [PATCH] lib/loopdev: fix loopcxt_check_size() to work with blkdevs + +The loopcxt_check_size() is workaround for kernels < v3.9, kernel has +been fixed by commit 541c742a7559eb65f0e36d3e2338c2ca532a3e61. + +The function sets loopdev size according to backing file size. The +problem is that the backing file could be a block device where +stat.st_size is zero, so we have to use blkdev_get_size() for block +devices. + +Addresses: https://bugs.archlinux.org/task/35193 +Reported-by: Dave Reisner +Signed-off-by: Karel Zak +--- + lib/loopdev.c | 16 +++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/lib/loopdev.c b/lib/loopdev.c +index c35e306..3b65b5d 100644 +--- a/lib/loopdev.c b/lib/loopdev.c +@@ -1097,7 +1097,17 @@ static int loopcxt_check_size(struct loopdev_cxt *lc, int file_fd) + if (fstat(file_fd, &st)) + return -errno; + +- expected_size = st.st_size; ++ if (S_ISBLK(st.st_mode)) { ++ if (blkdev_get_size(file_fd, ++ (unsigned long long *) &expected_size)) ++ return -errno; ++ } else ++ expected_size = st.st_size; ++ ++ if (expected_size == 0 || expected_size <= lc->info.lo_offset) { ++ DBG(lc, loopdev_debug("failed to determine expected size")); ++ return 0; /* ignore this error */ ++ } + + if (lc->info.lo_offset > 0) + expected_size -= lc->info.lo_offset; +@@ -1113,6 +1123,10 @@ st
Re: [OE-core] [PATCH 1/2] glib-2.0: update to 2.36.2
On 05/17/2013 08:12 PM, Andreas Müller wrote: While updating the C++ bindings in meta-oe (glibmm/cairomm/pangomm) a dependency on glib 2.36.1 came up. We have updated to 2.36.1 already, so this will need to be rebased if you want to update to 2.36.2. Sau! This patch was build- (gcc 4.7.2/4.8.0) and run-tested with my standard xfce-/gnome2-images Signed-off-by: Andreas Müller --- .../{glib-2.0_2.36.0.bb => glib-2.0_2.36.2.bb} |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.36.0.bb => glib-2.0_2.36.2.bb} (93%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb similarity index 93% rename from meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb index a042972..2e710c9 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb @@ -18,8 +18,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" -SRC_URI[md5sum] = "2047dff287473450593edecb18f79c17" -SRC_URI[sha256sum] = "455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227" +SRC_URI[md5sum] = "d791774ac49eaf8ba59792427bb74af7" +SRC_URI[sha256sum] = "5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80" BBCLASSEXTEND = "native nativesdk" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] updates for cogl, clutter and mx
On 05/17/2013 02:25 PM, Tomas Frydrych wrote: The following set of patches updates clutter and friends; the recipes were completely reworked and use PACKAGECONFIG to facilitate easy reconfiguration to match distro / machine needs. Clutter and Cogl packages are renamed to use a '-1.0' suffix instead of the '-vmajor.vminor' suffix of the old recipes, in keeping up with the upstream versioning policy, and to simplify dependency maintenance (note that dev files for the 1.x series are not parallel installable anyway); the '-1.0' suffix is with a view toward the '2.0' series which are on the horizon. The Cogl recipe is moved into a subdirectory of its own, this seemed appropriate as Cogl is now a seprate project in its own right. The new versions are: cogl 1.4.0, clutter 1.14.4, clutter-gst 1.6.0, clutter-gtk 1.4.2. The mx recipe is fixed up to build against the updated cogl and clutter. There are some issues with this patch set, some of the included patches either do not have Upstream-Status or Signed-off-by tags, please review that. Also, I want to confirm that these are all new recipes and will not cause backward PRs (ie do you need PE bumps to these)? Finally, I think you need to update the packagegroup-core-clutter recipe. Thanks Sau! [PATCH 1/7] Remove old clutter recipes [PATCH 2/7] clutter.bbclass: helper class for clutter and friends [PATCH 3/7] New cogl recipe (1.14.0) [PATCH 4/7] New clutter recipe (1.14.4) [PATCH 5/7] New clutter gst recipe (1.6.0) [PATCH 6/7] New clutter-gtk recipe (1.4.2) [PATCH 7/7] Update mx recipe to build with clutter 1.14.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Why doesn't my package rebuild
On 2013-05-17 09:29, William M.A. Traynor wrote: On Thu, May 16, 2013 at 5:10 PM, Gary Thomas wrote: Sort of as a follow up to my problem of yesterday, I've run into a problem - I have a simple recipe which only unpacks a source tarball and then installs it - no other steps are listed or required. The recipe also does not have an explicit PR value and I'm not running a PR server. If I have the package built, then change the tarball and the checksums in the recipe itself, it does not get rebuilt :-( I have to force it using cleansstate. This setup seems to work fine for my other recipes. I just tried it with two nearly identical recipes. I made similar changes in both recipes/files - one was rebuilt, the other not. How can I diagnose this? It's a private recipe (no use to anyone but me) so I'm not going to send it to the list but I can gladly share it with anyone who might be able to help. Hi Gary, You can increase the Debug level for your build with bitbake -D. You can specify this more than once for additional output, example: -DDD. This may help you to diagnose what's going on. Thanks, that was the hint I was looking for. Of course, today the recipe behaves... At least I'll know what to do the next time I have problems. -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] qt keyboard problem
> -Original Message- > From: Yi Qingliang [mailto:niqingliang2...@gmail.com] > Sent: Thursday, May 16, 2013 5:46 PM > To: Slater, Joseph > Cc: openembedded-core@lists.openembedded.org oe-core layer > Subject: Re: [OE-core] qt keyboard problem > > On Thursday, May 16, 2013 04:51:04 PM Slater, Joseph wrote: > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > > > [mailto:openembedded-core- boun...@lists.openembedded.org] On Behalf Of > > > Yi Qingliang > > > Sent: Tuesday, May 14, 2013 11:19 PM > > > To: openembedded-core@lists.openembedded.org oe-core layer > > > Subject: [OE-core] qt keyboard problem > > > > > > Hello, all. > > > > > > I'm running qt application on yocto's qt image. cpu is s3c2442, like > > > mini2440. > > > > > > the problem is: > > > > > > key event issued by pressing gpio-key eat by 'getty' (from busybox), > > > my application can't receive input event, > > > if I remove respawn 'getty' for tty1 in /etc/inittab, everything ok. > > > > This could be the same thing I have seen in a slightly different context. > > If so, you can keep the getty's attached to VT's. Just move the line in > > inittab that starts runlevel 5 to the very end of inittab. As long as the > > getty's start first, you'll be okay. > > you mean: move 'id:5:initdefault:' as the last line of the file, right? No, the line is "l5:5:wait:/etc/init.d/rc 5". Joe > > > > > > > > # /etc/inittab: init(8) configuration. > # $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ > > # The default runlevel. > id:5:initdefault: > > # Boot-time system configuration/initialization script. > # This is run first except when booting in emergency (-b) mode. > si::sysinit:/etc/init.d/rcS > > # What to do in single-user mode. > ~~:S:wait:/sbin/sulogin > > # /etc/init.d executes the S and K scripts upon change > # of runlevel. > # > # Runlevel 0 is halt. > # Runlevel 1 is single-user. > # Runlevels 2-5 are multi-user. > # Runlevel 6 is reboot. > > l0:0:wait:/etc/init.d/rc 0 > l1:1:wait:/etc/init.d/rc 1 > l2:2:wait:/etc/init.d/rc 2 > l3:3:wait:/etc/init.d/rc 3 > l4:4:wait:/etc/init.d/rc 4 > l5:5:wait:/etc/init.d/rc 5 > l6:6:wait:/etc/init.d/rc 6 > # Normally not reached, but fallthrough in case of emergency. > z6:6:respawn:/sbin/sulogin > S:2345:respawn:/sbin/getty 115200 ttySAC0 > # /sbin/getty invocations for the runlevels. > # > # The "id" field MUST be the same as the last > # characters of the device (after "tty"). > # > # Format: > # ::: > # > > 1:2345:respawn:/sbin/getty 38400 tty1 > > > > > > > Joe > > > > > any idea? > > > > > > > > > -- > > > Nanjing Jilong > > > Yi Qingliang > > > niqingliang2...@gmail.com > > > > > > ___ > > > Openembedded-core mailing list > > > Openembedded-core@lists.openembedded.org > > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -- > Nanjing Jilong > Yi Qingliang > niqingliang2...@gmail.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] glib-networking: update to 2.36.2
Signed-off-by: Andreas Müller --- ...working_2.36.0.bb => glib-networking_2.36.2.bb} |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/glib-networking/{glib-networking_2.36.0.bb => glib-networking_2.36.2.bb} (85%) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.36.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb similarity index 85% rename from meta/recipes-core/glib-networking/glib-networking_2.36.0.bb rename to meta/recipes-core/glib-networking/glib-networking_2.36.2.bb index 2cc69ef..863a4eb 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.36.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb @@ -10,8 +10,8 @@ DEPENDS = "glib-2.0 gnutls intltool-native" SRC_URI = "${GNOME_MIRROR}/${BPN}/2.36/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "062dafdb939510e7b38eea3d3b367be0" -SRC_URI[sha256sum] = "190d66fbaeb023ba4f43c315f23c5372c43be6cbe857596e00990211514650d9" +SRC_URI[md5sum] = "fb9121742ed36d1723f296eea19dbb3c" +SRC_URI[sha256sum] = "2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9" EXTRA_OECONF = "--without-ca-certificates --without-gnome-proxy --without-libproxy" -- 1.7.4.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] glib-2.0: update to 2.36.2
While updating the C++ bindings in meta-oe (glibmm/cairomm/pangomm) a dependency on glib 2.36.1 came up. This patch was build- (gcc 4.7.2/4.8.0) and run-tested with my standard xfce-/gnome2-images Signed-off-by: Andreas Müller --- .../{glib-2.0_2.36.0.bb => glib-2.0_2.36.2.bb} |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.36.0.bb => glib-2.0_2.36.2.bb} (93%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb similarity index 93% rename from meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb index a042972..2e710c9 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb @@ -18,8 +18,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" -SRC_URI[md5sum] = "2047dff287473450593edecb18f79c17" -SRC_URI[sha256sum] = "455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227" +SRC_URI[md5sum] = "d791774ac49eaf8ba59792427bb74af7" +SRC_URI[sha256sum] = "5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80" BBCLASSEXTEND = "native nativesdk" -- 1.7.4.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Redefine variable in bbappend
On 5/16/13 7:08 PM, Yevhen Kyriukha wrote: Hi! I'm using "base-files" recipe but I don't want that /var/log be a symlink to temp directory. Therefore in my custom layer I created base-files bbappend file with following content: PRINC := "${@int(PRINC) + 1}" dirs755_append += "${localstatedir}/log" volatiles = "run lock tmp" In this recipe I removed "log" from volatiles but it doesn't work. I'm getting error: ERROR: Fixup Perms: Unable to correct directory link, target already exists: /var/log -> /var/volatile/log How to properly redefine the variable in bbappend file? There are two parts to the filesystem layout. There is the base-files package that sets up the initial layout. This is the recipe you modified. But there is also a second file that affects -all- packages and ensures that the directories (and links) that they create match the system configuration. This is the meta/files/fs-perms.txt file. Instead of copying this file to your layer and changing it, the system allows you to make your own custom changes. To do that: Create a new file in your layer: your-layer/files/my-fs-perms.txt: # Make /var/log a directory ${localstatedir}/log 0755 root root false - - - Then in the layer's conf/layer.conf add: FILESYSTEM_PERMS_TABLES = "files/fs-perms.txt files/my-fs-perms.txt" This will tell the system to first load the fs-perms.txt file, and then load my-fs-perms.txt. The second file will simply add/change the entry from the first. --Mark Best regards, Yevhen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Why doesn't my package rebuild
On Thu, May 16, 2013 at 5:10 PM, Gary Thomas wrote: > Sort of as a follow up to my problem of yesterday, I've run into > a problem - I have a simple recipe which only unpacks a source tarball > and then installs it - no other steps are listed or required. The recipe > also does not have an explicit PR value and I'm not running a PR server. > > If I have the package built, then change the tarball and the checksums > in the recipe itself, it does not get rebuilt :-( I have to force it > using cleansstate. > > This setup seems to work fine for my other recipes. I just tried it > with two nearly identical recipes. I made similar changes in both > recipes/files - one was rebuilt, the other not. > > How can I diagnose this? It's a private recipe (no use to anyone but me) > so I'm not going to send it to the list but I can gladly share it with > anyone who might be able to help. Hi Gary, You can increase the Debug level for your build with bitbake -D. You can specify this more than once for additional output, example: -DDD. This may help you to diagnose what's going on. > > Thanks > > -- > > Gary Thomas | Consulting for the > MLB Associates |Embedded world > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Poor first impression
On 2013-05-17 08:32, Burton, Ross wrote: On 17 May 2013 15:23, Gary Thomas wrote: Master, updated 2013-05-16 Definitely worth updating again, there were some incompatibility with Python 2.6 that were fixed yesterday. No change, sorry. This only happens when 'git' is not installed and is very easy to reproduce. I tested on Ubuntu 12.04 and Fedora 17 -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Poor first impression
On 17 May 2013 15:23, Gary Thomas wrote: > Master, updated 2013-05-16 Definitely worth updating again, there were some incompatibility with Python 2.6 that were fixed yesterday. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Poor first impression
On 2013-05-17 08:18, Saul Wold wrote: On 05/17/2013 04:26 PM, Gary Thomas wrote: I just tried to run Poky/Yocto on a fresh Ubuntu 12.04 system. I knew there would be missing bits and have seen the "sanity" messages in the past, so I thought I'd just carry on. Today's experience was not pretty and would it not for my experience with this, I would have been very perplexed... Hey Gary, was this on a 1.4 / Danny Branch or master? Richard may have done something with master when he made some of the Python3 changes. Master, updated 2013-05-16 Here's what I saw: gthomas@saturn:/local/qemuarm_poky$ bitbake core-image-sato /local/poky-multi/scripts/bitbake: 1: /local/poky-multi/scripts/bitbake: git: not found File "", line 1 from distutils.version import LooseVersion; import sys; sys.exit(not (LooseVersion('>=') 1.7.5 LooseVersion(''))) ^ SyntaxError: invalid syntax /local/poky-multi/scripts/bitbake: 1: /local/poky-multi/scripts/bitbake: git: not found File "", line 1 from distutils.version import LooseVersion; import sys; sys.exit(not (LooseVersion('>=') 1.7.5 LooseVersion(''))) ^ SyntaxError: invalid syntax Traceback (most recent call last): File "/local/poky-multi/bitbake/bin/bitbake", line 293, in ret = main() File "/local/poky-multi/bitbake/bin/bitbake", line 260, in main event = server.event_queue.get(block=False) File "/usr/lib/python2.7/multiprocessing/queues.py", line 134, in get raise Empty Empty Pseudo is not present but is required, building this first before the main build ^CTraceback (most recent call last): File "/local/poky-multi/bitbake/bin/bitbake", line 293, in ret = main() File "/local/poky-multi/bitbake/bin/bitbake", line 260, in main event = server.event_queue.get(block=False) File "/usr/lib/python2.7/multiprocessing/queues.py", line 134, in get raise Empty Empty ERROR: OE-core's config sanity checker detected a potential misconfiguration. Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). Following is the list of potential problems / advisories: Please install the following missing utilities: C++ Compiler (g++),diffstat,makeinfo,git,gawk,chrpath ERROR: Execution of event handler 'check_sanity_eventhandler' failed -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Poor first impression
On 05/17/2013 04:26 PM, Gary Thomas wrote: I just tried to run Poky/Yocto on a fresh Ubuntu 12.04 system. I knew there would be missing bits and have seen the "sanity" messages in the past, so I thought I'd just carry on. Today's experience was not pretty and would it not for my experience with this, I would have been very perplexed... Hey Gary, was this on a 1.4 / Danny Branch or master? Richard may have done something with master when he made some of the Python3 changes. Sau! Here's what I saw: gthomas@saturn:/local/qemuarm_poky$ bitbake core-image-sato /local/poky-multi/scripts/bitbake: 1: /local/poky-multi/scripts/bitbake: git: not found File "", line 1 from distutils.version import LooseVersion; import sys; sys.exit(not (LooseVersion('>=') 1.7.5 LooseVersion(''))) ^ SyntaxError: invalid syntax /local/poky-multi/scripts/bitbake: 1: /local/poky-multi/scripts/bitbake: git: not found File "", line 1 from distutils.version import LooseVersion; import sys; sys.exit(not (LooseVersion('>=') 1.7.5 LooseVersion(''))) ^ SyntaxError: invalid syntax Traceback (most recent call last): File "/local/poky-multi/bitbake/bin/bitbake", line 293, in ret = main() File "/local/poky-multi/bitbake/bin/bitbake", line 260, in main event = server.event_queue.get(block=False) File "/usr/lib/python2.7/multiprocessing/queues.py", line 134, in get raise Empty Empty Pseudo is not present but is required, building this first before the main build ^CTraceback (most recent call last): File "/local/poky-multi/bitbake/bin/bitbake", line 293, in ret = main() File "/local/poky-multi/bitbake/bin/bitbake", line 260, in main event = server.event_queue.get(block=False) File "/usr/lib/python2.7/multiprocessing/queues.py", line 134, in get raise Empty Empty ERROR: OE-core's config sanity checker detected a potential misconfiguration. Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). Following is the list of potential problems / advisories: Please install the following missing utilities: C++ Compiler (g++),diffstat,makeinfo,git,gawk,chrpath ERROR: Execution of event handler 'check_sanity_eventhandler' failed ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Poor first impression
I just tried to run Poky/Yocto on a fresh Ubuntu 12.04 system. I knew there would be missing bits and have seen the "sanity" messages in the past, so I thought I'd just carry on. Today's experience was not pretty and would it not for my experience with this, I would have been very perplexed... Here's what I saw: gthomas@saturn:/local/qemuarm_poky$ bitbake core-image-sato /local/poky-multi/scripts/bitbake: 1: /local/poky-multi/scripts/bitbake: git: not found File "", line 1 from distutils.version import LooseVersion; import sys; sys.exit(not (LooseVersion('>=') 1.7.5 LooseVersion(''))) ^ SyntaxError: invalid syntax /local/poky-multi/scripts/bitbake: 1: /local/poky-multi/scripts/bitbake: git: not found File "", line 1 from distutils.version import LooseVersion; import sys; sys.exit(not (LooseVersion('>=') 1.7.5 LooseVersion(''))) ^ SyntaxError: invalid syntax Traceback (most recent call last): File "/local/poky-multi/bitbake/bin/bitbake", line 293, in ret = main() File "/local/poky-multi/bitbake/bin/bitbake", line 260, in main event = server.event_queue.get(block=False) File "/usr/lib/python2.7/multiprocessing/queues.py", line 134, in get raise Empty Empty Pseudo is not present but is required, building this first before the main build ^CTraceback (most recent call last): File "/local/poky-multi/bitbake/bin/bitbake", line 293, in ret = main() File "/local/poky-multi/bitbake/bin/bitbake", line 260, in main event = server.event_queue.get(block=False) File "/usr/lib/python2.7/multiprocessing/queues.py", line 134, in get raise Empty Empty ERROR: OE-core's config sanity checker detected a potential misconfiguration. Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). Following is the list of potential problems / advisories: Please install the following missing utilities: C++ Compiler (g++),diffstat,makeinfo,git,gawk,chrpath ERROR: Execution of event handler 'check_sanity_eventhandler' failed -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] package_write_ipk somehow looks into the wrong path
On Fri, May 17, 2013 at 12:51:37PM +0200, Mike Looijmans wrote: > On 05/17/2013 12:15 PM, Martin Jansa wrote: > > On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: > >> > >> I got this very weird build failure. It builds fine for one machine > >> (zedboard), but it craps out in a really weird way on the "zynq-zc702" > >> machine. > >> > >> Somehow the "package_write_ipk" task wants to find files in a directory > >> with "1-r0" (a version that has once existed a long long time ago) in > >> the version part, instead of the proper git hashed name. > >> > >> I've tried a "cleansstate" but that did not help. The "compile" step in > >> this recipe takes about 1,5 hour on my i7 system, so debugging this > >> recipe is painfully slow... > >> > >> I've attached the recipes, pasted the log below. > > > > try it with 2/2 patch from > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 > > > > I somehow fail to extract the patch from the mail correctly (probably > lack of skilz on my side, I am not often at the receiving end of mailed > patches). Patchwork makes it a lot easier: http://patchwork.openembedded.org/patch/47329/ > But my recipe does mess with the PV string because the Xilinx tools will > fail to work properly when there is a "+" sign in the path. I'll try to > fix it in a more proper way than using a python replace, see if that helps. It could be caused by something else, just the error message looks the same when your recipe was built with different PV in different architecture before (that's what referenced patch detects and shows better error message then "No such file" later). -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
On Thursday 16 May 2013 11:35:55 Phil Blundell wrote: > On Thu, 2013-05-16 at 10:01 +0100, Tomas Frydrych wrote: > > On 15/05/13 21:49, Phil Blundell wrote: > > > - we have a slightly funky 2-stage bootstrap process for cogl in order > > > to break the dependency cycle with cairo; this involves hacks to the > > > recipes for cogl, cairo, pango and harfbuzz (at least) which I suspect > > > would not be very palatable to oe-core. > > > > I have never run into this, is this with recent cogls? > > It's because we build Cairo with the cogl backend enabled. That > introduces a dependency of cairo on cogl (obviously), which is a problem > because cogl-pango needs pango, which needs harfbuzz, which needs cairo. > So what we do is build cogl initially with pango disabled, then use that > to compile cairo and the rest of the stack, and then finally build the > "real" cogl with everything enabled. > > Obviously the other option would be to build cairo twice, firstly > without cogl and the second time with it. I don't think there's much to > choose between the two. I was just speaking to one of the cogl developers and he was surprised that anyone would be using cairo's cogl backend since it's never really been finished. Is that backend definitely functionality that you're using? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] package_write_ipk somehow looks into the wrong path
On 05/17/2013 01:13 PM, Mike Looijmans wrote: On 05/17/2013 01:11 PM, Mike Looijmans wrote: On 05/17/2013 12:15 PM, Martin Jansa wrote: On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: I got this very weird build failure. It builds fine for one machine (zedboard), but it craps out in a really weird way on the "zynq-zc702" machine. Somehow the "package_write_ipk" task wants to find files in a directory with "1-r0" (a version that has once existed a long long time ago) in the version part, instead of the proper git hashed name. I've tried a "cleansstate" but that did not help. The "compile" step in this recipe takes about 1,5 hour on my i7 system, so debugging this recipe is painfully slow... I've attached the recipes, pasted the log below. try it with 2/2 patch from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 Okay, I just manually applied those changes. Then I get: ERROR: Recipe fpga-image is trying to change PV from '2.AUTOINC-bfd37feb034919cc11b3879745f2770810a4e796' to '1'. This will cause do_package_write_ipk failing to find right workdir. That helps, but I still don't have the faintest idea what is going on here. What's wrong with my recipe? As a last resort, I tried just putting PV="3" into the recipe. WTF? ERROR: Recipe fpga-image is trying to change PV from '3' to '1'. This will cause do_package_write_ipk failing to find right workdir. ERROR: Function failed: read_subpackage_metadata ERROR: Logfile of failure stored in: /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/3-r0/temp/log.do_package_write_ipk.13519 ERROR: Task 12 (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, do_package_write_ipk) failed with exit code '1' Who's touching my PV? And found the problem at last. As a long time user of "classic" OE, I added: PACKAGE_ARCH = "${MACHINE}" this was causing the failure, replacing it with PACKAGE_ARCH = "${MACHINE_ARCH}" as other recipes appear to do fixed it. Mike. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman-gnome: fixed DHCP segfault
Hi, When using manual ip the ipv4_config structure has all fields populated and this condition is skipped. The only case when the data structure fields are NULL is when we have DHCP settings and for different reasons network configurations are not done. In this case, connman automatically renews the ipv4 configurations in less than a minute. Ethernet manual configuration behavior remains unchanged after this fix. Thanks, Ema From: Burton, Ross [ross.bur...@intel.com] Sent: Friday, May 17, 2013 1:52 PM To: Ciobanu, Emilia Maria Silvia Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] connman-gnome: fixed DHCP segfault On 17 May 2013 11:32, Emilia Ciobanu wrote: > +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) > ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == > TRUE) Is this really the right behaviour if IPv4.Method isn't set? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] Update mx recipe to build with clutter 1.14.4
From: Tomas Frydrych Signed-off-by: Tomas Frydrych --- .../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 43 meta/recipes-graphics/mx/mx.inc| 20 + .../recipes-graphics/mx/mx/fix-test-includes.patch | 17 meta/recipes-graphics/mx/mx_1.4.7.bb | 26 +--- 4 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch create mode 100644 meta/recipes-graphics/mx/mx.inc create mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch new file mode 100644 index 000..667f526 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch @@ -0,0 +1,43 @@ +# Fixup for S != B +# This patch is specific to version 1.4.x +# Upstream-status: Pending +Index: git/docs/reference/libmx-gtk/Makefile.am +=== +--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -77,7 +80,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in +Index: git/docs/reference/libmx/Makefile.am +=== +--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -106,7 +109,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc new file mode 100644 index 000..a3b49bd --- /dev/null +++ b/meta/recipes-graphics/mx/mx.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Clutter based widget library" +LICENSE = "LGPLv2.1" + +inherit clutter + +DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" + +SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" + +EXTRA_OECONF = "--disable-introspection\ + --disable-gtk-doc \ + --disable-gtk-widgets \ + --with-dbus \ + --with-winsys=none \ + --without-clutter-imcontext \ + --without-clutter-gesture \ + --without-startup-notification \ + --without-glade \ + " + diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch new file mode 100644 index 000..eee62b6 --- /dev/null +++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch @@ -0,0 +1,17 @@ +# Fix missing include directory +# This patch is currently required for all versions of mx +# Upstream-status: Pending +Index: git/tests/Makefile.am +=== +--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 +@@ -10,7 +10,8 @@ + + INCLUDES = \ + -I$(top_srcdir) \ +- -I$(top_builddir) ++ -I$(top_builddir)\ ++ -I$(top_builddir)/mx + + noinst_PROGRAMS = \ + test-deform-texture \ diff --git a/meta/recipes-graphics/mx/mx_1.4.7.bb b/meta/recipes-graphics/mx/mx_1.4.7.bb index fd9189b..4c4c8eb 100644 --- a/meta/recipes-graphics/mx/mx_1.4.7.bb +++ b/meta/recipes-graphics/mx/mx_1.4.7.bb @@ -1,18 +1,14 @@ -DESCRIPTION = "Clutter based widget library" -LICENSE = "LGPLv2.1" +require mx.inc -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ - file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879" - -PR = "r0" - -DEPENDS = "clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification" +# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix +SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" +PV = "1.4.7+git${SRCPV}" -inherit autotools gettext +SRC_URI = "git://github.com/clutter-p
[OE-core] [PATCH 5/7] New clutter gst recipe (1.6.0)
From: Tomas Frydrych Signed-off-by: Tomas Frydrych --- meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 23 ++ .../clutter/clutter-gst-1.0_1.6.0.bb |9 .../clutter/clutter-gst-1.6/cogl-1.14.patch| 45 .../clutter/clutter-gst/enable-tests.patch | 17 4 files changed, 94 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc new file mode 100644 index 000..f79795c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "Clutter GStreamer" +HOMEPAGE = "http://www.clutter-project.org/"; +LICENSE = "LGPLv2+" + +inherit clutter + +SRC_URI += "file://enable-tests.patch" + +DEPENDS = "gst-plugins-base gst-plugins-bad clutter-1.0" +RDEPENDS_${PN} += "gst-meta-base" +PACKAGES =+ "${PN}-examples" + +EXTRA_OECONF += "--disable-introspection" + +FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so" +FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" + +do_configure_prepend () { + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb new file mode 100644 index 000..dc5cc13 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb @@ -0,0 +1,9 @@ +require clutter-gst-1.0.inc + +SRC_URI += "file://cogl-1.14.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" + +SRC_URI[archive.md5sum] = "d60ab0118730cecd5dd9988ad7da034b" +SRC_URI[archive.sha256sum] = "abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622" diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch new file mode 100644 index 000..7622f08 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch @@ -0,0 +1,45 @@ +From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 +From: Tomas Frydrych +Date: Thu, 11 Oct 2012 08:53:03 +0100 +Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against + cogl-1.14 + +Cogl 1.14 exposes various GL types through the public API but it does not +pull in the GL type definitions through its public headers; specifically +compilation will fail due to undefined GL_TEXTURE_2D. So include the headers +the hard way. +--- + clutter-gst/clutter-gst-video-sink.c | 17 + + 1 file changed, 17 insertions(+) + +diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +index 9b4b53c..f092581 100644 +--- a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +@@ -42,6 +42,23 @@ + #include "config.h" + #endif + ++/* ++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. ++ */ ++#include ++ ++#ifdef COGL_HAS_GLES1 ++#include ++#include ++#elif COGL_HAS_GLES2 ++#include ++#include ++#elif COGL_HAS_GL ++#include ++#else ++#error Unknown cogl configuration ++#endif ++ + #include "clutter-gst-video-sink.h" + #include "clutter-gst-util.h" + #include "clutter-gst-private.h" +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch new file mode 100644 index 000..de1dcc2 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inappropriate [embedded specific] + +Install example binary needed for poky-image-clutter + +Signed-off-by: Zhai Edwin +Index: clutter-gst-1.3.8/examples/Makefile.am +=== +--- clutter-gst-1.3.8.orig/examples/Makefile.am clutter-gst-1.3.8/examples/Makefile.am +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = video-player video-sink video-sink-navigation ++bin_PROGRAMS = video-player video-sink video-sink-navigation + + INCLUDES = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] New clutter-gtk recipe (1.4.2)
From: Tomas Frydrych Signed-off-by: Tomas Frydrych --- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb |6 ++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 000..3717f48 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "ClutterGtk" +HOMEPAGE = "http://www.clutter-project.org/"; +LICENSE = "LGPLv2+" + +inherit clutter + +DEPENDS = "clutter-1.0 gtk+3" +PACKAGES =+ "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build" + +EXTRA_OECONF += "--disable-introspection" + diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb new file mode 100644 index 000..64eb70c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "842601b584daf4447a46799a4ba88df6" +SRC_URI[archive.sha256sum] = "dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] Remove old clutter recipes
From: Tomas Frydrych Signed-off-by: Tomas Frydrych --- meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 23 --- meta/recipes-graphics/clutter/clutter-1.8_git.bb | 20 -- meta/recipes-graphics/clutter/clutter-fpu.inc |6 -- .../clutter/clutter-gst-1.8_1.4.6.bb | 22 --- meta/recipes-graphics/clutter/clutter-gst.inc | 13 .../clutter/clutter-gst/enable_tests-1.4.patch | 18 -- .../clutter/clutter-gst/enable_tests-1.8.patch | 17 - .../clutter/clutter-gst/enable_tests.patch | 18 -- .../clutter/clutter-gtk-1.8_0.11.4.bb | 11 meta/recipes-graphics/clutter/clutter-gtk.inc | 14 .../clutter/clutter-gtk/disable_deprecated.patch | 21 -- .../clutter/clutter-gtk/enable_tests.patch | 18 -- meta/recipes-graphics/clutter/clutter-package.inc |2 - meta/recipes-graphics/clutter/clutter.inc | 23 --- .../clutter/clutter/build-fix.patch| 18 -- .../clutter/clutter/enable_tests-0.6.patch | 42 .../clutter/clutter/enable_tests-0.8.patch | 52 --- .../clutter/clutter/enable_tests-1.0.patch | 34 -- .../clutter/clutter/enable_tests-1.4.patch | 15 - ...-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 34 -- .../clutter/clutter/enable_tests.patch | 34 -- .../clutter/clutter/symconflict.patch | 33 -- .../clutter/clutter/test-conformance-fix.patch | 68 .../clutter/update_gettext_macro_version.patch | 32 - meta/recipes-graphics/clutter/cogl.inc | 22 --- .../clutter/cogl/build_for_armv4t.patch| 23 --- .../clutter/cogl/macro-versions.patch | 28 meta/recipes-graphics/clutter/cogl_1.8.2.bb| 12 meta/recipes-graphics/clutter/cogl_git.bb | 16 - 29 files changed, 689 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-fpu.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-package.inc delete mode 100644 meta/recipes-graphics/clutter/clutter.inc delete mode 100644 meta/recipes-graphics/clutter/clutter/build-fix.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/symconflict.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch delete mode 100644 meta/recipes-graphics/clutter/cogl.inc delete mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch delete mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch delete mode 100644 meta/recipes-graphics/clutter/cogl_1.8.2.bb delete mode 100644 meta/recipes-graphics/clutter/cogl_git.bb diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb deleted file mode 100644 index aceef96..000 --- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -require recipes-graphics/clutter/clutter.inc -require recipes-graphics/clutter/clutter-package.inc - -PR = "r2" - -# We're API/ABI compatible and this may make things easier for layers -PROVIDES += "clutter-1.6" - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" - -SRC_URI = "http://source.clutter-project.org/sources/clutter/1.8/clutter-${PV}.tar.bz2 \ - file://enable_tests-1.4.patch \ - file:
[OE-core] [PATCH 3/7] New cogl recipe (1.14.0)
From: Tomas Frydrych The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parallel installable, it is not possible to use two versions of cogl 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) EGL platform: 'egl-null' -- PVR-style null platform 'egl-kms' -- kms platform provide by Mesa 'egl-x11' -- egl over xlib platform (Additional EGL platforms, e.g., Wayland are supported by cogl, but not supported here at present.) GLX: 'glx' for the GLX extension support (implies 'gl') Default configuration is 'glx'; typical configuration providing 'native' egl on embedded HW would be 'gles2 egl-null'. Signed-off-by: Tomas Frydrych --- meta/recipes-graphics/cogl/cogl-1.0.inc | 58 + meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb |7 +++ 2 files changed, 65 insertions(+) create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 000..17d8629 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,58 @@ +DESCRIPTION = "a modern 3D graphics API with associated utility APIs" +HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"; +LICENSE = "LGPLv2.1+" + +inherit clutter + +DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf" +PACKAGES =+ "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build" + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL= "virtual/libgl libdrm" +EDEPENDS_GLES2 = "virtual/libgles2" +EDEPENDS_KMS = "libdrm virtual/egl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi" + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +ERDEPENDS_GL= "libgl" +ERDEPENDS_GLES2 = "libgles2" + +EXTRA_OECONF += "--disable-introspection \ +--disable-gtk-doc \ +${@get_fpu_setting(bb, d)} \ +--enable-examples-install \ +--enable-debug \ +--disable-gl \ +--disable-gles1\ +--disable-gles2\ +--disable-glx \ + " + +# GL flavours +PACKAGECONFIG[gl] = "--enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL}" +PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" + +# egl backends +PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,,${EDEPENDS_KMS}" +PACKAGECONFIG[egl-null] = "--enable-null-egl-platform" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,,${EDEPENDS_X11}" + +# glx +PACKAGECONFIG[glx] = "--enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11}" + +# Default to GLX +PACKAGECONFIG ??= "glx" + +#Fix up some weirdness in the docs +do_configure_prepend() { +sed -i s:doc/reference/Makefile::g ${S}/configure.ac +sed -i s:doc::g ${S}/Makefile.am + + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} + +FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb new file mode 100644 index 000..0f40c59 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb @@ -0,0 +1,7 @@ + +require cogl-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "7eabaf4241c0b87cc9e3b0fa23fd0315" +SRC_URI[archive.sha256sum] = "276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] New clutter recipe (1.14.4)
From: Tomas Frydrych The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor, keeping up with the upstream versioning policy (all 1.x packages install clutter-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parall installable, it is not possible to use two versions of clutter 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: 'x11' : enable X11 backend, 'glx' : enable GLX backend, 'egl' : enable EGL backend, 'evdev': enable evdev input backend Default configuration is 'glx'; typical configuration for embedded HW using 'native' EGL would be 'egl evdev'. Signed-off-by: Tomas Frydrych --- meta/recipes-graphics/clutter/clutter-1.0.inc | 56 .../recipes-graphics/clutter/clutter-1.0_1.14.4.bb |7 +++ .../clutter/clutter-1.14/enable_tests.patch| 34 3 files changed, 97 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 000..6710776 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,56 @@ +DESCRIPTION = "Clutter graphics library" +HOMEPAGE = "http://www.clutter-project.org/"; +LICENSE = "LGPLv2.1+" + +inherit clutter + +SRC_URI += "file://enable_tests.patch" + +DEPENDS = "gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0" +PACKAGES =+ "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build" + +EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" +EDEPENDS_GLX = "virtual/libgl" +EDEPENDS_EGL = "virtual/egl" + +EDEPENDS_EVDEV = "libxkbcommon" +ERDEPENDS_EVDEV = "xkeyboard-config" + +# Disable pretty much everything, override in platform specific set up +EXTRA_OECONF += "--disable-gtk-doc \ +${@get_fpu_setting(bb, d)} \ +--disable-introspection\ +--disable-egl-backend \ +--disable-quartz-backend \ +--disable-win32-backend\ +--disable-x11-backend \ +--disable-gdk-backend \ +--disable-wayland-backend \ +--disable-wayland-compositor \ +--disable-cex100-backend \ +--disable-tslib-input \ +--disable-evdev-input \ + " + +PACKAGECONFIG[x11] = "--enable-x11-backend,,${EDEPENDS_X11}" +PACKAGECONFIG[glx] = "--enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX}" +PACKAGECONFIG[egl] = "--enable-egl-backend,,${EDEPENDS_EGL}" +PACKAGECONFIG[evdev] = "--enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" + +# Default configuration, distros might want to override +PACKAGECONFIG ??= "glx" + +FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" + +do_configure_prepend() { +# Fix up some weirdness in the docs +sed -i s:doc/reference/Makefile::g ${S}/configure.ac +sed -i s:doc::g ${S}/Makefile.am + + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 2101 po/clutter-1.0.pot + + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb new file mode 100644 index 000..35824c6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb @@ -0,0 +1,7 @@ + +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "c072e4c27e69368f2b877ea4f6da2cdf" +SRC_URI[archive.sha256sum] = "c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c" diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch new file mode 100644 index 000..480b208 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch @@ -0,0 +1,34 @@ +--- + tests/Makefile.am |7 ++- + tests/test-actors.c |2 +- + tests/test-text.c |2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Upstream-Status: Inappropriate [configuration] + +Index: git/tests/interactive/Makefile.am +=== +--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.0 + git/tests/interactive/Makefile.am 2009-11-30 17:42:30.0 + +@@ -88,7 +88,7 @@ + + common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la + +-noinst_PROGRAMS = test-interactive ++bin_PRO
[OE-core] updates for cogl, clutter and mx
The following set of patches updates clutter and friends; the recipes were completely reworked and use PACKAGECONFIG to facilitate easy reconfiguration to match distro / machine needs. Clutter and Cogl packages are renamed to use a '-1.0' suffix instead of the '-vmajor.vminor' suffix of the old recipes, in keeping up with the upstream versioning policy, and to simplify dependency maintenance (note that dev files for the 1.x series are not parallel installable anyway); the '-1.0' suffix is with a view toward the '2.0' series which are on the horizon. The Cogl recipe is moved into a subdirectory of its own, this seemed appropriate as Cogl is now a seprate project in its own right. The new versions are: cogl 1.4.0, clutter 1.14.4, clutter-gst 1.6.0, clutter-gtk 1.4.2. The mx recipe is fixed up to build against the updated cogl and clutter. [PATCH 1/7] Remove old clutter recipes [PATCH 2/7] clutter.bbclass: helper class for clutter and friends [PATCH 3/7] New cogl recipe (1.14.0) [PATCH 4/7] New clutter recipe (1.14.4) [PATCH 5/7] New clutter gst recipe (1.6.0) [PATCH 6/7] New clutter-gtk recipe (1.4.2) [PATCH 7/7] Update mx recipe to build with clutter 1.14.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] clutter.bbclass: helper class for clutter and friends
From: Tomas Frydrych Signed-off-by: Tomas Frydrych --- meta/classes/clutter.bbclass | 28 1 file changed, 28 insertions(+) create mode 100644 meta/classes/clutter.bbclass diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass new file mode 100644 index 000..184fb44 --- /dev/null +++ b/meta/classes/clutter.bbclass @@ -0,0 +1,28 @@ + +def get_minor_dir(v): +import re +m = re.match("^([0-9]+)\.([0-9]+)", v) +return "%s.%s" % (m.group(1), m.group(2)) + +def get_real_name(n): +import re +m = re.match("^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?", n) +return "%s" % (m.group(1)) + +VERMINOR = "${@get_minor_dir("${PV}")}" +REALNAME = "${@get_real_name("${BPN}")}" +FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALNAME}-${PV}", "${FILE_DIRNAME}/${REALNAME}-${VERMINOR}", "${FILE_DIRNAME}/${REALNAME}", "${FILE_DIRNAME}/files"], d)}" + +def get_fpu_setting(bb, d): +if d.getVar('TARGET_FPU', True) in [ 'soft' ]: +return "--without-fpu" +return "" + +CLUTTER_SRC_FTP = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive" + +CLUTTER_SRC_GIT = "git://git.gnome.org/${REALNAME};protocol=git" + +SRC_URI = "${CLUTTER_SRC_FTP}" +S = "${WORKDIR}/${REALNAME}-${PV}" + +inherit autotools pkgconfig gtk-doc gettext -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] package_write_ipk somehow looks into the wrong path
On 05/17/2013 01:11 PM, Mike Looijmans wrote: On 05/17/2013 12:15 PM, Martin Jansa wrote: On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: I got this very weird build failure. It builds fine for one machine (zedboard), but it craps out in a really weird way on the "zynq-zc702" machine. Somehow the "package_write_ipk" task wants to find files in a directory with "1-r0" (a version that has once existed a long long time ago) in the version part, instead of the proper git hashed name. I've tried a "cleansstate" but that did not help. The "compile" step in this recipe takes about 1,5 hour on my i7 system, so debugging this recipe is painfully slow... I've attached the recipes, pasted the log below. try it with 2/2 patch from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 Okay, I just manually applied those changes. Then I get: ERROR: Recipe fpga-image is trying to change PV from '2.AUTOINC-bfd37feb034919cc11b3879745f2770810a4e796' to '1'. This will cause do_package_write_ipk failing to find right workdir. That helps, but I still don't have the faintest idea what is going on here. What's wrong with my recipe? As a last resort, I tried just putting PV="3" into the recipe. WTF? ERROR: Recipe fpga-image is trying to change PV from '3' to '1'. This will cause do_package_write_ipk failing to find right workdir. ERROR: Function failed: read_subpackage_metadata ERROR: Logfile of failure stored in: /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/3-r0/temp/log.do_package_write_ipk.13519 ERROR: Task 12 (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, do_package_write_ipk) failed with exit code '1' Who's touching my PV? Mike. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] package_write_ipk somehow looks into the wrong path
On 05/17/2013 12:15 PM, Martin Jansa wrote: On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: I got this very weird build failure. It builds fine for one machine (zedboard), but it craps out in a really weird way on the "zynq-zc702" machine. Somehow the "package_write_ipk" task wants to find files in a directory with "1-r0" (a version that has once existed a long long time ago) in the version part, instead of the proper git hashed name. I've tried a "cleansstate" but that did not help. The "compile" step in this recipe takes about 1,5 hour on my i7 system, so debugging this recipe is painfully slow... I've attached the recipes, pasted the log below. try it with 2/2 patch from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 Okay, I just manually applied those changes. Then I get: ERROR: Recipe fpga-image is trying to change PV from '2.AUTOINC-bfd37feb034919cc11b3879745f2770810a4e796' to '1'. This will cause do_package_write_ipk failing to find right workdir. That helps, but I still don't have the faintest idea what is going on here. What's wrong with my recipe? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] package_write_ipk somehow looks into the wrong path
On 05/17/2013 12:51 PM, Mike Looijmans wrote: On 05/17/2013 12:15 PM, Martin Jansa wrote: On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: I got this very weird build failure. It builds fine for one machine (zedboard), but it craps out in a really weird way on the "zynq-zc702" machine. Somehow the "package_write_ipk" task wants to find files in a directory with "1-r0" (a version that has once existed a long long time ago) in the version part, instead of the proper git hashed name. I've tried a "cleansstate" but that did not help. The "compile" step in this recipe takes about 1,5 hour on my i7 system, so debugging this recipe is painfully slow... I've attached the recipes, pasted the log below. try it with 2/2 patch from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 I somehow fail to extract the patch from the mail correctly (probably lack of skilz on my side, I am not often at the receiving end of mailed patches). But my recipe does mess with the PV string because the Xilinx tools will fail to work properly when there is a "+" sign in the path. I'll try to fix it in a more proper way than using a python replace, see if that helps. Replaced SRCPV_NOPLUS = "${@d.getVar('SRCPV',True).replace('+','-')}" with SRCPV = "${@bb.fetch2.get_srcrev(d).replace('+','-')}" did a cleansstate, but still the same error. Mike. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman-gnome: fixed DHCP segfault
On 17 May 2013 11:32, Emilia Ciobanu wrote: > +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) > ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == > TRUE) Is this really the right behaviour if IPv4.Method isn't set? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] package_write_ipk somehow looks into the wrong path
On 05/17/2013 12:15 PM, Martin Jansa wrote: On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: I got this very weird build failure. It builds fine for one machine (zedboard), but it craps out in a really weird way on the "zynq-zc702" machine. Somehow the "package_write_ipk" task wants to find files in a directory with "1-r0" (a version that has once existed a long long time ago) in the version part, instead of the proper git hashed name. I've tried a "cleansstate" but that did not help. The "compile" step in this recipe takes about 1,5 hour on my i7 system, so debugging this recipe is painfully slow... I've attached the recipes, pasted the log below. try it with 2/2 patch from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 I somehow fail to extract the patch from the mail correctly (probably lack of skilz on my side, I am not often at the receiving end of mailed patches). But my recipe does mess with the PV string because the Xilinx tools will fail to work properly when there is a "+" sign in the path. I'll try to fix it in a more proper way than using a python replace, see if that helps. Mike. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] pixbufcache: update the loader cache when installing natively
On 17 May 2013 10:40, Ross Burton wrote: > Register a sstate postinst function so that when installing a native package, > the gdk-pixbuf loader cache is updated. Retracting this, a last-minute change introduced a dependency cycle. V2 coming shortly. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cdrtools-native : upgrade to 3.00
Upgrade from 2.01 -> 3.00 - Updated md5 of the license file because new information was added by the owner. - Removed glibc-conflict-rename.patch because it is not required anymore. - Updated no_usr_src.patch because it didn't apply. Signed-off-by: Andrei Dinu --- .../cdrtools-native/glibc-conflict-rename.patch| 236 .../cdrtools/cdrtools-native/no_usr_src.patch | 46 ++-- ...ools-native_2.01.bb => cdrtools-native_3.00.bb} | 11 +- 3 files changed, 28 insertions(+), 265 deletions(-) delete mode 100644 meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch rename meta/recipes-devtools/cdrtools/{cdrtools-native_2.01.bb => cdrtools-native_3.00.bb} (70%) diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch b/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch deleted file mode 100644 index 2fd5696..000 --- a/meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch +++ /dev/null @@ -1,236 +0,0 @@ -This patch fixes collisions between locally defined functions -and glibc's fexecve() and getline() functions. - -Upstream-Status: Inappropriate [Other] -Upstream no longer maintains a GPL version of this utility. - -Signed-off-by: Scott Garman - -Index: cdrtools-2.01/include/schily.h -=== cdrtools-2.01.orig/include/schily.h2009-06-18 11:30:45.0 +0100 -+++ cdrtools-2.01/include/schily.h 2009-06-18 11:31:22.0 +0100 -@@ -108,7 +108,7 @@ - /* 6th arg not const, fexecv forces av[ac] = NULL */ - externint fexecv __PR((const char *, FILE *, FILE *, FILE *, int, - char **)); --externint fexecve __PR((const char *, FILE *, FILE *, FILE *, -+externint fexecve_schily __PR((const char *, FILE *, FILE *, FILE *, - char * const *, char * const *)); - externint fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *)); - externint fspawnl __PR((FILE *, FILE *, FILE *, -@@ -187,7 +187,7 @@ - externchar*findbytes __PR((const void *, int, char)); - externint findline __PR((const char *, char, const char *, - int, char **, int)); --externint getline __PR((char *, int)); -+externint getline_schily __PR((char *, int)); - externint getstr __PR((char *, int)); - externint breakline __PR((char *, char, char **, int)); - externint getallargs __PR((int *, char * const**, const char *, ...)); -Index: cdrtools-2.01/libscg/scsitransp.c -=== cdrtools-2.01.orig/libscg/scsitransp.c 2009-06-18 11:33:57.0 +0100 -+++ cdrtools-2.01/libscg/scsitransp.c 2009-06-18 11:34:24.0 +0100 -@@ -323,7 +323,7 @@ - - js_printf("%s", msg); - flush(); -- if (getline(okbuf, sizeof (okbuf)) == EOF) -+ if (getline_schily(okbuf, sizeof (okbuf)) == EOF) - exit(EX_BAD); - if (streql(okbuf, "y") || streql(okbuf, "yes") || - streql(okbuf, "Y") || streql(okbuf, "YES")) -Index: cdrtools-2.01/libschily/fexec.c -=== cdrtools-2.01.orig/libschily/fexec.c 2009-06-18 11:29:29.0 +0100 -+++ cdrtools-2.01/libschily/fexec.c2009-06-18 11:30:36.0 +0100 -@@ -159,7 +159,7 @@ - } while (p != NULL); - va_end(args); - -- ret = fexecve(name, in, out, err, av, env); -+ ret = fexecve_schily(name, in, out, err, av, env); - if (av != xav) - free(av); - return (ret); -@@ -173,11 +173,11 @@ - char *av[]; - { - av[ac] = NULL; /* force list to be null terminated */ -- return (fexecve(name, in, out, err, av, environ)); -+ return (fexecve_schily(name, in, out, err, av, environ)); - } - - EXPORT int --fexecve(name, in, out, err, av, env) -+fexecve_schily(name, in, out, err, av, env) - const char *name; - FILE *in, *out, *err; - char * const av[], * const env[]; -Index: cdrtools-2.01/libschily/stdio/fgetline.c -=== cdrtools-2.01.orig/libschily/stdio/fgetline.c 2009-06-18 11:28:14.0 +0100 -+++ cdrtools-2.01/libschily/stdio/fgetline.c 2009-06-18 11:28:55.0 +0100 -@@ -64,7 +64,7 @@ - } - - EXPORT int --getline(buf, len) -+getline_schily(buf, len) - char*buf; - int len; - { -Index: cdrtools-2.01/readcd/io.c -=== cdrtools-2.01.orig/readcd/io.c 2009-06-18 11:33:57.0 +0100 -+++ cdrtools-2.01/readcd/io.c 2009-06-18 11:34:38.0 +010
Re: [OE-core] [PATCH] connman-gnome: fixed DHCP segfault
On 05/17/2013 01:32 PM, Emilia Ciobanu wrote: In networks that don't have a DHCP server configured, ipv4 address allocation fails and the ipv4 structure doesn't get populated. The patch checks this case also. [YOCTO #3945] Signed-off-by: Emilia Ciobanu --- .../connman-gnome/null_check_for_ipv4_config.patch | 26 .../connman/connman-gnome_0.7.bb |1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch diff --git a/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch b/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch new file mode 100644 index 000..456a4ba --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch You need to have Signed-off-by and Upstream-Status in your patch files also. And any Comments that might make it more clear. Sau! @@ -0,0 +1,26 @@ +Index: git/properties/ethernet.c +=== +--- git.orig/properties/ethernet.c git/properties/ethernet.c +@@ -194,7 +194,7 @@ void add_ethernet_service(GtkWidget *mai + + data->button = button; + +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) + update_ethernet_ipv4(data, CONNMAN_POLICY_DHCP); + else + update_ethernet_ipv4(data, CONNMAN_POLICY_MANUAL); +Index: git/properties/wifi.c +=== +--- git.orig/properties/wifi.c git/properties/wifi.c +@@ -230,7 +230,7 @@ static void wifi_ipconfig(GtkWidget *tab + + data->ipv4_config = ipv4_config; + +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) + update_wifi_ipv4(data, CONNMAN_POLICY_DHCP); + else + update_wifi_ipv4(data, CONNMAN_POLICY_MANUAL); diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index 6299e70..4f8875c 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb @@ -12,6 +12,7 @@ DEPENDS = "gtk+ dbus-glib intltool-native" SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143" SRC_URI = "git://github.com/connectivity/connman-gnome.git;protocol=git \ file://0001-Removed-icon-from-connman-gnome-about-applet.patch \ + file://null_check_for_ipv4_config.patch \ file://images/* \ " ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman-gnome: fixed DHCP segfault
In networks that don't have a DHCP server configured, ipv4 address allocation fails and the ipv4 structure doesn't get populated. The patch checks this case also. [YOCTO #3945] Signed-off-by: Emilia Ciobanu --- .../connman-gnome/null_check_for_ipv4_config.patch | 26 .../connman/connman-gnome_0.7.bb |1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch diff --git a/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch b/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch new file mode 100644 index 000..456a4ba --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch @@ -0,0 +1,26 @@ +Index: git/properties/ethernet.c +=== +--- git.orig/properties/ethernet.c git/properties/ethernet.c +@@ -194,7 +194,7 @@ void add_ethernet_service(GtkWidget *mai + + data->button = button; + +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) + update_ethernet_ipv4(data, CONNMAN_POLICY_DHCP); + else + update_ethernet_ipv4(data, CONNMAN_POLICY_MANUAL); +Index: git/properties/wifi.c +=== +--- git.orig/properties/wifi.c git/properties/wifi.c +@@ -230,7 +230,7 @@ static void wifi_ipconfig(GtkWidget *tab + + data->ipv4_config = ipv4_config; + +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) + update_wifi_ipv4(data, CONNMAN_POLICY_DHCP); + else + update_wifi_ipv4(data, CONNMAN_POLICY_MANUAL); diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index 6299e70..4f8875c 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb @@ -12,6 +12,7 @@ DEPENDS = "gtk+ dbus-glib intltool-native" SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143" SRC_URI = "git://github.com/connectivity/connman-gnome.git;protocol=git \ file://0001-Removed-icon-from-connman-gnome-about-applet.patch \ + file://null_check_for_ipv4_config.patch \ file://images/* \ " -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] package_write_ipk somehow looks into the wrong path
On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: > > I got this very weird build failure. It builds fine for one machine > (zedboard), but it craps out in a really weird way on the "zynq-zc702" > machine. > > Somehow the "package_write_ipk" task wants to find files in a directory > with "1-r0" (a version that has once existed a long long time ago) in > the version part, instead of the proper git hashed name. > > I've tried a "cleansstate" but that did not help. The "compile" step in > this recipe takes about 1,5 hour on my i7 system, so debugging this > recipe is painfully slow... > > I've attached the recipes, pasted the log below. try it with 2/2 patch from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 > > > > > mike@paradigit:~/zynq/build$ nice -n 15 bitbake my-image > Loading cache: 100% |###| ETA: > 00:00:00 > Loaded 1907 entries from dependency cache. > Parsing recipes: 100% |#| Time: > 00:00:00 > Parsing of 1517 .bb files complete (1514 cached, 3 parsed). 1909 > targets, 115 skipped, 0 masked, 0 errors. > > Build Configuration: > BB_VERSION= "1.17.1" > BUILD_SYS = "x86_64-linux" > NATIVELSBSTRING = "Ubuntu-11.10" > TARGET_SYS= "arm-oe-linux-gnueabi" > MACHINE = "zynq-zc702" > DISTRO= "tiny" > DISTRO_VERSION= "oe-core.0" > TUNE_FEATURES = "armv7a vfp neon" > TARGET_FPU= "vfp-neon" > meta = "master:a3c1e0f4e519921a692a5f4d1268a4eb249b1b03" > meta-oe > toolchain-layer > meta-efl > meta-gpe > meta-gnome > meta-xfce > meta-multimedia = "master:3dcea929763e6a3233dbe620920f02682b28bb8d" > meta-zynq = "master:7458ae3d3007c8159152a930a7f40991c1725240" > meta-topic= "master:860265ec025e9c7f05acd0778591cc9390a39e6c" > > NOTE: Resolving any missing task queue dependencies > NOTE: Preparing runqueue > NOTE: Executing SetScene Tasks > NOTE: Executing RunQueue Tasks > ERROR: Error executing a python function in > /home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb: > OSError: [Errno 2] No such file or directory: > '/home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/1-r0/packages-split/fpga-image' > > ERROR: The stack trace of python calls that resulted in this > exception/failure was: > ERROR: File "do_package_ipk", line 194, in > ERROR: > ERROR: File "do_package_ipk", line 45, in do_package_ipk > ERROR: > ERROR: The code that was being executed was: > ERROR: 0190:bb.utils.unlockfile(lf) > ERROR: 0191: > ERROR: 0192: > ERROR: 0193: > ERROR: *** 0194:do_package_ipk(d) > ERROR: 0195: > ERROR: [From file: 'do_package_ipk', lineno: 194, function: ] > ERROR: 0041:basedir = os.path.join(os.path.dirname(root)) > ERROR: 0042:arch = localdata.getVar('PACKAGE_ARCH', True) > ERROR: 0043:pkgoutdir = "%s/%s" % (outdir, arch) > ERROR: 0044:bb.mkdirhier(pkgoutdir) > ERROR: *** 0045:os.chdir(root) > ERROR: 0046:from glob import glob > ERROR: 0047:g = glob('*') > ERROR: 0048:try: > ERROR: 0049:del g[g.index('CONTROL')] > ERROR: [From file: 'do_package_ipk', lineno: 45, function: do_package_ipk] > ERROR: Function failed: do_package_ipk > ERROR: Execution of event handler 'run_buildstats' failed > Traceback (most recent call last): >File "run_buildstats(e)", line 103, in > run_buildstats(e=) >File "buildstats.bbclass", line 5, in > write_task_data(status='failed', > logfile='/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk', > > dev='sda5', e=) > IOError: [Errno 2] No such file or directory: > '/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk' > > ERROR: Logfile of failure stored in: > /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/2.AUTOINC-8095d780aab8d110298d655852f8f31053f5f124-r0/temp/log.do_package_write_ipk.5262 > ERROR: Task 335 > (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, > do_package_write_ipk) failed with exit code '1' > NOTE: Tasks Summary: Attempted 1836 tasks of which 1799 didn't need to > be rerun and 1 failed. > No currently running tasks (1836 of 1840) > > Summary: 1 task failed: >/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, > do_package_write_ipk > Summary: There were 26 ERROR messages shown, returning a non-zero exit code. > > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = > "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" > # Package is machine specific > PACKAGE_ARCH = "${MACHINE}" > > # Workaround: XPS fails to build when there's a "+" in the path. > SRCPV_NOPLUS = "${@d.getVar('SRCPV',True).replace('+','-')}" > > S="${WORKDIR}/git" > > BOARD_DESIGN_URI ?= "" > > BOARD_DESIGN_URI_ze
[OE-core] [PATCH 3/5] librsvg: add more PACKAGECONFIG options
Add options for the gdk-pixbuf loaders and the GTK+ 2 theme engine. The theme engine is generally unused so don't enable that by default, but enable the gdk-pixbuf loader and also enable the croco feature which is required for parsing CSS embedded into SVG. Signed-off-by: Ross Burton --- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index ff17cf7..980c01c 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://rsvg.h;beginline=3;endline=24;md5=20b4113c4909bbf0d67e006778302bc6" SECTION = "x11/utils" -DEPENDS = "gtk+ cairo libxml2" +DEPENDS = "cairo glib-2.0 gdk-pixbuf fontconfig freetype libxml2 pango" DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native" BBCLASSEXTEND = "native" @@ -17,11 +17,14 @@ inherit autotools pkgconfig gnome gtk-doc pixbufcache EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" -PACKAGECONFIG ??= "croco" -# When native we can manage without croco, as it's only for GTK+ -PACKAGECONFIG_class-native = "" +PACKAGECONFIG ??= "croco gdkpixbuf" +# Support embedded CSS stylesheets (recommended upstream) PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco" +# gdk-pixbuf loader +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader" +# GTK+ 2 theme engine +PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+" SRC_URI += "file://doc_Makefile.patch \ file://librsvg-CVE-2011-3146.patch \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] librsvg: small cleanups
Re-order fields to a more logical order. Remove the unrecognised --disable-mozilla-plugin option. Remove the unrequired setting of GDK_PIXBUF_QUERYLOADERS, it's found automatically. Signed-off-by: Ross Burton --- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 20 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index f50c1a8..6594bf0 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -14,7 +14,14 @@ PR = "r12" inherit autotools pkgconfig gnomebase gtk-doc pixbufcache -EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" +SRC_URI += "file://doc_Makefile.patch \ +file://librsvg-CVE-2011-3146.patch \ + " + +SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7" +SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334" + +EXTRA_OECONF = "--without-svgz" PACKAGECONFIG ??= "croco gdkpixbuf" @@ -25,17 +32,6 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader" # GTK+ 2 theme engine PACKAGECONFIG[gtk] = "--enable-gtk-theme,--disable-gtk-theme,gtk+" -SRC_URI += "file://doc_Makefile.patch \ - file://librsvg-CVE-2011-3146.patch \ - " - -SRC_URI[archive.md5sum] = "4b00d0fee130c936644892c152f42db7" -SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334" - -do_configure_prepend () { - export GDK_PIXBUF_QUERYLOADERS="${libdir}/gdk-pixbuf-2.0/2.10.0/loaders" -} - PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] librsvg: clean up native depends
inherit gnome was only used for the SRC_URI, so just inherit gnomebase and remove the native-specific DEPENDS which was only required as the gnome class pulls in an impossible hicolor-icon-theme-native dependency. Signed-off-by: Ross Burton --- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index 980c01c..f50c1a8 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "x11/utils" DEPENDS = "cairo glib-2.0 gdk-pixbuf fontconfig freetype libxml2 pango" -DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native" BBCLASSEXTEND = "native" PR = "r12" -inherit autotools pkgconfig gnome gtk-doc pixbufcache +inherit autotools pkgconfig gnomebase gtk-doc pixbufcache EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] gdk-pixbuf: remove native loader cache generation, use the class
We assumed that the only relevant gdk-pixbuf loaders in the native environment were the ones in gdk-pixbuf itself, as the icon cache is only for PNG files. However, glib-compile-resources can transform SVG files to raw image data, and done natively this requires the SVG loader to be registered. The current implementation relies on this assumption by generating the cache based on the staging directory during install, so if gdk-pixbuf-native is re-installed to the sysroot after librsvg-native it will overwrite the loader cache. So, remove the code in do_install that updated the cache, and rely on the new logic in pixbufcache.bbclass that updates the cache when it's installed into the sysroot itself. Signed-off-by: Ross Burton --- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb |3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb index b35f7c6..b85bbaf 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb @@ -69,9 +69,6 @@ python populate_packages_prepend () { } do_install_append_class-native() { -#Use wrapper script rather than binary as required libtool library is not installed now - GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] pixbufcache: update the loader cache when installing natively
Register a sstate postinst function so that when installing a native package, the gdk-pixbuf loader cache is updated. Signed-off-by: Ross Burton --- meta/classes/pixbufcache.bbclass | 13 + 1 file changed, 13 insertions(+) diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index 37bf812..0596018 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -44,3 +44,16 @@ python populate_packages_append() { postrm += d.getVar('pixbufcache_common', True) d.setVar('pkg_postrm_%s' % pkg, postrm) } + +# +# Add a sstate postinst hook to update the cache for native packages +# +DEPENDS_append_class-native = " gdk-pixbuf-native" +SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst" + +pixbufcache_sstate_postinst() { + if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] + then + gdk-pixbuf-query-loaders --update-cache + fi +} -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] gdk-pixbuf and librsvg fixes
Hi, A collection of fixes to gdk-pixbuf and librsvg, mainly improving the native packages. Ross The following changes since commit 88a7b041fbf2583472aa9408a33dd8881223a0c1: bitbake: pysh: Say what kind of token isn't implemented (2013-05-10 13:35:10 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ross/pixbuf for you to fetch changes up to 28ba5f0003c131377c4cff9bcd35c7eeabbb4f21: librsvg: small cleanups (2013-05-17 10:36:19 +0100) Ross Burton (5): pixbufcache: update the loader cache when installing natively gdk-pixbuf: remove native loader cache generation, use the class librsvg: add more PACKAGECONFIG options librsvg: clean up native depends librsvg: small cleanups meta/classes/pixbufcache.bbclass | 13 + meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb |3 -- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 30 +--- 3 files changed, 27 insertions(+), 19 deletions(-) Ross Burton (5): pixbufcache: update the loader cache when installing natively gdk-pixbuf: remove native loader cache generation, use the class librsvg: add more PACKAGECONFIG options librsvg: clean up native depends librsvg: small cleanups meta/classes/pixbufcache.bbclass | 13 + meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb |3 -- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 30 +--- 3 files changed, 27 insertions(+), 19 deletions(-) -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] package_write_ipk somehow looks into the wrong path
I got this very weird build failure. It builds fine for one machine (zedboard), but it craps out in a really weird way on the "zynq-zc702" machine. Somehow the "package_write_ipk" task wants to find files in a directory with "1-r0" (a version that has once existed a long long time ago) in the version part, instead of the proper git hashed name. I've tried a "cleansstate" but that did not help. The "compile" step in this recipe takes about 1,5 hour on my i7 system, so debugging this recipe is painfully slow... I've attached the recipes, pasted the log below. mike@paradigit:~/zynq/build$ nice -n 15 bitbake my-image Loading cache: 100% |###| ETA: 00:00:00 Loaded 1907 entries from dependency cache. Parsing recipes: 100% |#| Time: 00:00:00 Parsing of 1517 .bb files complete (1514 cached, 3 parsed). 1909 targets, 115 skipped, 0 masked, 0 errors. Build Configuration: BB_VERSION= "1.17.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "Ubuntu-11.10" TARGET_SYS= "arm-oe-linux-gnueabi" MACHINE = "zynq-zc702" DISTRO= "tiny" DISTRO_VERSION= "oe-core.0" TUNE_FEATURES = "armv7a vfp neon" TARGET_FPU= "vfp-neon" meta = "master:a3c1e0f4e519921a692a5f4d1268a4eb249b1b03" meta-oe toolchain-layer meta-efl meta-gpe meta-gnome meta-xfce meta-multimedia = "master:3dcea929763e6a3233dbe620920f02682b28bb8d" meta-zynq = "master:7458ae3d3007c8159152a930a7f40991c1725240" meta-topic= "master:860265ec025e9c7f05acd0778591cc9390a39e6c" NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: Error executing a python function in /home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb: OSError: [Errno 2] No such file or directory: '/home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/1-r0/packages-split/fpga-image' ERROR: The stack trace of python calls that resulted in this exception/failure was: ERROR: File "do_package_ipk", line 194, in ERROR: ERROR: File "do_package_ipk", line 45, in do_package_ipk ERROR: ERROR: The code that was being executed was: ERROR: 0190:bb.utils.unlockfile(lf) ERROR: 0191: ERROR: 0192: ERROR: 0193: ERROR: *** 0194:do_package_ipk(d) ERROR: 0195: ERROR: [From file: 'do_package_ipk', lineno: 194, function: ] ERROR: 0041:basedir = os.path.join(os.path.dirname(root)) ERROR: 0042:arch = localdata.getVar('PACKAGE_ARCH', True) ERROR: 0043:pkgoutdir = "%s/%s" % (outdir, arch) ERROR: 0044:bb.mkdirhier(pkgoutdir) ERROR: *** 0045:os.chdir(root) ERROR: 0046:from glob import glob ERROR: 0047:g = glob('*') ERROR: 0048:try: ERROR: 0049:del g[g.index('CONTROL')] ERROR: [From file: 'do_package_ipk', lineno: 45, function: do_package_ipk] ERROR: Function failed: do_package_ipk ERROR: Execution of event handler 'run_buildstats' failed Traceback (most recent call last): File "run_buildstats(e)", line 103, in run_buildstats(e=) File "buildstats.bbclass", line 5, in write_task_data(status='failed', logfile='/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk', dev='sda5', e=) IOError: [Errno 2] No such file or directory: '/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk' ERROR: Logfile of failure stored in: /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/2.AUTOINC-8095d780aab8d110298d655852f8f31053f5f124-r0/temp/log.do_package_write_ipk.5262 ERROR: Task 335 (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, do_package_write_ipk) failed with exit code '1' NOTE: Tasks Summary: Attempted 1836 tasks of which 1799 didn't need to be rerun and 1 failed. No currently running tasks (1836 of 1840) Summary: 1 task failed: /home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, do_package_write_ipk Summary: There were 26 ERROR messages shown, returning a non-zero exit code. LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" # Package is machine specific PACKAGE_ARCH = "${MACHINE}" # Workaround: XPS fails to build when there's a "+" in the path. SRCPV_NOPLUS = "${@d.getVar('SRCPV',True).replace('+','-')}" S="${WORKDIR}/git" BOARD_DESIGN_URI ?= "" BOARD_DESIGN_URI_zedboard = "git://github.com/milosoftware/zynq-zedboard-logic.git" SRCREV_board-zedboard = "63e317164357bf87bba7dd0adc429d4c91a78cff" BOARD_DESIGN_URI_zynq-zc702 = "git://github.com/milosoftware/zynq-zc702-logic.git" SRCREV_board-zynq-zc702 = "8095d780aab8d110298d655852f8f31053f5f124" SRC_URI = "\ ${BOARD_DESIGN_URI};name=board-${MACHINE} \ http://wiki.analog.com/_
Re: [OE-core] [PATCH 1/1] perl-tests: convert to ptest
Jesse Zhang wrote: > +--- a/t/TEST 2013-05-15 23:12:12.705104588 -0400 > b/t/TEST 2013-05-15 23:20:20.126104587 -0400 Is patching t/TEST better than simply using sed to transform the output? I took a quick look at future versions and t/TEST is modified in both perl 5.16.3 and 5.18.0-RC4. This means the patch will have to be manually updated for each of those version updates. And the patch cannot be upstreamed. Unless there are clear advantages with patching t/TEST that I have overlooked, I suggest using sed in run-ptest instead. -- Björn ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] Revert "initramfs-live-install*: fix the "install" boot option"
Op 16 mei 2013, om 20:03 heeft Saul Wold het volgende geschreven: > This was not the correct fix for this issues, it turns out that > base-files package was getting installed un-intentionally when > rpm-postinsts was split out. The base-files recipe lays down the > link that caused the cat failure. > > [YOCTO #4504] > > This reverts commit 45e460d0846f0f660128dc06064b597ce40282b3. > --- > meta/recipes-core/initrdscripts/files/init-install-efi.sh | 1 + > meta/recipes-core/initrdscripts/files/init-install.sh | 1 + > meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | 2 +- > meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh > b/meta/recipes-core/initrdscripts/files/init-install-efi.sh > index 9f7a9e7..23228c9 100644 > --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh > +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh > @@ -66,6 +66,7 @@ rm -f /etc/udev/scripts/mount* > umount /dev/${device}* 2> /dev/null || /bin/true > > mkdir -p /tmp > +cat /proc/mounts > /etc/mtab Traditionally /etc/mtab is a symlink to /proc/mounts, not a copy of it. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: replace package files
On 05/16/2013 12:59 PM, zhangxiao wrote: And, another method lies on meta/recipes-core/util-linux/util-linux.inc: --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -69,11 +69,11 @@ FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" -FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" +FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" +FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" -FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" +FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" FILES_util-linux-lscpu = "${bindir}/lscpu" FILES_util-linux-fsck = "${base_sbindir}/fsck*" Which one is better? Xiao, Not sure what level of testing you did, the patch as it stands does need to be fixed, and as you note above which location for the .so library should be ${libdir}. With you original patch the pkgconfig file points to /usr/lib, while you have installed the library in /lib, this caused some failures in the world build. Thanks Xiao On 2013年05月16日 15:26, Zhang Xiao wrote: Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM package to related library's dev RPM packages. [YOCTO #4500] [CQID: WIND00412705] Signed-off-by: Zhang Xiao --- .../util-linux-replace-package-files.patch | 56 meta/recipes-core/util-linux/util-linux_2.22.2.bb |1 + 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch new file mode 100644 index 000..32868cc --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch @@ -0,0 +1,56 @@ +Upstream-Status: Pending +Signed-off-by: Zhang Xiao + +Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM +package to related library's dev RPM packages. +--- + libblkid/src/Makemodule.am |6 +- + libmount/src/Makemodule.am |6 +- + libuuid/src/Makemodule.am |6 +- + 3 files changed, 3 insertions(+), 15 deletions(-) + +--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig util-linux-2.22.2/libuuid/src/Makemodule.am +@@ -42,11 +42,7 @@ install-exec-hook-libuuid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ +-so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ +-so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +-(cd $(DESTDIR)$(usrlib_execdir) && \ +-rm -f libuuid.so && \ +-$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \ ++mv $(DESTDIR)$(usrlib_execdir)/libuuid.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libuuid: +--- util-linux-2.22.2/libmount/src/Makemodule.am.orig util-linux-2.22.2/libmount/src/Makemodule.am +@@ -123,11 +123,7 @@ install-exec-hook-libmount: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* $(DESTDIR)$(libdir); \ +-so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libmount.so); \ +-so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +-(cd $(DESTDIR)$(usrlib_execdir) && \ +-rm -f libmount.so && \ +-$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libmount.so); \ ++mv $(DESTDIR)$(usrlib_execdir)/libmount.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libmount: +--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig util-linux-2.22.2/libblkid/src/Makemodule.am +@@ -219,11 +219,7 @@ install-exec-hook-libblkid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ +-so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ +-so_img_rel_targe