Re: [OE-core] [oe-core][PATCH] apr_cv_mutex_recursive=yes added to apr_1.4.6.bb to make rosnodes work
Hi Victor, just some comments on your commit message: On 07/03/2013 03:04 PM, vmayoral wrote: From: victor v.mayor...@gmail.com Working with the meta-ros project we detected that the ROS nodes didn't launch properly This very specific meta-ros problem should not be the first line, but if at all, the last one in the commit message. the reason was that by default apr_cv_mutex_recursive in apr is set to no and this leads to the APRENOTIMPL return value of apr_thread_mutex_create in thread_mutex.c when APR_THREAD_MUTEX_NESTED is requested via flags. instead of mentioning meta-ros, be more specific what happens in general: ... This then leads to a deadlock in applications using apr, as observed in an application with log4cxx. Added CACHED_CONFIGUREVARS += apr_cv_mutex_recursive=yes to sources/openembedded-core/meta/recipes-support/apr/apr_1.4.6.bb to fix this issue. It has also been removed the mention of this variable in meta/site/powerpc32-linux. Maybe, complete sentences are better as well: This commit adds CACHED_CONFIGUREVARS += apr_cv_mutex_recursive=yes to apr_1.4.6.bb and removes this variable in powerpc32-linux to address this issue. (Use short file names: The exact location of the files is directly visible in the commit anyway.) (Do not use fix: It might happen that we have to look at this issue again at some point in the future, and then addressing an issue again after a fix, seems inconsistent in retrospective. Better just say, we addressed it now.) In the very end, you can refer to meta-ros, but then mention the url of the github repository and/or the url of the concrete issue where we discussed the problem. The meta-ros project and the issue you refer to is not globally well-known. Just my two cents, Lukas P.S.: Thanks a lot for taking the initiative to carry the issue from our meta-ros project to the OpenEmbedded community. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH 0/8] Proposed implementation of a new runtime tests framework
On 06/28/2013 03:04 AM, Stefan Stanacar wrote: Hello, This is the proposed implementation of a new runtime tests framework based on python unittest. It's mean to ease qemu image testing and encourage developers to add more tests similar to the example tests provided (all tests are basically commands ran over ssh) You can try it out like this: - first build a qemu core-image-sato (a minimal wouldn't be interesting at all) - add INHERIT += testimage in local.conf - then bitbake core-image-sato -c testimage. That will run a standard suite of tests. You can set TEST_SUITES = ping ssh test name in local.conf to force run only certain tests (order matters here, it's the order in which tests run). You can also append auto and it will also run whatever tests are suitable for the image (if that was a sato-sdk image and you set TEST_SUITE = ping ssh rpm auto you force run ping, ssh and rpm but you also get smart, connman and gcc tests). Check the task log (log.do_testimage) in WORKDIR to see the results. Also a ssh log (what command is running, output and return codes) and qemu boot log are kept in WORKDIR/testimage/ There are some areas for improvement/limitations right now: - a better way of getting the list of installed packages in a image - qemu is started with the -snapshot option, we should create a copy of the original rootfs instead. - when using TEST_SUITES = auto there is no dependency at all between tests (rpm would run before ssh test), so better use TEST_SUITES = ping ssh auto - better logging and error reporting for qemu problems (runqemu erros, qemu doesn't start, etc) - more helper methods for tests - others I can't think of right now :) I hope this is going in the right direction and we could improve from here. Comments and feedback are most welcome! Tired this out today and got the following: ERROR: Function failed: Failed to start qemu. You should check the task log and the qemu boot log (qemu log is /srv/ssd/sgw/builds/world/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/testimage/qemu_boot_log.20130704065001) ERROR: Logfile of failure stored in: /srv/ssd/sgw/builds/world/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/temp/log.do_testimage.18354 Log data follows: | DEBUG: Executing python function do_testimage | NOTE: Test modules ['oeqa.runtime.ping', 'oeqa.runtime.ssh', 'oeqa.runtime.connman', 'oeqa.runtime.rpm', 'oeqa.runtime.smart', 'oeqa.runtime.xorg', 'oeqa.runtime.dmesg'] | NOTE: DISPLAY value: None | NOTE: rootfs file: /srv/ssd/sgw/builds/world/tmp/deploy/images/core-image-sato-qemux86-64.ext3 | NOTE: Qemu logfile: /srv/ssd/sgw/builds/world/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/testimage/qemu_boot_log.20130704065001 | NOTE: runqemu started, pid is 18389 | NOTE: waiting at most 30 seconds for qemu pid | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | No children found matching 18389 | NOTE: Qemu pid didn't appeared in 30 seconds | NOTE: Output from runqemu: Please use simplified serial or kvm
Re: [OE-core] [RFC] buildhistory: Record size of installed package not compressed archive
On 06/29/2013 06:36 PM, Martin Jansa wrote: * usually it's more important to know how much space will each package take on target device then size of compressed package Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/classes/buildhistory.bbclass | 11 scripts/oe-pkgdata-util | 59 --- 2 files changed, 61 insertions(+), 9 deletions(-) I am not sure how, but this patch is causing some failures in poky with core-image-sato build, it seems that that the args coming from the rootfs_install_complementary get goofed up somehow, not sure but I bisected down to this patch. the -poky seems to have a space added so it gets -poky -linux on the command line for oe-pkgdata-utils. Sau! diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 36e7fe1..1ebe68e 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -317,6 +317,8 @@ buildhistory_get_installed() { # Get list of installed packages pkgcache=$1/installed-packages.tmp list_installed_packages file | sort $pkgcache + pkgcachearch=$1/installed-packages-arch.tmp + list_installed_packages arch | sort $pkgcachearch cat $pkgcache | awk '{ print $1 }' $1/installed-package-names.txt if [ -s $pkgcache ] ; then @@ -338,18 +340,17 @@ buildhistory_get_installed() { # Produce installed package sizes list printf $1/installed-package-sizes.tmp - cat $pkgcache | while read pkg pkgfile + cat $pkgcachearch | while read pkg arch do - if [ -f $pkgfile ] ; then - pkgsize=`du -k $pkgfile | head -n1 | awk '{ print $1 }'` - echo $pkgsize $pkg $1/installed-package-sizes.tmp - fi + size=`oe-pkgdata-util read_values ${TMPDIR}/pkgdata ${TARGET_VENDOR}-${TARGET_OS} PKGSIZE ${pkg}_${arch}` + echo $size $pkg $1/installed-package-sizes.tmp done cat $1/installed-package-sizes.tmp | sort -n -r | awk '{print $1 \tKiB $2}' $1/installed-package-sizes.txt rm $1/installed-package-sizes.tmp # We're now done with the cache, delete it rm $pkgcache + rm $pkgcachearch if [ $2 != sdk ] ; then # Produce some cut-down graphs (for readability) diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 629b2d5..88b8122 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -20,9 +20,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # -# Currently only has one function - mapping of packages to their dev/dbg/doc/locale etc. -# counterparts (glob command). Could be extended in future to perform other useful querying -# functions on the pkgdata though. +# Currently only has two functions +# 1) glob - mapping of packages to their dev/dbg/doc/locale etc. counterparts. +# 2) read_values - mapping of packagenames to their location in +#pkgdata and then returns value of selected variable (e.g. PKGSIZE) +# Could be extended in future to perform other useful querying functions on the +# pkgdata though. # import sys @@ -32,7 +35,8 @@ import fnmatch import re def usage(): -print(syntax: pkgdata-util glob [-d] pkgdatadir vendor-os pkglist \globs\); +print(syntax: pkgdata-util glob [-d] pkgdatadir vendor-os pkglist \globs\\n \ +read_values [-d] pkgdatadir vendor-os variable-name \ipk filenames\); @@ -151,7 +155,52 @@ def glob(args): print(\n.join(mappedpkgs)) +def read_values(args): +if len(args) 4: +usage() +sys.exit(1) + +pkgdata_dir = args[0] +target_suffix = args[1] +var = args[2] +packages = args[3].split() +if target_suffix.startswith(-): +target_suffix = target_suffix[1:] + +def readvar(pkgdata_file, var): +val = +with open(pkgdata_file, 'r') as f: +for line in f: +if line.startswith(var + :): +val = line.split(': ')[1].rstrip() +return val + +if debug: +print read_values('%s', '%s', '%s' '%s' % (pkgdata_dir, target_suffix, var, packages) +for package in packages: +pkg_split = package.split('_') +pkg_name = pkg_split[0] +pkg_arch = '_'.join(pkg_split[1:]) +if debug: +print package: name: '%s', arch: '%s' % (pkg_name, pkg_arch) +multimach_target_sys = %s-%s % (pkg_arch, target_suffix) +revlink = os.path.join(pkgdata_dir, multimach_target_sys, runtime-reverse, pkg_name) +if debug: +print(revlink) +if not os.path.exists(revlink): +# [YOCTO #4227] try to drop -gnueabi from TARGET_OS +multimach_target_sys = '-'.join(multimach_target_sys.split('-')[:-1]) +revlink = os.path.join(pkgdata_dir, multimach_target_sys, runtime-reverse,
[OE-core] [PATCH] e2fsprogs: upgrade to 1.42.8
upgrade from 1.42.7 - 1.42.8 Signed-off-by: Andrei Dinu andrei.adrianx.d...@intel.com --- .../acinclude.m4 |0 .../fallocate.patch|0 .../mkdir.patch|0 .../remove.ldconfig.call.patch |0 .../{e2fsprogs_1.42.7.bb = e2fsprogs_1.42.8.bb} |5 ++--- 5 files changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.7 = e2fsprogs-1.42.8}/acinclude.m4 (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.7 = e2fsprogs-1.42.8}/fallocate.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.7 = e2fsprogs-1.42.8}/mkdir.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.7 = e2fsprogs-1.42.8}/remove.ldconfig.call.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.7.bb = e2fsprogs_1.42.8.bb} (93%) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/acinclude.m4 similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/acinclude.m4 rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/acinclude.m4 diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fallocate.patch similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/fallocate.patch rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fallocate.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/mkdir.patch similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/mkdir.patch rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/mkdir.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/remove.ldconfig.call.patch similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/remove.ldconfig.call.patch rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/remove.ldconfig.call.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb similarity index 93% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index 3a4f5a8..d231268 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -1,13 +1,12 @@ require e2fsprogs.inc -PR = r0 SRC_URI += file://acinclude.m4 \ file://remove.ldconfig.call.patch \ -SRC_URI[md5sum] = a1ec22ef003688dae9f76c74881b22b9 -SRC_URI[sha256sum] = dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 +SRC_URI[md5sum] = 8ef664b6eb698aa6b733df59b17b9ed4 +SRC_URI[sha256sum] = b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97 EXTRA_OECONF += --libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd EXTRA_OECONF_darwin = --libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] Allow xuser to shutdown
On 07/03/2013 07:19 PM, Martin Jansa wrote: On Wed, Jul 03, 2013 at 05:34:20PM +0300, Laurentiu Palcu wrote: The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9: bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/b4345_shutdown_icon_rootless_x http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/b4345_shutdown_icon_rootless_x Laurentiu Palcu (4): sysvinit: allow users in shutdown group to perform halt/reboot connman: make xuser a member of 'shutdown' group xserver-nodm-init: make xuser a member of 'shutdown' group shutdown-desktop: give entire path in Exec field Shouldn't we create separate recipe for xuser or any other default user and add it to connman and xserver-nodm-init RDEPENDS? I know there is some overhead from having one more package installed on image, but it would be a bit easier if we later decide that xuser also needs some file to be installed in his home or something like that. I can see one advantage of having a separate recipe for xuser: the user creation would be done in one place and we souldn't have to change in two places if we want to add the user to another group (for example). It sounds a good change to me. Laurentiu meta/recipes-connectivity/connman/connman.inc |2 +- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 12 +--- .../x11-common/xserver-nodm-init.bb|2 +- .../shutdown-desktop/shutdown-desktop.bb |2 +- .../shutdown-desktop/shutdown.desktop |4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] scripts/runqemu: 'qemuzynq' and 'qemumicroblaze'
The following patches add support to the runqemu scripts to allow for the machines named 'qemuzynq' and 'qemumicroblaze' to be booted within qemu. These target machines reside in the 'meta-xilinx' layer. Regards, Nathan Nathan Rossi (2): scripts/runqemu: Add support for 'qemuzynq' machine scripts/runqemu: Add support for 'qemumicroblaze' machine scripts/runqemu |9 - scripts/runqemu-internal | 28 2 files changed, 36 insertions(+), 1 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] scripts/runqemu: Add support for 'qemuzynq' machine
* Add support to boot the 'qemuzynq' machine in qemu-system-arm * Use the specific machine model for Zynq 'xilinx-zynq-a9' * Use the DTB generated from the kernel build as the DTB for boot * Force use of initrd rootfs (either in ext or cpio formats) Signed-off-by: Nathan Rossi nathan.ro...@xilinx.com --- scripts/runqemu |6 +- scripts/runqemu-internal | 15 +++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index f2eb2e1..01ef741 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -107,7 +107,8 @@ KVM_ENABLED=no while true; do arg=${1} case $arg in -qemux86 | qemux86-64 | qemuarm | qemumips | qemumipsel | qemumips64 | qemush4 | qemuppc) +qemux86 | qemux86-64 | qemuarm | qemumips | qemumipsel | \ +qemumips64 | qemush4 | qemuppc | qemuzynq) [ -z $MACHINE ] MACHINE=$arg || \ error conflicting MACHINE types [$MACHINE] and [$arg] ;; @@ -308,6 +309,9 @@ QEMUSH4_DEFAULT_FSTYPE=ext3 QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin QEMUPPC_DEFAULT_FSTYPE=ext3 +QEMUZYNQ_DEFAULT_KERNEL=uImage +QEMUZYNQ_DEFAULT_FSTYPE=cpio + AKITA_DEFAULT_KERNEL=zImage-akita.bin AKITA_DEFAULT_FSTYPE=jffs2 diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 4f3ba7b..f156c4d 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -59,6 +59,9 @@ else qemush4) mem_size=1024 ;; +qemuzynq) +mem_size=1024 +;; *) mem_size=64 ;; @@ -270,6 +273,7 @@ case $MACHINE in qemuarmv7) ;; qemux86) ;; qemux86-64) ;; +qemuzynq) ;; akita) ;; spitz) ;; *) @@ -492,6 +496,17 @@ if [ $MACHINE = akita ]; then fi fi +if [ $MACHINE = qemuzynq ]; then +QEMU=qemu-system-arm +QEMU_SYSTEM_OPTIONS=-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb +# zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values +SCRIPT_KERNEL_OPT=$(echo $SCRIPT_KERNEL_OPT | sed 's/console=ttyS/console=ttyPS/g') +if [ ${FSTYPE:0:3} = ext -o ${FSTYPE:0:4} = cpio ]; then +KERNCMDLINE=earlyprintk root=/dev/ram rw +QEMUOPTIONS=$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS +fi +fi + if [ x$RAMFS = xtrue ]; then QEMUOPTIONS=-initrd $ROOTFS -nographic KERNCMDLINE=root=/dev/ram0 debugshell -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] scripts/runqemu: Add support for 'qemumicroblaze' machine
* Add support to boot the 'qemumicroblaze' machine in qemu-system-microblazeel * Use the specific machine model for a MicroBlaze system 'petalogix-ml605' * Use the DTB generated from the kernel build as the DTB for boot * Force use of initrd rootfs (either in ext or cpio formats) Signed-off-by: Nathan Rossi nathan.ro...@xilinx.com --- scripts/runqemu |5 - scripts/runqemu-internal | 13 + 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 01ef741..5f7f252 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -108,7 +108,7 @@ while true; do arg=${1} case $arg in qemux86 | qemux86-64 | qemuarm | qemumips | qemumipsel | \ -qemumips64 | qemush4 | qemuppc | qemuzynq) +qemumips64 | qemush4 | qemuppc | qemumicroblaze | qemuzynq) [ -z $MACHINE ] MACHINE=$arg || \ error conflicting MACHINE types [$MACHINE] and [$arg] ;; @@ -309,6 +309,9 @@ QEMUSH4_DEFAULT_FSTYPE=ext3 QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin QEMUPPC_DEFAULT_FSTYPE=ext3 +QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub +QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio + QEMUZYNQ_DEFAULT_KERNEL=uImage QEMUZYNQ_DEFAULT_FSTYPE=cpio diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index f156c4d..9619bec 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -50,6 +50,9 @@ else qemuarm) mem_size=128 ;; +qemumicroblaze) +mem_size=64 +;; qemumips|qemumips64) mem_size=128 ;; @@ -264,6 +267,7 @@ fi case $MACHINE in qemuarm) ;; +qemumicroblaze) ;; qemumips) ;; qemumipsel) ;; qemumips64) ;; @@ -496,6 +500,15 @@ if [ $MACHINE = akita ]; then fi fi +if [ $MACHINE = qemumicroblaze ]; then +QEMU=qemu-system-microblazeel +QEMU_SYSTEM_OPTIONS=-M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb +if [ ${FSTYPE:0:3} = ext -o ${FSTYPE:0:4} = cpio ]; then +KERNCMDLINE=earlyprintk root=/dev/ram rw +QEMUOPTIONS=$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS +fi +fi + if [ $MACHINE = qemuzynq ]; then QEMU=qemu-system-arm QEMU_SYSTEM_OPTIONS=-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Using OpenEmbedded for customized builds
W dniu 04.07.2013 07:34, Holger Hans Peter Freyther pisze: Can this be already modeled? Do you have any idea how this could be done? My idea is simple. Keep each customer changes in separate layers and have separate builds for base and each customer. Let then customer builds use base sstate-cache in read-only mode (file:// mirror). This way you do all base building in base dir/vm and customer ones in separate ones. None of customer builds affect others and each of them uses sstate from common base one. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] buildhistory: Record size of installed package not compressed archive
On Wed, Jul 03, 2013 at 11:53:06PM -0700, Saul Wold wrote: On 06/29/2013 06:36 PM, Martin Jansa wrote: * usually it's more important to know how much space will each package take on target device then size of compressed package Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/classes/buildhistory.bbclass | 11 scripts/oe-pkgdata-util | 59 --- 2 files changed, 61 insertions(+), 9 deletions(-) I am not sure how, but this patch is causing some failures in poky with core-image-sato build, it seems that that the args coming from the rootfs_install_complementary get goofed up somehow, not sure but I bisected down to this patch. the -poky seems to have a space added so it gets -poky -linux on the command line for oe-pkgdata-utils. I'm sorry I haven't replied to that patch yet, it was sent only as RFC to see if people agree that we should just replace current sizes with size when installed on target (I have different version which records both, but is a bit slower and resulting file bigger without good reasons) I'm aware of the issue and will fix it soon. diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 36e7fe1..1ebe68e 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -317,6 +317,8 @@ buildhistory_get_installed() { # Get list of installed packages pkgcache=$1/installed-packages.tmp list_installed_packages file | sort $pkgcache + pkgcachearch=$1/installed-packages-arch.tmp + list_installed_packages arch | sort $pkgcachearch cat $pkgcache | awk '{ print $1 }' $1/installed-package-names.txt if [ -s $pkgcache ] ; then @@ -338,18 +340,17 @@ buildhistory_get_installed() { # Produce installed package sizes list printf $1/installed-package-sizes.tmp - cat $pkgcache | while read pkg pkgfile + cat $pkgcachearch | while read pkg arch do - if [ -f $pkgfile ] ; then - pkgsize=`du -k $pkgfile | head -n1 | awk '{ print $1 }'` - echo $pkgsize $pkg $1/installed-package-sizes.tmp - fi + size=`oe-pkgdata-util read_values ${TMPDIR}/pkgdata ${TARGET_VENDOR}-${TARGET_OS} PKGSIZE ${pkg}_${arch}` + echo $size $pkg $1/installed-package-sizes.tmp done cat $1/installed-package-sizes.tmp | sort -n -r | awk '{print $1 \tKiB $2}' $1/installed-package-sizes.txt rm $1/installed-package-sizes.tmp # We're now done with the cache, delete it rm $pkgcache + rm $pkgcachearch if [ $2 != sdk ] ; then # Produce some cut-down graphs (for readability) diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 629b2d5..88b8122 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -20,9 +20,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # -# Currently only has one function - mapping of packages to their dev/dbg/doc/locale etc. -# counterparts (glob command). Could be extended in future to perform other useful querying -# functions on the pkgdata though. +# Currently only has two functions +# 1) glob - mapping of packages to their dev/dbg/doc/locale etc. counterparts. +# 2) read_values - mapping of packagenames to their location in +#pkgdata and then returns value of selected variable (e.g. PKGSIZE) +# Could be extended in future to perform other useful querying functions on the +# pkgdata though. # import sys @@ -32,7 +35,8 @@ import fnmatch import re def usage(): -print(syntax: pkgdata-util glob [-d] pkgdatadir vendor-os pkglist \globs\); +print(syntax: pkgdata-util glob [-d] pkgdatadir vendor-os pkglist \globs\\n \ +read_values [-d] pkgdatadir vendor-os variable-name \ipk filenames\); @@ -151,7 +155,52 @@ def glob(args): print(\n.join(mappedpkgs)) +def read_values(args): +if len(args) 4: +usage() +sys.exit(1) + +pkgdata_dir = args[0] +target_suffix = args[1] +var = args[2] +packages = args[3].split() +if target_suffix.startswith(-): +target_suffix = target_suffix[1:] + +def readvar(pkgdata_file, var): +val = +with open(pkgdata_file, 'r') as f: +for line in f: +if line.startswith(var + :): +val = line.split(': ')[1].rstrip() +return val + +if debug: +print read_values('%s', '%s', '%s' '%s' % (pkgdata_dir, target_suffix, var, packages) +for package in packages: +pkg_split = package.split('_') +pkg_name = pkg_split[0] +pkg_arch = '_'.join(pkg_split[1:]) +if debug: +print package: name: '%s', arch:
[OE-core] (lib)gcc fails with dbg-pkgs in IMAGE_FEATURES
Hello, since gcc 4.8.x I get with dbg-pkgs in IMAGE_FEATURES | * check_data_file_clashes: Package gcc-dbg wants to install file /home/andreas/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-dev-image/1.0-r0/rootfs/usr/src/debug/libgcc/4.8.1-r0/gcc-4.8.1/build.arm-angstrom-linux-gnueabi.arm-angstrom-linux-gnueabi/libgcc/unwind.h | But that file is already provided by package * libgcc-s-dbg | * opkg_install_cmd: Cannot install package gcc-dbg. | ERROR: Function failed: do_rootfs (see /home/andreas/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-dev-image/1.0-r0/temp/log.do_rootfs.12650 for further information) could somebody look into that please because from time to time I need some remote debugging capable image. Andreas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] Allow xuser to shutdown
On 03/07/13 17:19, Martin Jansa wrote: Shouldn't we create separate recipe for xuser or any other default user and add it to connman and xserver-nodm-init RDEPENDS? I know there is some overhead from having one more package installed on image, but it would be a bit easier if we later decide that xuser also needs some file to be installed in his home or something like that. Yes, please; the current situation makes it rather awkward if you need to tweak some of the xuser parameters in a distro specific way. But perhaps it should be called something other than xuser? Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH 0/8] Proposed implementation of a new runtime tests framework
On Wed, 2013-07-03 at 23:51 -0700, Saul Wold wrote: Tired this out today and got the following: ERROR: Function failed: Failed to start qemu. You should check the task log and the qemu boot log (qemu log is /srv/ssd/sgw/builds/world/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/testimage/qemu_boot_log.20130704065001) ERROR: Logfile of failure stored in: /srv/ssd/sgw/builds/world/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/temp/log.do_testimage.18354 Log data follows: | DEBUG: Executing python function do_testimage | NOTE: Test modules ['oeqa.runtime.ping', 'oeqa.runtime.ssh', 'oeqa.runtime.connman', 'oeqa.runtime.rpm', 'oeqa.runtime.smart', 'oeqa.runtime.xorg', 'oeqa.runtime.dmesg'] On a second look, this shouldn't be none: | NOTE: DISPLAY value: None Because this happens: | Running qemu-system-x86_64... | /srv/ssd/sgw/builds/world/tmp/sysroots/x86_64-linux/usr/bin/qemu-system-x86_64 -kernel /srv/ssd/sgw/builds/world/tmp/deploy/images/bzImage-qemux86-64.bin -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=no,downscript=no -hda /srv/ssd/sgw/builds/world/tmp/deploy/images/core-image-sato-qemux86-64.ext3 -show-cursor -usb -usbdevice wacom-tablet -vga vmware -no-reboot -snapshot -serial unix:/tmp/qemuconnection.18354,server,nowait -m 128 --append vga=0 uvesafb.mode_option=640x480-32 root=/dev/hda rw mem=128M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 console=ttyS0 | Could not initialize SDL(No available video device) - exiting Can you export DISPLAY before running the task? But don't use DISPLAY=localhost:1 use DISPLAY=:1 (see my other mail). Cheers, Stefan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] populate_sdk_base.bbclass: allow $OECORE_NATIVE_SYSROOT in sdk_env_script
From: Bernhard Guillon bernhard.guil...@hale.at Only grep for 'OECORE_NATIVE_SYSROOT=' otherwise things like toolchain_create_sdk_env_script_append() { echo 'export MY_DIR_FOO=$OECORE_NATIVE_SYSROOT/my/dir/foo' $script } trigger the following error while executing the install script: find: `$OECORE_NATIVE_SYSROOT/my/dir/foo': No such file or directory Signed-off-by: Bernhard Guillon bernhard.guil...@hale.at --- meta/classes/populate_sdk_base.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index e5bc0b4..cb3a211 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -243,7 +243,7 @@ for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do done # fix dynamic loader paths in all ELF SDK binaries -native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'=' -f2|tr -d '') +native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '') dl_path=$($SUDO_EXEC find $native_sysroot/lib -name ld-linux*) if [ $dl_path = ] ; then echo SDK could not be set up. Relocate script unable to find ld-linux.so. Abort! -- 1.7.1 -- Scanned by MailScanner. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] initscripts: overwrite default hostname.sh
From: Jackie Huang jackie.hu...@windriver.com /etc/init.d/hostname.sh does not have a graceful fallback if the /etc/hostname file doesn't exist. Other systems such as Ubuntu and RH will either leave the hostname in place, if a proper hostname is already set, otherwise it will set the hostname to 'localhost' when the /etc/hostname files doesn't exist. As you can see we have to add some additional handling to provide this behavior when the system's hostname command doesn't take the '-b' option. Signed-off-by: Mark Asselstine mark.asselst...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../initscripts/initscripts-1.0/hostname.sh| 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh index fb58c9c..78fb91c 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh @@ -7,8 +7,16 @@ # Default-Stop: # Short-Description: Set hostname based on /etc/hostname ### END INIT INFO +HOSTNAME=$(/bin/hostname) -if test -f /etc/hostname -then +hostname -b -F /etc/hostname 2 /dev/null +if [ $? -eq 0 ]; then + exit +fi + +# Busybox hostname doesn't support -b so we need implement it on our own +if [ -f /etc/hostname ];then hostname -F /etc/hostname +elif [ -z $HOSTNAME -o $HOSTNAME = (none) -o ! -z `echo $HOSTNAME | sed -n '/^[0-9]*\.[0-9].*/p'` ] ; then + hostname localhost fi -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] initscripts: overwrite default hostname.sh
From: Jackie Huang jackie.hu...@windriver.com The following changes since commit 3e1dbabbf33a2e461abc92ff10cd970fe604ee38: sysstat: backport a patch to fix a parallel building error (2013-07-02 07:58:10 -0700) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/r_bbappend_udev-initscripts_0704 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_bbappend_udev-initscripts_0704 Jackie Huang (1): initscripts: overwrite default hostname.sh .../initscripts/initscripts-1.0/hostname.sh| 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] initscripts: add dmesg file to /var/log
From: Jackie Huang jackie.hu...@windriver.com We should create the /var/log/dmesg.log file as a default. If we don't then a later kernel error can flush the dmesg ring buffer, losing valuable debug information. Signed-off-by: Xin Ouyang xin.ouy...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../initscripts/initscripts-1.0/dmesg.sh | 17 + .../initscripts-1.0/logrotate-dmesg.conf |9 + meta/recipes-core/initscripts/initscripts_1.0.bb |9 +++-- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf diff --git a/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh b/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh new file mode 100644 index 000..a97b068 --- /dev/null +++ b/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh @@ -0,0 +1,17 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: dmesg +# Required-Start: +# Required-Stop: +# Default-Start:S +# Default-Stop: +### END INIT INFO + +if [ -f /var/log/dmesg ]; then + if [ -f /usr/sbin/logrotate ]; then + logrotate -f /etc/logrotate-dmesg.conf + else + mv -f /var/log/dmesg /var/log/dmesg.old + fi +fi +dmesg -s 131072 /var/log/dmesg diff --git a/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf b/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf new file mode 100644 index 000..6f46e42 --- /dev/null +++ b/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf @@ -0,0 +1,9 @@ +# see man logrotate for details +# rotate dmesg, and keep 5 versions. + +/var/log/dmesg { + create + rotate 5 + nodateext +} + diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 531b2b6..52e1c9c 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = Initscripts provide the basic system startup initialization scrip SECTION = base LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe -PR = r140 +PR = r141 INHIBIT_DEFAULT_DEPS = 1 @@ -31,7 +31,10 @@ SRC_URI = file://functions \ file://read-only-rootfs-hook.sh \ file://volatiles \ file://save-rtc.sh \ - file://GPLv2.patch + file://GPLv2.patch \ + file://dmesg.sh \ + file://logrotate-dmesg.conf \ + SRC_URI_append_arm = file://alignment.sh @@ -89,6 +92,8 @@ do_install () { install -m 0755${WORKDIR}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d install -m 0755${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d install -m 0644${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core + install -m 0755${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d + install -m 0644${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ if [ ${TARGET_ARCH} = arm ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] initscripts: add dmesg file to /var/log
From: Jackie Huang jackie.hu...@windriver.com The following changes since commit 682bcd0939697c34ce9bc7b2fe8f7d734f280490: initscripts: overwrite default hostname.sh (2013-07-04 17:19:03 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/r_bbappend_udev-initscripts_dmesg_0704_1 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_bbappend_udev-initscripts_dmesg_0704_1 Jackie Huang (1): initscripts: add dmesg file to /var/log .../initscripts/initscripts-1.0/dmesg.sh | 17 + .../initscripts-1.0/logrotate-dmesg.conf |9 + meta/recipes-core/initscripts/initscripts_1.0.bb |9 +++-- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] systemd: Move functions that only affect metadata to parse time.
On 26 June 2013 18:33, Randy Witt rew...@declaratino.com wrote: This is useful for times when you don't want to enable or disable a service automatically on install, but still want the rest of the functionality of the systemd.bbclass. This seems like a brute-force way of approaching the problem, which is that you don't want a service explicitly enabled or disabled on install. Why not extend the usage of SYSTEMD_AUTO_ENABLE and support setting it to ? i.e. enable means enable it, disable means disable it, and means do nothing. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/8] util-linux: disable runuser by default since it depends on PAM
On 3 July 2013 23:26, Saul Wold s...@linux.intel.com wrote: --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -45,6 +45,7 @@ EXTRA_OECONF = --libdir=${base_libdir} --disable-use-tty-group \ --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \ --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ +--disable-runuser \ usrsbin_execdir='${sbindir}' \ @@ -52,7 +53,7 @@ EXTRA_OECONF = --libdir=${base_libdir} --disable-use-tty-group \ EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-socket-activation', '--disable-socket-activation', d)} EXTRA_OECONF += ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)} -EXTRA_OECONF_append_class-native = --disable-login --disable-su +EXTRA_OECONF_append_class-native = --disable-login --disable-su --disable-runuser Surely the class-native append is redundant? Also, is runuser something that we should enable if the pam distro feature is enabled? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/8] packagegroup-core-basic: Only build libpam if it's enabled
On 3 July 2013 23:26, Saul Wold s...@linux.intel.com wrote: util-linux will check for the exisitance of pam header files and change what is built, so only build libpam when pam is enabled for DISTRO_FEATURES Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb index c73d173..03dabbf 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb @@ -104,7 +104,7 @@ RDEPENDS_packagegroup-core-multiuser = \ cracklib \ gzip \ libuser \ -libpam \ +${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ shadow \ sudo \ Do we even need to mention libpam in here? If pam is enabled, shadow will have a runtime dependency on it. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 8/8] resolvconf: Update to 1.72
On 3 July 2013 23:26, Saul Wold s...@linux.intel.com wrote: Signed-off-by: Saul Wold s...@linux.intel.com --- .../resolvconf/{resolvconf_1.72.bb = resolvconf_1.73.bb} | 4 ++-- Typo in commit message. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/5] Allow xuser to shutdown
Changes in v2: * created a separate recipe for xuser creation, located in meta/recipes-support/user-creation/. If there are other users we might need to add in the future, we can put the recipes here; * removed xuser creation from connman and xserver-noadm-init and added the new 'xuser-account' recipe in RDEPENDS; Laurentiu CC: s...@linux.intel.com CC: martin.ja...@gmail.com The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9: bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/b4345_shutdown_icon_rootless_x_v2 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/b4345_shutdown_icon_rootless_x_v2 Laurentiu Palcu (5): sysvinit: allow users in shutdown group to perform halt/reboot xuser-account: create separate recipe for xuser creation connman: remove xuser creation, RDEPEND on xuser-account xserver-nodm-init: remove xuser creation, RDEPEND on xuser-account shutdown-desktop: give entire path in Exec field meta/recipes-connectivity/connman/connman.inc | 10 ++-- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 12 ++--- .../x11-common/xserver-nodm-init.bb| 13 ++ .../shutdown-desktop/shutdown-desktop.bb |2 ++ .../user-creation/xuser-account_0.1.bb | 27 5 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 meta/recipes-support/user-creation/xuser-account_0.1.bb -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 5/5] shutdown-desktop: give entire path in Exec field
A normal user does not have /sbin in its PATH, by default, so having the entire path here allows the correct execution when run as regular user. [YOCTO #4345] Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- .../shutdown-desktop/shutdown-desktop.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb index c5096c1..9e283e4 100644 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb @@ -18,6 +18,8 @@ pkg_postinst_${PN} () { grep -q qemuarm $D${sysconfdir}/hostname \ sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' \ || true + +sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' } inherit allarch -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/5] xuser-account: create separate recipe for xuser creation
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- .../user-creation/xuser-account_0.1.bb | 27 1 file changed, 27 insertions(+) create mode 100644 meta/recipes-support/user-creation/xuser-account_0.1.bb diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb new file mode 100644 index 000..7430d2a --- /dev/null +++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb @@ -0,0 +1,27 @@ +DESCRIPTION = Creates an 'xuser' account +LICENSE = MIT +LIC_FILES_CHKSUM = file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 + +SRC_URI = + +inherit useradd + +do_configure() { +: +} + +do_compile() { +: +} + +do_install() { +: +} + +USERADD_PACKAGES = ${PN} +GROUPADD_PARAM_${PN} = --system shutdown +USERADD_PARAM_${PN} = --create-home \ + --groups video,tty,audio,input,shutdown \ + --user-group xuser + +ALLOW_EMPTY_${PN} = 1 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/5] sysvinit: allow users in shutdown group to perform halt/reboot
For this to happen: * 'shutdown' group has been created; * changed ownership group for /sbin/halt and /sbin/shutdown to 'shutdown'; * deny execution rights to other users except 'root' and those belonging to 'shutdown' group; * set setuid bit to both apps; So, basically, in order for a normal user to be able to shutdown/reboot the machine, it must be a member of 'shutdown' group. Other changes: * fixed identetion for 2 lines that used spaces instead of tabs; [YOCTO #4345] Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index e64b67a..784d538 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5 S = ${WORKDIR}/sysvinit-${PV} B = ${S}/src -inherit update-alternatives +inherit update-alternatives useradd DEPENDS_append = update-rc.d-native ALTERNATIVE_${PN} = init mountpoint halt reboot runlevel shutdown poweroff last mesg utmpdump wall @@ -54,6 +54,9 @@ ALTERNATIVE_LINK_NAME[sulogin.8] = ${mandir}/man8/sulogin.8 ALTERNATIVE_LINK_NAME[utmpdump.1] = ${mandir}/man1/utmpdump.1 ALTERNATIVE_LINK_NAME[wall.1] = ${mandir}/man1/wall.1 +USERADD_PACKAGES = ${PN} +GROUPADD_PARAM_${PN} = --system shutdown + PACKAGES =+ sysvinit-pidof sysvinit-sulogin FILES_${PN} += ${base_sbindir}/* ${base_bindir}/* FILES_sysvinit-pidof = ${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5 @@ -87,6 +90,9 @@ do_install () { install -m 0755${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd -update-rc.d -r ${D} bootlogd start 07 S . -update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . + update-rc.d -r ${D} bootlogd start 07 S . + update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . + + chown root.shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown + chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown } -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/5] connman: remove xuser creation, RDEPEND on xuser-account
[YOCTO #4345] Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- meta/recipes-connectivity/connman/connman.inc | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index e6584ff..6b5ea0b 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -60,14 +60,7 @@ SYSTEMD_SERVICE_${PN} = connman.service SYSTEMD_SERVICE_${PN}-vpn = connman-vpn.service SYSTEMD_WIRED_SETUP = ExecStartPre=-${libdir}/connman/wired-setup -# IMPORTANT: because xuser is shared with rootless X, please make sure the -# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb -USERADD_PACKAGES = ${PN} -USERADD_PARAM_${PN} = --create-home \ - --groups video,tty,audio \ - --user-group xuser - -inherit autotools gtk-doc pkgconfig systemd update-rc.d useradd +inherit autotools gtk-doc pkgconfig systemd update-rc.d do_configure_append () { sed -i s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=# ${S}/src/connman.service @@ -118,6 +111,7 @@ RDEPENDS_${PN} = \ ${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ ${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ ${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \ + xuser-account \ PACKAGES_DYNAMIC += ^${PN}-plugin-.* -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 4/5] xserver-nodm-init: remove xuser creation, RDEPEND on xuser-account
[YOCTO #4345] Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- .../x11-common/xserver-nodm-init.bb| 13 ++--- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index d2797a9..8490c81 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb @@ -3,7 +3,7 @@ LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe SECTION = x11 PR = r31 -RDEPENDS_${PN} = sudo +RDEPENDS_${PN} = sudo xuser-account SRC_URI = file://xserver-nodm \ file://Xusername \ @@ -23,17 +23,8 @@ do_install() { fi } -inherit update-rc.d useradd +inherit update-rc.d INITSCRIPT_NAME = xserver-nodm INITSCRIPT_PARAMS = start 9 5 2 . stop 20 0 1 6 . -# Use fixed Xusername of xuser for now, this will need to be -# fixed if the Xusername changes from xuser -# IMPORTANT: because xuser is shared with connman, please make sure the -# USERADD_PARAM is in sync with the one in connman.inc -USERADD_PACKAGES = ${PN} -USERADD_PARAM_${PN} = --create-home \ - --groups video,tty,audio,input \ - --user-group xuser - -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] Allow xuser to shutdown
On 4 July 2013 09:54, Tomas Frydrych tf+lists.yo...@r-finger.com wrote: I know there is some overhead from having one more package installed on image, but it would be a bit easier if we later decide that xuser also needs some file to be installed in his home or something like that. Yes, please; the current situation makes it rather awkward if you need to tweak some of the xuser parameters in a distro specific way. But perhaps it should be called something other than xuser? Wayland likes to have a non-root user start it up, so make that three locations and another reason for it not being called xuser. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cmake: fix configure error if system Qt installation is broken
If the host Qt installation exists but is incomplete or the installed qmake architecture doesn't match that of the Qt libraries, cmake was failing at do_configure. cmake 2.8.10 failed silently here so we should make 2.8.11 do the same. Fixes [YOCTO #4565]. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-devtools/cmake/cmake.inc | 1 + .../cmake/cmake/qt4-fail-silent.patch | 55 ++ 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 6144d51..014ff5a 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -15,6 +15,7 @@ SRC_URI = http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz file://support-oe-qt4-tools-names.patch \ file://aarch64-cmake.patch \ file://aarch64-kwsys.patch \ + file://qt4-fail-silent.patch \ inherit autotools diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch new file mode 100644 index 000..fd39f3f --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch @@ -0,0 +1,55 @@ +Fail silently if system Qt installation is broken + +Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the +following error if the system Qt installation is broken: + +CMake Error at Modules/FindQt4.cmake:1028 (set_property): + set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet + been created. +Call Stack (most recent call first): + Tests/RunCMake/CMakeLists.txt:79 (find_package) + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com + +--- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 +0100 cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 +0100 +@@ -1025,21 +1025,22 @@ + set(_configs) + endmacro() + +- +- # Set QT_xyz_LIBRARY variable and add +- # library include path to QT_INCLUDES +- _QT4_ADJUST_LIB_VARS(QtCore) +- set_property(TARGET Qt4::QtCore APPEND PROPERTY +-INTERFACE_INCLUDE_DIRECTORIES +- ${QT_MKSPECS_DIR}/default +- ${QT_INCLUDE_DIR} +- ) +- set_property(TARGET Qt4::QtCore PROPERTY +-INTERFACE_QT_MAJOR_VERSION 4 +- ) +- set_property(TARGET Qt4::QtCore APPEND PROPERTY +-COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION +- ) ++ if(QT_QTCORE_FOUND) ++# Set QT_xyz_LIBRARY variable and add ++# library include path to QT_INCLUDES ++_QT4_ADJUST_LIB_VARS(QtCore) ++set_property(TARGET Qt4::QtCore APPEND PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ++${QT_MKSPECS_DIR}/default ++${QT_INCLUDE_DIR} ++) ++set_property(TARGET Qt4::QtCore PROPERTY ++ INTERFACE_QT_MAJOR_VERSION 4 ++) ++set_property(TARGET Qt4::QtCore APPEND PROPERTY ++ COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION ++) ++ endif() + + foreach(QT_MODULE ${QT_MODULES}) + _QT4_ADJUST_LIB_VARS(${QT_MODULE}) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/5] xuser-account: create separate recipe for xuser creation
On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: +USERADD_PARAM_${PN} = --create-home \ + --groups video,tty,audio,input,shutdown \ + --user-group xuser I'm not liking the name xuser but unless someone has a much better idea right now we can change that later. Thinking about places where the xuser is used in other recipes (i.e. connman for ACLs), can anyone see a problem with adding xuser to the users group so those ACLS can use group membership instead of user name? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/5] xuser-account: create separate recipe for xuser creation
On Thu, Jul 04, 2013 at 01:58:01PM +0300, Laurentiu Palcu wrote: Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- .../user-creation/xuser-account_0.1.bb | 27 1 file changed, 27 insertions(+) create mode 100644 meta/recipes-support/user-creation/xuser-account_0.1.bb diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb new file mode 100644 index 000..7430d2a --- /dev/null +++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb @@ -0,0 +1,27 @@ +DESCRIPTION = Creates an 'xuser' account +LICENSE = MIT +LIC_FILES_CHKSUM = file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 + can we inherit allarch in it? +SRC_URI = + +inherit useradd + +do_configure() { +: +} + +do_compile() { +: +} + +do_install() { +: +} + +USERADD_PACKAGES = ${PN} +GROUPADD_PARAM_${PN} = --system shutdown +USERADD_PARAM_${PN} = --create-home \ + --groups video,tty,audio,input,shutdown \ + --user-group xuser + +ALLOW_EMPTY_${PN} = 1 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/5] xuser-account: create separate recipe for xuser creation
On 04/07/13 12:29, Burton, Ross wrote: On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: +USERADD_PARAM_${PN} = --create-home \ + --groups video,tty,audio,input,shutdown \ + --user-group xuser I'm not liking the name xuser but unless someone has a much better idea right now we can change that later. oeuser? Thinking about places where the xuser is used in other recipes (i.e. connman for ACLs), can anyone see a problem with adding xuser to the users group so those ACLS can use group membership instead of user name? Yes, I think group would be preferred option. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] populate_sdk_base: fix bashism
The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9: bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/b4811_printf_issue_in_sh http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/b4811_printf_issue_in_sh Laurentiu Palcu (1): populate_sdk_base: fix bashism meta/classes/populate_sdk_base.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] populate_sdk_base: fix bashism
Only the printf bash builtin knows about %q format option for escaping spaces. The coreutils version doesn't. Unfortunately, neither dash nor sh have a printf builtin. So, escape the spaces using sed. [YOCTO #4811] Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- meta/classes/populate_sdk_base.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 31e848d..6378af9 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -181,7 +181,7 @@ else echo $target_sdk_dir fi -eval target_sdk_dir=$(printf %q $target_sdk_dir) +eval target_sdk_dir=$(echo $target_sdk_dir|sed 's/ /\\ /g') if [ -d $target_sdk_dir ]; then target_sdk_dir=$(cd $target_sdk_dir; pwd) else -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qt4: disable qmeegographicssystemhelper
On Wed, Jul 3, 2013 at 2:04 PM, Paul Eggleton paul.eggle...@linux.intel.com wrote: We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com Agreed; maybe this could be considered for dylan as well? -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Using OpenEmbedded for customized builds
On Thu, Jul 4, 2013 at 2:34 AM, Holger Hans Peter Freyther hol...@moiji-mobile.com wrote: Good Morning, we have a basic product and build the images for it using OpenEmbedded. Some customers require the installation of additional packages, or even the modification of some of the installed ones. The current approach would be to build one VM per customer but that doesn't really scale. I think somehow I want to end up with having my base/generic buuld and a way to put additional ipk's into a customer directory. So something likes this: base-build/tmp/deploy/ipk/ armv5te/ machine/ customer1/ armv5te/ ... customer2/ armv5te/ customer3/ or base-build/tmp/... customer1-build/tmp/deploy/ipk/... In both cases the customer should only include the packages that were built for the customer. All the 'base' packages should be taken/used from the base built. I could indicate for which customer I build by setting an environment variable? For a corner case, e.g. if I change the SRCREV and re-build with a customer flag set, this package should still go to the customer directory. Can this be already modeled? Do you have any idea how this could be done? Currently I did this using MACHINEOVERRIDE and I made a machine which is reused for each customer. So I have a single kernel and machine setup but customer aliases which I can use to control the system in the image and like. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qt4: disable qmeegographicssystemhelper
On Thursday 04 July 2013 10:10:52 Otavio Salvador wrote: On Wed, Jul 3, 2013 at 2:04 PM, Paul Eggleton paul.eggle...@linux.intel.com wrote: We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com Agreed; maybe this could be considered for dylan as well? Sounds reasonable to me; once it's merged to master I will include it in my queue for dylan. To be honest it would be nice if it were fixed properly upstream; building it based on the conditional given seems wrong. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/8] util-linux: disable runuser by default since it depends on PAM
On Wed, Jul 3, 2013 at 7:26 PM, Saul Wold s...@linux.intel.com wrote: util-linux's configure checks for pam_misc.h and if it finds it will enable runuser, there was a case where it was found via shared state and then got rebuilt. This makes the build more deterministic. Signed-off-by: Saul Wold s...@linux.intel.com Please make this as a PACKAGECONFIG and add it if pam feature is enabled. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/8] packagegroup-core-basic: Only build libpam if it's enabled
On Thu, Jul 4, 2013 at 7:37 AM, Burton, Ross ross.bur...@intel.com wrote: On 3 July 2013 23:26, Saul Wold s...@linux.intel.com wrote: util-linux will check for the exisitance of pam header files and change what is built, so only build libpam when pam is enabled for DISTRO_FEATURES Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb index c73d173..03dabbf 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb @@ -104,7 +104,7 @@ RDEPENDS_packagegroup-core-multiuser = \ cracklib \ gzip \ libuser \ -libpam \ +${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ shadow \ sudo \ Do we even need to mention libpam in here? If pam is enabled, shadow will have a runtime dependency on it. Agreed :-) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qt4: disable qmeegographicssystemhelper
On Thu, Jul 4, 2013 at 10:20 AM, Paul Eggleton paul.eggle...@linux.intel.com wrote: On Thursday 04 July 2013 10:10:52 Otavio Salvador wrote: On Wed, Jul 3, 2013 at 2:04 PM, Paul Eggleton paul.eggle...@linux.intel.com wrote: We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com Agreed; maybe this could be considered for dylan as well? Sounds reasonable to me; once it's merged to master I will include it in my queue for dylan. To be honest it would be nice if it were fixed properly upstream; building it based on the conditional given seems wrong. I fully agree but until it is fixed (if it is ever fixed) your patch seems the way to go! :-) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxml2: Add ptest
Install libxml2 test suite and run it as ptest. Signed-off-by: Mihaela Sendrea mihaela.send...@enea.com --- meta/recipes-core/libxml/libxml2.inc | 14 +- meta/recipes-core/libxml/libxml2/run-ptest |3 + meta/recipes-core/libxml/libxml2/runtest.patch | 820 meta/recipes-core/libxml/libxml2_2.9.1.bb |7 +- 4 files changed, 839 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/run-ptest create mode 100644 meta/recipes-core/libxml/libxml2/runtest.patch diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 9b2af0f..7fb2644 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -13,12 +13,16 @@ DEPENDS_class-nativesdk = nativesdk-python DEPENDS_class-native = python-native DEPENDS =+ zlib -SRC_URI = ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ +SRC_URI = ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://libxml-64bit.patch \ - file://ansidecl.patch + file://ansidecl.patch \ + file://runtest.patch \ + file://run-ptest \ + +inherit autotools pkgconfig binconfig pythonnative ptest -inherit autotools pkgconfig binconfig pythonnative +RDEPENDS_${PN}-ptest_append_libc-glibc += eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141 # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { @@ -49,4 +53,8 @@ PACKAGES += ${PN}-utils FILES_${PN}-dev += ${libdir}/xml2Conf.sh FILES_${PN}-utils += ${bindir}/* +do_install_ptest () { + cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} +} + BBCLASSEXTEND = native nativesdk diff --git a/meta/recipes-core/libxml/libxml2/run-ptest b/meta/recipes-core/libxml/libxml2/run-ptest new file mode 100644 index 000..473d0b6 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make -k runtests diff --git a/meta/recipes-core/libxml/libxml2/runtest.patch b/meta/recipes-core/libxml/libxml2/runtest.patch new file mode 100644 index 000..fce69d9 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/runtest.patch @@ -0,0 +1,820 @@ +Add 'install-ptest' rule. +Print a standard result line for each test. + +Signed-off-by: Mihaela Sendrea mihaela.send...@enea.com +Upstream-status: Pending + +diff -uNr a/Makefile.am b/Makefile.am +--- a/Makefile.am 2013-04-17 14:51:42.633386477 +0200 b/Makefile.am 2013-04-19 14:47:51.544720568 +0200 +@@ -202,10 +202,19 @@ + #testOOM_DEPENDENCIES = $(DEPS) + #testOOM_LDADD= $(LDADDS) + ++install-ptest: ++ @(if [ -d .libs ] ; then cd .libs; fi; \ ++ install $(noinst_PROGRAMS) $(DESTDIR)) ++ cp -r $(srcdir)/test $(DESTDIR) ++ cp -r $(srcdir)/result $(DESTDIR) ++ cp -r $(srcdir)/python $(DESTDIR) ++ cp Makefile $(DESTDIR) ++ sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile ++ + runtests: + [ -d test ] || $(LN_S) $(srcdir)/test . + [ -d result ] || $(LN_S) $(srcdir)/result . +- $(CHECKER) ./runtest$(EXEEXT) $(CHECKER) ./testrecurse$(EXEEXT) $(CHECKER) ./testapi$(EXEEXT) $(CHECKER) ./testchar$(EXEEXT) $(CHECKER) ./testdict$(EXEEXT) $(CHECKER) ./runxmlconf$(EXEEXT) ++ ./runtest$(EXEEXT) ; ./testrecurse$(EXEEXT) ; ./testapi$(EXEEXT) ; ./testchar$(EXEEXT) ; ./testdict$(EXEEXT) ; ./runxmlconf$(EXEEXT) + @(if [ $(PYTHON_SUBDIR) != ] ; then cd python ; \ + $(MAKE) tests ; fi) + +diff -uNr a/runsuite.c b/runsuite.c +--- a/runsuite.c 2013-04-12 16:17:11.462823238 +0200 b/runsuite.c 2013-04-17 14:07:24.352693211 +0200 +@@ -1162,6 +1162,7 @@ + + if (logfile != NULL) + fclose(logfile); ++printf(%s: runsuite\n\n, (ret == 0) ? PASS : FAIL); + return(ret); + } + #else /* !SCHEMAS */ +diff -uNr a/runtest.c b/runtest.c +--- a/runtest.c2013-04-16 13:19:15.087997290 +0200 b/runtest.c2013-04-17 14:08:29.529949655 +0200 +@@ -4386,6 +4386,7 @@ + err++; + } + } ++printf(%s: %s\n, (err == 0) ? PASS : FAIL, tst-desc); + return(err); + } + +@@ -4455,6 +4456,7 @@ + xmlCleanupParser(); + xmlMemoryDump(); + ++printf(%s: runtest\n\n, (ret == 0) ? PASS : FAIL); + return(ret); + } + +diff -uNr a/runxmlconf.c b/runxmlconf.c +--- a/runxmlconf.c 2013-04-16 12:53:49.900982990 +0200 b/runxmlconf.c 2013-04-17 14:09:21.111778104 +0200 +@@ -595,6 +595,7 @@ + + if (logfile != NULL) + fclose(logfile); ++printf(%s: runxmlconf\n, (ret == 0) ? PASS : FAIL); + return(ret); + } + +diff -uNr a/testapi.c b/testapi.c +--- a/testapi.c2013-04-12 16:16:57.763417659 +0200 b/testapi.c2013-04-17 14:10:28.876924881 +0200 +@@ -1245,49 +1245,91 @@ + testlibxml2(void) + { + int test_ret = 0; ++int ret = 0; + +-test_ret += test_HTMLparser(); +-test_ret += test_HTMLtree(); +-test_ret += test_SAX2();
[OE-core] [PATCH] gtkdoc: set the default docdir to ${S}, not ${B}
Previously these directories were the same location, but with seperatebuilddir.inc they are not and putting the file into ${B} means it goes to the wrong place for autoreconf. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/classes/gtk-doc.bbclass |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass index 4e0bd88..fb7863e 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass @@ -7,7 +7,8 @@ # packages up any existing documentation (so from tarball builds). # The documentation directory, where the infrastructure will be copied. -GTKDOC_DOCDIR ?= ${B} +# gtkdocize has a default of . so to handle out-of-tree builds set this to $S. +GTKDOC_DOCDIR ?= ${S} DEPENDS_append = gtk-doc-stub-native -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/11] Package Upgrades
* iputils: Removed obsolete patches Replaced openssl with gnutls in dependency list * busybox: Removed obsolete patches Added a few fixes from upstream (http://busybox.net/downloads/fixes-1.21.0/) busybox-1.21.0-mdev.patch busybox-1.21.0-platform.patch busybox-1.21.0-xz.patch * elfutils: license changed to GPLv3 several patches were absolete so I removed them redhat-portability redhat-robustify backported from latest elfutils-portability elfutils-robustify from upstream * The rest are basic upgrades, no issues The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9: bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib rmoisan/branch-updates http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rmoisan/branch-updates Radu Moisan (11): iputils: Upgrade to v20121221 busybox: Upgrade to v1.21.0 elfutils: Upgrade to v0.155 rxvt-unicode: Upgrade to v9.18 ed: Upgrade to v1.8 atk: Upgrade to v2.9.3 libdmx: Upgrade to v1.1.3 apr: Upgrade to v1.4.8 apr-util: Upgrade to v1.5.2 diffutils: Upgrade to v3.3 usbutils: Upgrade to v007 .../usbutils/{usbutils_006.bb = usbutils_007.bb} |5 +- .../busybox/busybox-1.20.2/B921600.patch | 24 - .../busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 28 - .../busybox-mkfs-minix-tests_bigendian.patch | 34 - .../fix-for-spurious-testsuite-failure.patch | 27 - .../busybox/busybox-1.20.2/sys_resource.patch | 99 -- .../busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 - .../busybox-1.21.0/busybox-1.21.0-mdev.patch | 647 +++ .../busybox-1.21.0/busybox-1.21.0-platform.patch | 28 + .../busybox/busybox-1.21.0/busybox-1.21.0-xz.patch | 88 + .../busybox-appletlib-dependency.patch |0 ...usybox-list-suid-and-non-suid-app-configs.patch |0 .../busybox-sulogin-empty-root-password.patch |0 .../busybox-udhcpc-no_deconfig.patch |0 .../{busybox-1.20.2 = busybox-1.21.0}/defconfig |0 .../fail_on_no_media.patch |0 .../get_header_tar.patch |0 .../login-utilities.cfg|0 .../run-parts.in.usr-bin.patch |6 +- .../stat-usr-bin.patch |0 .../strict-atime.patch |0 ...estsuite-du-du-k-works-fix-false-positive.patch |0 .../watch.in.usr-bin.patch |0 .../{busybox_1.20.2.bb = busybox_1.21.0.bb} | 20 +- .../elfutils/elfutils-0.155/arm_backend.diff | 450 + .../elfutils/elfutils-0.155/do-autoreconf.diff | 215 +++ .../elfutils/elfutils-0.155/dso-link-change.patch | 32 + .../elfutils/elfutils-0.155/elf_additions.diff | 61 + .../elfutils-ar-c-fix-num-passed-to-memset.patch | 23 + .../elfutils-0.155/elfutils-robustify.patch| 1756 +++ .../elfutils/elfutils-0.155/hppa_backend.diff | 796 + .../elfutils/elfutils-0.155/i386_dis.h | 1657 ++ .../elfutils/elfutils-0.155/m68k_backend.diff | 303 .../elfutils/elfutils-0.155/mempcpy.patch | 24 + .../elfutils/elfutils-0.155/mips_backend.diff | 708 ...ssed-to-snprintf-for-invalid-sh_name-case.patch | 27 + .../elfutils-0.155/redhat-portability.diff | 1775 +++ .../elfutils/elfutils-0.155/redhat-robustify.diff | 1824 .../elfutils/elfutils-0.155/uclibc-support.patch | 91 + .../elfutils/elfutils-0.155/x86_64_dis.h | 1632 ++ meta/recipes-devtools/elfutils/elfutils_0.155.bb | 84 + .../diffutils-3.2/obsolete_automake_macros.patch | 14 - .../diffutils/diffutils-3.2/remove-gets.patch | 22 - meta/recipes-extended/diffutils/diffutils.inc |2 +- .../{diffutils_3.2.bb = diffutils_3.3.bb} | 10 +- meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch | 43 - meta/recipes-extended/ed/{ed_1.7.bb = ed_1.8.bb} | 11 +- .../files/debian/add-icmp-return-codes.diff| 43 - .../iputils/files/debian/fix-arping-timeouts.diff | 26 - .../files/debian/fix-dead-host-ping-stats.diff | 16 - .../iputils/files/debian/targets.diff | 14 +- .../iputils/files/debian/use_gethostbyname2.diff | 36 +- .../{iputils_s20101006.bb = iputils_s20121221.bb} | 14 +- .../xorg-lib/{libdmx_1.1.2.bb = libdmx_1.1.3.bb} |4 +- .../rxvt.desktop |0 .../rxvt.png | Bin 2847 - 2847 bytes .../xwc.patch |0 .../{rxvt-unicode_9.17.bb = rxvt-unicode_9.18.bb} |6 +- .../apr/{apr-util_1.5.1.bb = apr-util_1.5.2.bb} |6 +-
[OE-core] [PATCH 06/11] atk: Upgrade to v2.9.3
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../atk/{atk_2.8.0.bb = atk_2.9.3.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/atk/{atk_2.8.0.bb = atk_2.9.3.bb} (79%) diff --git a/meta/recipes-support/atk/atk_2.8.0.bb b/meta/recipes-support/atk/atk_2.9.3.bb similarity index 79% rename from meta/recipes-support/atk/atk_2.8.0.bb rename to meta/recipes-support/atk/atk_2.9.3.bb index 9a36ae4..e7cc67c 100644 --- a/meta/recipes-support/atk/atk_2.8.0.bb +++ b/meta/recipes-support/atk/atk_2.9.3.bb @@ -14,8 +14,8 @@ inherit gnomebase gtk-doc GNOME_COMPRESS_TYPE = xz -SRC_URI[archive.md5sum] = c652bd25530825d604dae1c1ebd2da02 -SRC_URI[archive.sha256sum] = b22519176226f3e07cf6d932b77852e6b6be478090704b32d0f4e0686df4 +SRC_URI[archive.md5sum] = 467447fa3d733394481c214d619690df +SRC_URI[archive.sha256sum] = 5fdb79c729cfad45042c3e0f55d01f57fdde3b8379b6cb5bbeb8b37478d4456d BBCLASSEXTEND = native -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/11] ed: Upgrade to v1.8
License files chenged but not the license type Signed-off-by: Radu Moisan radu.moi...@intel.com --- meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch | 43 meta/recipes-extended/ed/{ed_1.7.bb = ed_1.8.bb} | 11 +++-- 2 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch rename meta/recipes-extended/ed/{ed_1.7.bb = ed_1.8.bb} (49%) diff --git a/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch deleted file mode 100644 index d30b393..000 --- a/meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -http://lists.gnu.org/archive/html/bug-ed/2008-12/msg1.html - -2007-04-16 Mike Frysinger vap...@gentoo.org - - * Do not set CC/CXX/CPPFLAGS/LDFLAGS to so that user can - override if they so choose. - * Only set CFLAGS/CXXFLAGS if user did not specify any. - -ed had already taken GPLv3 when this patch out, so it should be GPLv3. -Signed-off-by: Zhai Edwin edwin.z...@intel.com - -Upstream-Status: Pending - -Index: ed-1.5/configure -=== ed-1.5.orig/configure 2010-08-30 07:34:49.0 -0700 -+++ ed-1.5/configure 2010-11-20 16:42:20.490645823 -0800 -@@ -26,10 +26,6 @@ - mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' - program_prefix= --CC= --CPPFLAGS= --CFLAGS='-Wall -W -O2' --LDFLAGS= - - # Loop over all args - while [ -n $1 ] ; do -@@ -105,6 +101,14 @@ - esac - done - -+# Defaults if the user did not select any -+if [ x${CFLAGS+set} != xset ] ; then -+ CFLAGS='-Wall -W -O2' -+fi -+if [ x${CXXFLAGS+set} != xset ] ; then -+ CXXFLAGS='-Wall -W -O2' -+fi -+ - # Find the source files, if location was not specified. - srcdirtext= - if [ -z ${srcdir} ] ; then diff --git a/meta/recipes-extended/ed/ed_1.7.bb b/meta/recipes-extended/ed/ed_1.8.bb similarity index 49% rename from meta/recipes-extended/ed/ed_1.7.bb rename to meta/recipes-extended/ed/ed_1.8.bb index 0057438..c6b5075 100644 --- a/meta/recipes-extended/ed/ed_1.7.bb +++ b/meta/recipes-extended/ed/ed_1.8.bb @@ -4,8 +4,8 @@ BUGTRACKER = LICENSE = GPLv3+ LIC_FILES_CHKSUM = file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://ed.h;endline=20;md5=c708cda1b2e8d723d458690b7db03878 \ - file://main.c;endline=24;md5=1bd039d59e04ee5f82adcc970144a2c3 + file://ed.h;endline=20;md5=375a20cc2545ac1115eeb7b323c60ae3 \ + file://main.c;endline=24;md5=1b31246da5e3864d7b30094ff76bf7ed SECTION = base PR = r0 @@ -13,11 +13,10 @@ PR = r0 # LSB states that ed should be in /bin/ bindir = ${base_bindir} -SRC_URI = ${GNU_MIRROR}/ed/ed-${PV}.tar.gz \ - file://ed-1.2-build.patch +SRC_URI = ${GNU_MIRROR}/ed/ed-${PV}.tar.gz -SRC_URI[md5sum] = 0aa4e2428e325203d0d7c3e86c961b1c -SRC_URI[sha256sum] = 894241019a5ff2b7816d20c5bd5a7048fb8f336ca52e97b3cc88d45b16472031 +SRC_URI[md5sum] = 2268d2344b3c52d23730acb2e3c942fe +SRC_URI[sha256sum] = 64c138d33b1ea4b9daa88e045da0619e2a43cb99a9d378417d20163f410a7273 do_configure() { ${S}/configure -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/11] busybox: Upgrade to v1.21.0
Removed obsolete patches Added a few fixes from upstream (http://busybox.net/downloads/fixes-1.21.0/) *busybox-1.21.0-mdev.patch *busybox-1.21.0-platform.patch *busybox-1.21.0-xz.patch Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../busybox/busybox-1.20.2/B921600.patch | 24 - .../busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 28 - .../busybox-mkfs-minix-tests_bigendian.patch | 34 - .../fix-for-spurious-testsuite-failure.patch | 27 - .../busybox/busybox-1.20.2/sys_resource.patch | 99 --- .../busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 - .../busybox-1.21.0/busybox-1.21.0-mdev.patch | 647 .../busybox-1.21.0/busybox-1.21.0-platform.patch | 28 + .../busybox/busybox-1.21.0/busybox-1.21.0-xz.patch | 88 +++ .../busybox-appletlib-dependency.patch |0 ...usybox-list-suid-and-non-suid-app-configs.patch |0 .../busybox-sulogin-empty-root-password.patch |0 .../busybox-udhcpc-no_deconfig.patch |0 .../{busybox-1.20.2 = busybox-1.21.0}/defconfig |0 .../fail_on_no_media.patch |0 .../get_header_tar.patch |0 .../login-utilities.cfg|0 .../run-parts.in.usr-bin.patch |6 +- .../stat-usr-bin.patch |0 .../strict-atime.patch |0 ...estsuite-du-du-k-works-fix-false-positive.patch |0 .../watch.in.usr-bin.patch |0 .../{busybox_1.20.2.bb = busybox_1.21.0.bb} | 20 +- 23 files changed, 774 insertions(+), 257 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/B921600.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch create mode 100644 meta/recipes-core/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch create mode 100644 meta/recipes-core/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch create mode 100644 meta/recipes-core/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-appletlib-dependency.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-list-suid-and-non-suid-app-configs.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-sulogin-empty-root-password.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-udhcpc-no_deconfig.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/defconfig (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/fail_on_no_media.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/get_header_tar.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/login-utilities.cfg (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/run-parts.in.usr-bin.patch (90%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/stat-usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/strict-atime.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/testsuite-du-du-k-works-fix-false-positive.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/watch.in.usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox_1.20.2.bb = busybox_1.21.0.bb} (73%) diff --git a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch deleted file mode 100644 index c4d98e3..000 --- a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -# copy commit message from OE as the patch comment: -#commit 5b1ed09b1ab1a60a28a76e4658bc9957cd361b5d -#Author: Valentin Longchamp valentin.longch...@epfl.ch -#Date: Mon Dec 8 14:43:23 2008 +0100 - -#busybox: added support for 921600 speed of serial line -# -# above comment added by Kevin Tian kevin.t...@intel.com, 2010-07-06 - -diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.0 +0200 -+++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200 -@@ -52,6 +52,9 @@ static const struct speed_map speeds[] = - #ifdef B460800 - {B460800, 460800/256 + 0x8000U}, - #endif -+#ifdef B921600
[OE-core] [PATCH 01/11] iputils: Upgrade to v20121221
Removed obsolete patches Replaced openssl with gnutls in dependency list Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../files/debian/add-icmp-return-codes.diff| 43 .../iputils/files/debian/fix-arping-timeouts.diff | 26 .../files/debian/fix-dead-host-ping-stats.diff | 16 .../iputils/files/debian/targets.diff | 14 +++ .../iputils/files/debian/use_gethostbyname2.diff | 36 .../{iputils_s20101006.bb = iputils_s20121221.bb} | 14 +++ 6 files changed, 30 insertions(+), 119 deletions(-) delete mode 100644 meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff rename meta/recipes-extended/iputils/{iputils_s20101006.bb = iputils_s20121221.bb} (80%) diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff deleted file mode 100644 index 40070c3..000 --- a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping.c -=== trunk.orig/ping.c 2010-05-07 23:13:54.0 -0700 -+++ trunk/ping.c 2010-05-07 23:23:22.0 -0700 -@@ -883,9 +883,36 @@ - case ICMP_SR_FAILED: - printf(Source Route Failed\n); - break; -+ case ICMP_NET_UNKNOWN: -+ printf(Destination Net Unknown\n); -+ break; -+ case ICMP_HOST_UNKNOWN: -+ printf(Destination Host Unknown\n); -+ break; -+ case ICMP_HOST_ISOLATED: -+ printf(Source Host Isolated\n); -+ break; -+ case ICMP_NET_ANO: -+ printf(Destination Net Prohibited\n); -+ break; -+ case ICMP_HOST_ANO: -+ printf(Destination Host Prohibited\n); -+ break; -+ case ICMP_NET_UNR_TOS: -+ printf(Destination Net Unreachable for Type of Service\n); -+ break; -+ case ICMP_HOST_UNR_TOS: -+ printf(Destination Host Unreachable for Type of Service\n); -+ break; - case ICMP_PKT_FILTERED: - printf(Packet filtered\n); - break; -+ case ICMP_PREC_VIOLATION: -+ printf(Precedence Violation\n); -+ break; -+ case ICMP_PREC_CUTOFF: -+ printf(Precedence Cutoff\n); -+ break; - default: - printf(Dest Unreachable, Bad Code: %d\n, code); - break; diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff deleted file mode 100644 index 3e34788..000 --- a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/arping.c -=== trunk.orig/arping.c2010-05-07 23:13:52.0 -0700 -+++ trunk/arping.c 2010-05-07 23:41:16.0 -0700 -@@ -182,12 +182,17 @@ - if (start.tv_sec==0) - start = tv; - -- if (count-- == 0 || (timeout MS_TDIFF(tv,start) timeout*1000 + 500)) -+ if (timeout MS_TDIFF(tv,start) timeout*1000 + 500) - finish(); - -- if (last.tv_sec==0 || MS_TDIFF(tv,last) 500) { -+ if ((!timeout) (count == 0)) -+ finish(); -+ -+ if ( count!=0 (last.tv_sec==0 || MS_TDIFF(tv,last) 500 ) ) { - send_pack(s, src, dst, - (struct sockaddr_ll *)me, (struct sockaddr_ll *)he); -+ if (count = 0) -+ count--; - if (count == 0 unsolicited) - finish(); - } diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff deleted file mode 100644 index fda42bf..000 --- a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping_common.c -=== trunk.orig/ping_common.c 2010-05-07 23:13:51.0 -0700 -+++
[OE-core] [PATCH 04/11] rxvt-unicode: Upgrade to v9.18
do_configure was initially failing because could not stat aclocal.m4, prepended ${S} so that it could find the file, however I don't know the reasoning for do_configure_prepend in this recipe, it also builds fine without it Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../rxvt.desktop |0 .../rxvt.png | Bin 2847 - 2847 bytes .../xwc.patch |0 .../{rxvt-unicode_9.17.bb = rxvt-unicode_9.18.bb} |6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 = rxvt-unicode-9.18}/rxvt.desktop (100%) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 = rxvt-unicode-9.18}/rxvt.png (100%) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 = rxvt-unicode-9.18}/xwc.patch (100%) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.17.bb = rxvt-unicode_9.18.bb} (92%) diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop similarity index 100% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.desktop rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.png b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png similarity index 100% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.png rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch similarity index 100% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/xwc.patch rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb similarity index 92% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb index 806e354..9a47617 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb @@ -17,8 +17,8 @@ SRC_URI = http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 file://rxvt.desktop \ file://rxvt.png -SRC_URI[md5sum] = 1270432bdc7ce17dbb07d41a607081e0 -SRC_URI[sha256sum] = de017b2b2a1a7182aeada99f605da33cbee18d450e07a7fdabef48da446521e4 +SRC_URI[md5sum] = 963ccc748fe5bca925e7b92c0404d68b +SRC_URI[sha256sum] = 87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f inherit autotools update-alternatives @@ -42,7 +42,7 @@ EXTRA_OECONF = --enable-menubar --enable-xim \ --with-x=${STAGING_DIR_HOST}${prefix} do_configure_prepend () { - cp aclocal.m4 acinclude.m4 + cp ${S}/aclocal.m4 ${S}/acinclude.m4 } do_compile_prepend () { -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/11] usbutils: Upgrade to v007
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../usbutils/{usbutils_006.bb = usbutils_007.bb} |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-bsp/usbutils/{usbutils_006.bb = usbutils_007.bb} (83%) diff --git a/meta/recipes-bsp/usbutils/usbutils_006.bb b/meta/recipes-bsp/usbutils/usbutils_007.bb similarity index 83% rename from meta/recipes-bsp/usbutils/usbutils_006.bb rename to meta/recipes-bsp/usbutils/usbutils_007.bb index c1c9fc0..45f829f 100644 --- a/meta/recipes-bsp/usbutils/usbutils_006.bb +++ b/meta/recipes-bsp/usbutils/usbutils_007.bb @@ -7,14 +7,13 @@ LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f DEPENDS = libusb zlib -PR = r0 SRC_URI = ${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ file://usb-devices-avoid-dependency-on-bash.patch \ file://Fix-NULL-pointer-crash.patch -SRC_URI[md5sum] = 850790442f5eb487cdc7e35f8ee03e11 -SRC_URI[sha256sum] = 553270b4030f0844cb70aed57e61c7f10a7ed6641c3bed20249201cec9bcf122 +SRC_URI[md5sum] = be6c42294be5c940f208190d3479d50c +SRC_URI[sha256sum] = e65c234cadf7c81b6b1567c440e3b9b31b44f51c27df3e45741b88848d8b37d3 inherit autotools -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/11] libdmx: Upgrade to v1.1.3
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../xorg-lib/{libdmx_1.1.2.bb = libdmx_1.1.3.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libdmx_1.1.2.bb = libdmx_1.1.3.bb} (79%) diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb similarity index 79% rename from meta/recipes-graphics/xorg-lib/libdmx_1.1.2.bb rename to meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb index 9d876bb..5aef188 100644 --- a/meta/recipes-graphics/xorg-lib/libdmx_1.1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb @@ -16,6 +16,6 @@ DEPENDS += libxext dmxproto PR = r0 PE = 1 -SRC_URI[md5sum] = 782ced3a9e754dfeb53a8a006a75eb1a -SRC_URI[sha256sum] = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba +SRC_URI[md5sum] = ba983eba5a9f05d152a0725b8e863151 +SRC_URI[sha256sum] = c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/11] diffutils: Upgrade to v3.3
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../diffutils-3.2/obsolete_automake_macros.patch | 14 - .../diffutils/diffutils-3.2/remove-gets.patch | 22 meta/recipes-extended/diffutils/diffutils.inc |2 +- .../{diffutils_3.2.bb = diffutils_3.3.bb} | 10 ++--- 4 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch rename meta/recipes-extended/diffutils/{diffutils_3.2.bb = diffutils_3.3.bb} (59%) diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch deleted file mode 100644 index f47cc79..000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist cazf...@gmail.com -diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac diffutils-3.2/configure.ac 2011-08-11 18:17:54.0 +0300 -+++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200 -@@ -33,7 +33,6 @@ - - AC_PROG_AWK - AC_PROG_CC --AM_PROG_CC_STDC - AM_MISSING_PROG([HELP2MAN], [help2man]) - AC_PROG_RANLIB - gl_EARLY diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch b/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch deleted file mode 100644 index 58ed62d..000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch +++ /dev/null @@ -1,22 +0,0 @@ -check for gets before using it - -Signed-off-by: Khem Raj raj.k...@gmail.com -Upstream-Status: Pending -Index: diffutils-3.2/lib/stdio.in.h -=== diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.0 -0700 -+++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700 -@@ -693,11 +693,13 @@ - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -so any use of gets warrants an unconditional warning. Assume it is -always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, gets is a security hole - use fgets instead); -+# endif - #endif - - diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index c90a3c9..8286569 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc @@ -6,7 +6,7 @@ SECTION = base INC_PR = r7 -SRC_URI = ${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz +SRC_URI = ${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz inherit autotools update-alternatives gettext diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.3.bb similarity index 59% rename from meta/recipes-extended/diffutils/diffutils_3.2.bb rename to meta/recipes-extended/diffutils/diffutils_3.3.bb index ef400ef..1b72a4b 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.2.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.3.bb @@ -10,11 +10,5 @@ do_configure_prepend () { done } -PR = ${INC_PR}.1 - -SRC_URI += file://remove-gets.patch \ -file://obsolete_automake_macros.patch \ - - -SRC_URI[md5sum] = 22e4deef5d8949a727b159d6bc65c1cc -SRC_URI[sha256sum] = 2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3 +SRC_URI[md5sum] = 99180208ec2a82ce71f55b0d7389f1b3 +SRC_URI[sha256sum] = a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/11] apr: Upgrade to v1.4.8
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../apr/{apr_1.4.6.bb = apr_1.4.8.bb} |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-support/apr/{apr_1.4.6.bb = apr_1.4.8.bb} (92%) diff --git a/meta/recipes-support/apr/apr_1.4.6.bb b/meta/recipes-support/apr/apr_1.4.8.bb similarity index 92% rename from meta/recipes-support/apr/apr_1.4.6.bb rename to meta/recipes-support/apr/apr_1.4.8.bb index 77dffee..38a0673 100644 --- a/meta/recipes-support/apr/apr_1.4.6.bb +++ b/meta/recipes-support/apr/apr_1.4.8.bb @@ -9,15 +9,13 @@ LIC_FILES_CHKSUM = file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ BBCLASSEXTEND = native -PR = r2 - SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configure_fixes.patch \ file://cleanup.patch \ file://configfix.patch -SRC_URI[md5sum] = ffee70a111fd07372982b0550bbb14b7 -SRC_URI[sha256sum] = 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc +SRC_URI[md5sum] = ce2ab01a0c3cdb71cf0a6326b8654f41 +SRC_URI[sha256sum] = 61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421 inherit autotools lib_package binconfig multilib_header -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/11] apr-util: Upgrade to v1.5.2
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../apr/{apr-util_1.5.1.bb = apr-util_1.5.2.bb} |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-support/apr/{apr-util_1.5.1.bb = apr-util_1.5.2.bb} (91%) diff --git a/meta/recipes-support/apr/apr-util_1.5.1.bb b/meta/recipes-support/apr/apr-util_1.5.2.bb similarity index 91% rename from meta/recipes-support/apr/apr-util_1.5.1.bb rename to meta/recipes-support/apr/apr-util_1.5.2.bb index e547fe0..ea0f7fb 100644 --- a/meta/recipes-support/apr/apr-util_1.5.1.bb +++ b/meta/recipes-support/apr/apr-util_1.5.2.bb @@ -9,14 +9,12 @@ LICENSE = Apache-2.0 LIC_FILES_CHKSUM = file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42 -PR = r0 - SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ file://configure_fixes.patch -SRC_URI[md5sum] = 490c2e26e2dc95fd0983ad71112ddac6 -SRC_URI[sha256sum] = 0cf4e48d93ceb9a5e314f48fe127211b71d30234665587e2eaffbb4fc13d931d +SRC_URI[md5sum] = eb682cfb8642babba427a4fb391b15e8 +SRC_URI[sha256sum] = a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613 EXTRA_OECONF = --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/5] shutdown-desktop: give entire path in Exec field
On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: +sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' Doing this in postinst is pretty nasty, instead change the desktop file to contain something like @SBIN@ and run it through sed in do_install. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 06/11] atk: Upgrade to v2.9.3
On 4 July 2013 15:57, Radu Moisan radu.moi...@intel.com wrote: Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../atk/{atk_2.8.0.bb = atk_2.9.3.bb} |4 ++-- NAK, ATK is GNOMEy, so this is a development release. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: upgrade to 2.36.3
Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../glib-2.0/{glib-2.0_2.36.2.bb = glib-2.0_2.36.3.bb}|4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.36.2.bb = glib-2.0_2.36.3.bb} (92%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb similarity index 92% rename from meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb index 935a493..463dc0d 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.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] = d791774ac49eaf8ba59792427bb74af7 -SRC_URI[sha256sum] = 5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80 +SRC_URI[md5sum] = 89180c7354b0acd3efb0a36ac05ca39c +SRC_URI[sha256sum] = 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e BBCLASSEXTEND = native nativesdk -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/10] iputils: Upgrade to v20121221
Removed obsolete patches Replaced openssl with gnutls in dependency list Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../files/debian/add-icmp-return-codes.diff| 43 .../iputils/files/debian/fix-arping-timeouts.diff | 26 .../files/debian/fix-dead-host-ping-stats.diff | 16 .../iputils/files/debian/targets.diff | 14 +++ .../iputils/files/debian/use_gethostbyname2.diff | 36 .../{iputils_s20101006.bb = iputils_s20121221.bb} | 14 +++ 6 files changed, 30 insertions(+), 119 deletions(-) delete mode 100644 meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff rename meta/recipes-extended/iputils/{iputils_s20101006.bb = iputils_s20121221.bb} (80%) diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff deleted file mode 100644 index 40070c3..000 --- a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping.c -=== trunk.orig/ping.c 2010-05-07 23:13:54.0 -0700 -+++ trunk/ping.c 2010-05-07 23:23:22.0 -0700 -@@ -883,9 +883,36 @@ - case ICMP_SR_FAILED: - printf(Source Route Failed\n); - break; -+ case ICMP_NET_UNKNOWN: -+ printf(Destination Net Unknown\n); -+ break; -+ case ICMP_HOST_UNKNOWN: -+ printf(Destination Host Unknown\n); -+ break; -+ case ICMP_HOST_ISOLATED: -+ printf(Source Host Isolated\n); -+ break; -+ case ICMP_NET_ANO: -+ printf(Destination Net Prohibited\n); -+ break; -+ case ICMP_HOST_ANO: -+ printf(Destination Host Prohibited\n); -+ break; -+ case ICMP_NET_UNR_TOS: -+ printf(Destination Net Unreachable for Type of Service\n); -+ break; -+ case ICMP_HOST_UNR_TOS: -+ printf(Destination Host Unreachable for Type of Service\n); -+ break; - case ICMP_PKT_FILTERED: - printf(Packet filtered\n); - break; -+ case ICMP_PREC_VIOLATION: -+ printf(Precedence Violation\n); -+ break; -+ case ICMP_PREC_CUTOFF: -+ printf(Precedence Cutoff\n); -+ break; - default: - printf(Dest Unreachable, Bad Code: %d\n, code); - break; diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff deleted file mode 100644 index 3e34788..000 --- a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/arping.c -=== trunk.orig/arping.c2010-05-07 23:13:52.0 -0700 -+++ trunk/arping.c 2010-05-07 23:41:16.0 -0700 -@@ -182,12 +182,17 @@ - if (start.tv_sec==0) - start = tv; - -- if (count-- == 0 || (timeout MS_TDIFF(tv,start) timeout*1000 + 500)) -+ if (timeout MS_TDIFF(tv,start) timeout*1000 + 500) - finish(); - -- if (last.tv_sec==0 || MS_TDIFF(tv,last) 500) { -+ if ((!timeout) (count == 0)) -+ finish(); -+ -+ if ( count!=0 (last.tv_sec==0 || MS_TDIFF(tv,last) 500 ) ) { - send_pack(s, src, dst, - (struct sockaddr_ll *)me, (struct sockaddr_ll *)he); -+ if (count = 0) -+ count--; - if (count == 0 unsolicited) - finish(); - } diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff deleted file mode 100644 index fda42bf..000 --- a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping_common.c -=== trunk.orig/ping_common.c 2010-05-07 23:13:51.0 -0700 -+++
[OE-core] [PATCH 06/10] libdmx: Upgrade to v1.1.3
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../xorg-lib/{libdmx_1.1.2.bb = libdmx_1.1.3.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libdmx_1.1.2.bb = libdmx_1.1.3.bb} (79%) diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb similarity index 79% rename from meta/recipes-graphics/xorg-lib/libdmx_1.1.2.bb rename to meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb index 9d876bb..5aef188 100644 --- a/meta/recipes-graphics/xorg-lib/libdmx_1.1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb @@ -16,6 +16,6 @@ DEPENDS += libxext dmxproto PR = r0 PE = 1 -SRC_URI[md5sum] = 782ced3a9e754dfeb53a8a006a75eb1a -SRC_URI[sha256sum] = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba +SRC_URI[md5sum] = ba983eba5a9f05d152a0725b8e863151 +SRC_URI[sha256sum] = c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] rxvt-unicode: Upgrade to v9.18
do_configure was initially failing because could not stat aclocal.m4, prepended ${S} so that it could find the file, however I don't know the reasoning for do_configure_prepend in this recipe, it also builds fine without it Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../rxvt.desktop |0 .../rxvt.png | Bin 2847 - 2847 bytes .../xwc.patch |0 .../{rxvt-unicode_9.17.bb = rxvt-unicode_9.18.bb} |6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 = rxvt-unicode-9.18}/rxvt.desktop (100%) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 = rxvt-unicode-9.18}/rxvt.png (100%) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 = rxvt-unicode-9.18}/xwc.patch (100%) rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.17.bb = rxvt-unicode_9.18.bb} (92%) diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop similarity index 100% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.desktop rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.png b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png similarity index 100% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.png rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch similarity index 100% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/xwc.patch rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb similarity index 92% rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb index 806e354..9a47617 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb @@ -17,8 +17,8 @@ SRC_URI = http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 file://rxvt.desktop \ file://rxvt.png -SRC_URI[md5sum] = 1270432bdc7ce17dbb07d41a607081e0 -SRC_URI[sha256sum] = de017b2b2a1a7182aeada99f605da33cbee18d450e07a7fdabef48da446521e4 +SRC_URI[md5sum] = 963ccc748fe5bca925e7b92c0404d68b +SRC_URI[sha256sum] = 87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f inherit autotools update-alternatives @@ -42,7 +42,7 @@ EXTRA_OECONF = --enable-menubar --enable-xim \ --with-x=${STAGING_DIR_HOST}${prefix} do_configure_prepend () { - cp aclocal.m4 acinclude.m4 + cp ${S}/aclocal.m4 ${S}/acinclude.m4 } do_compile_prepend () { -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 00/10] Package Upgrades
* iputils: Removed obsolete patches Replaced openssl with gnutls in dependency list * busybox: Removed obsolete patches Added a few fixes from upstream (http://busybox.net/downloads/fixes-1.21.0/) busybox-1.21.0-mdev.patch busybox-1.21.0-platform.patch busybox-1.21.0-xz.patch * elfutils: license changed to GPLv3 several patches were absolete so I removed them redhat-portability redhat-robustify backported from latest elfutils-portability elfutils-robustify from upstream * The rest are basic upgrades, no issues The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9: bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib rmoisan/branch-updates http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rmoisan/branch-updates Radu Moisan (10): iputils: Upgrade to v20121221 busybox: Upgrade to v1.21.0 elfutils: Upgrade to v0.155 rxvt-unicode: Upgrade to v9.18 ed: Upgrade to v1.8 libdmx: Upgrade to v1.1.3 apr: Upgrade to v1.4.8 apr-util: Upgrade to v1.5.2 diffutils: Upgrade to v3.3 usbutils: Upgrade to v007 .../usbutils/{usbutils_006.bb = usbutils_007.bb} |5 +- .../busybox/busybox-1.20.2/B921600.patch | 24 - .../busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 28 - .../busybox-mkfs-minix-tests_bigendian.patch | 34 - .../fix-for-spurious-testsuite-failure.patch | 27 - .../busybox/busybox-1.20.2/sys_resource.patch | 99 -- .../busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 - .../busybox-1.21.0/busybox-1.21.0-mdev.patch | 647 +++ .../busybox-1.21.0/busybox-1.21.0-platform.patch | 28 + .../busybox/busybox-1.21.0/busybox-1.21.0-xz.patch | 88 + .../busybox-appletlib-dependency.patch |0 ...usybox-list-suid-and-non-suid-app-configs.patch |0 .../busybox-sulogin-empty-root-password.patch |0 .../busybox-udhcpc-no_deconfig.patch |0 .../{busybox-1.20.2 = busybox-1.21.0}/defconfig |0 .../fail_on_no_media.patch |0 .../get_header_tar.patch |0 .../login-utilities.cfg|0 .../run-parts.in.usr-bin.patch |6 +- .../stat-usr-bin.patch |0 .../strict-atime.patch |0 ...estsuite-du-du-k-works-fix-false-positive.patch |0 .../watch.in.usr-bin.patch |0 .../{busybox_1.20.2.bb = busybox_1.21.0.bb} | 20 +- .../elfutils/elfutils-0.155/arm_backend.diff | 450 + .../elfutils/elfutils-0.155/do-autoreconf.diff | 215 +++ .../elfutils/elfutils-0.155/dso-link-change.patch | 32 + .../elfutils/elfutils-0.155/elf_additions.diff | 61 + .../elfutils-ar-c-fix-num-passed-to-memset.patch | 23 + .../elfutils-0.155/elfutils-robustify.patch| 1756 +++ .../elfutils/elfutils-0.155/hppa_backend.diff | 796 + .../elfutils/elfutils-0.155/i386_dis.h | 1657 ++ .../elfutils/elfutils-0.155/m68k_backend.diff | 303 .../elfutils/elfutils-0.155/mempcpy.patch | 24 + .../elfutils/elfutils-0.155/mips_backend.diff | 708 ...ssed-to-snprintf-for-invalid-sh_name-case.patch | 27 + .../elfutils-0.155/redhat-portability.diff | 1775 +++ .../elfutils/elfutils-0.155/redhat-robustify.diff | 1824 .../elfutils/elfutils-0.155/uclibc-support.patch | 91 + .../elfutils/elfutils-0.155/x86_64_dis.h | 1632 ++ meta/recipes-devtools/elfutils/elfutils_0.155.bb | 84 + .../diffutils-3.2/obsolete_automake_macros.patch | 14 - .../diffutils/diffutils-3.2/remove-gets.patch | 22 - meta/recipes-extended/diffutils/diffutils.inc |2 +- .../{diffutils_3.2.bb = diffutils_3.3.bb} | 10 +- meta/recipes-extended/ed/ed-1.7/ed-1.2-build.patch | 43 - meta/recipes-extended/ed/{ed_1.7.bb = ed_1.8.bb} | 11 +- .../files/debian/add-icmp-return-codes.diff| 43 - .../iputils/files/debian/fix-arping-timeouts.diff | 26 - .../files/debian/fix-dead-host-ping-stats.diff | 16 - .../iputils/files/debian/targets.diff | 14 +- .../iputils/files/debian/use_gethostbyname2.diff | 36 +- .../{iputils_s20101006.bb = iputils_s20121221.bb} | 14 +- .../xorg-lib/{libdmx_1.1.2.bb = libdmx_1.1.3.bb} |4 +- .../rxvt.desktop |0 .../rxvt.png | Bin 2847 - 2847 bytes .../xwc.patch |0 .../{rxvt-unicode_9.17.bb = rxvt-unicode_9.18.bb} |6 +- .../apr/{apr-util_1.5.1.bb = apr-util_1.5.2.bb} |6 +- .../apr/{apr_1.4.6.bb = apr_1.4.8.bb}
[OE-core] [PATCH 08/10] apr-util: Upgrade to v1.5.2
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../apr/{apr-util_1.5.1.bb = apr-util_1.5.2.bb} |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-support/apr/{apr-util_1.5.1.bb = apr-util_1.5.2.bb} (91%) diff --git a/meta/recipes-support/apr/apr-util_1.5.1.bb b/meta/recipes-support/apr/apr-util_1.5.2.bb similarity index 91% rename from meta/recipes-support/apr/apr-util_1.5.1.bb rename to meta/recipes-support/apr/apr-util_1.5.2.bb index e547fe0..ea0f7fb 100644 --- a/meta/recipes-support/apr/apr-util_1.5.1.bb +++ b/meta/recipes-support/apr/apr-util_1.5.2.bb @@ -9,14 +9,12 @@ LICENSE = Apache-2.0 LIC_FILES_CHKSUM = file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42 -PR = r0 - SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://configfix.patch \ file://configure_fixes.patch -SRC_URI[md5sum] = 490c2e26e2dc95fd0983ad71112ddac6 -SRC_URI[sha256sum] = 0cf4e48d93ceb9a5e314f48fe127211b71d30234665587e2eaffbb4fc13d931d +SRC_URI[md5sum] = eb682cfb8642babba427a4fb391b15e8 +SRC_URI[sha256sum] = a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613 EXTRA_OECONF = --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/10] usbutils: Upgrade to v007
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../usbutils/{usbutils_006.bb = usbutils_007.bb} |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-bsp/usbutils/{usbutils_006.bb = usbutils_007.bb} (83%) diff --git a/meta/recipes-bsp/usbutils/usbutils_006.bb b/meta/recipes-bsp/usbutils/usbutils_007.bb similarity index 83% rename from meta/recipes-bsp/usbutils/usbutils_006.bb rename to meta/recipes-bsp/usbutils/usbutils_007.bb index c1c9fc0..45f829f 100644 --- a/meta/recipes-bsp/usbutils/usbutils_006.bb +++ b/meta/recipes-bsp/usbutils/usbutils_007.bb @@ -7,14 +7,13 @@ LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f DEPENDS = libusb zlib -PR = r0 SRC_URI = ${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ file://usb-devices-avoid-dependency-on-bash.patch \ file://Fix-NULL-pointer-crash.patch -SRC_URI[md5sum] = 850790442f5eb487cdc7e35f8ee03e11 -SRC_URI[sha256sum] = 553270b4030f0844cb70aed57e61c7f10a7ed6641c3bed20249201cec9bcf122 +SRC_URI[md5sum] = be6c42294be5c940f208190d3479d50c +SRC_URI[sha256sum] = e65c234cadf7c81b6b1567c440e3b9b31b44f51c27df3e45741b88848d8b37d3 inherit autotools -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/10] apr: Upgrade to v1.4.8
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../apr/{apr_1.4.6.bb = apr_1.4.8.bb} |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-support/apr/{apr_1.4.6.bb = apr_1.4.8.bb} (92%) diff --git a/meta/recipes-support/apr/apr_1.4.6.bb b/meta/recipes-support/apr/apr_1.4.8.bb similarity index 92% rename from meta/recipes-support/apr/apr_1.4.6.bb rename to meta/recipes-support/apr/apr_1.4.8.bb index 77dffee..38a0673 100644 --- a/meta/recipes-support/apr/apr_1.4.6.bb +++ b/meta/recipes-support/apr/apr_1.4.8.bb @@ -9,15 +9,13 @@ LIC_FILES_CHKSUM = file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ BBCLASSEXTEND = native -PR = r2 - SRC_URI = ${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://configure_fixes.patch \ file://cleanup.patch \ file://configfix.patch -SRC_URI[md5sum] = ffee70a111fd07372982b0550bbb14b7 -SRC_URI[sha256sum] = 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc +SRC_URI[md5sum] = ce2ab01a0c3cdb71cf0a6326b8654f41 +SRC_URI[sha256sum] = 61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421 inherit autotools lib_package binconfig multilib_header -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/10] diffutils: Upgrade to v3.3
Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../diffutils-3.2/obsolete_automake_macros.patch | 14 - .../diffutils/diffutils-3.2/remove-gets.patch | 22 meta/recipes-extended/diffutils/diffutils.inc |2 +- .../{diffutils_3.2.bb = diffutils_3.3.bb} | 10 ++--- 4 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch rename meta/recipes-extended/diffutils/{diffutils_3.2.bb = diffutils_3.3.bb} (59%) diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch deleted file mode 100644 index f47cc79..000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist cazf...@gmail.com -diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac diffutils-3.2/configure.ac 2011-08-11 18:17:54.0 +0300 -+++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200 -@@ -33,7 +33,6 @@ - - AC_PROG_AWK - AC_PROG_CC --AM_PROG_CC_STDC - AM_MISSING_PROG([HELP2MAN], [help2man]) - AC_PROG_RANLIB - gl_EARLY diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch b/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch deleted file mode 100644 index 58ed62d..000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch +++ /dev/null @@ -1,22 +0,0 @@ -check for gets before using it - -Signed-off-by: Khem Raj raj.k...@gmail.com -Upstream-Status: Pending -Index: diffutils-3.2/lib/stdio.in.h -=== diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.0 -0700 -+++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700 -@@ -693,11 +693,13 @@ - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -so any use of gets warrants an unconditional warning. Assume it is -always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, gets is a security hole - use fgets instead); -+# endif - #endif - - diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index c90a3c9..8286569 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc @@ -6,7 +6,7 @@ SECTION = base INC_PR = r7 -SRC_URI = ${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz +SRC_URI = ${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz inherit autotools update-alternatives gettext diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.3.bb similarity index 59% rename from meta/recipes-extended/diffutils/diffutils_3.2.bb rename to meta/recipes-extended/diffutils/diffutils_3.3.bb index ef400ef..1b72a4b 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.2.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.3.bb @@ -10,11 +10,5 @@ do_configure_prepend () { done } -PR = ${INC_PR}.1 - -SRC_URI += file://remove-gets.patch \ -file://obsolete_automake_macros.patch \ - - -SRC_URI[md5sum] = 22e4deef5d8949a727b159d6bc65c1cc -SRC_URI[sha256sum] = 2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3 +SRC_URI[md5sum] = 99180208ec2a82ce71f55b0d7389f1b3 +SRC_URI[sha256sum] = a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [v3] lighttpd: Enabling with systemd
From: Muhammad Shakeel muhammad_shak...@mentor.com - Remove dependency on systemd layer - Use lighttpd service type 'simple' rather than 'oneshot' Signed-off-by: Muhammad Shakeel muhammad_shak...@mentor.com --- .../lighttpd/files/lighttpd.service| 12 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 11 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index df6ce97..d73a76a 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb @@ -5,7 +5,6 @@ BUGTRACKER = http://redmine.lighttpd.net/projects/lighttpd/issues; LICENSE = BSD LIC_FILES_CHKSUM = file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 - SECTION = net DEPENDS = zlib libpcre RDEPENDS_${PN} += \ @@ -18,10 +17,15 @@ RDEPENDS_${PN} += \ PR = r0 +inherit systemd + +SYSTEMD_SERVICE_${PN} = lighttpd.service + SRC_URI = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \ file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ +file://lighttpd.service \ SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b @@ -49,6 +53,11 @@ do_install_append() { install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html + +if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system +fi } FILES_${PN} += ${sysconfdir} /www -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [v3] lighttpd: Enabling with systemd
Please ignore this. I will send a v4 which will run the service file through sed. Thanks, Shakeel From: Shakeel, Muhammad Sent: Thursday, July 04, 2013 8:18 PM To: openembedded-core@lists.openembedded.org Cc: Shakeel, Muhammad Subject: [PATCH] [v3] lighttpd: Enabling with systemd From: Muhammad Shakeel muhammad_shak...@mentor.com - Remove dependency on systemd layer - Use lighttpd service type 'simple' rather than 'oneshot' Signed-off-by: Muhammad Shakeel muhammad_shak...@mentor.com --- .../lighttpd/files/lighttpd.service| 12 meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 11 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index df6ce97..d73a76a 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb @@ -5,7 +5,6 @@ BUGTRACKER = http://redmine.lighttpd.net/projects/lighttpd/issues; LICENSE = BSD LIC_FILES_CHKSUM = file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 - SECTION = net DEPENDS = zlib libpcre RDEPENDS_${PN} += \ @@ -18,10 +17,15 @@ RDEPENDS_${PN} += \ PR = r0 +inherit systemd + +SYSTEMD_SERVICE_${PN} = lighttpd.service + SRC_URI = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \ file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ +file://lighttpd.service \ SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b @@ -49,6 +53,11 @@ do_install_append() { install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html + +if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system +fi } FILES_${PN} += ${sysconfdir} /www -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/5] shutdown-desktop: give entire path in Exec field
On 07/04/2013 05:58 PM, Burton, Ross wrote: On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: +sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' Doing this in postinst is pretty nasty, Nasty, in what way? How is this line different from the previous line in the same postinstall? That one is also using sed to change 'halt' to 'reboot' for qemuarm. Is it the sed you're worried about? This postinstall is executed on host anyway, at do_rootfs(). instead change the desktop file to contain something like @SBIN@ and run it through sed in do_install. Even though the change you're proposing is OK, involves changing the desktop file to add the @SBIN@ pattern and move the sed line to do_install(). Compared to having one single line added in the postinstall... I would choose the latter, unless you elaborate on what do you actually mean by nasty. Laurentiu Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pango: drop unexplainable elfutils dependency
In dafefa7bd4de518adb63ec19390b77a56cb65d8e elfutils was added as a build-dependency of Pango. However there is no such linkage inside Pango, and it builds fine without elfutils. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-graphics/pango/pango.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 52dd064..80f2e19 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -10,7 +10,7 @@ SECTION = libs LICENSE = LGPLv2.0+ X11DEPENDS = virtual/libx11 libxft -DEPENDS = glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils harfbuzz +DEPENDS = glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} PACKAGECONFIG[x11] = --with-x,--without-x,${X11DEPENDS} -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/5] shutdown-desktop: give entire path in Exec field
On 4 July 2013 16:39, Laurentiu Palcu laurentiu.pa...@intel.com wrote: Doing this in postinst is pretty nasty, Nasty, in what way? How is this line different from the previous line in the same postinstall? That one is also using sed to change 'halt' to 'reboot' for qemuarm. Is it the sed you're worried about? This postinstall is executed on host anyway, at do_rootfs(). The existing sed to manipulate the exec line is arguably a better solution to making this package machine-specific and special-casing just qemuarm. (I'm not sure why it special-cases qemuarm, and 751212d5effdceab91d95705e647cf07e6820940 where it was introduced doesn't clarify matters, but we'll ignore that for now). Arguably, but I'm not sure I agree. Anyway, you've a path that is known at build time so we can fix it at build time. Instead of using install, you can use sed. Just because we *can* run postinst scripts when generating the rootfs doesn't mean we *should*, do_install is for installing the files we're going to package, and postinst is for runtime changes that can't happen at any other time. instead change the desktop file to contain something like @SBIN@ and run it through sed in do_install. Even though the change you're proposing is OK, involves changing the desktop file to add the @SBIN@ pattern and move the sed line to do_install(). Compared to having one single line added in the postinstall... I would choose the latter, unless you elaborate on what do you actually mean by nasty. We're not being invoiced based on the number of patch hunks, and changing /sbin to @SBIN@ and install to sed isn't exactly a massive time sink. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/5] shutdown-desktop: give entire path in Exec field
On 04/07/13 16:39, Laurentiu Palcu wrote: On 07/04/2013 05:58 PM, Burton, Ross wrote: On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: Even though the change you're proposing is OK, involves changing the desktop file to add the @SBIN@ pattern and move the sed line to do_install(). Compared to having one single line added in the postinstall... I would choose the latter, unless you elaborate on what do you actually mean by nasty. Post install scripts should be avoided whenever possible and used only for things that cannot be done at build or install time. This clearly can be done at install time, so it should. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 00/10] Package Upgrades
On 4 July 2013 16:13, Radu Moisan radu.moi...@intel.com wrote: * elfutils: license changed to GPLv3 Humpf. As elfutils disappearing in a no-GPLv3 build will have effects, I expect we'll either want to a) hold back on this or b) have both versions. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 04/10] rxvt-unicode: Upgrade to v9.18
On 4 July 2013 16:13, Radu Moisan radu.moi...@intel.com wrote: do_configure_prepend () { - cp aclocal.m4 acinclude.m4 + cp ${S}/aclocal.m4 ${S}/acinclude.m4 } That's the right fix. The rationale for this pattern is that aclocal.m4 is a generated file, created by the aclocal binary, which contains all of the macros used by rxvt from /usr/share/aclocal (i.e. the X macros). Thus, it will be destroyed at configure time. acinclude.m4 is for local macros and is a source file. Typically you see this pattern in packages which ship a non-pristine aclocal.m4, so when we re-generate it macros are lost. That normally means that the package won't build though. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] nativesdk-dbus do_package error
On 3 July 2013 07:53, Yi Qingliang niqingliang2...@gmail.com wrote: ERROR: QA Issue: nativesdk-dbus: Files/directories were installed but not shipped /run /run/dbus I thought we'd deleted that, I'll check later. ERROR: QA Issue: Found library in wrong location: /lib/systemd/system/dbus.socket Found library in wrong location: /lib/systemd/system/dbus.target.wants/dbus.socket Found library in wrong location: /lib/systemd/system/sockets.target.wants/dbus.socket There's a patch on the list for this from Paul, should be merged soon. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/5] shutdown-desktop: give entire path in Exec field
On Thu, Jul 04, 2013 at 04:56:45PM +0100, Tomas Frydrych wrote: On 04/07/13 16:39, Laurentiu Palcu wrote: On 07/04/2013 05:58 PM, Burton, Ross wrote: On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: Even though the change you're proposing is OK, involves changing the desktop file to add the @SBIN@ pattern and move the sed line to do_install(). Compared to having one single line added in the postinstall... I would choose the latter, unless you elaborate on what do you actually mean by nasty. Post install scripts should be avoided whenever possible and used only for things that cannot be done at build or install time. This clearly can be done at install time, so it should. I agree. However, in this particular case I'm just being consistent with what was already there. I would have personally moved the entire postinstall to do_install, but the previous sed cannot be moved. So, since we're stuck with that sed there, this one is just a harmless addition. This is what I mean! Laurentiu Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Stale contrib branches
Hi folks, It's that time again - could you please clear out any old already merged contrib branches from openembedded-core-contrib that belong to you (and any of the other contrib repos for that matter). Thanks, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/11] iputils: Upgrade to v20121221
On 07/04/2013 07:57 AM, Radu Moisan wrote: Replaced openssl with gnutls in dependency list why is this done ? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] busybox: upgrade to stable 1.21.1
On 07/02/2013 07:39 PM, qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../poky-tiny/defconfig|0 ...box_1.20.2.bbappend = busybox_1.21.1.bbappend} |0 These two need to go to the meta-yocto (p...@yoctoproject.org). Thanks Sau! .../busybox/busybox-1.20.2/B921600.patch | 24 - .../busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 28 -- .../busybox-mkfs-minix-tests_bigendian.patch | 34 --- .../fix-for-spurious-testsuite-failure.patch | 27 -- .../busybox/busybox-1.20.2/strict-atime.patch | 49 -- .../busybox/busybox-1.20.2/sys_resource.patch | 99 .../busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 -- .../busybox-appletlib-dependency.patch |0 ...usybox-list-suid-and-non-suid-app-configs.patch |0 .../busybox-sulogin-empty-root-password.patch |0 .../busybox-udhcpc-no_deconfig.patch |0 .../{busybox-1.20.2 = busybox-1.21.1}/defconfig |0 .../fail_on_no_media.patch |0 .../get_header_tar.patch |0 .../login-utilities.cfg|0 .../run-parts.in.usr-bin.patch |4 +- .../stat-usr-bin.patch |0 ...estsuite-du-du-k-works-fix-false-positive.patch |0 .../watch.in.usr-bin.patch |0 .../{busybox_1.20.2.bb = busybox_1.21.1.bb} | 13 +-- 22 files changed, 5 insertions(+), 303 deletions(-) rename meta-yocto/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/poky-tiny/defconfig (100%) rename meta-yocto/recipes-core/busybox/{busybox_1.20.2.bbappend = busybox_1.21.1.bbappend} (100%) delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/B921600.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-appletlib-dependency.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-list-suid-and-non-suid-app-configs.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-sulogin-empty-root-password.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-udhcpc-no_deconfig.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/defconfig (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/fail_on_no_media.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/get_header_tar.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/login-utilities.cfg (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/run-parts.in.usr-bin.patch (94%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/stat-usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/testsuite-du-du-k-works-fix-false-positive.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/watch.in.usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox_1.20.2.bb = busybox_1.21.1.bb} (75%) diff --git a/meta-yocto/recipes-core/busybox/busybox-1.20.2/poky-tiny/defconfig b/meta-yocto/recipes-core/busybox/busybox-1.21.1/poky-tiny/defconfig similarity index 100% rename from meta-yocto/recipes-core/busybox/busybox-1.20.2/poky-tiny/defconfig rename to meta-yocto/recipes-core/busybox/busybox-1.21.1/poky-tiny/defconfig diff --git a/meta-yocto/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-yocto/recipes-core/busybox/busybox_1.21.1.bbappend similarity index 100% rename from meta-yocto/recipes-core/busybox/busybox_1.20.2.bbappend rename to meta-yocto/recipes-core/busybox/busybox_1.21.1.bbappend diff --git a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch deleted file mode 100644 index c4d98e3..000 --- a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -# copy commit message
[OE-core] [PATCH v8] systemd: added python-systemd package generation.
--- meta/recipes-core/systemd/systemd_204.bb | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb index b8b1290..2a6ed0c 100644 --- a/meta/recipes-core/systemd/systemd_204.bb +++ b/meta/recipes-core/systemd/systemd_204.bb @@ -13,9 +13,16 @@ PE = 1 DEPENDS = kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux DEPENDS += ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} +# need to export these variables for python-config to work +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + SECTION = base/shell -inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu +inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu \ +${@base_contains('DISTRO_FEATURES', 'python', 'pythonnative python-dir', '', d)} SRC_URI = http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ file://touchscreen.rules \ @@ -42,7 +49,8 @@ LDFLAGS_libc-uclibc_append = -lrt GTKDOC_DOCDIR = ${S}/docs/ -PACKAGECONFIG ??= xz tcp-wrappers +PACKAGECONFIG ??= xz tcp-wrappers \ + ${@base_contains('DISTRO_FEATURES', 'python', 'python', '', d)} # Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = --enable-gcrypt,--disable-gcrypt,libgcrypt # regardless of PACKAGECONFIG, libgcrypt is always required to expand @@ -51,6 +59,8 @@ DEPENDS += libgcrypt # Compress the journal PACKAGECONFIG[xz] = --enable-xz,--disable-xz,xz PACKAGECONFIG[tcp-wrappers] = --enable-tcpwrap,--disable-tcpwrap,tcp-wrappers +# Use python-systemd +PACKAGECONFIG[python] = --with-python,--without-python,python CACHED_CONFIGUREVARS = ac_cv_path_KILL=${base_bindir}/kill @@ -71,7 +81,6 @@ EXTRA_OECONF = --with-rootprefix=${rootprefix} \ --disable-tcpwrap \ --enable-split-usr \ --disable-microhttpd \ - --without-python \ --with-sysvrcnd-path=${sysconfdir} \ --with-firmware-path=/lib/firmware \ ac_cv_path_KILL=${base_bindir}/kill \ @@ -93,6 +102,8 @@ do_install() { # Provided by a separate recipe rm ${D}${systemd_unitdir}/system/serial-getty* -f + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/systemd/*.la + # Provide support for initramfs ln -s ${rootlibexecdir}/systemd/systemd ${D}/init ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd @@ -121,7 +132,7 @@ python populate_packages_prepend (){ } PACKAGES_DYNAMIC += ^lib(udev|gudev|systemd).* -PACKAGES =+ ${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install +PACKAGES =+ ${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install python-${PN} USERADD_PACKAGES = ${PN} GROUPADD_PARAM_${PN} = -r lock; -r systemd-journal @@ -131,6 +142,9 @@ FILES_${PN}-analyze = ${bindir}/systemd-analyze FILES_${PN}-initramfs = /init RDEPENDS_${PN}-initramfs = ${PN} +FILES_python-${PN} = ${PYTHON_SITEPACKAGES_DIR}/systemd/*.py* ${PYTHON_SITEPACKAGES_DIR}/systemd/*.so +RDEPENDS_python-${PN} = python-core python-datetime python-logging python-syslog + FILES_${PN}-gui = ${bindir}/systemadm FILES_${PN}-vconsole-setup = ${rootlibexecdir}/systemd/systemd-vconsole-setup \ @@ -187,7 +201,7 @@ FILES_${PN} = ${base_bindir}/* \ /lib/udev/rules.d/99-systemd.rules \ -FILES_${PN}-dbg += ${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/ +FILES_${PN}-dbg += ${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/ ${PYTHON_SITEPACKAGES_DIR}/systemd/.debug FILES_${PN}-dev += ${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd RDEPENDS_${PN} += dbus util-linux-mount -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] gst-plugins-bad: inherit gsettings
* do_configure fails without native glib-compile-schemas: | checking for glib-compile-schemas... no | configure: error: glib-compile-schemas not found. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb index a3a1204..7e80ce4 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb @@ -10,7 +10,7 @@ DEPENDS += gst-plugins-base PR = r4 -inherit gettext +inherit gettext gsettings EXTRA_OECONF += --disable-experimental \ --disable-sdl --disable-cdaudio --disable-directfb \ -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] systemtap: inherit pkgconfig
* systemtap-native was failing with undefined AC_DEFINE configure.ac:56: error: possibly undefined macro: AC_DEFINE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-kernel/systemtap/systemtap_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 22f8959..9bba5a9 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -20,7 +20,7 @@ STAP_DOCS ?= --disable-docs --disable-publican --disable-refdocs EXTRA_OECONF += ${STAP_DOCS} -inherit autotools gettext +inherit autotools gettext pkgconfig BBCLASSEXTEND = native nativesdk -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] quota: inherit pkgconfig
* missing dependency on pkgconfig-native was causing that PKG_CHECK_MODULES(DBUS, dbus-1) stayed unexpanded in configure script: checking for ext2fs_initialize in -lext2fs... yes quota/4.01-r1/quota-tools/configure: line 3746: syntax error near unexpected token `DBUS,' quota/4.01-r1/quota-tools/configure: line 3746: ` PKG_CHECK_MODULES(DBUS, dbus-1)' Configure failed. The contents of all config.log files follows to aid debugging Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-extended/quota/quota_4.01.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/quota/quota_4.01.bb b/meta/recipes-extended/quota/quota_4.01.bb index 4dc7e68..9835f06 100644 --- a/meta/recipes-extended/quota/quota_4.01.bb +++ b/meta/recipes-extended/quota/quota_4.01.bb @@ -17,7 +17,7 @@ S = ${WORKDIR}/quota-tools DEPENDS = gettext-native e2fsprogs -inherit autotools gettext +inherit autotools gettext pkgconfig EXTRA_OEMAKE += 'STRIP=' -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] eglibc-locale: add missing dependency on virtual/${TARGET_PREFIX}binutils
* eglibc-collateral.inc inhibits all default deps, but do_package needs objcopy: ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'eglibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'eglibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so') ERROR: Function failed: split_and_strip_files Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-core/eglibc/eglibc-locale.inc | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index f4cb814..fc51022 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc @@ -5,6 +5,11 @@ SUMMARY = Locale data from eglibc BPN = eglibc LOCALEBASEPN = ${MLPREFIX}eglibc +# eglibc-collateral.inc inhibits all default deps, but do_package needs objcopy +# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'eglibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'eglibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so') +# ERROR: Function failed: split_and_strip_files +DEPENDS = virtual/${TARGET_PREFIX}binutils + # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION # is set. The idea is to avoid running localedef on the target (at first boot) # to decrease initial boot time and avoid localedef being killed by the OOM -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] (lib)telepathy*: add missing dependency on libxslt-native
* do_configure fails without: | configure:13590: error: xsltproc (from the libxslt source package) is required Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb | 2 +- meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb | 3 +-- meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb | 3 +-- .../telepathy/telepathy-mission-control_5.14.0.bb | 4 +--- meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb | 1 + 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb b/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb index 7d0ef79..f13e709 100644 --- a/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb +++ b/meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb @@ -4,7 +4,7 @@ communication, including instant messaging, voice calls and video calls. It \ abstracts differences between protocols to provide a unified interface for \ applications. HOMEPAGE = http://telepathy.freedesktop.org/wiki/; -DEPENDS = glib-2.0 dbus dbus-glib telepathy-glib +DEPENDS = glib-2.0 dbus dbus-glib telepathy-glib libxslt-native LICENSE = LGPLv2.1+ LIC_FILES_CHKSUM = file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://src/tp-conn.c;beginline=1;endline=19;md5=4c58069f77d601cc59200bce5396c7cb diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb index a0c3103..85071c0 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb @@ -1,9 +1,8 @@ SUMMARY = Telepathy Framework glib-base helper library DESCRIPTION = Telepathy Framework: GLib-based helper library for connection managers HOMEPAGE = http://telepathy.freedesktop.org/wiki/; -DEPENDS = glib-2.0 dbus python-native-runtime dbus-native dbus-glib +DEPENDS = glib-2.0 dbus python-native-runtime dbus-native dbus-glib libxslt-native LICENSE = LGPLv2.1+ -PR = r0 SRC_URI = http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \ file://pkgconfig.patch diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb index 02250ea..4edcb3b 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb @@ -1,11 +1,10 @@ SUMMARY = Telepathy IRC connection manager DESCRIPTION = Telepathy implementation of the Internet Relay Chat protocols. HOMEPAGE = http://telepathy.freedesktop.org/wiki/; -DEPENDS = glib-2.0 dbus telepathy-glib openssl +DEPENDS = glib-2.0 dbus telepathy-glib openssl libxslt-native LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9 -PR = r0 SRC_URI = http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://fix-svc-gtk-doc.h-target.patch diff --git a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.14.0.bb b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.14.0.bb index b758dd9..23e4c97 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.14.0.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.14.0.bb @@ -4,12 +4,10 @@ LICENSE = LGPLv2.1+ LIC_FILES_CHKSUM = file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ file://src/request.h;beginline=1;endline=21;md5=f80534d9af1c33291b3b79609f196eb2 SECTION = libs -DEPENDS = libtelepathy dbus-glib gconf +DEPENDS = libtelepathy dbus-glib gconf libxslt-native SRC_URI = http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-${PV}.tar.gz; -PR = r0 - inherit autotools pkgconfig pythonnative PACKAGES =+ \ diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb index f83bb2c..5a02d81 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb @@ -4,6 +4,7 @@ LICENSE = LGPLv2.1+ LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/utils.py;beginline=1;endline=17;md5=9a07d1a9791a7429a14e7b25c6c86822 +DEPENDS = libxslt-native RDEPENDS_${PN} += python-dbus SRC_URI = http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] Missing deps discovered in per-recipe builds
I was using simple script to build each component alone: #!/bin/bash rm -rf tmp-eglibc/abi_version tmp-eglibc/buildstats tmp-eglibc/cache tmp-eglibc/deploy tmp-eglibc/log tmp-eglibc/pkgdata pseudodone tmp-eglibc/saved_tmpdir tmp-eglibc/sstate-control tmp-eglibc/stamps tmp-eglibc/sysroots tmp-eglibc/work-shared tmp-eglibc/work/* rm -rf log.* ls -d buildhistory/packages/*/* | xargs -n 1 basename | sort -u component.list ncomponents=`cat component.list | wc -l` i=1 for component in `cat component.list`; do echo Building component: ${component} ($i/$ncomponents) bitbake -c cleansstate ${component} | tee log.${component}; bitbake ${component} | tee -a log.${component}; rm -rf tmp-eglibc/abi_version tmp-eglibc/buildstats tmp-eglibc/cache tmp-eglibc/deploy tmp-eglibc/log tmp-eglibc/pkgdata pseudodone tmp-eglibc/saved_tmpdir tmp-eglibc/sstate-control tmp-eglibc/stamps tmp-eglibc/sysroots tmp-eglibc/work-shared tmp-eglibc/work/* i=`expr $i + 1` done grep NOTE: Tasks Summary: Attempted.*failed.$ log.* That should cover missing mandatory dependencies. Comparing depends.dot files in buildhistory between incremental build and this per-component build should detect at least some autodetected dependencies. In per-component builds it can find only libraries already included in dependency tree, so dependencies lost in buildhistory aren't deterministic. Even better would be to run per-component build once after building world without removing tmp-eglibc, that will allow components to autodetect all possible libraries and then run another per-component build with removing tmp-eglibc which allows to detect libraries from dependency-tree. The following changes since commit 3e1dbabbf33a2e461abc92ff10cd970fe604ee38: sysstat: backport a patch to fix a parallel building error (2013-07-02 07:58:10 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/deps http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/deps Martin Jansa (8): (lib)telepathy*: add missing dependency on libxslt-native gst-plugins-bad: inherit gsettings gst-plugins-base: add missing dependency on glib-2.0-native taglib: add missing dependency on zlib quota: inherit pkgconfig libpam: inherit pkgconfig systemtap: inherit pkgconfig eglibc-locale: add missing dependency on virtual/${TARGET_PREFIX}binutils meta/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb| 2 +- meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb | 3 +-- meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb | 3 +-- .../telepathy/telepathy-mission-control_5.14.0.bb| 4 +--- meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb | 1 + meta/recipes-core/eglibc/eglibc-locale.inc | 5 + meta/recipes-extended/pam/libpam_1.1.6.bb| 2 +- meta/recipes-extended/quota/quota_4.01.bb| 2 +- meta/recipes-kernel/systemtap/systemtap_git.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb| 2 +- meta/recipes-support/taglib/taglib_1.8.bb| 2 ++ 12 files changed, 17 insertions(+), 13 deletions(-) -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] libpam: inherit pkgconfig
* missing dependency on pkgconfig-native was causing that PKG_CHECK_MODULES(DBUS, dbus-1) stayed unexpanded in configure script: checking for dbm_store in -lndbm... no libpam/1.1.6-r2/Linux-PAM-1.1.6/configure: line 14217: syntax error near unexpected token `libtirpc,' libpam/1.1.6-r2/Linux-PAM-1.1.6/configure: line 14217: ` PKG_CHECK_MODULES(libtirpc, libtirpc,' Configure failed. The contents of all config.log files follows to aid debugging Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index f811f4c..62ad7b1 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb @@ -43,7 +43,7 @@ PR = r2 S = ${WORKDIR}/Linux-PAM-${PV} -inherit autotools gettext +inherit autotools gettext pkgconfig PACKAGES += ${PN}-runtime ${PN}-xtests FILES_${PN} = ${base_libdir}/lib*${SOLIBS} -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] gst-plugins-base: add missing dependency on glib-2.0-native
* glib-genmarshal is needed during do_compile: | /bin/bash: line 1: glib-genmarshal: command not found Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb index 26c562c..19473ba 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0 -DEPENDS += alsa-lib liboil libogg libvorbis libtheora util-linux tremor +DEPENDS += alsa-lib liboil libogg libvorbis libtheora util-linux tremor glib-2.0-native SRC_URI += file://gst-plugins-base-tremor.patch \ file://configure.ac-fix-subparse-plugin.patch -- 1.8.2.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 02/11] busybox: Upgrade to v1.21.0
Hi Radu, I sent a patch a few days ago, which updates busybox to 1.21.1. 1.21.1 is now available and claimed to be 'stable'. Please have a look at the patch. Any comment or suggestion is welcome. Thanks, Chen Qi On 07/04/2013 10:57 PM, Radu Moisan wrote: Removed obsolete patches Added a few fixes from upstream (http://busybox.net/downloads/fixes-1.21.0/) *busybox-1.21.0-mdev.patch *busybox-1.21.0-platform.patch *busybox-1.21.0-xz.patch Signed-off-by: Radu Moisan radu.moi...@intel.com --- .../busybox/busybox-1.20.2/B921600.patch | 24 - .../busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 28 - .../busybox-mkfs-minix-tests_bigendian.patch | 34 - .../fix-for-spurious-testsuite-failure.patch | 27 - .../busybox/busybox-1.20.2/sys_resource.patch | 99 --- .../busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 - .../busybox-1.21.0/busybox-1.21.0-mdev.patch | 647 .../busybox-1.21.0/busybox-1.21.0-platform.patch | 28 + .../busybox/busybox-1.21.0/busybox-1.21.0-xz.patch | 88 +++ .../busybox-appletlib-dependency.patch |0 ...usybox-list-suid-and-non-suid-app-configs.patch |0 .../busybox-sulogin-empty-root-password.patch |0 .../busybox-udhcpc-no_deconfig.patch |0 .../{busybox-1.20.2 = busybox-1.21.0}/defconfig |0 .../fail_on_no_media.patch |0 .../get_header_tar.patch |0 .../login-utilities.cfg|0 .../run-parts.in.usr-bin.patch |6 +- .../stat-usr-bin.patch |0 .../strict-atime.patch |0 ...estsuite-du-du-k-works-fix-false-positive.patch |0 .../watch.in.usr-bin.patch |0 .../{busybox_1.20.2.bb = busybox_1.21.0.bb} | 20 +- 23 files changed, 774 insertions(+), 257 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/B921600.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch create mode 100644 meta/recipes-core/busybox/busybox-1.21.0/busybox-1.21.0-mdev.patch create mode 100644 meta/recipes-core/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch create mode 100644 meta/recipes-core/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-appletlib-dependency.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-list-suid-and-non-suid-app-configs.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-sulogin-empty-root-password.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/busybox-udhcpc-no_deconfig.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/defconfig (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/fail_on_no_media.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/get_header_tar.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/login-utilities.cfg (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/run-parts.in.usr-bin.patch (90%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/stat-usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/strict-atime.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/testsuite-du-du-k-works-fix-false-positive.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.0}/watch.in.usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox_1.20.2.bb = busybox_1.21.0.bb} (73%) diff --git a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch deleted file mode 100644 index c4d98e3..000 --- a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -# copy commit message from OE as the patch comment: -#commit 5b1ed09b1ab1a60a28a76e4658bc9957cd361b5d -#Author: Valentin Longchamp valentin.longch...@epfl.ch -#Date: Mon Dec 8 14:43:23 2008 +0100 - -#busybox: added support for 921600 speed of serial line -# -# above comment added by Kevin Tian kevin.t...@intel.com, 2010-07-06 - -diff -upNr busybox-1.7.2/libbb/speed_table.c
Re: [OE-core] [PATCH 1/1] busybox: upgrade to stable 1.21.1
On 07/05/2013 06:59 AM, Saul Wold wrote: On 07/02/2013 07:39 PM, qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../poky-tiny/defconfig|0 ...box_1.20.2.bbappend = busybox_1.21.1.bbappend} |0 These two need to go to the meta-yocto (p...@yoctoproject.org). Thanks Sau! Got it. I'll split this patch and send out a V2. Thanks, Chen Qi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] busybox: upgrade to stable 1.21.1
From: Chen Qi qi.c...@windriver.com The following changes since commit 80b263430453896189b704d0997943642eec6fef: classes/insane: remove la2 check which no longer exists from ERROR_QA (2013-06-28 16:33:08 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/busybox-upgrade-1.21.1 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/busybox-upgrade-1.21.1 Chen Qi (1): busybox: upgrade to stable 1.21.1 .../busybox/busybox-1.20.2/B921600.patch | 24 - .../busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 28 -- .../busybox-mkfs-minix-tests_bigendian.patch | 34 --- .../fix-for-spurious-testsuite-failure.patch | 27 -- .../busybox/busybox-1.20.2/strict-atime.patch | 49 -- .../busybox/busybox-1.20.2/sys_resource.patch | 99 .../busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 -- .../busybox-appletlib-dependency.patch |0 ...usybox-list-suid-and-non-suid-app-configs.patch |0 .../busybox-sulogin-empty-root-password.patch |0 .../busybox-udhcpc-no_deconfig.patch |0 .../{busybox-1.20.2 = busybox-1.21.1}/defconfig |0 .../fail_on_no_media.patch |0 .../get_header_tar.patch |0 .../login-utilities.cfg|0 .../run-parts.in.usr-bin.patch |4 +- .../stat-usr-bin.patch |0 ...estsuite-du-du-k-works-fix-false-positive.patch |0 .../watch.in.usr-bin.patch |0 .../{busybox_1.20.2.bb = busybox_1.21.1.bb} | 13 +-- 20 files changed, 5 insertions(+), 303 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/B921600.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-appletlib-dependency.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-list-suid-and-non-suid-app-configs.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-sulogin-empty-root-password.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-udhcpc-no_deconfig.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/defconfig (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/fail_on_no_media.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/get_header_tar.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/login-utilities.cfg (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/run-parts.in.usr-bin.patch (94%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/stat-usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/testsuite-du-du-k-works-fix-false-positive.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/watch.in.usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox_1.20.2.bb = busybox_1.21.1.bb} (75%) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] busybox: upgrade to stable 1.21.1
From: Chen Qi qi.c...@windriver.com Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../busybox/busybox-1.20.2/B921600.patch | 24 - .../busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 28 -- .../busybox-mkfs-minix-tests_bigendian.patch | 34 --- .../fix-for-spurious-testsuite-failure.patch | 27 -- .../busybox/busybox-1.20.2/strict-atime.patch | 49 -- .../busybox/busybox-1.20.2/sys_resource.patch | 99 .../busybox/busybox-1.20.2/wget_dl_dir_fix.patch | 30 -- .../busybox-appletlib-dependency.patch |0 ...usybox-list-suid-and-non-suid-app-configs.patch |0 .../busybox-sulogin-empty-root-password.patch |0 .../busybox-udhcpc-no_deconfig.patch |0 .../{busybox-1.20.2 = busybox-1.21.1}/defconfig |0 .../fail_on_no_media.patch |0 .../get_header_tar.patch |0 .../login-utilities.cfg|0 .../run-parts.in.usr-bin.patch |4 +- .../stat-usr-bin.patch |0 ...estsuite-du-du-k-works-fix-false-positive.patch |0 .../watch.in.usr-bin.patch |0 .../{busybox_1.20.2.bb = busybox_1.21.1.bb} | 13 +-- 20 files changed, 5 insertions(+), 303 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/B921600.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch delete mode 100644 meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-appletlib-dependency.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-list-suid-and-non-suid-app-configs.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-sulogin-empty-root-password.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/busybox-udhcpc-no_deconfig.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/defconfig (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/fail_on_no_media.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/get_header_tar.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/login-utilities.cfg (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/run-parts.in.usr-bin.patch (94%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/stat-usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/testsuite-du-du-k-works-fix-false-positive.patch (100%) rename meta/recipes-core/busybox/{busybox-1.20.2 = busybox-1.21.1}/watch.in.usr-bin.patch (100%) rename meta/recipes-core/busybox/{busybox_1.20.2.bb = busybox_1.21.1.bb} (75%) diff --git a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch deleted file mode 100644 index c4d98e3..000 --- a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -# copy commit message from OE as the patch comment: -#commit 5b1ed09b1ab1a60a28a76e4658bc9957cd361b5d -#Author: Valentin Longchamp valentin.longch...@epfl.ch -#Date: Mon Dec 8 14:43:23 2008 +0100 - -#busybox: added support for 921600 speed of serial line -# -# above comment added by Kevin Tian kevin.t...@intel.com, 2010-07-06 - -diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.0 +0200 -+++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200 -@@ -52,6 +52,9 @@ static const struct speed_map speeds[] = - #ifdef B460800 - {B460800, 460800/256 + 0x8000U}, - #endif -+#ifdef B921600 -+ {B921600, 921600/256 + 0x8000U}, -+#endif - }; - - enum { NUM_SPEEDS = ARRAY_SIZE(speeds) }; diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch deleted file mode 100644 index 69bbe73..000 --- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch +++
[OE-core] [PATCH] qt4: add upstream QTBUG-31579 patch to fix polyline drawing regression
Signed-off-by: Jonathan Liu net...@gmail.com --- meta/recipes-qt/qt4/qt4-4.8.5.inc | 1 + ...-of-0-width-polylines-from-outside-the-de.patch | 148 + 2 files changed, 149 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch diff --git a/meta/recipes-qt/qt4/qt4-4.8.5.inc b/meta/recipes-qt/qt4/qt4-4.8.5.inc index 184261a..709e3a8 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.5.inc +++ b/meta/recipes-qt/qt4/qt4-4.8.5.inc @@ -21,6 +21,7 @@ SRC_URI = http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0018-configure-make-pulseaudio-a-configurable-option.patch \ file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \ + file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \ file://g++.conf \ file://linux.conf \ diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch new file mode 100644 index 000..ad45dd0 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch @@ -0,0 +1,148 @@ +From b7029fbd12c32e851ed7d81b692197176eb71d9e Mon Sep 17 00:00:00 2001 +From: Gunnar Sletta gunnar.sle...@digia.com +Date: Thu, 4 Jul 2013 16:20:40 +1000 +Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect. + +This was broken by a previous fix which aimed to fix gaps in +polylines with tiny line segments. The result was that we +skipped updating the origin point when stroke() didn't produce +pixels which accidentally included the case of the line +being completely outside the deviceRect. I fixed this +by returning the value of clipLine in drawLine to the caller +so we could still update the origin for this case. + +Upstream-Status: Accepted [https://codereview.qt-project.org/#change,60427] +Signed-off-by: Jonathan Liu net...@gmail.com + +Task-number: QTBUG-31579 +Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 +(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) +--- + src/gui/painting/qcosmeticstroker.cpp | 42 ++- + src/gui/painting/qcosmeticstroker_p.h | 2 +- + 2 files changed, 27 insertions(+), 17 deletions(-) + +diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp +index 0061ecb..4413170 100644 +--- a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp +@@ -133,10 +133,15 @@ struct NoDasher { + + }; + ++/* ++ * The return value is the result of the clipLine() call performed at the start ++ * of each of the two functions, aka false means completely outside the devices ++ * rect. ++ */ + templateDrawPixel drawPixel, class Dasher +-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + templateDrawPixel drawPixel, class Dasher +-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + + inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage) + { +@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath path) + caps |= CapEnd; + + QCosmeticStroker::Point last = this-lastPixel; +-stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); ++bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); + + /* fix for gaps in polylines with fastpen and aliased in a sequence +of points with small distances: if current point p2 has been dropped +- out, keep last non dropped point p. */ +-if (fastPenAliased) { +-if (last.x != lastPixel.x || last.y != lastPixel.y || +-points == begin + 2 || points == end - 2 ) { +-{ +-p = p2; +-} ++ out, keep last non dropped point p. ++ ++ However, if the line was completely outside the devicerect, we ++ still need to update p to avoid drawing the line after this one from ++ a bad starting position. ++*/ ++if (fastPenAliased unclipped) { ++if (last.x != lastPixel.x || last.y != lastPixel.y ++|| points == begin + 2 || points == end - 2) { ++p = p2; + } + } else { + p = p2; +@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int