Re: [OE-core] [PATCH 2/6] e2fsprogs: let debugfs do sparse copy
On 08/23/2013 10:33 AM, Rongqing Li wrote: On 08/22/2013 09:13 PM, Robert Yang wrote: Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto" This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 148 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644 index 000..c87bcbf --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch @@ -0,0 +1,147 @@ +debugfs.c: do sparse copy when src is a sparse file + +Let debugfs do sparse copy when src is a sparse file, just like +"cp --sparse=auto" + +* For the: + #define IO_BUFSIZE 64*1024 + this is a suggested value from gnu coreutils: + http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD + +* Use malloc() to allocate memory for the buffer since put 64K (or + more) on the stack seems not a good idea. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang +Acked-by: Darren Hart +--- + debugfs/debugfs.c | 61 +++ + 1 file changed, 57 insertions(+), 4 deletions(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -41,6 +41,16 @@ extern char *optarg; + #define BUFSIZ 8192 + #endif + ++/* 64KiB is the minimium blksize to best minimize system call overhead. */ ++#ifndef IO_BUFSIZE ++#define IO_BUFSIZE 64*1024 ++#endif ++ ++/* Block size for `st_blocks' */ ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[]) + } + + #ifndef READ_ONLY +-static errcode_t copy_file(int fd, ext2_ino_t newfile) ++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) + { + ext2_file_te2_file; + errcode_tretval; + intgot; + unsigned intwritten; +-charbuf[8192]; ++char*buf; + char*ptr; ++char*zero_buf; ++intcmp; + + retval = ext2fs_file_open(current_fs, newfile, + EXT2_FILE_WRITE, &e2_file); + if (retval) + return retval; + ++if (!(buf = (char *) malloc(bufsize))){ ++com_err("copy_file", errno, "can't allocate buffer\n"); ++return; ++} ++ ++/* This is used for checking whether the whole block is zero */ ++retval = ext2fs_get_memzero(bufsize, &zero_buf); ++if (retval) { ++com_err("copy_file", retval, "can't allocate buffer\n"); should free(buf), or memory leak. Add a free(buf) and updated the PR: git://git.pokylinux.org/poky-contrib robert/extX // Robert -Roy ++return retval; ++} ++ + while (1) { +-got = read(fd, buf, sizeof(buf)); ++got = read(fd, buf, bufsize); + if (got == 0) + break; + if (got < 0) { +@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + goto fail; + } + ptr = buf; ++ ++/* Sparse copy */ ++if (make_holes) { ++/* Check whether all is zero */ ++cmp = memcmp(ptr, zero_buf, got); ++if (cmp == 0) { ++ /* The whole block is zero, make a hole */ ++retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL); ++if (retval) ++goto fail; ++got = 0; ++} ++} ++ ++/* Normal copy */ + while (got > 0) { + retval = ext2fs_file_write(e2_file, ptr, +got, &written); +@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + ptr += written; + } + } ++free(buf); ++ext2fs_free_mem(&zero_buf); + retval = ext2fs_file_close(e2_file); + return retval; + + fail: ++free(buf); ++ext2fs_free_mem(&zero_buf); + (void) ext2fs_file_close(e2_file); + return retval; + } +@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[]) + ext2_ino_tnewfile; + errcode_tretval; + struct ext2_inode inode; ++intbufsize = IO_BUFSIZE; ++intmake_holes = 0; + + if (common_args_process(argc, argv, 3, 3, "write", + " ", CHECK_FS_RW)) +@@ -1699,7 +1744,15 @@ void do_write(int argc, char *argv[]) + return; + } + if (LINUX_S_ISREG(inode.i_mode)) { +-
Re: [OE-core] Issue with pulseaudio and Qt introduced with eglibc 2.18
On Aug 22, 2013, at 11:14 PM, Erik Botö wrote: > Hi, > > I'm hitting a bug now when using Qt to play e.g mp3:s to a pulseaudio sink. > Using gst-launch with playbin2 and pulsesink works well on the same system. I > have tried a few different versions of Qt (5.0.1, 5.0.2 and Qt 5.1) and both > pulseaudio 3 and 4 with the same problem. When I added this to local.conf: > > PREFERRED_VERSION_eglibc-locale = "2.17" > PREFERRED_VERSION_eglibc-mtrace = "2.17" > PREFERRED_VERSION_eglibc-scripts = "2.17" > PREFERRED_VERSION_eglibc-initial = "2.17" > PREFERRED_VERSION_eglibc = "2.17" > > It works ok again, so it was introduced when moving to eglib 2.18 (not saying > that the actual error is in eglibc though). > > The error I'm seeing is this: > Assertion 'pthread_mutex_unlock(&m->mutex) == 0' failed at > pulsecore/mutex-posix.c:108, function pa_mutex_unlock(). Aborting. can you try $ export CANBERRA_DRIVER="null" and run the faulty program in this shell. Does this fix the problem ? > > Google tells me that this has been an issue for OMAP4 when certain kernel > configuration where enabled [1], which makes me believe this might be a hard > one to track down. I'll see if I can find the time to debug it a bit more, > but I would really appreciate any input. > > It's quite easy to reproduce, just use the QtMultimedia (built to use > gstreamer and pulseaudio) mediaplayer example and select an mp3 file. It > works like one time out of 20 or so, so some kind of race condition is > probably the case. > > My hardware setup is a nitrogen6x board with a Freescale iMX6 processor (so > I'm using meta-fsl-arm*), I've tried with both Qt built with meta-qt5 and an > external Qt build against the Yocto sysroot. If anyone can reproduce this on > some other hardware that would be nice to know. > > This started on the meta-freescale list [2], but is probably belonging here. > > [1]. http://lists.linaro.org/pipermail/linaro-dev/2013-April/015794.html > [2]. > https://lists.yoctoproject.org/pipermail/meta-freescale/2013-August/004152.html > > Cheers, > Erik Botö > ___ > 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
Re: [OE-core] [v2 PATCH] kernel.bbclass, image.bbclass: Implement kernel INITRAMFS dependency and bundling
On Thu, Aug 22, 2013 at 4:04 PM, Jason Wessel wrote: > This patch aims to fix the following two cases for the INITRAMFS generation. > 1) Allow an image recipe to specify a paired INITRAMFS recipe such > as core-image-minimal-initramfs. This allows building a base > image which always generates the needed initramfs image in one step > 2) Allow building a single binary which contains a kernel and > the initramfs. I think this could be a bit simpler. Have a full kernel image recipe ( kernel + initramfs) separate. It fits into the equation nicely. The final image can bundle initramfs which has modules from practically same kernel build is staged step 1 of kernel build which automatically happens today for any image build. The new recipe for kernel+initramfs requires the existing kernel recipes and tweaks the .config to enable INITRAMFS_IMAGE You can share the sources for both stages where kernel is built like gcc is putting the sources under work-shared and building all gcc recipes out of this location. > > A key requirement of the initramfs is to be able to add kernel > modules. The current implementation of the INITRAMFS_IMAGE variable > has a circular dependency when using kernel modules in the initramfs > image.bb file that is caused by kernel.bbclass trying to build the > initramfs before the kernel's do_install rule. > > The solution for this problem is to have the kernel's > do_bundle_initramfs_image task depend on the do_rootfs from the > INITRAMFS_IMAGE and not some intermediate point. The image.bbclass > will also sets up dependencies to make the initramfs creation task run > last. > > The code to bundle the kernel and initramfs together has been added. > At a high level, all it is doing is invoking a second compilation of > the kernel but changing the value of CONFIG_INITRAMFS_SOURCE to point > to the generated initramfs from the image recipe. > > [YOCTO #4072] > > Signed-off-by: Jason Wessel > Acked-by: Bruce Ashfield > > --- > meta/classes/image.bbclass | 12 ++ > meta/classes/kernel.bbclass | 96 > +-- > meta/conf/local.conf.sample | 20 + > 3 files changed, 116 insertions(+), 12 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 909702a..23967ec 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -130,6 +130,10 @@ python () { > d.setVar('MULTILIB_VENDORS', ml_vendor_list) > > check_image_features(d) > +initramfs_image = d.getVar('INITRAMFS_IMAGE', True) or "" > +if initramfs_image != "": > +d.appendVarFlag('do_build', 'depends', " %s:do_bundle_initramfs" % > d.getVar('PN', True)) > +d.appendVarFlag('do_bundle_initramfs', 'depends', " %s:do_rootfs" % > initramfs_image) > } > > # > @@ -629,3 +633,11 @@ do_package_write_deb[noexec] = "1" > do_package_write_rpm[noexec] = "1" > > addtask rootfs before do_build > +# Allow the kernel to be repacked with the initramfs and boot image file as > a single file > +do_bundle_initramfs[depends] += "virtual/kernel:do_bundle_initramfs" > +do_bundle_initramfs[nostamp] = "1" > +do_bundle_initramfs[noexec] = "1" > +do_bundle_initramfs () { > + : > +} > +addtask bundle_initramfs after do_rootfs > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index e039dfc..8cf66ce 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -9,6 +9,7 @@ INHIBIT_DEFAULT_DEPS = "1" > KERNEL_IMAGETYPE ?= "zImage" > INITRAMFS_IMAGE ?= "" > INITRAMFS_TASK ?= "" > +INITRAMFS_IMAGE_BUNDLE ?= "" > > python __anonymous () { > kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or '' > @@ -19,7 +20,15 @@ python __anonymous () { > > image = d.getVar('INITRAMFS_IMAGE', True) > if image: > -d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs') > +d.appendVarFlag('do_bundle_initramfs', 'depends', ' > ${INITRAMFS_IMAGE}:do_rootfs') > + > +# NOTE: setting INITRAMFS_TASK is for backward compatibility > +# The preferred method is to set INITRAMFS_IMAGE, because > +# this INITRAMFS_TASK has circular dependency problems > +# if the initramfs requires kernel modules > +image_task = d.getVar('INITRAMFS_TASK', True) > +if image_task: > +d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}') > } > > inherit kernel-arch deploy > @@ -72,9 +81,82 @@ KERNEL_SRC_PATH = "/usr/src/kernel" > > KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else > s)(d.getVar('KERNEL_IMAGETYPE', True))}" > > +copy_initramfs() { > + echo "Copying initramfs into ./usr ..." > + # Find and use the first initramfs image archive type we find > + rm -f ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio > + for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do > + if [ -e > "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; t
[OE-core] Issue with pulseaudio and Qt introduced with eglibc 2.18
Hi, I'm hitting a bug now when using Qt to play e.g mp3:s to a pulseaudio sink. Using gst-launch with playbin2 and pulsesink works well on the same system. I have tried a few different versions of Qt (5.0.1, 5.0.2 and Qt 5.1) and both pulseaudio 3 and 4 with the same problem. When I added this to local.conf: PREFERRED_VERSION_eglibc-locale = "2.17" PREFERRED_VERSION_eglibc-mtrace = "2.17" PREFERRED_VERSION_eglibc-scripts = "2.17" PREFERRED_VERSION_eglibc-initial = "2.17" PREFERRED_VERSION_eglibc = "2.17" It works ok again, so it was introduced when moving to eglib 2.18 (not saying that the actual error is in eglibc though). The error I'm seeing is this: Assertion 'pthread_mutex_unlock(&m->mutex) == 0' failed at pulsecore/mutex-posix.c:108, function pa_mutex_unlock(). Aborting. Google tells me that this has been an issue for OMAP4 when certain kernel configuration where enabled [1], which makes me believe this might be a hard one to track down. I'll see if I can find the time to debug it a bit more, but I would really appreciate any input. It's quite easy to reproduce, just use the QtMultimedia (built to use gstreamer and pulseaudio) mediaplayer example and select an mp3 file. It works like one time out of 20 or so, so some kind of race condition is probably the case. My hardware setup is a nitrogen6x board with a Freescale iMX6 processor (so I'm using meta-fsl-arm*), I've tried with both Qt built with meta-qt5 and an external Qt build against the Yocto sysroot. If anyone can reproduce this on some other hardware that would be nice to know. This started on the meta-freescale list [2], but is probably belonging here. [1]. http://lists.linaro.org/pipermail/linaro-dev/2013-April/015794.html [2]. https://lists.yoctoproject.org/pipermail/meta-freescale/2013-August/004152.html Cheers, Erik Botö ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pulseaudio: upgrade to v4.0
Now, it makes sense, please ignore my previous message. I will do a review this afternoon. Regards, Cristian -Original Message- From: Saul Wold [mailto:s...@linux.intel.com] Sent: Friday, August 23, 2013 1:21 AM To: Saul Wold Cc: Iorga, Cristian; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] pulseaudio: upgrade to v4.0 On 08/22/2013 11:41 AM, Saul Wold wrote: > > I found a floating dependency on gtk+3, and that the configure for 4.0 > takes a different set of options: > > configure:29775: WARNING: unrecognized options: --disable-lynx, > --disable-polkit, --without-jack, --with-glib, --with-alsa, > --with-oss, --without-hal, --disable-hal, --enable-gtk2 > > If you look at configure --help for pulse audio, there is an updated > list of options. There might be a little challenging with gtk+3 since > it's enabled by default and we want to disable it when no x11 > DISTRO_FEATURE is there, so look at this carefully. > I provided a patch for this already, but you might want to review the options that we have enabled, we might want to consider disabling some more. Sau! > Sau! > > > On 07/23/2013 09:00 AM, Cristian Iorga wrote: >> pulseaudio_fix_for_x32.patch removed; included in upstream. >> general recipe clean-up (multiple src URI removed, inheritance >> grouping, dependency grouping). >> parallel make is now active (was disabled in version 0.9). >> >> Signed-off-by: Cristian Iorga >> --- >> meta/recipes-multimedia/pulseaudio/pulseaudio.inc |9 +- >> .../pulseaudio/pulseaudio_fix_for_x32.patch| 238 >> >> .../{pulseaudio_3.0.bb => pulseaudio_4.0.bb} | 11 +- >> 3 files changed, 5 insertions(+), 253 deletions(-) >> delete mode 100644 >> meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32. >> patch >> >> rename meta/recipes-multimedia/pulseaudio/{pulseaudio_3.0.bb => >> pulseaudio_4.0.bb} (51%) >> >> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc >> b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc >> index d4f66e6..d3f6d17 100644 >> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc >> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc >> @@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = >> "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ >> >> file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ >> >> file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=2 >> 5;md5=e4cc710e40a4d900c2c294167bc58270 >> \ >> >> file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" >> >> + >> DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" >> # optional >> DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" >> +DEPENDS += "libjson gdbm speex libxml-parser-perl-native" >> >> -SRC_URI = >> "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ >> - file://gcc4-compile-fix.patch \ >> - file://volatiles.04_pulse" >> - >> -inherit autotools pkgconfig useradd >> +inherit autotools pkgconfig useradd gettext perlnative >> >> # *.desktop rules wont be generated during configure and build will >> fail >> # if using --disable-nls >> @@ -53,7 +51,6 @@ PACKAGECONFIG[avahi] = >> "--enable-avahi,--disable-avahi,avahi" >> >> EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", >> "neon", "", "--enable-neon-opt=no", d)}" >> >> -PARALLEL_MAKE = "" >> >> export TARGET_PFPU = "${TARGET_FPU}" >> >> diff --git >> a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x3 >> 2.patch >> b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x3 >> 2.patch >> >> deleted file mode 100644 >> index b68ac5b..000 >> --- >> a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x3 >> 2.patch >> >> +++ /dev/null >> @@ -1,238 +0,0 @@ >> -Upstream-Status: Pending >> - >> -This patch makes assembly syntax compatible to the x32 toolchain. >> - >> -This fixes these kinds of compilations errors with x32 gcc. >> -| pulsecore/svolume_mmx.c: Assembler messages: >> -| pulsecore/svolume_mmx.c:107: Error: `(%esi,%rdi,4)' is not a valid >> base/index expression >> -| pulsecore/svolume_mmx.c:135: Error: `(%esi,%rdi,4)' is not a valid >> base/index expression >> -| pulsecore/svolume_mmx.c:161: Error: `(%esi,%rdi,4)' is not a valid >> base/index expression >> -| pulsecore/svolume_mmx.c:162: Error: `8(%esi,%rdi,4)' is not a >> -| valid >> base/index expression >> -| pulsecore/svolume_mmx.c:180: Error: `(%esi,%rdi,4)' is not a valid >> base/index expression >> -| pulsecore/svolume_mmx.c:210: Error: `(%esi,%rdi,4)' is not a valid >> base/index expression >> -| pulsecore/svolume_mmx.c:244: Error: `(%esi,%rdi,4)' is not a valid >> base/index expression >> -| pulsecore/svolume_mmx.c:245: Error: `8(%esi,%rdi,4)' is not a >> -| valid >> base/index expression >> -| make[3]: *** [libpulsecore_1.1_la-svolume_mmx.lo] Error 1 >> - >> -Orignally these assembly lin
Re: [OE-core] [PATCH 1/3] kmod: Upgrade to version 14
On Aug 22, 2013, at 2:54 PM, Saul Wold wrote: > On 08/21/2013 09:31 PM, Khem Raj wrote: >> The update is a requirement for systemd-206 >> >> Signed-off-by: Khem Raj >> --- >> meta/recipes-kernel/kmod/kmod-native_git.bb| 1 - >> meta/recipes-kernel/kmod/kmod.inc | 9 >> ...-man-page-generation-because-we-don-t-hav.patch | 26 >> -- >> .../kmod/kmod/fix-undefined-O_CLOEXEC.patch| 16 ++--- >> meta/recipes-kernel/kmod/kmod_git.bb | 3 +-- >> 5 files changed, 13 insertions(+), 42 deletions(-) >> delete mode 100644 >> meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >> > > Did you build the native version? I am seeing failures in MUT on the > autobuilder. It did pass my "sniff" test on my 2 local world builds. yes and multiple times. what distro do you run on your build boxes ? I wonder if its some sort of race condition I use -j20 and -j16 % bitbake kmod-native Loading cache: 100% |###| ETA: 00:00:00 Loaded 1197 entries from dependency cache. Build Configuration: BB_VERSION= "1.19.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "Ubuntu-12.04" TARGET_SYS= "x86_64-oe-linux" MACHINE = "qemux86-64" DISTRO_VERSION= "oe-core.0" TUNE_FEATURES = "m64" TARGET_FPU= "" meta = "master:2176bfd1099287056432780d0ee6b202e94bd1ee" NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks NOTE: Tasks Summary: Attempted 72 tasks of which 60 didn't need to be rerun and all succeeded. > >> | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE >> -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op >> -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith >> -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes >> -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations >> -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 >> -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter >> -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs >> -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common >> -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections >> -fdata-sections >> -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include >> -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link >> -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x8 6_64-linux > /usr/lib -Wl,-rpath-link > -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib > -Wl,-rpath > -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib > -Wl,-rpath > -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib > -Wl,-O1 -o tools/test/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o > tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o > tools/static-nodes.o > -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib > > -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib > libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod-private.a > Nice ester egg >> | tools/kmod.o: In function `kmod_help': >> | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' >> | tools/kmod.o: In function `main': >> | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' >> | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to >> `_Static_assert' follow >> | collect2: ld returned 1 exit status >> | make[2]: *** [tools/test/kmod] Error 1 >> | make[2]: *** Waiting for unfinished jobs >> | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE >> -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op >> -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith >> -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes >> -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations >> -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 >> -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter >> -Wno-missing-field-initializers -Wno-unused-res
Re: [OE-core] World build on OE-Core
On Aug 22, 2013, at 2:36 PM, "Burton, Ross" wrote: > On 22 August 2013 22:24, Khem Raj wrote: >> x86_64 >> == >> >> Summary: 17 tasks failed: >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/cairo/cairo_1.12.14.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb, >> do_compile > ... > > The majority of your failures on x86-64 get autobuilt every night, so > I'd be curious to see the your logs if you still have them. > well, one point to note is I am using OE-Core standalone, the logs are here http://sakrah.homelinux.org/files/world/ see for eglibc.* files. > Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] World build on OE-Core
On Aug 22, 2013, at 3:12 PM, Saul Wold wrote: > On 08/22/2013 02:24 PM, Khem Raj wrote: >> Hi >> >> In spare cycles my box ran world build for all eglibc/qemus, arm, ppc, mips >> looks all fine however I see errors on mips64,x86 and x86_64 >> I am looking into the mips64 one. >> >> x86_64 >> == >> >> Summary: 17 tasks failed: >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/cairo/cairo_1.12.14.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez/bluez4_4.101.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-support/curl/curl_7.32.0.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/mesa/mesa_9.1.6.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-support/enchant/enchant_1.6.0.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-support/neon/neon_0.30.0.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-support/taglib/taglib_1.8.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/parted/parted_3.1.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/libuser/libuser_0.59.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/neard/neard_0.10.bb, >> do_compile >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez5/bluez5_5.7.bb, >> do_compile >> > I do regular builds on my local machine of world and qemumips (not mips64) > with MUT, I wonder what your failures are. Do you build OE-Core or poky ? > I will do a scratch build right now. > > What's your exact setup? any other settings in your local.conf? I checkout OE-Core and bitbake and have default local.conf and I append following to local.conf DISTRO_FEATURES_append = " systemd" # DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" VIRTUAL-RUNTIME_dev_manager = "udev" VIRTUAL-RUNTIME_login_manager = "busybox" VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" VIRTUAL-RUNTIME_keymaps = "keymaps" > > Sau! > > >> >> x86 >> >> >> Summary: 1 task failed: >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb, >> do_compile >> > This is strange because we do world builds regularly. > >> >> mips64 >> == >> >> Summary: 1 task failed: >> >> /builds1/angstrom/sources/openembedded-core/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb, >> do_configure >> >> >> ___ >> 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
Re: [OE-core] [PATCH 2/6] e2fsprogs: let debugfs do sparse copy
On 08/22/2013 09:13 PM, Robert Yang wrote: Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto" This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 148 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644 index 000..c87bcbf --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch @@ -0,0 +1,147 @@ +debugfs.c: do sparse copy when src is a sparse file + +Let debugfs do sparse copy when src is a sparse file, just like +"cp --sparse=auto" + +* For the: + #define IO_BUFSIZE 64*1024 + this is a suggested value from gnu coreutils: + http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD + +* Use malloc() to allocate memory for the buffer since put 64K (or + more) on the stack seems not a good idea. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang +Acked-by: Darren Hart +--- + debugfs/debugfs.c | 61 +++ + 1 file changed, 57 insertions(+), 4 deletions(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -41,6 +41,16 @@ extern char *optarg; + #define BUFSIZ 8192 + #endif + ++/* 64KiB is the minimium blksize to best minimize system call overhead. */ ++#ifndef IO_BUFSIZE ++#define IO_BUFSIZE 64*1024 ++#endif ++ ++/* Block size for `st_blocks' */ ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[]) + } + + #ifndef READ_ONLY +-static errcode_t copy_file(int fd, ext2_ino_t newfile) ++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) + { + ext2_file_t e2_file; + errcode_t retval; + int got; + unsigned intwritten; +- charbuf[8192]; ++ char*buf; + char*ptr; ++ char*zero_buf; ++ int cmp; + + retval = ext2fs_file_open(current_fs, newfile, + EXT2_FILE_WRITE, &e2_file); + if (retval) + return retval; + ++ if (!(buf = (char *) malloc(bufsize))){ ++ com_err("copy_file", errno, "can't allocate buffer\n"); ++ return; ++ } ++ ++/* This is used for checking whether the whole block is zero */ ++ retval = ext2fs_get_memzero(bufsize, &zero_buf); ++ if (retval) { ++ com_err("copy_file", retval, "can't allocate buffer\n"); should free(buf), or memory leak. -Roy ++ return retval; ++ } ++ + while (1) { +- got = read(fd, buf, sizeof(buf)); ++ got = read(fd, buf, bufsize); + if (got == 0) + break; + if (got < 0) { +@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + goto fail; + } + ptr = buf; ++ ++ /* Sparse copy */ ++ if (make_holes) { ++ /* Check whether all is zero */ ++ cmp = memcmp(ptr, zero_buf, got); ++ if (cmp == 0) { ++ /* The whole block is zero, make a hole */ ++ retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL); ++ if (retval) ++ goto fail; ++ got = 0; ++ } ++ } ++ ++ /* Normal copy */ + while (got > 0) { + retval = ext2fs_file_write(e2_file, ptr, + got, &written); +@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + ptr += written; + } + } ++ free(buf); ++ ext2fs_free_mem(&zero_buf); + retval = ext2fs_file_close(e2_file); + return retval; + + fail: ++ free(buf); ++ ext2fs_free_mem(&zero_buf); + (void) ext2fs_file_close(e2_file); + return retval; + } +@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[]) + ext2_ino_t newfile; + errcode_t retval; + struct ext2_inode inode; ++ int bufsize = IO_BUFSIZE; ++ int
Re: [OE-core] [PATCH 2/6] e2fsprogs: let debugfs do sparse copy
On 08/22/2013 10:52 PM, Darren Hart wrote: On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto" This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Minor whitespace nit below, but will likely be caught by upstream. Thanks, I upgraded the pull request repo: git://git.pokylinux.org/poky-contrib robert/extX // Robert -- Darren Signed-off-by: Robert Yang --- .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 148 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644 index 000..c87bcbf --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch @@ -0,0 +1,147 @@ +debugfs.c: do sparse copy when src is a sparse file + +Let debugfs do sparse copy when src is a sparse file, just like +"cp --sparse=auto" + +* For the: + #define IO_BUFSIZE 64*1024 + this is a suggested value from gnu coreutils: + http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD + +* Use malloc() to allocate memory for the buffer since put 64K (or + more) on the stack seems not a good idea. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang +Acked-by: Darren Hart +--- + debugfs/debugfs.c | 61 +++ + 1 file changed, 57 insertions(+), 4 deletions(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -41,6 +41,16 @@ extern char *optarg; + #define BUFSIZ 8192 + #endif + ++/* 64KiB is the minimium blksize to best minimize system call overhead. */ ++#ifndef IO_BUFSIZE ++#define IO_BUFSIZE 64*1024 ++#endif ++ ++/* Block size for `st_blocks' */ ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[]) + } + + #ifndef READ_ONLY +-static errcode_t copy_file(int fd, ext2_ino_t newfile) ++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) + { + ext2_file_t e2_file; + errcode_t retval; + int got; + unsigned intwritten; +- charbuf[8192]; ++ char*buf; + char*ptr; ++ char*zero_buf; ++ int cmp; + + retval = ext2fs_file_open(current_fs, newfile, + EXT2_FILE_WRITE, &e2_file); + if (retval) + return retval; + ++ if (!(buf = (char *) malloc(bufsize))){ ++ com_err("copy_file", errno, "can't allocate buffer\n"); ++ return; ++ } ++ ++/* This is used for checking whether the whole block is zero */ Whitespace/indentation error ^ ++ retval = ext2fs_get_memzero(bufsize, &zero_buf); ++ if (retval) { ++ com_err("copy_file", retval, "can't allocate buffer\n"); ++ return retval; ++ } ++ + while (1) { +- got = read(fd, buf, sizeof(buf)); ++ got = read(fd, buf, bufsize); + if (got == 0) + break; + if (got < 0) { +@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + goto fail; + } + ptr = buf; ++ ++ /* Sparse copy */ ++ if (make_holes) { ++ /* Check whether all is zero */ ++ cmp = memcmp(ptr, zero_buf, got); ++ if (cmp == 0) { ++ /* The whole block is zero, make a hole */ ++ retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL); ++ if (retval) ++ goto fail; ++ got = 0; ++ } ++ } ++ ++ /* Normal copy */ + while (got > 0) { + retval = ext2fs_file_write(e2_file, ptr, + got, &written); +@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + ptr += written; + } + } ++ free(buf); ++ ext2fs_free_mem(&zero_buf); + retval = ext2fs_file_close(e2_file); + return retval; + + fail: ++ free(buf); ++ ext2fs_free_mem(&zero_buf); + (void) ext2fs_file_close(e2_file); + r
Re: [OE-core] [PATCH 5/6] e2fsprogs: add populate-extfs.sh
On 08/23/2013 01:29 AM, Darren Hart wrote: On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: This script is originally from Darren Hart, it will be used for creating the ext* filesystem from a given directory, which will replace the genext2fs in image_types.bbclass at the moment, we may use the mke2fs to replace this script again when it has the initial directory support. Changes of the script: * Rename it from mkdebugfs.sh to populate-extfs.sh * Add a simple usage * Add checking for the number of the parameters * Add the "regular empty file" and "fifo" file type * Set mode, uid and gid for the file * Save the command lines to a file and batch run them * Change the error message * Improve the performance * Add the support for hardlink [YOCTO #3848] Signed-off-by: Darren Hart Signed-off-by: Robert Yang Ted has offered to add this to the contrib dir for the ext2 tools. This is fine to add to yocto, but we should contribute this back upstream as well. Thanks, I will send it to linux ext4 list. // Robert ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/6] e2fsprogs: properly set up extent header in do_write
On 08/23/2013 01:24 AM, Darren Hart wrote: On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: do_write doesn't fully set up the first extent header on a new inode, so if we write a 0-length file, and don't write any data to the new file, we end up creating something that looks corrupt to kernelspace: EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0) Do something similar to ext4_ext_tree_init() here, and fill out the first extent header upon creation to avoid this. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs-1.42.8/debugfs-extent-header.patch | 47 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |2 + +Upstream-Status: Backport Should we backport? Or should we just update the revision we use? Yes, I think so, Ted said that he had merge this patch a few days ago, but I didn't see where is it, I pulled this patch from the linux ext mailing list. // Robert ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/6] e2fsprogs: only update the icache for ext2_inode
On 08/23/2013 01:23 AM, Darren Hart wrote: On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: We only read the cache when: bufsize == sizeof(struct ext2_inode) then we should only update the cache in the same condition, otherwise there would be errors, for example: cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full() Then update the cache: cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full() Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was cached by bufsize = 156), so there would be errors. [YOCTO #3848] Signed-off-by: Robert Yang +Upstream-Status: [Inappropriate] Hrm... why is this one inappropriate? Hi Darren, the upstream has changed the icache lot, so this patch is inappropriate for the upstream, we can drop this patch when we update the package, I had put this in the patch head. // Robert ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v2 PATCH] kernel.bbclass, image.bbclass: Implement kernel INITRAMFS dependency and bundling
This patch aims to fix the following two cases for the INITRAMFS generation. 1) Allow an image recipe to specify a paired INITRAMFS recipe such as core-image-minimal-initramfs. This allows building a base image which always generates the needed initramfs image in one step 2) Allow building a single binary which contains a kernel and the initramfs. A key requirement of the initramfs is to be able to add kernel modules. The current implementation of the INITRAMFS_IMAGE variable has a circular dependency when using kernel modules in the initramfs image.bb file that is caused by kernel.bbclass trying to build the initramfs before the kernel's do_install rule. The solution for this problem is to have the kernel's do_bundle_initramfs_image task depend on the do_rootfs from the INITRAMFS_IMAGE and not some intermediate point. The image.bbclass will also sets up dependencies to make the initramfs creation task run last. The code to bundle the kernel and initramfs together has been added. At a high level, all it is doing is invoking a second compilation of the kernel but changing the value of CONFIG_INITRAMFS_SOURCE to point to the generated initramfs from the image recipe. [YOCTO #4072] Signed-off-by: Jason Wessel Acked-by: Bruce Ashfield --- meta/classes/image.bbclass | 12 ++ meta/classes/kernel.bbclass | 96 +-- meta/conf/local.conf.sample | 20 + 3 files changed, 116 insertions(+), 12 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 909702a..23967ec 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -130,6 +130,10 @@ python () { d.setVar('MULTILIB_VENDORS', ml_vendor_list) check_image_features(d) +initramfs_image = d.getVar('INITRAMFS_IMAGE', True) or "" +if initramfs_image != "": +d.appendVarFlag('do_build', 'depends', " %s:do_bundle_initramfs" % d.getVar('PN', True)) +d.appendVarFlag('do_bundle_initramfs', 'depends', " %s:do_rootfs" % initramfs_image) } # @@ -629,3 +633,11 @@ do_package_write_deb[noexec] = "1" do_package_write_rpm[noexec] = "1" addtask rootfs before do_build +# Allow the kernel to be repacked with the initramfs and boot image file as a single file +do_bundle_initramfs[depends] += "virtual/kernel:do_bundle_initramfs" +do_bundle_initramfs[nostamp] = "1" +do_bundle_initramfs[noexec] = "1" +do_bundle_initramfs () { + : +} +addtask bundle_initramfs after do_rootfs diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index e039dfc..8cf66ce 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -9,6 +9,7 @@ INHIBIT_DEFAULT_DEPS = "1" KERNEL_IMAGETYPE ?= "zImage" INITRAMFS_IMAGE ?= "" INITRAMFS_TASK ?= "" +INITRAMFS_IMAGE_BUNDLE ?= "" python __anonymous () { kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or '' @@ -19,7 +20,15 @@ python __anonymous () { image = d.getVar('INITRAMFS_IMAGE', True) if image: -d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs') +d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs') + +# NOTE: setting INITRAMFS_TASK is for backward compatibility +# The preferred method is to set INITRAMFS_IMAGE, because +# this INITRAMFS_TASK has circular dependency problems +# if the initramfs requires kernel modules +image_task = d.getVar('INITRAMFS_TASK', True) +if image_task: +d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}') } inherit kernel-arch deploy @@ -72,9 +81,82 @@ KERNEL_SRC_PATH = "/usr/src/kernel" KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else s)(d.getVar('KERNEL_IMAGETYPE', True))}" +copy_initramfs() { + echo "Copying initramfs into ./usr ..." + # Find and use the first initramfs image archive type we find + rm -f ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio + for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do + if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then + cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img ${B}/usr/. + case $img in + *gz) + echo "gzip decompressing image" + gunzip -f ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.$img + break + ;; + *lzo) + echo "lzo decompressing image" + lzop -df ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.$img + break + ;; + *lzma) + echo "lzma decompressing image" + lzmash -df ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.$img +
Re: [OE-core] World build on OE-Core
On Thu, Aug 22, 2013 at 03:12:17PM -0700, Saul Wold wrote: > On 08/22/2013 02:24 PM, Khem Raj wrote: > > Hi > > > > In spare cycles my box ran world build for all eglibc/qemus, arm, ppc, mips > > looks all fine however I see errors on mips64,x86 and x86_64 > > I am looking into the mips64 one. > > > > x86_64 > > == > > > > Summary: 17 tasks failed: > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/cairo/cairo_1.12.14.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez/bluez4_4.101.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-support/curl/curl_7.32.0.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/mesa/mesa_9.1.6.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-support/enchant/enchant_1.6.0.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-support/neon/neon_0.30.0.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-support/taglib/taglib_1.8.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/parted/parted_3.1.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/libuser/libuser_0.59.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/neard/neard_0.10.bb, > > do_compile > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez5/bluez5_5.7.bb, > > do_compile > > > I do regular builds on my local machine of world and qemumips (not > mips64) with MUT, I wonder what your failures are. I will do a scratch > build right now. > > What's your exact setup? any other settings in your local.conf? > > Sau! > > > > > > x86 > > > > > > Summary: 1 task failed: > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb, > > do_compile > > > This is strange because we do world builds regularly. IIRC this one happens when opengl isn't in DISTRO_FEATURES. It's also included in my "State of bitbake world" reports every time.. > > mips64 > > == > > > > Summary: 1 task failed: > > > > /builds1/angstrom/sources/openembedded-core/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb, > > do_configure > > > > > > ___ > > 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 -- 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] [danny][PATCH 3/3] binutils: fix build with recent texinfo (5.1)
On Thu, 2013-08-22 at 20:02 +0100, Burton, Ross wrote: > On 22 August 2013 18:49, Eric Bénard wrote: > >> Sorry for the delay, this series is now in ross/danny-next. > >> > > when do you think these patches could reach oe-core's danny branch ? > > Consider this ball well and truly dropped. > > I'm literally packing now for a week away but I've just pinged Richard > about the outstanding commits, so there may be a merge shortly. If > not, I'll follow up when I return (1st September). They're merged. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pulseaudio: upgrade to v4.0
On 08/22/2013 11:41 AM, Saul Wold wrote: I found a floating dependency on gtk+3, and that the configure for 4.0 takes a different set of options: configure:29775: WARNING: unrecognized options: --disable-lynx, --disable-polkit, --without-jack, --with-glib, --with-alsa, --with-oss, --without-hal, --disable-hal, --enable-gtk2 If you look at configure --help for pulse audio, there is an updated list of options. There might be a little challenging with gtk+3 since it's enabled by default and we want to disable it when no x11 DISTRO_FEATURE is there, so look at this carefully. I provided a patch for this already, but you might want to review the options that we have enabled, we might want to consider disabling some more. Sau! Sau! On 07/23/2013 09:00 AM, Cristian Iorga wrote: pulseaudio_fix_for_x32.patch removed; included in upstream. general recipe clean-up (multiple src URI removed, inheritance grouping, dependency grouping). parallel make is now active (was disabled in version 0.9). Signed-off-by: Cristian Iorga --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |9 +- .../pulseaudio/pulseaudio_fix_for_x32.patch| 238 .../{pulseaudio_3.0.bb => pulseaudio_4.0.bb} | 11 +- 3 files changed, 5 insertions(+), 253 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch rename meta/recipes-multimedia/pulseaudio/{pulseaudio_3.0.bb => pulseaudio_4.0.bb} (51%) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index d4f66e6..d3f6d17 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" + DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" +DEPENDS += "libjson gdbm speex libxml-parser-perl-native" -SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ - file://gcc4-compile-fix.patch \ - file://volatiles.04_pulse" - -inherit autotools pkgconfig useradd +inherit autotools pkgconfig useradd gettext perlnative # *.desktop rules wont be generated during configure and build will fail # if using --disable-nls @@ -53,7 +51,6 @@ PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" -PARALLEL_MAKE = "" export TARGET_PFPU = "${TARGET_FPU}" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch deleted file mode 100644 index b68ac5b..000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch +++ /dev/null @@ -1,238 +0,0 @@ -Upstream-Status: Pending - -This patch makes assembly syntax compatible to the x32 toolchain. - -This fixes these kinds of compilations errors with x32 gcc. -| pulsecore/svolume_mmx.c: Assembler messages: -| pulsecore/svolume_mmx.c:107: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:135: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:161: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:162: Error: `8(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:180: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:210: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:244: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:245: Error: `8(%esi,%rdi,4)' is not a valid base/index expression -| make[3]: *** [libpulsecore_1.1_la-svolume_mmx.lo] Error 1 - -Orignally these assembly lines are written for x86_64 ABI, now they are also compatible with -X32 ABI. - -Signed-Off-By: Nitin A Kamble 2011/12/03 -Index: pulseaudio-1.1/src/pulsecore/svolume_mmx.c -=== pulseaudio-1.1.orig/src/pulsecore/svolume_mmx.c -+++ pulseaudio-1.1/src/pulsecore/svolume_mmx.c -@@ -107,7 +107,7 @@ static void pa_volume_s16ne_mmx(int16_t - " test $1, %2 \n\t" /* check for odd samples */ - " je 2f \n\t" - --" movd (%1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */ -+" movd (%q1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */ - " movw (%0), %w4
Re: [OE-core] World build on OE-Core
On 08/22/2013 02:24 PM, Khem Raj wrote: Hi In spare cycles my box ran world build for all eglibc/qemus, arm, ppc, mips looks all fine however I see errors on mips64,x86 and x86_64 I am looking into the mips64 one. x86_64 == Summary: 17 tasks failed: /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/cairo/cairo_1.12.14.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez/bluez4_4.101.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/curl/curl_7.32.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/mesa/mesa_9.1.6.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/enchant/enchant_1.6.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/neon/neon_0.30.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/taglib/taglib_1.8.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/parted/parted_3.1.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/libuser/libuser_0.59.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/neard/neard_0.10.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez5/bluez5_5.7.bb, do_compile I do regular builds on my local machine of world and qemumips (not mips64) with MUT, I wonder what your failures are. I will do a scratch build right now. What's your exact setup? any other settings in your local.conf? Sau! x86 Summary: 1 task failed: /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb, do_compile This is strange because we do world builds regularly. mips64 == Summary: 1 task failed: /builds1/angstrom/sources/openembedded-core/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb, do_configure ___ 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
Re: [OE-core] [PATCH 1/3] kmod: Upgrade to version 14
On 08/21/2013 09:31 PM, Khem Raj wrote: The update is a requirement for systemd-206 Signed-off-by: Khem Raj --- meta/recipes-kernel/kmod/kmod-native_git.bb| 1 - meta/recipes-kernel/kmod/kmod.inc | 9 ...-man-page-generation-because-we-don-t-hav.patch | 26 -- .../kmod/kmod/fix-undefined-O_CLOEXEC.patch| 16 ++--- meta/recipes-kernel/kmod/kmod_git.bb | 3 +-- 5 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch Did you build the native version? I am seeing failures in MUT on the autobuilder. It did pass my "sniff" test on my 2 local world builds. | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86 _64-linux /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/test/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod-private.a Nice ester egg | tools/kmod.o: In function `kmod_help': | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' | tools/kmod.o: In function `main': | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to `_Static_assert' follow | collect2: ld returned 1 exit status | make[2]: *** [tools/test/kmod] Error 1 | make[2]: *** Waiting for unfinished jobs | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86 _64-linux /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/.libs/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightl
Re: [OE-core] World build on OE-Core
On Thursday, August 22, 2013, Burton, Ross wrote: > On 22 August 2013 22:24, Khem Raj wrote: >> x86_64 >> == >> >> Summary: 17 tasks failed: >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-lib/ libxft_2.3.1.bb, do_compile >> /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/cairo/ cairo_1.12.14.bb, do_compile >> /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/ gst-plugins-base_0.10.36.bb, do_compile > ... > > The majority of your failures on x86-64 get autobuilt every night, so > I'd be curious to see the your logs if you still have them. I have them once I get to my computer I will share. My build enables multilib and uses systemd as default so its not default out of box > > Ross > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Automake-1.13
gtk-engines fix updated, and the automake update patch itself added to the set. It's probably better to leave latter to beginning of new cycle (1.6) than to push it in just before 1.5 freeze, as it might break number of recipes in other layers. The following changes since commit e473e60d5572f36829068f6d3db9ce9ba9633d71: mkfontscale: This no longer needs a full libx11, xproto suffices (2013-08-22 18:29:50 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib cazfi/am13 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=cazfi/am13 Marko Lindqvist (2): gtk-engines: fix build with automake-1.13 automake: update to upstream version 1.13.4 .../prefer-cpio-over-pax-for-ustar-archives.patch | 37 ++-- .../{automake_1.12.6.bb => automake_1.13.4.bb} |6 ++-- .../gtk-engines-2.20.2/substitute-tests.patch | 37 .../gtk-engines/gtk-engines_2.20.2.bb |3 +- 4 files changed, 60 insertions(+), 23 deletions(-) rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%) create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] automake: update to upstream version 1.13.4
prefer-cpio-over-pax-for-ustar-archives.patch updated to apply Signed-off-by: Marko Lindqvist --- .../prefer-cpio-over-pax-for-ustar-archives.patch | 37 ++-- .../{automake_1.12.6.bb => automake_1.13.4.bb} |6 ++-- 2 files changed, 21 insertions(+), 22 deletions(-) rename meta/recipes-devtools/automake/{automake_1.12.6.bb => automake_1.13.4.bb} (90%) diff --git a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch index 4627855..6558a00 100644 --- a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch +++ b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch @@ -19,24 +19,13 @@ Updated for version 1.11.3: Signed-off-by: Nitin A Kamble Date: 2011/03/14 -Index: automake-1.11.3/m4/tar.m4 -=== automake-1.11.3.orig/m4/tar.m4 2012-01-31 03:41:18.0 -0800 -+++ automake-1.11.3/m4/tar.m4 2012-03-14 17:36:11.901303777 -0700 -@@ -31,7 +31,7 @@ m4_if([$1], [v7], - [m4_fatal([Unknown tar format])]) - AC_MSG_CHECKING([how to create a $1 tar archive]) - # Loop over all known methods to create a tar archive until one works. --_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none' - _am_tools=${am_cv_prog_tar_$1-$_am_tools} - # Do not fold the above two line into one, because Tru64 sh and - # Solaris sh will not grok spaces in the rhs of `-'. -Index: automake-1.11.3/Makefile.in -=== automake-1.11.3.orig/Makefile.in 2012-02-01 02:37:59.0 -0800 -+++ automake-1.11.3/Makefile.in2012-03-14 17:38:03.530869197 -0700 -@@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a +Updated for version 1.13.2: +Signed-off-by: Marko Lindqvist + +diff -Nurd automake-1.13.2/Makefile.in automake-1.13.2/Makefile.in +--- automake-1.13.2/Makefile.in2013-05-15 23:12:58.0 +0300 automake-1.13.2/Makefile.in2013-05-23 02:13:41.364026301 +0300 +@@ -141,7 +141,7 @@ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ @@ -45,3 +34,15 @@ Index: automake-1.11.3/Makefile.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +diff -Nurd automake-1.13.2/m4/tar.m4 automake-1.13.2/m4/tar.m4 +--- automake-1.13.2/m4/tar.m4 2013-05-13 23:12:48.0 +0300 automake-1.13.2/m4/tar.m4 2013-05-23 02:13:26.600025805 +0300 +@@ -26,7 +26,7 @@ + AC_SUBST([AMTAR], ['$${TAR-tar}']) + + # We'll loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none' + + m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], diff --git a/meta/recipes-devtools/automake/automake_1.12.6.bb b/meta/recipes-devtools/automake/automake_1.13.4.bb similarity index 90% rename from meta/recipes-devtools/automake/automake_1.12.6.bb rename to meta/recipes-devtools/automake/automake_1.13.4.bb index 549051b..e3db834 100644 --- a/meta/recipes-devtools/automake/automake_1.12.6.bb +++ b/meta/recipes-devtools/automake/automake_1.13.4.bb @@ -26,10 +26,8 @@ SRC_URI += "${PATHFIXPATCH} \ file://py-compile-compile-only-optimized-byte-code.patch \ file://buildtest.patch" -SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026" -SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef" - -PR = "r0" +SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e" +SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c" do_install_append () { install -d ${D}${datadir} -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] gtk-engines: fix build with automake-1.13
Add patch substitute-tests.patch that works around automake TESTS limitation. See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13771. Signed-off-by: Marko Lindqvist --- .../gtk-engines-2.20.2/substitute-tests.patch | 37 .../gtk-engines/gtk-engines_2.20.2.bb |3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch new file mode 100644 index 000..5c557ba --- /dev/null +++ b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch @@ -0,0 +1,37 @@ +Upstream-Status: Pending + +Signed-off-by: Marko Lindqvist +diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac +--- gtk-engines-2.20.2/configure.ac2010-10-01 15:42:37.0 +0300 gtk-engines-2.20.2/configure.ac2013-08-20 02:50:27.930510565 +0300 +@@ -166,6 +166,9 @@ + + AC_SUBST(DEVELOPMENT_CFLAGS) + ++AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]]) ++AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]]) ++ + AM_CONFIG_HEADER([engines/support/config.h]) + + AC_CONFIG_FILES([ +diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am +--- gtk-engines-2.20.2/test/Makefile.am2010-09-19 18:18:21.0 +0300 gtk-engines-2.20.2/test/Makefile.am2013-08-20 02:50:36.842510865 +0300 +@@ -66,7 +66,7 @@ + # Prefix with exported_ + EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) + +-TESTS += $(EXPORTED_SYMBOLS_TESTS) ++TESTS += @exported_symbols_tests@ + + + # +@@ -88,7 +88,7 @@ + TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) + + # Add TORTURE_TEST_ENGINES to list of tests +-TESTS += $(TORTURE_TEST_TESTS) ++TESTS += @torture_test_tests@ + + # Possible other tests: + # - An extensive theme switch tests that loads/unloads the engine diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index 32d7be4..f899307 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -37,6 +37,7 @@ python populate_packages_prepend() { # TODO: mark theme packages as arch all } -SRC_URI += "file://glib-2.32.patch" +SRC_URI += "file://glib-2.32.patch \ +file://substitute-tests.patch" SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] World build on OE-Core
On 22 August 2013 22:24, Khem Raj wrote: > x86_64 > == > > Summary: 17 tasks failed: > > /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb, > do_compile > > /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/cairo/cairo_1.12.14.bb, > do_compile > > /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb, > do_compile ... The majority of your failures on x86-64 get autobuilt every night, so I'd be curious to see the your logs if you still have them. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] World build on OE-Core
Hi In spare cycles my box ran world build for all eglibc/qemus, arm, ppc, mips looks all fine however I see errors on mips64,x86 and x86_64 I am looking into the mips64 one. x86_64 == Summary: 17 tasks failed: /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/cairo/cairo_1.12.14.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez/bluez4_4.101.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/curl/curl_7.32.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/mesa/mesa_9.1.6.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-core/glib-networking/glib-networking_2.36.2.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/enchant/enchant_1.6.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/neon/neon_0.30.0.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.0.9.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-support/taglib/taglib_1.8.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/parted/parted_3.1.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-extended/libuser/libuser_0.59.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/neard/neard_0.10.bb, do_compile /builds1/angstrom/sources/openembedded-core/meta/recipes-connectivity/bluez5/bluez5_5.7.bb, do_compile x86 Summary: 1 task failed: /builds1/angstrom/sources/openembedded-core/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.13.bb, do_compile mips64 == Summary: 1 task failed: /builds1/angstrom/sources/openembedded-core/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb, do_configure ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2013.07
Please provide feedback. I would like to get this into poky 1.5. Thanks! On Thu, Aug 22, 2013 at 9:36 PM, Laszlo Papp wrote: > Signed-off-by: Laszlo Papp > --- > meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb | 28 > ...Drop-config.h-include-in-tools-imximage.h.patch | 39 -- > ...ove-LDSCRIPT-processing-to-the-top-level-.patch | 82 > -- > meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb | 31 > meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb | 29 > .../u-boot/u-boot-mkimage_2013.01.01.bb| 33 - > meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb | 27 +++ > meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 24 --- > meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 24 --- > meta/recipes-bsp/u-boot/u-boot_2013.01.01.bb | 29 > meta/recipes-bsp/u-boot/u-boot_2013.07.bb | 23 ++ > 11 files changed, 50 insertions(+), 319 deletions(-) > delete mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb > delete mode 100644 > meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch > delete mode 100644 > meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch > delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb > delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb > delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.01.01.bb > create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb > delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2011.03.bb > delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2011.06.bb > delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.01.01.bb > create mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.07.bb > > diff --git > a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bbb/meta/recipes-bsp/u-boot/ > u-boot-fw-utils_2011.06.bb > deleted file mode 100644 > index 7c4df1a..000 > --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb > +++ /dev/null > @@ -1,28 +0,0 @@ > -DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils" > -LICENSE = "GPLv2+" > -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ > - > file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" > -SECTION = "bootloader" > - > -DEPENDS = "mtd-utils" > - > -PR = "r1" > - > -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"; > - > -SRC_URI[md5sum] = "0cc5026aad02f218a9b9ac56b301c97a" > -SRC_URI[sha256sum] = > "362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b" > - > -S = "${WORKDIR}/u-boot-${PV}" > - > -EXTRA_OEMAKE = 'HOSTCC="${CC}"' > - > -do_compile () { > - oe_runmake env > -} > - > -do_install () { > - install -d ${D}${base_sbindir} > - install -m 755 ${S}/tools/env/fw_printenv > ${D}${base_sbindir}/fw_printenv > - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv > -} > diff --git > a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch > b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch > deleted file mode 100644 > index 0405834..000 > --- > a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Lo=C3=AFc=20Minier?= > -Date: Thu, 3 Feb 2011 15:07:01 +0100 > -Subject: Drop config.h include in tools/imximage.h > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Upstream-Status: Accepted > - > -"make tools-all" should allow building tools such as mkimage and the new > -imximage without any config, but imximage.c currently fails to build > -with: > -imximage.h:27:20: error: config.h: No such file or directory > - > -config.h is not needed in imximage.h nor in imximage.c, and imximage.h > -is only included from imximage.c, so drop this include to fix the build. > - > -Signed-off-by: Loïc Minier > > - tools/imximage.h |2 -- > - 1 files changed, 0 insertions(+), 2 deletions(-) > - > -diff --git a/tools/imximage.h b/tools/imximage.h > -index 38ca6be..d126a46 100644 > a/tools/imximage.h > -+++ b/tools/imximage.h > -@@ -24,8 +24,6 @@ > - #ifndef _IMXIMAGE_H_ > - #define _IMXIMAGE_H_ > - > --#include > -- > - #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set > for v2 */ > - #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set > for v1 */ > - #define APP_CODE_BARKER 0xB1 > --- > -1.7.4.4 > - > diff --git > a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch > b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch > de
[OE-core] [PATCH] u-boot: update to 2013.07
Signed-off-by: Laszlo Papp --- meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb | 28 ...Drop-config.h-include-in-tools-imximage.h.patch | 39 -- ...ove-LDSCRIPT-processing-to-the-top-level-.patch | 82 -- meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb | 31 meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb | 29 .../u-boot/u-boot-mkimage_2013.01.01.bb| 33 - meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb | 27 +++ meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 24 --- meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 24 --- meta/recipes-bsp/u-boot/u-boot_2013.01.01.bb | 29 meta/recipes-bsp/u-boot/u-boot_2013.07.bb | 23 ++ 11 files changed, 50 insertions(+), 319 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.01.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot-mkimage_2013.07.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2011.03.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2011.06.bb delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.01.01.bb create mode 100644 meta/recipes-bsp/u-boot/u-boot_2013.07.bb diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb deleted file mode 100644 index 7c4df1a..000 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2011.06.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ - file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" -SECTION = "bootloader" - -DEPENDS = "mtd-utils" - -PR = "r1" - -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"; - -SRC_URI[md5sum] = "0cc5026aad02f218a9b9ac56b301c97a" -SRC_URI[sha256sum] = "362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b" - -S = "${WORKDIR}/u-boot-${PV}" - -EXTRA_OEMAKE = 'HOSTCC="${CC}"' - -do_compile () { - oe_runmake env -} - -do_install () { - install -d ${D}${base_sbindir} - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv -} diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch deleted file mode 100644 index 0405834..000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ce56e089ddb51dbd81bb2c86b1646d77447afe39 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Minier?= -Date: Thu, 3 Feb 2011 15:07:01 +0100 -Subject: Drop config.h include in tools/imximage.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Accepted - -"make tools-all" should allow building tools such as mkimage and the new -imximage without any config, but imximage.c currently fails to build -with: -imximage.h:27:20: error: config.h: No such file or directory - -config.h is not needed in imximage.h nor in imximage.c, and imximage.h -is only included from imximage.c, so drop this include to fix the build. - -Signed-off-by: Lo�c Minier - tools/imximage.h |2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/tools/imximage.h b/tools/imximage.h -index 38ca6be..d126a46 100644 a/tools/imximage.h -+++ b/tools/imximage.h -@@ -24,8 +24,6 @@ - #ifndef _IMXIMAGE_H_ - #define _IMXIMAGE_H_ - --#include -- - #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ - #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ - #define APP_CODE_BARKER 0xB1 --- -1.7.4.4 - diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch deleted file mode 100644 index 5729cd9..000 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch +++ /dev/null @@ -1,82 +0,0 @@ -From fd1b50c5ff9c288040abf5e78815151327d32e0e Mon Sep 17 00:00:00 2001 -From: Ilya Yanok -Date: Mon, 20 Jun 2011 12:45:37 + -Subject: conf
Re: [OE-core] [PATCH 1/1] cronie: add PACKAGECONFIG data
On 08/22/2013 12:34 PM, Joe Slater wrote: We add PACKAGECONFIG[] data for audit and move the current pam related stuff into it's own entry. Signed-off-by: Joe Slater --- meta/recipes-extended/cronie/cronie_1.4.11.bb | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb index aa1ba39..9d2d30b 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.11.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.11.bb @@ -14,9 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ SECTION = "utils" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" -PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ file://fix-out-of-tree-build.patch \ @@ -25,15 +22,21 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://crond_pam_config.patch" - +PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI[md5sum] = "2ba645cf54de17f138ef70312843862f" SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be" inherit autotools update-rc.d useradd -EXTRA_OECONF += "\ -${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" + +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" + +# yes, no, depends, rdepends +# You must have this in your cut and paste, as with the other patch, we don't need the extra comments here. Thanks Sau! +PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" + INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pulseaudio: Fix up configure options and use gtk+3
Pulseaudio 4.0 switch from gtk+ to gtk+3, a floating dependency had occurred during a build which made me check into this. Signed-off-by: Saul Wold --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index f1b346c..afe8410 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -20,14 +20,7 @@ inherit autotools pkgconfig useradd gettext perlnative USE_NLS = "yes" EXTRA_OECONF = "\ - --disable-lynx \ - --disable-polkit \ - --without-jack \ - --with-glib \ - --with-alsa \ - --with-oss \ - --without-hal \ - --disable-hal \ + --disable-hal-compat \ --disable-orc \ --enable-tcpwrap=no \ --with-access-group=audio \ @@ -44,7 +37,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" -PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" +PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] cronie: add PACKAGECONFIG data
We add PACKAGECONFIG[] data for audit and move the current pam related stuff into it's own entry. Signed-off-by: Joe Slater --- meta/recipes-extended/cronie/cronie_1.4.11.bb | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb index aa1ba39..9d2d30b 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.11.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.11.bb @@ -14,9 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ SECTION = "utils" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" -PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ file://fix-out-of-tree-build.patch \ @@ -25,15 +22,21 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://crond_pam_config.patch" - +PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI[md5sum] = "2ba645cf54de17f138ef70312843862f" SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be" inherit autotools update-rc.d useradd -EXTRA_OECONF += "\ -${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" + +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" + +# yes, no, depends, rdepends +# +PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" + INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [danny][PATCH 3/3] binutils: fix build with recent texinfo (5.1)
On 22 August 2013 18:49, Eric Bénard wrote: >> Sorry for the delay, this series is now in ross/danny-next. >> > when do you think these patches could reach oe-core's danny branch ? Consider this ball well and truly dropped. I'm literally packing now for a week away but I've just pinged Richard about the outstanding commits, so there may be a merge shortly. If not, I'll follow up when I return (1st September). Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On 22 August 2013 18:32, Iorga, Cristian wrote: > So your advice is to keep hicolor-icon-theme and also add sato theme? Yes. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pulseaudio: upgrade to v4.0
I found a floating dependency on gtk+3, and that the configure for 4.0 takes a different set of options: configure:29775: WARNING: unrecognized options: --disable-lynx, --disable-polkit, --without-jack, --with-glib, --with-alsa, --with-oss, --without-hal, --disable-hal, --enable-gtk2 If you look at configure --help for pulse audio, there is an updated list of options. There might be a little challenging with gtk+3 since it's enabled by default and we want to disable it when no x11 DISTRO_FEATURE is there, so look at this carefully. Sau! On 07/23/2013 09:00 AM, Cristian Iorga wrote: pulseaudio_fix_for_x32.patch removed; included in upstream. general recipe clean-up (multiple src URI removed, inheritance grouping, dependency grouping). parallel make is now active (was disabled in version 0.9). Signed-off-by: Cristian Iorga --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |9 +- .../pulseaudio/pulseaudio_fix_for_x32.patch| 238 .../{pulseaudio_3.0.bb => pulseaudio_4.0.bb} | 11 +- 3 files changed, 5 insertions(+), 253 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch rename meta/recipes-multimedia/pulseaudio/{pulseaudio_3.0.bb => pulseaudio_4.0.bb} (51%) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index d4f66e6..d3f6d17 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" + DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" +DEPENDS += "libjson gdbm speex libxml-parser-perl-native" -SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ - file://gcc4-compile-fix.patch \ - file://volatiles.04_pulse" - -inherit autotools pkgconfig useradd +inherit autotools pkgconfig useradd gettext perlnative # *.desktop rules wont be generated during configure and build will fail # if using --disable-nls @@ -53,7 +51,6 @@ PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" -PARALLEL_MAKE = "" export TARGET_PFPU = "${TARGET_FPU}" diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch deleted file mode 100644 index b68ac5b..000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio_fix_for_x32.patch +++ /dev/null @@ -1,238 +0,0 @@ -Upstream-Status: Pending - -This patch makes assembly syntax compatible to the x32 toolchain. - -This fixes these kinds of compilations errors with x32 gcc. -| pulsecore/svolume_mmx.c: Assembler messages: -| pulsecore/svolume_mmx.c:107: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:135: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:161: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:162: Error: `8(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:180: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:210: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:244: Error: `(%esi,%rdi,4)' is not a valid base/index expression -| pulsecore/svolume_mmx.c:245: Error: `8(%esi,%rdi,4)' is not a valid base/index expression -| make[3]: *** [libpulsecore_1.1_la-svolume_mmx.lo] Error 1 - -Orignally these assembly lines are written for x86_64 ABI, now they are also compatible with -X32 ABI. - -Signed-Off-By: Nitin A Kamble 2011/12/03 -Index: pulseaudio-1.1/src/pulsecore/svolume_mmx.c -=== pulseaudio-1.1.orig/src/pulsecore/svolume_mmx.c -+++ pulseaudio-1.1/src/pulsecore/svolume_mmx.c -@@ -107,7 +107,7 @@ static void pa_volume_s16ne_mmx(int16_t - " test $1, %2 \n\t" /* check for odd samples */ - " je 2f \n\t" - --" movd (%1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */ -+" movd (%q1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */ - " movw (%0), %w4\n\t" /* .. | p0 | */ - " movd %4, %%mm1\n\t" - VOLUME_32x16 (%%mm1, %%mm0) -@
[OE-core] Days away from Feature Freeze for 1.5!!
Folks, We have all been busy working on our respective projects and I want to point out that we are days away from the 1.5 Feature Freeze of August 25th, at midnight PST. What this means is that in the coming weeks we will be slowing the uptake of patches as we get closer to the 1.5 release date of 10/18. This also means we will be doing more full pass testing and focusing on getting any bugs discovered there fixed and generally well understood patches that help with stabilization. We will not take any more recipe updates or major changes after the 25th, please set those aside for when we open up master again for 1.6, which will likely happen in 3 - 5 weeks once master settles enough so that we can create the release branch. We will start the planning for 1.6 in the mid-late September timeframe, so put your idea cap on and file 1.6 enhancements. Thanks to everyone work on these projects. -- Sau! Saul Wold Yocto Component Wrangler @ Intel Yocto Project / Poky Build System ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Aug 22, 2013, at 2:07 AM, Paul Eggleton wrote: > On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: >> Paul, Ross: >> >> Please review this set. >> >> It has a number of large changes that I want more EYES on! >> >> Particularly, the python3 patch set, which I may remove before >> this is final due to the world build issue. >> >> There is also a few patches on poky from Beth and myself which >> need a look at and ACK >> The following changes since commit d98f08a7ad95d0b17846276b028a6614f16b6846: >> >> genext2fs: fix memory corruption on powerpc (2013-08-20 07:11:44 -0700) >> >> are available in the git repository at: >> >> git://git.openembedded.org/openembedded-core-contrib sgw/stage >> >> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/ >> stage >> >> Cristian Iorga (4): >> packagegroup-self-hosted: pcmanfm integration >> builder: register directories with pcmanfm >> build-appliance-image: changing the icon theme to sato >> default-providers: Set the preferred provider for bluez > > I thought we were going to fix the libasound-module-bluez multiple provider > issue by renaming the package? > >> Jonathan Liu (3): >> xf86-video-intel: remove duplicate xf86driproto from DEPENDS >> xf86-video-vesa: remove duplicate xf86driproto from DEPENDS >> mesa: enable additional drivers for gallium-llvm x86/x86-64 >> >> Kai Kang (3): >> bc: fix segmentation fault >> libx11: upgrade to 1.6.1 >> libx11-diet: upgrade to 1.6.1 > > "Deleted keysymdef_include patch" - why? Presumably because it was merged > upstream, but that needs to be stated. > >> Khem Raj (27): >> generate-manifest-3.3.py: Add script to generate python 3.3 manifests >> python-3.3-manifest: Add python3 manifest file >> python3native.bbclass: Add python3 abstraction class >> package_rpm.bbclass:Make the regexp less greedy >> classes/distutils: Introduce PYTHON_PN >> classes: Add distutils for python3 > > I hadn't noticed earlier, but this set of changes introduces a shedload more > bbclasses. Are these really all necessary? > >> setuptools.bbclass: Use python-distribute instead of python-setuptools >> distutils3.bbclass: Port the distutils class fix to handle filenames >>with spaces >> setuptools3.bbclass: Remove useless multiline comment > > These incremental changes to files added in earlier commits need to be > squashed > into those commits. > >> distutils: Introduce PYTHON_ABI variable >> distutils3: Do build_ext as separate step during compile >> python3: Add recipes >> python3: Add native recipe >> python_2.7.3.bb: Inherit python-dir >> python3-nose: Testing tools for python >> zeromq: Add recipe >> pyzmq: Add recipes using python3 > > There's inadequate justification given in the commit messages for why these > last two need to be added; I already mentioned this in earlier feedback on > these changes. What's more, the second commit makes a tweak to the commit > before which should be squashed into there instead. > >> ipython: Add recipes for ipython2 and ipython3 > > Again, the commit message needs to mention why we need these. > >> python-distribute: Add recipes for python2 and python3 >> python3: Upgrade to 3.3.2 >> distutils3.bbclass: Fix typo and use proper values for target sysroot >> python3, python3-native: Consider OE staging installation >> python3: Fix host include contamination issue >> distutils3.bbclass: Use MACHINE for sysroot when not building for >>build host >> python3: Fix the compiler invocation and linker flags when cross >>compiling >> python: Add Patch description and status information >> eglibc: Update SRC_URI and fix unpackaged empty dir > > I appreciate the work and testing that has gone into this set of changes but > it still needs further cleaning up as discussed above IMO. Paul and All I have rehashed the pull tree. http://git.openembedded.org/openembedded-core-contrib/log/?h=kraj/python3 Squashed the commits Removed ipython and its deps Take a look again and let me know if you have more comments. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thu, Aug 22, 2013 at 9:51 AM, Paul Eggleton wrote: > On Thursday 22 August 2013 11:20:46 Richard Purdie wrote: >> On Thu, 2013-08-22 at 10:07 +0100, Paul Eggleton wrote: >> > On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: >> > > Marko Lindqvist (3): >> > > texinfo: correct dont-depend-on-help2man.patch >> > > SDL2: add recipe >> > > boost: fix build when PARALLEL_MAKE is not set >> > > >> > > Otavio Salvador (1): >> > > distro_features_check.bbclass: Allow checking of required/conflicting >> > > >> > > features >> > >> > I should have asked this earlier - why does this need to be a separate >> > bbclass? The code doesn't do anything if the variables aren't set, so it >> > can't be because it could have an impact on existing setups that don't >> > set them. >> >> FWIW I do have a worry about the shear weight of the core these days as >> we're building up piles of anonymous python for example. In many ways I >> therefore like the idea of having more classes which get included when >> they're needed. > > For something like this though it just increases complexity for users - unlike > other optional class-supported functionality it's not even clear from the > variable name that you'll need to inherit the class before they can be used. Both ways works for me. So do the choice and I update the patch. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.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] [danny][PATCH 3/3] binutils: fix build with recent texinfo (5.1)
Hi Ross, Le Tue, 23 Jul 2013 14:37:05 +0100, "Burton, Ross" a écrit : > On 9 July 2013 08:29, Eric Bénard wrote: > > Signed-off-by: Eric Bénard > > --- > > meta/recipes-devtools/binutils/binutils-2.22.inc |1 + > > .../binutils/binutils/texinfo.patch| 294 > > > > 2 files changed, 295 insertions(+) > > create mode 100644 meta/recipes-devtools/binutils/binutils/texinfo.patch > > Sorry for the delay, this series is now in ross/danny-next. > when do you think these patches could reach oe-core's danny branch ? Thanks, Eric ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Aug 22, 2013, at 2:07 AM, Paul Eggleton wrote: > On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: >> Paul, Ross: >> >> Please review this set. >> >> It has a number of large changes that I want more EYES on! >> >> Particularly, the python3 patch set, which I may remove before >> this is final due to the world build issue. >> >> There is also a few patches on poky from Beth and myself which >> need a look at and ACK >> The following changes since commit d98f08a7ad95d0b17846276b028a6614f16b6846: >> >> genext2fs: fix memory corruption on powerpc (2013-08-20 07:11:44 -0700) >> >> are available in the git repository at: >> >> git://git.openembedded.org/openembedded-core-contrib sgw/stage >> >> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/ >> stage >> >> Cristian Iorga (4): >> packagegroup-self-hosted: pcmanfm integration >> builder: register directories with pcmanfm >> build-appliance-image: changing the icon theme to sato >> default-providers: Set the preferred provider for bluez > > I thought we were going to fix the libasound-module-bluez multiple provider > issue by renaming the package? > >> Jonathan Liu (3): >> xf86-video-intel: remove duplicate xf86driproto from DEPENDS >> xf86-video-vesa: remove duplicate xf86driproto from DEPENDS >> mesa: enable additional drivers for gallium-llvm x86/x86-64 >> >> Kai Kang (3): >> bc: fix segmentation fault >> libx11: upgrade to 1.6.1 >> libx11-diet: upgrade to 1.6.1 > > "Deleted keysymdef_include patch" - why? Presumably because it was merged > upstream, but that needs to be stated. > >> Khem Raj (27): >> generate-manifest-3.3.py: Add script to generate python 3.3 manifests >> python-3.3-manifest: Add python3 manifest file >> python3native.bbclass: Add python3 abstraction class >> package_rpm.bbclass:Make the regexp less greedy >> classes/distutils: Introduce PYTHON_PN >> classes: Add distutils for python3 > > I hadn't noticed earlier, but this set of changes introduces a shedload more > bbclasses. Are these really all necessary? If you look at it the classes are to let python3 live along and share the common code with python2 > >> setuptools.bbclass: Use python-distribute instead of python-setuptools >> distutils3.bbclass: Port the distutils class fix to handle filenames >>with spaces >> setuptools3.bbclass: Remove useless multiline comment > > These incremental changes to files added in earlier commits need to be > squashed > into those commits. I have kept them for history, except the last one other two are worthwhile to have separate commits > >> distutils: Introduce PYTHON_ABI variable >> distutils3: Do build_ext as separate step during compile >> python3: Add recipes >> python3: Add native recipe >> python_2.7.3.bb: Inherit python-dir >> python3-nose: Testing tools for python >> zeromq: Add recipe >> pyzmq: Add recipes using python3 > > There's inadequate justification given in the commit messages for why these > last two need to be added; I already mentioned this in earlier feedback on > these changes. What's more, the second commit makes a tweak to the commit > before which should be squashed into there instead. *mq and *nose are needed for ipython, which is a powerful tool commonly used but on a second thought actually I will drop ipython from OE-Core and put it in some other layer like meta-oe and if there are enough users who then want it, we can make a case of moving it into OE-Core > >> ipython: Add recipes for ipython2 and ipython3 > > Again, the commit message needs to mention why we need these. > see above. >> python-distribute: Add recipes for python2 and python3 >> python3: Upgrade to 3.3.2 >> distutils3.bbclass: Fix typo and use proper values for target sysroot >> python3, python3-native: Consider OE staging installation >> python3: Fix host include contamination issue >> distutils3.bbclass: Use MACHINE for sysroot when not building for >>build host >> python3: Fix the compiler invocation and linker flags when cross >>compiling >> python: Add Patch description and status information >> eglibc: Update SRC_URI and fix unpackaged empty dir > > I appreciate the work and testing that has gone into this set of changes but > it still needs further cleaning up as discussed above IMO. > >> Lauren Post (2): >> directfb: Upgrade to 1.6.3 >> directfb: add fusion patch for hangs on exit with > > The commit messages seem a little bit malformed on these two. > >> Mark Hatle (11): >> image.bbclass: Add basic support for PACKAGE_EXCLUDE >> python-smartpm: Add support for excluding package from the install >> package_rpm.bbclass: Add support for PACKAGE_EXCLUDE to RPM installs >> python-smartpm: Add support to disable installing recommends >> package_rpm.bbclass: NO_RECOMMENDATIONS support >> package_deb.bbclass: Use the WORKDIR not SYSROOT for temp files >> package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EX
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
So your advice is to keep hicolor-icon-theme and also add sato theme? Regards, Cristian -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Burton, Ross Sent: Thursday, August 22, 2013 6:44 PM To: Saul Wold Cc: Paul Eggleton; OE-core Subject: Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)! On 22 August 2013 06:58, Saul Wold wrote: > Cristian Iorga (4): > packagegroup-self-hosted: pcmanfm integration This also adds xprop. Is that a dependency of something else, or should it be removed? > build-appliance-image: changing the icon theme to sato You'll want to keep hicolor-icon-theme installed, as it provides the skeleton structure for icons. Ross ___ 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
Re: [OE-core] [PATCH 4/6] e2fsprogs: properly set up extent header in do_write
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: > do_write doesn't fully set up the first extent header on a new > inode, so if we write a 0-length file, and don't write any data > to the new file, we end up creating something that looks corrupt > to kernelspace: > > EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm > ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), > depth 0(0) > > Do something similar to ext4_ext_tree_init() here, and > fill out the first extent header upon creation to avoid this. > > [YOCTO #3848] > > Signed-off-by: Robert Yang > --- > .../e2fsprogs-1.42.8/debugfs-extent-header.patch | 47 > > .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |2 + > +Upstream-Status: Backport Should we backport? Or should we just update the revision we use? -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/6] e2fsprogs: add populate-extfs.sh
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: > This script is originally from Darren Hart, it will be used for creating > the ext* filesystem from a given directory, which will replace the > genext2fs in image_types.bbclass at the moment, we may use the mke2fs to > replace this script again when it has the initial directory support. > > Changes of the script: > * Rename it from mkdebugfs.sh to populate-extfs.sh > * Add a simple usage > * Add checking for the number of the parameters > * Add the "regular empty file" and "fifo" file type > * Set mode, uid and gid for the file > * Save the command lines to a file and batch run them > * Change the error message > * Improve the performance > * Add the support for hardlink > > [YOCTO #3848] > Signed-off-by: Darren Hart > Signed-off-by: Robert Yang Ted has offered to add this to the contrib dir for the ext2 tools. This is fine to add to yocto, but we should contribute this back upstream as well. -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/6] e2fsprogs: only update the icache for ext2_inode
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: > We only read the cache when: > > bufsize == sizeof(struct ext2_inode) > > then we should only update the cache in the same condition, otherwise > there would be errors, for example: > > cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() > cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full() > > Then update the cache: > cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full() > > Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was > cached by bufsize = 156), so there would be errors. > [YOCTO #3848] > > Signed-off-by: Robert Yang > +Upstream-Status: [Inappropriate] Hrm... why is this one inappropriate? -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: Web browsing and HTML in OE-Core
On Thu, Aug 22, 2013 at 11:04 AM, Richard Purdie wrote: > We've slowly been shaking out the definition of OE-Core and as part of > that we removed web and web-gtk which were the only browsers in there > and were admittedly a bit limited/broken. > > There is no doubt that web technology has an increasingly important role > in the future and in embedded devices (e.g. kiosk type devices, digital > signs and so on). > > With that in mind, I think some kind of HTML support in OE-Core is > important going forward. Equally, I dislike having things there which we > cannot test. I know some people have looked into this and it appears > midori is the best option for something with a small number of > additional dependencies. I therefore currently think this is something > we should make a decision to include since it gives us significantly > better coverage of things like webkit which are a already in the core > yet totally untested at present. > > I'm open to opinions, equally we do need to make a decision on this soon > since we're nearly at the feature freeze point. Thoughts? Qt demos has a browser which might do the work. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.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] [v4][PATCH 1/2] directfb: Upgrade to 1.6.3
On Thu, Aug 22, 2013 at 1:54 PM, Lauren Post wrote: > directfb: Upgrade to 1.6.3 > > Remove mesa patch as 1.6.3 provides compatibility with mesa > > Signed-off-by: Lauren Post Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.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] [v4][PATCH 2/2] directfb: Add fusion patch for hangs on exit
On Thu, Aug 22, 2013 at 1:54 PM, Lauren Post wrote: > directfb: Add fusion patch for hangs on exit > > with following tests: direct_test, fusion_skirmish > > Signed-off-by: Lauren Post Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.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 v2 4/4] builder: register directories with pcmanfm
Register directories to be opened with PCManFM filemanager using xdg-open in Build Appliance. Signed-off-by: Cristian Iorga --- meta/recipes-graphics/builder/files/builder_hob_start.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/meta/recipes-graphics/builder/files/builder_hob_start.sh b/meta/recipes-graphics/builder/files/builder_hob_start.sh index 40616f5..b3a0540 100644 --- a/meta/recipes-graphics/builder/files/builder_hob_start.sh +++ b/meta/recipes-graphics/builder/files/builder_hob_start.sh @@ -9,6 +9,15 @@ export PSEUDO_LOCALSTATEDIR=/home/builder/pseudo export PSEUDO_LIBDIR=/usr/lib/pseudo/lib64 export GIT_PROXY_COMMAND=/home/builder/poky/scripts/oe-git-proxy +#start pcmanfm in daemon mode to allow asynchronous launch +pcmanfm -d& + +#register folders to open with PCManFM filemanager +if [ ! -d /home/ubik/tmp/.local/share/applications ]; then +mkdir -p /home/builder/.local/share/applications/ +xdg-mime default pcmanfm.desktop inode/directory +fi + cd /home/builder/poky . ./oe-init-build-env -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/4] Build Appliance: pcmanfm integration
PCManFm file manager is integrated in Build Appliance; xdg-utils is also integrated for file association support. Signed-off-by: Cristian Iorga --- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 6a0722a..2d35c16 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -38,11 +38,13 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\ hdparm \ iptables \ lsb \ +xdg-utils \ mc \ mc-fish \ mc-helpers \ mc-helpers-perl \ mc-helpers-python \ +pcmanfm \ parted \ pseudo \ screen \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/4] xdg-utils: add runtime dependency on xprop
xprop is called by xdg-utils scripts. Signed-off-by: Cristian Iorga --- meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb index d5c7aa3..22247f7 100644 --- a/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb +++ b/meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb @@ -23,3 +23,4 @@ SRC_URI[sha256sum] = "7b05558ae4bb8ede356863cae8c42e3e012aa421bf9d45130a570fd209 inherit autotools +RDEPENDS_${PN} = "xprop" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/4] build-appliance-image: changing the icon theme to sato
Hicolor icon theme does not properly displays icons for folders. Sato icon theme is working correctly. Also, settings-daemon needs to be added to image in order to properly display folder icons. Signed-off-by: Cristian Iorga --- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 2d35c16..17dc980 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -123,7 +123,8 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ grep \ groff \ gzip \ -hicolor-icon-theme \ +settings-daemon \ +sato-icon-theme \ libaio \ libusb1 \ libxml2 \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/4] YB2370: Build Appliance integrates a filemanager
PCManFM filemanager is integrated in Build Appliance; It will handle folders and files navigation from within Hob. The following changes since commit 02521a40d36d06d269ec14ce9000f2941d6980af: busybox.inc: Avoid error when SYSLOG is not enabled (2013-08-22 15:11:13 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ciorga/YB2370 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/YB2370 Cristian Iorga (4): xdg-utils: add runtime dependency on xprop Build Appliance: pcmanfm integration build-appliance-image: changing the icon theme to sato builder: register directories with pcmanfm meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 5 - meta/recipes-extended/xdg-utils/xdg-utils_1.1.0-rc1.bb | 1 + meta/recipes-graphics/builder/files/builder_hob_start.sh| 9 + 3 files changed, 14 insertions(+), 1 deletion(-) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/31] Updated for Final Review
On Thursday 22 August 2013 09:26:02 Saul Wold wrote: > I updated a few of the commit messages and removed the Python3 > patch set along with a couple other patches which include the > Build Appliance related ones and cpan patch (I will have an > alternate fix soon) > > Sau! > > The following changes since commit 4c5756149754d0b18b14595db335f8f5e14cc0a3: > > busybox.inc: Avoid error when SYSLOG is not enabled (2013-08-22 15:10:06 > +0100) > > are available in the git repository at: > > git://git.openembedded.org/openembedded-core-contrib sgw/stage > > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/ > stage > > Cristian Iorga (1): > builder: register directories with pcmanfm > > Jonathan Liu (3): > xf86-video-intel: remove duplicate xf86driproto from DEPENDS > xf86-video-vesa: remove duplicate xf86driproto from DEPENDS > mesa: enable additional drivers for gallium-llvm x86/x86-64 > > Kai Kang (3): > bc: add patch to fix segmentation fault > libx11: upgrade to 1.6.1 > libx11-diet: upgrade to 1.6.1 > > Khem Raj (1): > eglibc: Update SRC_URI and fix unpackaged empty dir > > Lauren Post (2): > directfb: Upgrade to 1.6.3 > directfb: add fusion patch for hangs > > Mark Hatle (11): > image.bbclass: Add basic support for PACKAGE_EXCLUDE > python-smartpm: Add support for excluding package from the install > package_rpm.bbclass: Add support for PACKAGE_EXCLUDE to RPM installs > python-smartpm: Add support to disable installing recommends > package_rpm.bbclass: NO_RECOMMENDATIONS support > package_deb.bbclass: Use the WORKDIR not SYSROOT for temp files > package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE > opkg: Add --no-install-recommends option. > package_ipk: Add support for NO_RECOMMENDATIONS > opkg: Add support for excluding packages from the install > package_ipk: Add support for PACKAGE_EXCLUDE > > Marko Lindqvist (3): > texinfo: correct dont-depend-on-help2man.patch > SDL2: add recipe It would be great to tweak SDL2 -> libsdl2 in the commit message here. > boost: fix build when PARALLEL_MAKE is not set > > Otavio Salvador (1): > distro_features_check.bbclass: Allow checking of required/conflicting > features > > Paul Eggleton (1): > gst-plugins-good: fix orc enabling via PACKAGECONFIG > > Roy.Li (1): > shadow: backport a patch to make newgrp work > > Saul Wold (3): > libsdl: Backport xData32 patch for x11 update > valgrind: Backport patch for eglibc 2.18 > gnupg: Update to 2.0.21 > > Yevhen Kyriukha (1): > connman: fix systemd support for connman-* packages. Other than the above minor suggestion: Acked-by: Paul Eggleton -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v4][PATCH 2/2] directfb: Add fusion patch for hangs on exit
directfb: Add fusion patch for hangs on exit with following tests: direct_test, fusion_skirmish Signed-off-by: Lauren Post --- meta/recipes-graphics/directfb/directfb.inc|3 +- .../directfb/directfb/fusion.patch | 36 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 60b12f7..a23209f 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -14,7 +14,8 @@ DEPENDS = "jpeg libpng freetype zlib tslib" INC_PR = "r0" SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ - file://configurefix.patch" + file://configurefix.patch \ + file://fusion.patch" S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch new file mode 100755 index 000..1f81a67 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fusion.patch @@ -0,0 +1,36 @@ +directfb: Fix for hangs in direct_test, fusion_skirmish on exit + +Upstream-Status: Pending +Signed-off-by: Lauren Post + +--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.0 +0800 b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 +@@ -2853,9 +2853,14 @@ + direct_mutex_lock( &world->event_dispatcher_mutex ); + + while (1) { +- if (!world->event_dispatcher_buffers) ++ if (!world->event_dispatcher_buffers){ + direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); +- ++if (world->dispatch_stop) { ++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); ++ direct_mutex_unlock( &world->event_dispatcher_mutex ); ++ return NULL; ++} ++ } +buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; +D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); + +@@ -2872,6 +2877,11 @@ + //D_INFO("waiting...\n"); + D_ASSERT( buf->read_pos == buf->write_pos ); + direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); ++if (world->dispatch_stop) { ++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); ++ direct_mutex_unlock( &world->event_dispatcher_mutex ); ++ return NULL; ++} +} + +buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v4][PATCH 1/2] directfb: Upgrade to 1.6.3
directfb: Upgrade to 1.6.3 Remove mesa patch as 1.6.3 provides compatibility with mesa Signed-off-by: Lauren Post --- meta/recipes-graphics/directfb/directfb.inc|3 +- .../recipes-graphics/directfb/directfb/mesa9.patch | 29 .../{directfb_1.6.1.bb => directfb_1.6.3.bb} |5 ++-- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-graphics/directfb/directfb/mesa9.patch rename meta/recipes-graphics/directfb/{directfb_1.6.1.bb => directfb_1.6.3.bb} (76%) diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 7295c35..60b12f7 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -14,8 +14,7 @@ DEPENDS = "jpeg libpng freetype zlib tslib" INC_PR = "r0" SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ - file://configurefix.patch \ - file://mesa9.patch" + file://configurefix.patch" S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta/recipes-graphics/directfb/directfb/mesa9.patch b/meta/recipes-graphics/directfb/directfb/mesa9.patch deleted file mode 100644 index 43fd5c2..000 --- a/meta/recipes-graphics/directfb/directfb/mesa9.patch +++ /dev/null @@ -1,29 +0,0 @@ -Patch from upstream to fix build against Mesa 9. - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001 -From: Andreas Shimokawa -Date: Wed, 24 Oct 2012 18:01:15 +0200 -Subject: [PATCH] mesa: fix compatibility with mesa 9.0 - - systems/mesa/mesa_surface_pool.c |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systems/mesa/mesa_surface_pool.c b/systems/mesa/mesa_surface_pool.c -index 0a588bb..bfb5ff3 100644 a/systems/mesa/mesa_surface_pool.c -+++ b/systems/mesa/mesa_surface_pool.c -@@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool *pool, - alloc->bo = gbm_bo_create( mesa->gbm, surface->config.size.w, surface->config.size.h, GBM_BO_FORMAT_ARGB, - GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING ); - alloc->handle = gbm_bo_get_handle( alloc->bo ).u32; -- alloc->pitch = gbm_bo_get_pitch( alloc->bo ); -+ alloc->pitch = gbm_bo_get_stride( alloc->bo ); - - alloc->image = eglCreateImageKHR( mesa->dpy, NULL, EGL_NATIVE_PIXMAP_KHR, alloc->bo, NULL ); - --- -1.7.9.5 diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.3.bb similarity index 76% rename from meta/recipes-graphics/directfb/directfb_1.6.1.bb rename to meta/recipes-graphics/directfb/directfb_1.6.3.bb index 1230d12..277e9a9 100644 --- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb +++ b/meta/recipes-graphics/directfb/directfb_1.6.3.bb @@ -22,6 +22,5 @@ EXTRA_OECONF = "\ LEAD_SONAME = "libdirectfb-1.6.so.0" -SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65" -SRC_URI[sha256sum] = "f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45" - +SRC_URI[md5sum] = "641e8e999c017770da647f9b5b890906" +SRC_URI[sha256sum] = "7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70" -- 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 1/3] Build Appliance: pcmanfm integration
ACK, fixing now. Thanks, Ross. -Original Message- From: Burton, Ross [mailto:ross.bur...@intel.com] Sent: Thursday, August 22, 2013 6:52 PM To: Iorga, Cristian Cc: OE-core Subject: Re: [OE-core] [PATCH 1/3] Build Appliance: pcmanfm integration On 20 August 2013 17:05, Cristian Iorga wrote: > +xprop \ As discussed on Jabber, this should be a rdepends of xdg-utils. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] [v4] openssh: Add systemd support
On 22 August 2013 08:19, Shakeel, Muhammad wrote: > sed -i 's,/bin/,${base_bindir}/,g' ${D}${systemd_unitdir}/system/sshd.socket > ${D}${systemd_unitdir}/system/sshd@.service Instead of replacing path fragments, make the source file use a symbol such as @BASE_BINDIR@ @SBIN@ etc. (for all patches) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 00/31] Updated for Final Review
Richard, I updated a few of the commit messages and removed the Python3 patch set along with a couple other patches which include the Build Appliance related ones and cpan patch (I will have an alternate fix soon) Sau! The following changes since commit 4c5756149754d0b18b14595db335f8f5e14cc0a3: busybox.inc: Avoid error when SYSLOG is not enabled (2013-08-22 15:10:06 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Cristian Iorga (1): builder: register directories with pcmanfm Jonathan Liu (3): xf86-video-intel: remove duplicate xf86driproto from DEPENDS xf86-video-vesa: remove duplicate xf86driproto from DEPENDS mesa: enable additional drivers for gallium-llvm x86/x86-64 Kai Kang (3): bc: add patch to fix segmentation fault libx11: upgrade to 1.6.1 libx11-diet: upgrade to 1.6.1 Khem Raj (1): eglibc: Update SRC_URI and fix unpackaged empty dir Lauren Post (2): directfb: Upgrade to 1.6.3 directfb: add fusion patch for hangs Mark Hatle (11): image.bbclass: Add basic support for PACKAGE_EXCLUDE python-smartpm: Add support for excluding package from the install package_rpm.bbclass: Add support for PACKAGE_EXCLUDE to RPM installs python-smartpm: Add support to disable installing recommends package_rpm.bbclass: NO_RECOMMENDATIONS support package_deb.bbclass: Use the WORKDIR not SYSROOT for temp files package_deb: Add support for NO_RECOMMENDATIONS and PACKAGE_EXCLUDE opkg: Add --no-install-recommends option. package_ipk: Add support for NO_RECOMMENDATIONS opkg: Add support for excluding packages from the install package_ipk: Add support for PACKAGE_EXCLUDE Marko Lindqvist (3): texinfo: correct dont-depend-on-help2man.patch SDL2: add recipe boost: fix build when PARALLEL_MAKE is not set Otavio Salvador (1): distro_features_check.bbclass: Allow checking of required/conflicting features Paul Eggleton (1): gst-plugins-good: fix orc enabling via PACKAGECONFIG Roy.Li (1): shadow: backport a patch to make newgrp work Saul Wold (3): libsdl: Backport xData32 patch for x11 update valgrind: Backport patch for eglibc 2.18 gnupg: Update to 2.0.21 Yevhen Kyriukha (1): connman: fix systemd support for connman-* packages. meta/classes/distro_features_check.bbclass | 28 ++ meta/classes/image.bbclass | 39 ++--- meta/classes/package_deb.bbclass | 34 +--- meta/classes/package_ipk.bbclass | 2 + meta/classes/package_rpm.bbclass | 8 ++ meta/classes/rootfs_deb.bbclass| 8 +- meta/conf/bitbake.conf | 1 + meta/conf/documentation.conf | 9 ++ meta/recipes-connectivity/connman/connman.inc | 8 ++ .../eglibc/cross-localedef-native_2.18.bb | 6 +- meta/recipes-core/eglibc/eglibc-package.inc| 4 + meta/recipes-core/eglibc/eglibc_2.18.bb| 6 +- meta/recipes-devtools/opkg/opkg/add-exclude.patch | 99 ++ .../opkg/opkg/no-install-recommends.patch | 78 + meta/recipes-devtools/opkg/opkg_svn.bb | 5 +- .../smart-config-ignore-all-recommends.patch | 24 ++ .../smart-flag-exclude-packages.patch | 70 +++ .../python/python-smartpm_1.4.1.bb | 2 + .../valgrind/valgrind-3.8.1/eglibc-2.18.patch | 27 ++ meta/recipes-devtools/valgrind/valgrind_3.8.1.bb | 1 + meta/recipes-extended/bc/bc_1.06.bb| 3 +- .../bc/files/fix-segment-fault.patch | 28 ++ .../shadow/files/fix-etc-gshadow-reading.patch | 36 meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 1 + .../texinfo-5.1/dont-depend-on-help2man.patch | 43 -- .../builder/files/builder_hob_start.sh | 9 ++ meta/recipes-graphics/directfb/directfb.inc| 2 +- .../directfb/directfb/fusion.patch | 36 .../recipes-graphics/directfb/directfb/mesa9.patch | 29 --- .../{directfb_1.6.1.bb => directfb_1.6.3.bb} | 5 +- .../libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | 19 + meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 +- meta/recipes-graphics/libsdl2/libsdl2_2.0.0.bb | 56 meta/recipes-graphics/mesa/mesa.inc| 4 + .../xorg-driver/xf86-video-intel_2.21.13.bb| 2 +- .../xorg-driver/xf86-video-vesa_2.3.2.bb | 2 +- .../{libx11-diet_1.5.0.bb => libx11-diet_1.6.1.bb} | 7 +- meta/recipes-graphics/xorg-lib/libx11.inc | 3 +- .../xorg-lib/libx11/disable_tests.patch| 9 +- .../xorg-lib/libx11/keysymdef_include.patch| 42 - meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 13 --- meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
[OE-core] [PATCH v2] mkfontscale: This no longer needs a full libx11, xproto suffices
>From 241ba8ad72afe7010568d0b3b574244f424817fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Aug 2013 15:49:08 + Subject: mkfontscale: This no longer needs a full libx11, xproto suffices configure just looks for xproto so we can drop the libx11 dependency and reduce the amount we build for some small performance improvements and less of the -native stack. Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb index 3d248d1..65f74c2 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb @@ -8,7 +8,7 @@ font name (XLFD) is generated, and is written together with the file \ name to a file fonts.scale in the directory. The resulting fonts.scale \ is used by the mkfontdir program." -DEPENDS += " zlib libfontenc freetype virtual/libx11" +DEPENDS = "util-macros-native zlib libfontenc freetype xproto" BBCLASSEXTEND = "native" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] Build Appliance: pcmanfm integration
On 20 August 2013 17:05, Cristian Iorga wrote: > +xprop \ As discussed on Jabber, this should be a rdepends of xdg-utils. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mkfontscale: This no longer needs a full libx11, xproto suffices
configure just looks for xproto so we can drop the libx11 dependency and reduce the amount we build for some small performance improvements and less of the -native stack. Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb index 3d248d1..e4cbd69 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb @@ -8,7 +8,7 @@ font name (XLFD) is generated, and is written together with the file \ name to a file fonts.scale in the directory. The resulting fonts.scale \ is used by the mkfontdir program." -DEPENDS += " zlib libfontenc freetype virtual/libx11" +DEPENDS += " zlib libfontenc freetype xproto" BBCLASSEXTEND = "native" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] [Patch V2] YB5030: Multiple providers are available for runtime libasound-module-bluez (bluez4, bluez5) warning
V2 has a better commit message. The following changes since commit 06f1ebf206911ffe223483da945189a287f20b7d: poky.conf: add Debian 7.1 to SANITY_TESTED_DISTROS (2013-08-22 12:54:39 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ciorga/bluez5_fixes http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/bluez5_fixes Cristian Iorga (1): default-providers: Set the preferred provider for bluez meta/conf/distro/include/default-providers.inc | 1 + 1 file changed, 1 insertion(+) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On 22 August 2013 06:58, Saul Wold wrote: > Cristian Iorga (4): > packagegroup-self-hosted: pcmanfm integration This also adds xprop. Is that a dependency of something else, or should it be removed? > build-appliance-image: changing the icon theme to sato You'll want to keep hicolor-icon-theme installed, as it provides the skeleton structure for icons. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gpgme: update to 1.4.3
Signed-off-by: Paul Eggleton --- .../gpgme/gpgme-1.4.2/disable_gpgconf_check.patch | 39 -- .../gpgme/gpgme-1.4.3/disable_gpgconf_check.patch | 39 ++ meta/recipes-support/gpgme/gpgme_1.4.2.bb | 29 meta/recipes-support/gpgme/gpgme_1.4.3.bb | 30 + 4 files changed, 69 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch create mode 100644 meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch delete mode 100644 meta/recipes-support/gpgme/gpgme_1.4.2.bb create mode 100644 meta/recipes-support/gpgme/gpgme_1.4.3.bb diff --git a/meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch deleted file mode 100644 index df09530..000 --- a/meta/recipes-support/gpgme/gpgme-1.4.2/disable_gpgconf_check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause -configure failure if not founding them in cross-compile environment. We can -add the gnupg-native to get them, but still have some issues: - -1. need add new package: libksba, update libassuan(not in sato), and extend - native support in some other packages(libgcrypt, libgpg-error, pth...) -2. Even we have gnupg, the g13 only exist in development branch, so that we - still have the g13 check failure in configure. - -I have searched the compile log, and found gpgconf/g13 are not used. So use a -simple method here, throw a warning mesg rather than an error here just like in -non-cross-compile environment. - -Signed-off-by: Zhai Edwin - -Upstream-Status: Inappropriate [embedded specific] - -Index: gpgme-1.3.0/configure.ac -=== gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.0 +0800 -+++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.0 +0800 -@@ -574,7 +574,7 @@ - *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH - ***]) -@@ -670,7 +670,7 @@ - *** Could not find g13, install g13 or use --with-g13=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH - ***]) diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch new file mode 100644 index 000..df09530 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme-1.4.3/disable_gpgconf_check.patch @@ -0,0 +1,39 @@ +From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause +configure failure if not founding them in cross-compile environment. We can +add the gnupg-native to get them, but still have some issues: + +1. need add new package: libksba, update libassuan(not in sato), and extend + native support in some other packages(libgcrypt, libgpg-error, pth...) +2. Even we have gnupg, the g13 only exist in development branch, so that we + still have the g13 check failure in configure. + +I have searched the compile log, and found gpgconf/g13 are not used. So use a +simple method here, throw a warning mesg rather than an error here just like in +non-cross-compile environment. + +Signed-off-by: Zhai Edwin + +Upstream-Status: Inappropriate [embedded specific] + +Index: gpgme-1.3.0/configure.ac +=== +--- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.0 +0800 gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.0 +0800 +@@ -574,7 +574,7 @@ + *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it + ***]) + else +- AC_MSG_ERROR([ ++ AC_MSG_WARN([ + *** + *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH + ***]) +@@ -670,7 +670,7 @@ + *** Could not find g13, install g13 or use --with-g13=PATH to enable it + ***]) + else +- AC_MSG_ERROR([ ++ AC_MSG_WARN([ + *** + *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH + ***]) diff --git a/meta/recipes-support/gpgme/gpgme_1.4.2.bb b/meta/recipes-support/gpgme/gpgme_1.4.2.bb deleted file mode 100644 index 040cdf4..000 --- a/meta/recipes-support/gpgme/gpgme_1.4.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "High-level GnuPG encryption/signing API" -DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" -HOMEPAGE = "http://www.gnupg.org/gpgme.html"; -BUGTRACKER = "https://bugs.g10code.com/gnupg/index
[OE-core] [PATCH 1/1] default-providers: Set the preferred provider for bluez
There is a need for a default provider for bluez now that bluez5 recipe is also present. Fixes this warnings: "NOTE: multiple providers are available for runtime libasound-module-bluez (bluez4, bluez5) NOTE: consider defining a PREFERRED_PROVIDER entry to match libasound-module-bluez" Fixes [YOCTO #5030]. Signed-off-by: Cristian Iorga --- meta/conf/distro/include/default-providers.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 67cc5f5..9255fd6 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -39,3 +39,4 @@ PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" PREFERRED_PROVIDER_make ?= "make" PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" +PREFERRED_PROVIDER_bluez4 ?= "bluez4" -- 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] runqemu-ifup: when tunctl can't be found, say what package builds it
On Thu, Aug 22, 2013 at 03:36:18PM +0100, Ross Burton wrote: > If runqemu is used without actually building any qemu images (i.e. you > downloaded the images) it's likely that qemu-helper-native hasn't been built. > Instead of just saying what command can't be found, tell the user how to solve > their problem. > > Signed-off-by: Ross Burton > --- > scripts/runqemu-ifup |2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup > index 5f6a437..140dd88 100755 > --- a/scripts/runqemu-ifup > +++ b/scripts/runqemu-ifup > @@ -53,7 +53,7 @@ NATIVE_SYSROOT_DIR=$3 > > TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl > if [ ! -x "$TUNCTL" ]; then > - echo "Error: Unable to find tunctl binary in > '$NATIVE_SYSROOT_DIR/usr/bin'" > +echo "Error: Unable to find tunctl binary in > '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native" ^ inconsistent whitespace > exit 1 > fi > > -- > 1.7.10.4 > > ___ > 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 2/6] e2fsprogs: let debugfs do sparse copy
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: > Let debugfs do sparse copy when src is a sparse file, just like > "cp --sparse=auto" > > This patch has been reviewed by the linux-ext4 mailing list, but isn't > merged atm. > > [YOCTO #3848] Minor whitespace nit below, but will likely be caught by upstream. -- Darren > > Signed-off-by: Robert Yang > --- > .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 > > .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + > 2 files changed, 148 insertions(+) > create mode 100644 > meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch > > diff --git > a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch > b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch > new file mode 100644 > index 000..c87bcbf > --- /dev/null > +++ > b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch > @@ -0,0 +1,147 @@ > +debugfs.c: do sparse copy when src is a sparse file > + > +Let debugfs do sparse copy when src is a sparse file, just like > +"cp --sparse=auto" > + > +* For the: > + #define IO_BUFSIZE 64*1024 > + this is a suggested value from gnu coreutils: > + > http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD > + > +* Use malloc() to allocate memory for the buffer since put 64K (or > + more) on the stack seems not a good idea. > + > +Upstream-Status: Submitted > + > +Signed-off-by: Robert Yang > +Acked-by: Darren Hart > +--- > + debugfs/debugfs.c | 61 > +++ > + 1 file changed, 57 insertions(+), 4 deletions(-) > + > +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c > +--- a/debugfs/debugfs.c > b/debugfs/debugfs.c > +@@ -41,6 +41,16 @@ extern char *optarg; > + #define BUFSIZ 8192 > + #endif > + > ++/* 64KiB is the minimium blksize to best minimize system call overhead. */ > ++#ifndef IO_BUFSIZE > ++#define IO_BUFSIZE 64*1024 > ++#endif > ++ > ++/* Block size for `st_blocks' */ > ++#ifndef S_BLKSIZE > ++#define S_BLKSIZE 512 > ++#endif > ++ > + ss_request_table *extra_cmds; > + const char *debug_prog_name; > + int sci_idx; > +@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[]) > + } > + > + #ifndef READ_ONLY > +-static errcode_t copy_file(int fd, ext2_ino_t newfile) > ++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int > make_holes) > + { > + ext2_file_t e2_file; > + errcode_t retval; > + int got; > + unsigned intwritten; > +-charbuf[8192]; > ++char*buf; > + char*ptr; > ++char*zero_buf; > ++int cmp; > + > + retval = ext2fs_file_open(current_fs, newfile, > + EXT2_FILE_WRITE, &e2_file); > + if (retval) > + return retval; > + > ++if (!(buf = (char *) malloc(bufsize))){ > ++com_err("copy_file", errno, "can't allocate buffer\n"); > ++return; > ++} > ++ > ++/* This is used for checking whether the whole block is zero */ Whitespace/indentation error ^ > ++retval = ext2fs_get_memzero(bufsize, &zero_buf); > ++if (retval) { > ++com_err("copy_file", retval, "can't allocate buffer\n"); > ++return retval; > ++} > ++ > + while (1) { > +-got = read(fd, buf, sizeof(buf)); > ++got = read(fd, buf, bufsize); > + if (got == 0) > + break; > + if (got < 0) { > +@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) > + goto fail; > + } > + ptr = buf; > ++ > ++/* Sparse copy */ > ++if (make_holes) { > ++/* Check whether all is zero */ > ++cmp = memcmp(ptr, zero_buf, got); > ++if (cmp == 0) { > ++ /* The whole block is zero, make a hole */ > ++retval = ext2fs_file_lseek(e2_file, got, > EXT2_SEEK_CUR, NULL); > ++if (retval) > ++goto fail; > ++got = 0; > ++} > ++} > ++ > ++/* Normal copy */ > + while (got > 0) { > + retval = ext2fs_file_write(e2_file, ptr, > +got, &written); > +@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t > newfile) > + ptr += written; > + } > + } > ++free(buf); > ++ext2fs_free_mem(&zero_buf); > + retval = ext2fs_file_close(e2_file); > + return retval; > + > + fail: > ++free(buf); > ++ext2fs_free_mem(&zero_buf); > + (void) ext2fs_file
Re: [OE-core] [PATCH 1/6] e2fsprogs: the max length of debugfs argument is too short
On Thu, 2013-08-22 at 09:13 -0400, Robert Yang wrote: > The max length of debugfs argument is 256 which is too short, the > arguments are two paths, the PATH_MAX is 4096 according to > /usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux > systems), that's also what the ss library uses. > > This patch has been reviewed by the linux-ext4 mailing list, but isn't > merged atm. > > [YOCTO #3848] > > Signed-off-by: Robert Yang Acked-by: Darren Hart > --- > .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 > > .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + > 2 files changed, 42 insertions(+) > create mode 100644 > meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch > > diff --git > a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch > b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch > new file mode 100644 > index 000..607305b > --- /dev/null > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch > @@ -0,0 +1,41 @@ > +debugfs.c: the max length of debugfs argument is too short > + > +The max length of debugfs argument is 256 which is too short, the > +arguments are two paths, the PATH_MAX is 4096 according to > +/usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux > +systems), that's also what the ss library uses. > + > +Upstream-Status: Submitted > + > +Signed-off-by: Robert Yang > +Acked-by: Darren Hart > +--- > + debugfs/debugfs.c | 6 +- > + 1 file changed, 5 insertions(+), 1 deletion(-) > + > +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c > +--- a/debugfs/debugfs.c > b/debugfs/debugfs.c > +@@ -37,6 +37,10 @@ extern char *optarg; > + #include "../version.h" > + #include "jfs_user.h" > + > ++#ifndef BUFSIZ > ++#define BUFSIZ 8192 > ++#endif > ++ > + ss_request_table *extra_cmds; > + const char *debug_prog_name; > + int sci_idx; > +@@ -2311,7 +2315,7 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char > *argv[]) > + static int source_file(const char *cmd_file, int ss_idx) > + { > + FILE*f; > +-charbuf[256]; > ++charbuf[BUFSIZ]; > + char*cp; > + int exit_status = 0; > + int retval; > +-- > +1.8.1.2 > + > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb > b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb > index d231268..f97de7f 100644 > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb > @@ -3,6 +3,7 @@ require e2fsprogs.inc > > SRC_URI += "file://acinclude.m4 \ > file://remove.ldconfig.call.patch \ > +file://debugfs-too-short.patch \ > " > > SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4" -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] runqemu-ifup: when tunctl can't be found, say what package builds it
If runqemu is used without actually building any qemu images (i.e. you downloaded the images) it's likely that qemu-helper-native hasn't been built. Instead of just saying what command can't be found, tell the user how to solve their problem. Signed-off-by: Ross Burton --- scripts/runqemu-ifup |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup index 5f6a437..140dd88 100755 --- a/scripts/runqemu-ifup +++ b/scripts/runqemu-ifup @@ -53,7 +53,7 @@ NATIVE_SYSROOT_DIR=$3 TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl if [ ! -x "$TUNCTL" ]; then - echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin'" +echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native" exit 1 fi -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] qemu-native build regularly failing
On 08/22/2013 06:03 AM, Paul Eggleton wrote: On Thursday 22 August 2013 15:56:39 Marko Lindqvist wrote: On 21 August 2013 19:33, Marko Lindqvist wrote: On 21 August 2013 01:15, Marko Lindqvist wrote: On 21 August 2013 00:16, Paul Eggleton wrote: On Tuesday 20 August 2013 23:26:44 Marko Lindqvist wrote: On 20 August 2013 16:32, Paul Eggleton wrote: On Tuesday 20 August 2013 15:51:21 Marko Lindqvist wrote: Build of qemu-native regularly fails with: | LINK sh4-softmmu/qemu-system-sh4 | | /usr/lib/x86_64-linux-gnu/libXext.so.6: undefined reference to `_XEatDataWords' | collect2: error: ld returned 1 exit status This might be some dependency missing, as building first some packets (+ more importantly their dependencies) that do not depend on qemu and only then qemu dependant image success. Do you have something else causing libxext-native to be built by any chance? Yes, it seems to be difference between the tree where build fails and the one where build success that former has no libxext-native built. Further, I tested just building libxext-native before building qemu-native, and then the build succeded. The problem is we want qemu-native to be buildable both on systems without X11 and systems with X11, so the dependency has to be floating, and this is more or less acceptable for a native recipe - there's only a problem when libxext- native needs to be built. I can't see a lot of value in building libxext- native in any case - what is causing it to be built on your system? Cheers, Paul I'm still running more tests - this seems to be complicated matter. For one, I just got successful build from empty tree by building qemu-native directly. That was build targeted to arm, while failing builds have been for x86 (native is amd64). Also, I think (but cannot be 100% sure any more) build has succeeded on trees where nothing depends on libxext-native but still *something* was needed to be built before qemu-native. It seems libxext-native is not needed. Rather this seems like problem with build parallelism. - Sometimes "bitbake qemu-native" to empty tree success at once - When it first fails (but other tasks get executed while it tries to build), it then success by forcing configure rerun & building ( "bitbake qemu-native -c configure -f && bitbake qemu-native" ) I think next step is to get config.log of the succesful and failed build to compare. --- success-qemu/qemu-1.5.0/config-host.h 2013-08-22 15:45:10.323126880 +0300 +++ failed-qemu/qemu-1.5.0/config-host.h2013-08-22 15:32:23.515101072 +0300 @@ -26,6 +26,7 @@ #define CONFIG_UUID 1 #define QEMU_VERSION "1.5.0" #define QEMU_PKGVERSION "" +#define CONFIG_SDL 1 #define CONFIG_CURSES 1 #define CONFIG_ATFILE 1 #define CONFIG_UTIMENSAT 1 @@ -55,6 +56,7 @@ #define CONFIG_MADVISE 1 #define CONFIG_POSIX_MADVISE 1 #define CONFIG_SIGEV_THREAD_ID 1 +#define CONFIG_GLX 1 #define CONFIG_UNAME_RELEASE "" #define CONFIG_ZERO_MALLOC 1 #define CONFIG_QOM_CAST_DEBUG 1 As this diff is success -> failed, CONFIG_GLX and CONFIG_SDL are defined on first build ending to failure, but not on forced reconfigure that then build succesfully. You'd probably need to dig into the actual configure check that enables these automatically. I was about to suggest maybe libsdl-native was present in the failing case, but then the current libsdl recipe in OE-Core doesn't provide libsdl-native so that probably isn't it... Something that we did not ask here, is what is your host OS? We just had a very similar issue Fedora 19, since qemu had a floating dependency on some X libraries specifically libX11 and libXext and X11 is newer on F19, it was causing problems if you happen to have libX11-native built. We just updated libX11 and in our testing it seems to have fix this issue. Check out the patches. Sau! Cheers, Paul ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: Web browsing and HTML in OE-Core
2013/8/22 Richard Purdie : > We've slowly been shaking out the definition of OE-Core and as part of > that we removed web and web-gtk which were the only browsers in there > and were admittedly a bit limited/broken. > > There is no doubt that web technology has an increasingly important role > in the future and in embedded devices (e.g. kiosk type devices, digital > signs and so on). > > With that in mind, I think some kind of HTML support in OE-Core is > important going forward. Equally, I dislike having things there which we > cannot test. I know some people have looked into this and it appears > midori is the best option for something with a small number of > additional dependencies. I therefore currently think this is something > we should make a decision to include since it gives us significantly > better coverage of things like webkit which are a already in the core > yet totally untested at present. > > I'm open to opinions, equally we do need to make a decision on this soon > since we're nearly at the feature freeze point. Thoughts? Hi, just some thoughts: Qt provides an example application that uses webkit called "fancybrowser" This demo it is located at the package qt4-examples (/usr/bin/qt4/examples/webkit/fancybrowser/ in the target sysroot). -- Regards Samuel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: Web browsing and HTML in OE-Core
On Thu, 2013-08-22 at 15:04 +0100, Richard Purdie wrote: > With that in mind, I think some kind of HTML support in OE-Core is > important going forward. Equally, I dislike having things there which we > cannot test. I know some people have looked into this and it appears > midori is the best option for something with a small number of > additional dependencies. I therefore currently think this is something > we should make a decision to include since it gives us significantly > better coverage of things like webkit which are a already in the core > yet totally untested at present. WebKit itself comes with a bunch of test wrappers (and tests!) for different platforms and if the aim of the exercise is to test webkit then it seems like maybe we should just be installing and using those. Midori would be fine for testing the parts of webkit that it uses, but obviously it doesn't exercise anything other than the Gtk port which still leaves you with a bit of a hole in your coverage. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] RFC: Web browsing and HTML in OE-Core
We've slowly been shaking out the definition of OE-Core and as part of that we removed web and web-gtk which were the only browsers in there and were admittedly a bit limited/broken. There is no doubt that web technology has an increasingly important role in the future and in embedded devices (e.g. kiosk type devices, digital signs and so on). With that in mind, I think some kind of HTML support in OE-Core is important going forward. Equally, I dislike having things there which we cannot test. I know some people have looked into this and it appears midori is the best option for something with a small number of additional dependencies. I therefore currently think this is something we should make a decision to include since it gives us significantly better coverage of things like webkit which are a already in the core yet totally untested at present. I'm open to opinions, equally we do need to make a decision on this soon since we're nearly at the feature freeze point. Thoughts? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-4.8: Add two patches to deal with cross-canadian build failures
See the patch headers for more information about the cross-canadian build failures these patches avoid. Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 9d92eda..e66bdaf 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc @@ -72,6 +72,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://0040-fix-g++-sysroot.patch \ file://0041-libtool-avoid-libdir.patch \ file://0042-pr57748.patch \ + file://0043-cpp.patch \ + file://0044-gengtypes.patch \ " SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304" SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813" diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch b/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch new file mode 100644 index 000..eaf8646 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/0043-cpp.patch @@ -0,0 +1,40 @@ +The OE environment sets and exports CPP as being the target gcc. When building +gcc-cross-canadian for a mingw targetted sdk, the following can be found in +build.x86_64-pokysdk-mingw32.i586-poky-linux/build-x86_64-linux/libiberty/config.log: + +configure:3641: checking for _FILE_OFFSET_BITS value needed for large files +configure:3666: gcc -c -isystem/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe conftest.c >&5 +configure:3666: $? = 0 +configure:3698: result: no +configure:3786: checking how to run the C preprocessor +configure:3856: result: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 +configure:3876: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 conftest.c +configure:3876: $? = 0 + +Note this is a *build* target (in build-x86_64-linux) so it should be using +the host "gcc", not x86_64-pokysdk-mingw32-gcc. Since the mingw32 headers are +very different, using the wrong cpp is a real problem. It is leaking into +configure through the CPP variable. Ultimately this leads to build failures +related to not being able to include a process.h file for pem-unix.c. + +The fix is to ensure we export a sane CPP value into the build environment when +using build targets. We could define a CPP_FOR_BUILD value which may be the version +which needs to be upstreamed but for now, this fix is good enough to avoid the +problem. + +RP 22/08/2013 + +Upstream-Status: Pending + +Index: gcc-4.8.1/Makefile.in +=== +--- gcc-4.8.1.orig/Makefile.in 2013-03-30 11:25:03.0 + gcc-4.8.1/Makefile.in 2013-08-13 12:03:17.15192 + +@@ -149,6 +149,7 @@ + AR="$(AR_FOR_BUILD)"; export AR; \ + AS="$(AS_FOR_BUILD)"; export AS; \ + CC="$(CC_FOR_BUILD)"; export CC; \ ++ CPP="$(CC_FOR_BUILD) -E"; export CPP; \ + CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CXX="$(CXX_FOR_BUILD)"; export CXX; \ diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch b/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch new file mode 100644 index 000..e38761d --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/0044-gengtypes.patch @@ -0,0 +1,97 @@ +gengtype is generated for both the build system and the target. -DGENERATOR_FILE +was added in the patch http://gcc.gnu.org/ml/gcc-patches/2012-07/msg00273.html +and was applied to both versions of gengtype. + +Unfortunately the presence of this flag triggers the build configuration (bconfig.h) +to be included for the target build of gengtype. Compiling gengtype with the target +compiler and bconfig.h can result in errors if the build and target systems are +dissimilar. An example case this fails is cross compiling gcc on linux for a darwin +target system: + +In file included from /media/build1/poky/build/tmp/work-shared/gcc-4.8.1-r0/gcc-4.8.1/gcc/gengtype-parse.c:25:0: +| /media/build1/poky/build/tmp/work-shared/gcc-4.8.1-r0/gcc-4.8.1/gcc/gengtype-parse.c: In function 'void parse_error(const char*, ...)': +| /media/build1/poky/build/tmp/work-shared/gcc-4.8.1-r0/gcc-4.8.1/gcc/system.h:93:53: error: 'fputc_unlocked' was not declared in this scope +| # define fputc(C, Stream) fputc_unlocked (C, Stream) + +which occurs since auto-build.h and auto-host.h have differnet values of +HAVE_FPUTC_UNLOCKED: + +#define HAVE_FPUTC_UNLOCKED 1 +/* #undef HAVE_FPUTS_UNLOCKED */ + +The obvious fix is to only include the flag on build/ targets which this patch does, however +this also leads to compile errors due to const_tree being undefined but used in double_int.h + +I added a GENERATOR_FILE2 flag to workaround those in the +target case and allow the build to succeed. + +Only the build/gengtypes should have
[OE-core] [PATCH 6/6] image_types.bbclass: replace genext2fs with populate-extfs.sh
* The benefits: - Really support ext4 - Support the sparse file (we lost the sparse file in the image in the past, the sparse file became into the common file) - Fix the error reported by fsck: (ext2/ext3) Inode 1025, i_size is 16384, should be 17408. - Have a uniform code for ext2/3/4 generation * Comments from Darren Hart: Basically, genext2fs doesn't support creating ext4 filesystems. It creates, as I understand it, an ext2 filesystem, then adds a journal, and sets some bits. It can't support the newer features like extents. So what we end up with is a bit of a hack for a filesystem. The ext tools (e2fsprogs) unfortunately don't provide an integrated solution for generating prepopulated filesystem images as many other mkfs* tools do. One thing missing was symlink support in libext2fs. I added that support and demonstrated a script which uses the e2fsprogs debugfs tool that can populate the newly formatted filesystem from a directory and without root privileges. [YOCTO #3848] Signed-off-by: Robert Yang --- meta/classes/image_types.bbclass | 46 +++--- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 0e5a9a8..c168ed5 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -141,34 +141,24 @@ IMAGE_CMD_sum.jffs2 = "${IMAGE_CMD_jffs2} && sumtool -i ${DEPLOY_DIR_IMAGE}/${IM IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2 () { - rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 - mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 - rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} -} +oe_mkext234fs () { + fstype=$1 + extra_imagecmd="" -IMAGE_CMD_ext3 () { - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 - tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 -} + if [ $# -gt 1 ]; then + shift + extra_imagecmd=$@ + fi -oe_mkext4fs () { - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1 - tune2fs -O extents,uninit_bg,dir_index,has_journal,filetype $1 - e2fsck -yfDC0 $1 || chk=$? - case $chk in - 0|1|2) - ;; - *) - return $chk - ;; - esac + # Create a sparse image block + dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype seek=$ROOTFS_SIZE count=0 bs=1k + mkfs.$fstype -F $extra_imagecmd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype + populate-extfs.sh ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype } -IMAGE_CMD_ext4 () { - oe_mkext4fs ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 -} +IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" +IMAGE_CMD_ext3 = "oe_mkext234fs ext3 ${EXTRA_IMAGECMD}" +IMAGE_CMD_ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}" IMAGE_CMD_btrfs () { mkfs.btrfs -b `expr ${ROOTFS_SIZE} \* 1024` ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs @@ -218,7 +208,7 @@ JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--little- JFFS2_ERASEBLOCK ?= "0x4" EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" -# Change these if you want default genext2fs behavior (i.e. create minimal inode number) +# Change these if you want default mkfs behavior (i.e. create minimal inode number) EXTRA_IMAGECMD_ext2 ?= "-i 8192" EXTRA_IMAGECMD_ext3 ?= "-i 8192" EXTRA_IMAGECMD_ext4 ?= "-i 8192" @@ -229,9 +219,9 @@ IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" IMAGE_DEPENDS_sum.jffs2 = "mtd-utils-native" IMAGE_DEPENDS_cramfs = "cramfs-native" -IMAGE_DEPENDS_ext2 = "genext2fs-native" -IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" -IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native" +IMAGE_DEPENDS_ext2 = "e2fsprogs-native" +IMAGE_DEPENDS_ext3 = "e2fsprogs-native" +IMAGE_DEPENDS_ext4 = "e2fsprogs-native" IMAGE_DEPENDS_btrfs = "btrfs-tools-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" IMAGE_DEPENDS_squashfs-xz = "squashfs-tools-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 2/6] e2fsprogs: let debugfs do sparse copy
Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto" This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 148 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644 index 000..c87bcbf --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch @@ -0,0 +1,147 @@ +debugfs.c: do sparse copy when src is a sparse file + +Let debugfs do sparse copy when src is a sparse file, just like +"cp --sparse=auto" + +* For the: + #define IO_BUFSIZE 64*1024 + this is a suggested value from gnu coreutils: + http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD + +* Use malloc() to allocate memory for the buffer since put 64K (or + more) on the stack seems not a good idea. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang +Acked-by: Darren Hart +--- + debugfs/debugfs.c | 61 +++ + 1 file changed, 57 insertions(+), 4 deletions(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -41,6 +41,16 @@ extern char *optarg; + #define BUFSIZ 8192 + #endif + ++/* 64KiB is the minimium blksize to best minimize system call overhead. */ ++#ifndef IO_BUFSIZE ++#define IO_BUFSIZE 64*1024 ++#endif ++ ++/* Block size for `st_blocks' */ ++#ifndef S_BLKSIZE ++#define S_BLKSIZE 512 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[]) + } + + #ifndef READ_ONLY +-static errcode_t copy_file(int fd, ext2_ino_t newfile) ++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) + { + ext2_file_t e2_file; + errcode_t retval; + int got; + unsigned intwritten; +- charbuf[8192]; ++ char*buf; + char*ptr; ++ char*zero_buf; ++ int cmp; + + retval = ext2fs_file_open(current_fs, newfile, + EXT2_FILE_WRITE, &e2_file); + if (retval) + return retval; + ++ if (!(buf = (char *) malloc(bufsize))){ ++ com_err("copy_file", errno, "can't allocate buffer\n"); ++ return; ++ } ++ ++/* This is used for checking whether the whole block is zero */ ++ retval = ext2fs_get_memzero(bufsize, &zero_buf); ++ if (retval) { ++ com_err("copy_file", retval, "can't allocate buffer\n"); ++ return retval; ++ } ++ + while (1) { +- got = read(fd, buf, sizeof(buf)); ++ got = read(fd, buf, bufsize); + if (got == 0) + break; + if (got < 0) { +@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + goto fail; + } + ptr = buf; ++ ++ /* Sparse copy */ ++ if (make_holes) { ++ /* Check whether all is zero */ ++ cmp = memcmp(ptr, zero_buf, got); ++ if (cmp == 0) { ++ /* The whole block is zero, make a hole */ ++ retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL); ++ if (retval) ++ goto fail; ++ got = 0; ++ } ++ } ++ ++ /* Normal copy */ + while (got > 0) { + retval = ext2fs_file_write(e2_file, ptr, + got, &written); +@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile) + ptr += written; + } + } ++ free(buf); ++ ext2fs_free_mem(&zero_buf); + retval = ext2fs_file_close(e2_file); + return retval; + + fail: ++ free(buf); ++ ext2fs_free_mem(&zero_buf); + (void) ext2fs_file_close(e2_file); + return retval; + } +@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[]) + ext2_ino_t newfile; + errcode_t retval; + struct ext2_inode inode; ++ int bufsize = IO_BUFSIZE; ++ int make_holes = 0; + + if (common_args_process(argc, argv, 3, 3, "write", +
[OE-core] [PATCH 1/6] e2fsprogs: the max length of debugfs argument is too short
The max length of debugfs argument is 256 which is too short, the arguments are two paths, the PATH_MAX is 4096 according to /usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux systems), that's also what the ss library uses. This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch new file mode 100644 index 000..607305b --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch @@ -0,0 +1,41 @@ +debugfs.c: the max length of debugfs argument is too short + +The max length of debugfs argument is 256 which is too short, the +arguments are two paths, the PATH_MAX is 4096 according to +/usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux +systems), that's also what the ss library uses. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang +Acked-by: Darren Hart +--- + debugfs/debugfs.c | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -37,6 +37,10 @@ extern char *optarg; + #include "../version.h" + #include "jfs_user.h" + ++#ifndef BUFSIZ ++#define BUFSIZ 8192 ++#endif ++ + ss_request_table *extra_cmds; + const char *debug_prog_name; + int sci_idx; +@@ -2311,7 +2315,7 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[]) + static int source_file(const char *cmd_file, int ss_idx) + { + FILE*f; +- charbuf[256]; ++ charbuf[BUFSIZ]; + char*cp; + int exit_status = 0; + int retval; +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index d231268..f97de7f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -3,6 +3,7 @@ require e2fsprogs.inc SRC_URI += "file://acinclude.m4 \ file://remove.ldconfig.call.patch \ +file://debugfs-too-short.patch \ " SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] e2fsprogs: properly set up extent header in do_write
do_write doesn't fully set up the first extent header on a new inode, so if we write a 0-length file, and don't write any data to the new file, we end up creating something that looks corrupt to kernelspace: EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0) Do something similar to ext4_ext_tree_init() here, and fill out the first extent header upon creation to avoid this. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs-1.42.8/debugfs-extent-header.patch | 47 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |2 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch new file mode 100644 index 000..ae44730 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch @@ -0,0 +1,47 @@ +debugfs: properly set up extent header in do_write + +do_write doesn't fully set up the first extent header on a new +inode, so if we write a 0-length file, and don't write any data +to the new file, we end up creating something that looks corrupt +to kernelspace: + +EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0) + +Do something similar to ext4_ext_tree_init() here, and +fill out the first extent header upon creation to avoid this. + +Upstream-Status: Backport + +Reported-by: Robert Yang +Signed-off-by: Eric Sandeen +--- + debugfs/debugfs.c | 13 - + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +--- a/debugfs/debugfs.c b/debugfs/debugfs.c +@@ -1726,8 +1726,19 @@ void do_write(int argc, char *argv[]) + inode.i_links_count = 1; + inode.i_size = statbuf.st_size; + if (current_fs->super->s_feature_incompat & +- EXT3_FEATURE_INCOMPAT_EXTENTS) ++ EXT3_FEATURE_INCOMPAT_EXTENTS) { ++ int i; ++ struct ext3_extent_header *eh; ++ ++ eh = (struct ext3_extent_header *) &inode.i_block[0]; ++ eh->eh_depth = 0; ++ eh->eh_entries = 0; ++ eh->eh_magic = EXT3_EXT_MAGIC; ++ i = (sizeof(inode.i_block) - sizeof(*eh)) / ++ sizeof(struct ext3_extent); ++ eh->eh_max = ext2fs_cpu_to_le16(i); + inode.i_flags |= EXT4_EXTENTS_FL; ++ } + if (debugfs_write_new_inode(newfile, &inode, argv[0])) { + close(fd); + return; +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index b063bc0..2dc9dab 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -6,6 +6,8 @@ SRC_URI += "file://acinclude.m4 \ file://debugfs-too-short.patch \ file://debugfs-sparse-copy.patch \ file://fix-icache.patch \ +file://debugfs-extent-header.patch \ +file://populate-extfs.sh \ " SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] replace genext2fs with populate-extfs.sh
* The benefits: - Really support ext4 - Support the sparse file (we lost the sparse file in the image in the past, the sparse file became into the common file) - Fix the error reported by fsck: (ext2/ext3) "Inode 1025, i_size is 16384, should be 17408." - Have a uniform code for ext2/3/4 generation * Impact - Build time: a) If we build fresh core-image-sato, there is nearly no impact. b) If we do the image generation, which means: $ bitbake core-image-sato $ bitbake core-image-sato -ccleansstate $ bitbake core-image-sato About 40 extra seconds are needed, here is my test result: Before the patches: 4m53s After the patches: 5m35s This is because the genext2fs is much faster than the populate-extfs.sh, we will replace this script by the mke2fs when it supports create the filesystem from a initial directory. - Disk space (take core-image-sato as an example) a) The image file size is the same as before (519M) b) The disk usage is a little different: (du -sh) before now ext2: 356M 379M ext3: 372M 395M ext4: 372M 380M I have done some simple runtime testing on core-image-sato based on ext2/3/4, they worked well. * The "fsck.extX -fn .extX" shows it is OK. // Robert The following changes since commit b2ff1add530b1fec2fb7f385227a03db47015c37: poky.conf: Don't force the addition of extra DISTRO_FEATURES (2013-08-20 22:58:04 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/extX http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/extX Robert Yang (6): e2fsprogs: the max length of debugfs argument is too short e2fsprogs: let debugfs do sparse copy e2fsprogs: only update the icache for ext2_inode e2fsprogs: properly set up extent header in do_write e2fsprogs: add populate-extfs.sh image_types.bbclass: replace genext2fs with populate-extfs.sh meta/classes/image_types.bbclass | 46 +++--- .../e2fsprogs-1.42.8/debugfs-extent-header.patch | 47 +++ .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch | 147 .../e2fsprogs-1.42.8/debugfs-too-short.patch | 41 ++ .../e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch| 69 + .../e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh | 96 + .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |6 + 7 files changed, 424 insertions(+), 28 deletions(-) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-extent-header.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] e2fsprogs: only update the icache for ext2_inode
We only read the cache when: bufsize == sizeof(struct ext2_inode) then we should only update the cache in the same condition, otherwise there would be errors, for example: cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full() Then update the cache: cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full() Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was cached by bufsize = 156), so there would be errors. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch| 69 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 70 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch new file mode 100644 index 000..ad4e343 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/fix-icache.patch @@ -0,0 +1,69 @@ +inode.c: only update the icache for ext2_inode + +We only read the cache when: + +bufsize == sizeof(struct ext2_inode) + +then we should only update the cache in the same condition, otherwise +there would be errors, for example: + +cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() +cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full() + +Then update the cache: +cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full() + +Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was +cached by bufsize = 156), so there would be errors. + +Note: the upstream has changed the icache lot, so this patch is +inappropriate for the upstream, we can drop this patch when we update +the package. + +Upstream-Status: [Inappropriate] + +Signed-off-by: Robert Yang +--- + lib/ext2fs/inode.c | 20 + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c +--- a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c +@@ -612,10 +612,12 @@ errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino, + #endif + + /* Update the inode cache */ +- fs->icache->cache_last = (fs->icache->cache_last + 1) % +- fs->icache->cache_size; +- fs->icache->cache[fs->icache->cache_last].ino = ino; +- fs->icache->cache[fs->icache->cache_last].inode = *inode; ++ if (bufsize == sizeof(struct ext2_inode)) { ++ fs->icache->cache_last = (fs->icache->cache_last + 1) % ++ fs->icache->cache_size; ++ fs->icache->cache[fs->icache->cache_last].ino = ino; ++ fs->icache->cache[fs->icache->cache_last].inode = *inode; ++ } + + return 0; + } +@@ -648,10 +650,12 @@ errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino, + + /* Check to see if the inode cache needs to be updated */ + if (fs->icache) { +- for (i=0; i < fs->icache->cache_size; i++) { +- if (fs->icache->cache[i].ino == ino) { +- fs->icache->cache[i].inode = *inode; +- break; ++ if (bufsize == sizeof(struct ext2_inode)) { ++ for (i=0; i < fs->icache->cache_size; i++) { ++ if (fs->icache->cache[i].ino == ino) { ++ fs->icache->cache[i].inode = *inode; ++ break; ++ } + } + } + } else { +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index 5d65bbc..b063bc0 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -5,6 +5,7 @@ SRC_URI += "file://acinclude.m4 \ file://remove.ldconfig.call.patch \ file://debugfs-too-short.patch \ file://debugfs-sparse-copy.patch \ +file://fix-icache.patch \ " SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] e2fsprogs: add populate-extfs.sh
This script is originally from Darren Hart, it will be used for creating the ext* filesystem from a given directory, which will replace the genext2fs in image_types.bbclass at the moment, we may use the mke2fs to replace this script again when it has the initial directory support. Changes of the script: * Rename it from mkdebugfs.sh to populate-extfs.sh * Add a simple usage * Add checking for the number of the parameters * Add the "regular empty file" and "fifo" file type * Set mode, uid and gid for the file * Save the command lines to a file and batch run them * Change the error message * Improve the performance * Add the support for hardlink [YOCTO #3848] Signed-off-by: Darren Hart Signed-off-by: Robert Yang --- .../e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh | 96 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |1 + 2 files changed, 97 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh new file mode 100644 index 000..9eff030 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +do_usage () { + cat << _EOF +Usage: populate-extfs.sh +Create an ext2/ext3/ext4 filesystem from a directory or file + + source: The source directory or file + device: The target device + +_EOF + exit 1 +} + +[ $# -ne 2 ] && do_usage + +SRCDIR=${1%%/} +DEVICE=$2 +DEBUGFS="debugfs" + +{ + CWD="/" + find $SRCDIR | while read FILE; do +TGT="${FILE##*/}" +DIR="${FILE#$SRCDIR}" +DIR="${DIR%$TGT}" + + # Skip the root dir + [ ! -z "$DIR" ] || continue + [ ! -z "$TGT" ] || continue + + if [ "$DIR" != "$CWD" ]; then + echo "cd $DIR" + CWD="$DIR" + fi + + # Only stat once since stat is a time consuming command + STAT=$(stat -c "TYPE=\"%F\";DEVNO=\"0x%t 0x%T\";MODE=\"%f\";U=\"%u\";G=\"%g\"" $FILE) + eval $STAT + + case $TYPE in + "directory") + echo "mkdir $TGT" + ;; + "regular file" | "regular empty file") + echo "write $FILE $TGT" + ;; + "symbolic link") + LINK_TGT=$(readlink $FILE) + echo "symlink $TGT $LINK_TGT" + ;; + "block special file") + echo "mknod $TGT b $DEVNO" + ;; + "character special file") + echo "mknod $TGT c $DEVNO" + ;; + "fifo") + echo "mknod $TGT p" + ;; + *) + echo "Unknown/unhandled file type '$TYPE' file: $FILE" 1>&2 + ;; + esac + + # Set the file mode + echo "sif $TGT mode 0x$MODE" + + # Set uid and gid + echo "sif $TGT uid $U" + echo "sif $TGT gid $G" + done + + # Handle the hard links. + # Save the hard links to a file, use the inode number as the filename, for example: + # If a and b's inode number is 6775928, save a and b to /tmp/tmp.VrCwHh5gdt/6775928. + INODE_DIR=`mktemp -d` || exit 1 + for i in `find $SRCDIR -type f -links +1 -printf 'INODE=%i###FN=%p\n'`; do + eval `echo $i | sed 's$###$ $'` + echo ${FN#$SRCDIR} >>$INODE_DIR/$INODE + done + # Use the debugfs' ln and "sif links_count" to handle them. + for i in `ls $INODE_DIR`; do + # The link source + SRC=`head -1 $INODE_DIR/$i` + # Remove the files and link them again except the first one + for TGT in `sed -n -e '1!p' $INODE_DIR/$i`; do + echo "rm $TGT" + echo "ln $SRC $TGT" + done + LN_CNT=`cat $INODE_DIR/$i | wc -l` + # Set the links count + echo "sif $SRC links_count $LN_CNT" + done + rm -fr $INODE_DIR +} | $DEBUGFS -w -f - $DEVICE diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index 2dc9dab..8b69b22 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -45,6 +45,7 @@ do_install_append () { mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} mv ${D}${base_libdir}/pkgconfig ${D}${libdir} fi + install -m 0755 ${WORKDIR}/populate-extfs.sh ${D}${bindir} } RDEPENDS_e2fspr
Re: [OE-core] qemu-native build regularly failing
On Thursday 22 August 2013 15:56:39 Marko Lindqvist wrote: > On 21 August 2013 19:33, Marko Lindqvist wrote: > > On 21 August 2013 01:15, Marko Lindqvist wrote: > >> On 21 August 2013 00:16, Paul Eggleton wrote: > >>> On Tuesday 20 August 2013 23:26:44 Marko Lindqvist wrote: > On 20 August 2013 16:32, Paul Eggleton > > wrote: > > On Tuesday 20 August 2013 15:51:21 Marko Lindqvist wrote: > >> Build of qemu-native regularly fails with: > >> | LINK sh4-softmmu/qemu-system-sh4 > >> | > >> | /usr/lib/x86_64-linux-gnu/libXext.so.6: undefined reference to > >> > >> `_XEatDataWords' > >> > >> | collect2: error: ld returned 1 exit status > >> > >> This might be some dependency missing, as building first some > >> packets > >> (+ more importantly their dependencies) that do not depend on qemu > >> and > >> only then qemu dependant image success. > > > > Do you have something else causing libxext-native to be built by any > > chance? > > Yes, it seems to be difference between the tree where build fails and > > the one where build success that former has no libxext-native built. > Further, I tested just building libxext-native before building > qemu-native, and then the build succeded. > >>> > >>> The problem is we want qemu-native to be buildable both on systems > >>> without X11 and systems with X11, so the dependency has to be floating, > >>> and this is more or less acceptable for a native recipe - there's only > >>> a problem when libxext- native needs to be built. I can't see a lot of > >>> value in building libxext- native in any case - what is causing it to > >>> be built on your system? > >>> > >>> Cheers, > >>> Paul > >>> > >> I'm still running more tests - this seems to be complicated matter. > >> > >> For one, I just got successful build from empty tree by building > >> qemu-native directly. That was build targeted to arm, while failing > >> builds have been for x86 (native is amd64). Also, I think (but cannot > >> be 100% sure any more) build has succeeded on trees where nothing > >> depends on libxext-native but still *something* was needed to be built > >> before qemu-native. > >> > > It seems libxext-native is not needed. Rather this seems like problem > > > > with build parallelism. > > > > - Sometimes "bitbake qemu-native" to empty tree success at once > > - When it first fails (but other tasks get executed while it tries to > > > > build), it then success by forcing configure rerun & building ( > > "bitbake qemu-native -c configure -f && bitbake qemu-native" ) > > > > I think next step is to get config.log of the succesful and failed > > > > build to compare. > > --- success-qemu/qemu-1.5.0/config-host.h 2013-08-22 > 15:45:10.323126880 +0300 > +++ failed-qemu/qemu-1.5.0/config-host.h2013-08-22 > 15:32:23.515101072 +0300 > @@ -26,6 +26,7 @@ > #define CONFIG_UUID 1 > #define QEMU_VERSION "1.5.0" > #define QEMU_PKGVERSION "" > +#define CONFIG_SDL 1 > #define CONFIG_CURSES 1 > #define CONFIG_ATFILE 1 > #define CONFIG_UTIMENSAT 1 > @@ -55,6 +56,7 @@ > #define CONFIG_MADVISE 1 > #define CONFIG_POSIX_MADVISE 1 > #define CONFIG_SIGEV_THREAD_ID 1 > +#define CONFIG_GLX 1 > #define CONFIG_UNAME_RELEASE "" > #define CONFIG_ZERO_MALLOC 1 > #define CONFIG_QOM_CAST_DEBUG 1 > > > As this diff is success -> failed, CONFIG_GLX and CONFIG_SDL are > defined on first build ending to failure, but not on forced > reconfigure that then build succesfully. You'd probably need to dig into the actual configure check that enables these automatically. I was about to suggest maybe libsdl-native was present in the failing case, but then the current libsdl recipe in OE-Core doesn't provide libsdl-native so that probably isn't it... 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] qemu-native build regularly failing
On 21 August 2013 19:33, Marko Lindqvist wrote: > On 21 August 2013 01:15, Marko Lindqvist wrote: >> On 21 August 2013 00:16, Paul Eggleton wrote: >>> On Tuesday 20 August 2013 23:26:44 Marko Lindqvist wrote: On 20 August 2013 16:32, Paul Eggleton wrote: > On Tuesday 20 August 2013 15:51:21 Marko Lindqvist wrote: >> Build of qemu-native regularly fails with: >> | LINK sh4-softmmu/qemu-system-sh4 >> | >> | /usr/lib/x86_64-linux-gnu/libXext.so.6: undefined reference to >> >> `_XEatDataWords' >> >> | collect2: error: ld returned 1 exit status >> >> This might be some dependency missing, as building first some packets >> (+ more importantly their dependencies) that do not depend on qemu and >> only then qemu dependant image success. > > Do you have something else causing libxext-native to be built by any > chance? Yes, it seems to be difference between the tree where build fails and the one where build success that former has no libxext-native built. Further, I tested just building libxext-native before building qemu-native, and then the build succeded. >>> >>> The problem is we want qemu-native to be buildable both on systems without >>> X11 >>> and systems with X11, so the dependency has to be floating, and this is >>> more or >>> less acceptable for a native recipe - there's only a problem when libxext- >>> native needs to be built. I can't see a lot of value in building libxext- >>> native in any case - what is causing it to be built on your system? >>> >>> Cheers, >>> Paul >> >> >> I'm still running more tests - this seems to be complicated matter. >> For one, I just got successful build from empty tree by building >> qemu-native directly. That was build targeted to arm, while failing >> builds have been for x86 (native is amd64). Also, I think (but cannot >> be 100% sure any more) build has succeeded on trees where nothing >> depends on libxext-native but still *something* was needed to be built >> before qemu-native. > > It seems libxext-native is not needed. Rather this seems like problem > with build parallelism. > > - Sometimes "bitbake qemu-native" to empty tree success at once > - When it first fails (but other tasks get executed while it tries to > build), it then success by forcing configure rerun & building ( > "bitbake qemu-native -c configure -f && bitbake qemu-native" ) > > I think next step is to get config.log of the succesful and failed > build to compare. > --- success-qemu/qemu-1.5.0/config-host.h 2013-08-22 15:45:10.323126880 +0300 +++ failed-qemu/qemu-1.5.0/config-host.h2013-08-22 15:32:23.515101072 +0300 @@ -26,6 +26,7 @@ #define CONFIG_UUID 1 #define QEMU_VERSION "1.5.0" #define QEMU_PKGVERSION "" +#define CONFIG_SDL 1 #define CONFIG_CURSES 1 #define CONFIG_ATFILE 1 #define CONFIG_UTIMENSAT 1 @@ -55,6 +56,7 @@ #define CONFIG_MADVISE 1 #define CONFIG_POSIX_MADVISE 1 #define CONFIG_SIGEV_THREAD_ID 1 +#define CONFIG_GLX 1 #define CONFIG_UNAME_RELEASE "" #define CONFIG_ZERO_MALLOC 1 #define CONFIG_QOM_CAST_DEBUG 1 As this diff is success -> failed, CONFIG_GLX and CONFIG_SDL are defined on first build ending to failure, but not on forced reconfigure that then build succesfully. - ML ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thursday 22 August 2013 11:20:46 Richard Purdie wrote: > On Thu, 2013-08-22 at 10:07 +0100, Paul Eggleton wrote: > > On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: > > > Marko Lindqvist (3): > > > texinfo: correct dont-depend-on-help2man.patch > > > SDL2: add recipe > > > boost: fix build when PARALLEL_MAKE is not set > > > > > > Otavio Salvador (1): > > > distro_features_check.bbclass: Allow checking of required/conflicting > > > > > > features > > > > I should have asked this earlier - why does this need to be a separate > > bbclass? The code doesn't do anything if the variables aren't set, so it > > can't be because it could have an impact on existing setups that don't > > set them. > > FWIW I do have a worry about the shear weight of the core these days as > we're building up piles of anonymous python for example. In many ways I > therefore like the idea of having more classes which get included when > they're needed. For something like this though it just increases complexity for users - unlike other optional class-supported functionality it's not even clear from the variable name that you'll need to inherit the class before they can be used. 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] [CONSOLIDATED PULL 00/62] Python3, Packge Exlude and more (Initial ACK Please)!
On Thu, Aug 22, 2013 at 7:20 AM, Richard Purdie wrote: > On Thu, 2013-08-22 at 10:07 +0100, Paul Eggleton wrote: >> On Wednesday 21 August 2013 22:58:55 Saul Wold wrote: >> > Marko Lindqvist (3): >> > texinfo: correct dont-depend-on-help2man.patch >> > SDL2: add recipe >> > boost: fix build when PARALLEL_MAKE is not set >> > >> > Otavio Salvador (1): >> > distro_features_check.bbclass: Allow checking of required/conflicting >> > features >> >> I should have asked this earlier - why does this need to be a separate >> bbclass? The code doesn't do anything if the variables aren't set, so it >> can't >> be because it could have an impact on existing setups that don't set them. > > FWIW I do have a worry about the shear weight of the core these days as > we're building up piles of anonymous python for example. In many ways I > therefore like the idea of having more classes which get included when > they're needed. That's why I splitted it in a class. I agree with your concern about base growing ;-) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.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][for-dylan] bluez4: fix network Connect parameter validation
On 08/22/2013 04:46 AM, Burton, Ross wrote: On 21 August 2013 23:47, Peter A. Bigot wrote: The incorrect validation prevents connection to the NAP service on another device. Is this intended for master as well as dylan? At the moment, no. I have not been actively developing under master yet so have not tested it there. However, if Yocto 1.5 will still provide bluez4-101 (which was the last bluez4 release) the patch will be needed. I thought there was some discussion of moving to bluez5 with a compatibility layer (again which I have not personally tested). Peter ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/28] Toolchain tweaks
Playing with meta-mingw, it was clear that there were some simple changes we could make to the core that would improve things for non-linux SDKs. This series includes those changes. Since I like pain, I also attempted a darwin build and have included some tweaks for that too. When looking at the gcc recipes, it also became clear that we have way too many include files and the whole thing was a bit of a maze. The series has some changes in to combine various files together and simplify things. I appreciate this may complicate moving things into meta-oe such as gcc 4.7. I would propose when we do that, we put them into recipes-gcc- and include a snapshot of the .inc files at that time. The alternative is the continual copy and paste growth of the .bb files (libgcc being a more extreme example) which I don't think lends itself to future maintenance of the recipes. There are some layers which for example use gcc-cross4.inc, they should just be able to switch directly to gcc-cross.inc. I think this applies to meta-arago-extras. This also leads the way to possibly further unify and clean up some of the configuration (e.g. the do_configure_prepends) but I will leave that for another series when someone has some further time to spend on it. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/28] gcc-package-sdk.inc: Use relative symlinks in libexec dir
We already use relative links for other gcc libexec links, this changes the sdk do_install to match elsewhere and use relative symlinks too. This makes things slightly easier in the SDK installation process and standardises. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-package-sdk.inc | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-package-sdk.inc b/meta/recipes-devtools/gcc/gcc-package-sdk.inc index bb6dfde..b546d5c 100644 --- a/meta/recipes-devtools/gcc/gcc-package-sdk.inc +++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc @@ -28,6 +28,9 @@ FILES_${PN}-doc = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ " +# Compute how to get from libexecdir to bindir in python (easier than shell) +BINRELPATH = "${@oe.path.relative(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${bindir}"))}" + do_install () { oe_runmake 'DESTDIR=${D}' install-host @@ -64,7 +67,7 @@ do_install () { continue fi - ln -sf ${bindir}/${TARGET_PREFIX}$t $dest$t + ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t done chown -R root:root ${D} -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/28] Revert "nativesdk: inherit relocatable"
This reverts commit f93ddea31fcf18833c9bc6e93d93ad223c62eded. We never run nativesdk binaries so it doesn't make sense to use the relocatable class. The chrpath calls at packaging time will ensure the binaries are relocated in the final packages. The binaries in the sysroot are never used. Signed-off-by: Richard Purdie --- meta/classes/nativesdk.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 5b9d1f5..0d5cba4 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -1,5 +1,3 @@ -inherit relocatable - # SDK packages are built either explicitly by the user, # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/28] bitbake.conf/classes/gcc: Don't hardcode -nativesdk
Hardcoding -nativesdk as the sdk package architecture is inflexible. We may have multiple different target OS and we need a way to be able to separate them. Turning this into a configurable value allows the flexibility we need to build different SDKMACHINEs with different OS targets. The commit should have no behaviour change, just makes things more configurable. Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 16 meta/classes/crosssdk.bbclass | 2 +- meta/classes/nativesdk.bbclass | 2 +- meta/conf/bitbake.conf | 3 ++- meta/recipes-devtools/gcc/gcc-configure-runtime.inc | 8 meta/recipes-devtools/gcc/libgcc_4.7.bb | 6 +++--- meta/recipes-devtools/gcc/libgcc_4.8.bb | 6 +++--- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index fa2ab70..87dd994 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -14,25 +14,25 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S # # Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS # -PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" +PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" python () { archs = d.getVar('PACKAGE_ARCHS', True).split() sdkarchs = [] for arch in archs: -sdkarchs.append(arch + '-nativesdk') +sdkarchs.append(arch + '-${SDKPKGSUFFIX}') d.setVar('PACKAGE_ARCHS', " ".join(sdkarchs)) } MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" INHIBIT_DEFAULT_DEPS = "1" -STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" +STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}" -TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" +TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR}/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}" PATH_append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}" -PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}" -PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/" +PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}" +PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/" HOST_ARCH = "${SDK_ARCH}" HOST_VENDOR = "${SDK_VENDOR}" @@ -90,8 +90,8 @@ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" # Cross-canadian packages need to pull in nativesdk dynamic libs -SHLIBSDIRS = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/ ${TMPDIR}/pkgdata/all-${HOST_VENDOR}-${HOST_OS}/shlibs/" -SHLIBSDIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/" +SHLIBSDIRS = "${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/shlibs/ ${TMPDIR}/pkgdata/all-${HOST_VENDOR}-${HOST_OS}/shlibs/" +SHLIBSDIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-${SDKPKGSUFFIX}${HOST_VENDOR}-${HOST_OS}/shlibs/" do_populate_sysroot[stamp-extra-info] = "" diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 635c0c4..bcc285b 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -7,7 +7,7 @@ python () { d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH', True)) } -STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" +STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}" STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" TARGET_ARCH = "${SDK_ARCH}" diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 0d5cba4..26d1e4a 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -11,7 +11,7 @@ CLASSOVERRIDE = "class-nativesdk" # # Update PACKAGE_ARCH and PACKAGE_ARCHS # -PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" +PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" PACKAGE_ARCHS = "${SDK_PACKAGE_ARCHS}" # diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 8ae3ad2..4535f68 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -127,7 +127,8 @@ SDK_VENDOR = "-oesdk" SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]}" SDK_PREFIX = "${SDK_SYS}-" SDK_CC_ARCH = "${BUILD_CC_ARCH}" -SDK_PACKAGE_ARCHS = "all any noarch ${SDK_ARCH}-nativesdk" +SDKPKGSUFFIX = "nativesdk" +SDK_PACKAGE_ARCHS = "all any noarch ${SDK_ARCH}-${SDKPKGSUFFIX}" SDK_LD_ARCH = "${BUILD_LD_ARCH}" SDK_AS_ARCH = "${BUILD_AS_ARCH}" diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
[OE-core] [PATCH 04/28] gettext: Improve USE_NLS handling for nativesdk/crosssdk/cross-canadian
The gettext handling of USE_NLS has become a bit tricky to understand, or alter from the SDK context. This patch introduces a SDKUSE_NLS which can be set to configure a given SDK/ADT to use NLS or not. This is independent of the target system NLS usage. The code in gettext.bbclass is therefore simplified and the classes themselves now set USE_NLS to appropriate values. No NLS is used for native, cross and crosssdk since it is never used there and would just increase build time. Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 2 ++ meta/classes/cross.bbclass | 2 ++ meta/classes/crosssdk.bbclass | 2 ++ meta/classes/gettext.bbclass| 8 +++- meta/classes/native.bbclass | 2 ++ meta/classes/nativesdk.bbclass | 2 ++ meta/conf/bitbake.conf | 1 + 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 7ab36ac..fa2ab70 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -94,3 +94,5 @@ SHLIBSDIRS = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/ SHLIBSDIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/" do_populate_sysroot[stamp-extra-info] = "" + +USE_NLS = "${SDKUSE_NLS}" diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 54584fe..f6e7dc1 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -75,3 +75,5 @@ cross_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" do_install () { oe_runmake 'DESTDIR=${D}' install } + +USE_NLS = "no" diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 810f61d..635c0c4 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -30,3 +30,5 @@ do_populate_sysroot[stamp-extra-info] = "" # Need to force this to ensure consitency accross architectures EXTRA_OECONF_FPU = "" + +USE_NLS = "no" diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 17c894f..03b89b2 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -1,17 +1,15 @@ def gettext_dependencies(d): -if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'): -return "" if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return "" -if oe.utils.inherits(d, 'native', 'cross'): +if d.getVar('USE_NLS', True) == 'no': return "gettext-minimal-native" return d.getVar('DEPENDS_GETTEXT', False) def gettext_oeconf(d): -if oe.utils.inherits(d, 'native', 'cross'): +if d.getVar('USE_NLS', True) == 'no': return '--disable-nls' # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set -if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): +if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return '--disable-nls' return "--enable-nls" diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 04f0d06..102dfb8 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -158,3 +158,5 @@ do_package_write_deb[noexec] = "1" do_package_write_rpm[noexec] = "1" do_populate_sysroot[stamp-extra-info] = "" + +USE_NLS = "no" diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 96e1b42..5b9d1f5 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -89,3 +89,5 @@ addhandler nativesdk_virtclass_handler nativesdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" do_populate_sysroot[stamp-extra-info] = "" + +USE_NLS = "${SDKUSE_NLS}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 07eb473..8ae3ad2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -110,6 +110,7 @@ TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}" LIBCEXTENSION ??= "" ABIEXTENSION ??= "" USE_NLS ??= "yes" +SDKUSE_NLS ??= "yes" TARGET_ARCH = "${TUNE_ARCH}" TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/28] gcc: Drop gcc-cross4.inc, its pointless now
The include was useful historically, its not anymore so lets remove it. This should have no functional change except on any layers directly depending on it or gcc-cross.inc but even then it would only impact sh4 and is easily fixed if there was a problem. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross.inc| 2 ++ meta/recipes-devtools/gcc/gcc-cross4.inc | 3 --- meta/recipes-devtools/gcc/gcc-cross_4.7.bb | 2 +- meta/recipes-devtools/gcc/gcc-cross_4.8.bb | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-cross4.inc diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 9d29f56..2913df7 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -106,3 +106,5 @@ STOP chmod +x ${B}/${TARGET_PREFIX}testgcc } + +EXTRA_OECONF_append_sh4 = " --with-multilib-list= --enable-incomplete-targets " diff --git a/meta/recipes-devtools/gcc/gcc-cross4.inc b/meta/recipes-devtools/gcc/gcc-cross4.inc deleted file mode 100644 index 4a20818..000 --- a/meta/recipes-devtools/gcc/gcc-cross4.inc +++ /dev/null @@ -1,3 +0,0 @@ -require gcc-cross.inc - -EXTRA_OECONF_append_sh4 = " --with-multilib-list= --enable-incomplete-targets " diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb index d605235..b02ea13 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb @@ -1,5 +1,5 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-cross4.inc +require gcc-cross.inc EXTRA_OECONF += "--disable-libunwind-exceptions \ --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb index d605235..b02ea13 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb @@ -1,5 +1,5 @@ require recipes-devtools/gcc/gcc-${PV}.inc -require gcc-cross4.inc +require gcc-cross.inc EXTRA_OECONF += "--disable-libunwind-exceptions \ --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/28] gcc-configure-sdk.inc: Don't build target-libgcc
I don't understand why we're building the target libgcc in the canadian-cross build since it should have been built elsewhere. The compiler configuration isn't correct to build a working target libgcc in all cases anyway. To avoid various weird build errors, stop building it. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-configure-sdk.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc index 51c0217..6c55bc7 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc @@ -43,5 +43,5 @@ do_configure () { } do_compile () { - oe_runmake all-host all-target-libgcc + oe_runmake all-host } -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/28] gcc-cross-canadian-4.8: Enable PARALLEL_MAKE
This disabling of PARALLEL_MAKE has been forward ported for gcc-cross-canadian since at least 2009-09 and gcc 4.3.3, probably older. I've tested this with high values of parallel make and it all seems to work and we usually build gcc with parallel make so it seems unlikely there are issues. Lets therefore enable it. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb index 53c4632..278a529 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb @@ -20,7 +20,5 @@ EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ # to find libmpfr # export LD_LIBRARY_PATH = "{STAGING_DIR_HOST}${layout_exec_prefix}" -PARALLEL_MAKE = "" - # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/28] gcc-cross: Fold common configuration into gcc-cross.inc
Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross.inc| 12 meta/recipes-devtools/gcc/gcc-cross_4.7.bb | 11 --- meta/recipes-devtools/gcc/gcc-cross_4.8.bb | 11 --- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 2913df7..c3542e2 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -108,3 +108,15 @@ STOP } EXTRA_OECONF_append_sh4 = " --with-multilib-list= --enable-incomplete-targets " + +EXTRA_OECONF += "--disable-libunwind-exceptions \ + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ + --with-system-zlib " + +EXTRA_OECONF_PATHS = " \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ + --with-sysroot=${STAGING_DIR_TARGET} \ + --with-build-sysroot=${STAGING_DIR_TARGET}" + + +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb index b02ea13..b43cca0 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.7.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.7.bb @@ -1,14 +1,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross.inc -EXTRA_OECONF += "--disable-libunwind-exceptions \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ - --with-system-zlib " - -EXTRA_OECONF_PATHS = " \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ - --with-sysroot=${STAGING_DIR_TARGET} \ - --with-build-sysroot=${STAGING_DIR_TARGET}" - - -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb index b02ea13..b43cca0 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_4.8.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_4.8.bb @@ -1,14 +1,3 @@ require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross.inc -EXTRA_OECONF += "--disable-libunwind-exceptions \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ - --with-system-zlib " - -EXTRA_OECONF_PATHS = " \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ - --with-sysroot=${STAGING_DIR_TARGET} \ - --with-build-sysroot=${STAGING_DIR_TARGET}" - - -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 20/28] gcc-target: Combine gcc-target-configure.inc, gcc-target-package.inc and other common code
Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-configure-target.inc | 8 -- meta/recipes-devtools/gcc/gcc-package-target.inc | 142 --- meta/recipes-devtools/gcc/gcc-target.inc | 153 + meta/recipes-devtools/gcc/gcc_4.7.bb | 5 +- meta/recipes-devtools/gcc/gcc_4.8.bb | 5 +- 5 files changed, 155 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-configure-target.inc delete mode 100644 meta/recipes-devtools/gcc/gcc-package-target.inc create mode 100644 meta/recipes-devtools/gcc/gcc-target.inc diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc b/meta/recipes-devtools/gcc/gcc-configure-target.inc deleted file mode 100644 index 5f608d6..000 --- a/meta/recipes-devtools/gcc/gcc-configure-target.inc +++ /dev/null @@ -1,8 +0,0 @@ -GCCMULTILIB = "--enable-multilib" -require gcc-configure-common.inc - -EXTRA_OECONF_PATHS = " \ ---with-sysroot=/ \ ---with-build-sysroot=${STAGING_DIR_TARGET} \ ---with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ ---with-gxx-include-dir=${includedir}/c++/ --enable-dependency-tracking" diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc deleted file mode 100644 index 95a92c1..000 --- a/meta/recipes-devtools/gcc/gcc-package-target.inc +++ /dev/null @@ -1,142 +0,0 @@ -PACKAGES = "\ - ${PN} ${PN}-plugins ${PN}-symlinks \ - g++ g++-symlinks \ - cpp cpp-symlinks \ - g77 g77-symlinks \ - gfortran gfortran-symlinks \ - gcov gcov-symlinks \ - ${PN}-plugin-dev \ - ${PN}-doc \ - ${PN}-dev \ - ${PN}-dbg \ -" - -FILES_${PN} = "\ - ${bindir}/${TARGET_PREFIX}gcc* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ -" -INSANE_SKIP_${PN} += "dev-so" - -FILES_${PN}-dbg += "\ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/.debug/ \ -" -FILES_${PN}-dev = "\ - ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ -" -FILES_${PN}-plugin-dev = "\ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ -" -FILES_${PN}-symlinks = "\ - ${bindir}/cc \ - ${bindir}/gcc \ - ${bindir}/gccbug \ -" - -FILES_${PN}-plugins = "\ - ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ -" -ALLOW_EMPTY_${PN}-plugins = "1" - -FILES_g77 = "\ - ${bindir}/${TARGET_PREFIX}g77 \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ -" -FILES_g77-symlinks = "\ - ${bindir}/g77 \ - ${bindir}/f77 \ -" -FILES_gfortran = "\ - ${bindir}/${TARGET_PREFIX}gfortran \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ -" -FILES_gfortran-symlinks = "\ - ${bindir}/gfortran \ - ${bindir}/f95" - -FILES_cpp = "\ - ${bindir}/${TARGET_PREFIX}cpp \ - ${base_libdir}/cpp \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" -FILES_cpp-symlinks = "${bindir}/cpp" - -FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" -FILES_gcov-symlinks = "${bindir}/gcov" - -FILES_g++ = "\ - ${bindir}/${TARGET_PREFIX}g++ \ - ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ -" -FILES_g++-symlinks = "\ - ${bindir}/c++ \ - ${bindir}/g++ \ -" - - -FILES_${PN}-doc = "\ - ${infodir} \ - ${mandir} \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ -" - -do_install () { - oe_runmake 'DESTDIR=${D}' install-host - - # Cleanup some of the ${libdir}{,exec}/gcc stuff ... - rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools - rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools - rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la - rmdir ${D}${includedir} - - # Hack around specs file assumptions - test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs - - # Cleanup manpages.. - rm -rf ${D}${mandir}/man7 - - cd ${D}${bindir} - - # We care about g++ not c++ - rm -f *c++ - - # We don't care about the gcc- ones for this - rm -f *gcc-?.?* - - # We use libiberty from binutils - find ${D}${libdir} -name libiberty.a | xargs rm -f - find ${D}${libdir} -name libiberty.h | xargs rm -f - - # Not sure why we end up with these but we don't want them... - rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* -
[OE-core] [PATCH 27/28] Drop darwin8/darwin9 usage
There were darwin8/darwin9 overrides spinkled in the code from times gone by. Lets settle on the darwin override and remove the others since its pointless duplication. We always inject darwin into OVERRIDES if needed in the darwin8/9 cases. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 4 meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb| 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 45a5221..05259b2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -260,16 +260,12 @@ MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativ SOLIBS = ".so.*" SOLIBS_darwin = ".dylib" -SOLIBS_darwin8 = ".dylib" -SOLIBS_darwin9 = ".dylib" SOLIBSDEV = ".so" # Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin, # we can't make the symlinks end up in the -dev packages easily at this point. This hack # at least means builds aren't completely broken and symlinks don't take up much space. SOLIBSDEV_darwin = ".dylibbroken" -SOLIBSDEV_darwin8 = ".dylibbroken" -SOLIBSDEV_darwin9 = ".dylibbroken" PACKAGE_BEFORE_PN ?= "" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 63fea28..84fb95d 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\ nativesdk-automake \ " -RDEPENDS_${PN}_darwin8 = "\ +RDEPENDS_${PN}_darwin = "\ odcctools-cross-canadian \ llvm-cross-canadian \ nativesdk-pkgconfig \ diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb index d231268..928a0cd 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb @@ -10,7 +10,6 @@ SRC_URI[sha256sum] = "b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68 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" -EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" do_configure_prepend () { cp ${WORKDIR}/acinclude.m4 ${S}/ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 28/28] chrpath: Add support for relocating darwin binaries
On darwin, install_name_tool can be used to relocate binaries/libraries. This adds support for adjusting them with relative paths rather than hardcoded ones. The Linux code is factored out into a function but is otherwise unchanged. Signed-off-by: Richard Purdie --- meta/classes/chrpath.bbclass | 138 +++ 1 file changed, 88 insertions(+), 50 deletions(-) diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index 0c7ab77..61a24b3 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass @@ -1,18 +1,103 @@ CHRPATH_BIN ?= "chrpath" PREPROCESS_RELOCATE_DIRS ?= "" -def process_dir (directory, d): +def process_file_linux(cmd, fpath, basedir, tmpdir, d): import subprocess as sub + +p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) +err, out = p.communicate() +# If returned succesfully, process stderr for results +if p.returncode != 0: +return + +# Throw away everything other than the rpath list +curr_rpath = err.partition("RPATH=")[2] +#bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) +rpaths = curr_rpath.split(":") +new_rpaths = [] +for rpath in rpaths: +# If rpath is already dynamic copy it to new_rpath and continue +if rpath.find("$ORIGIN") != -1: +new_rpaths.append(rpath.strip()) +continue +rpath = os.path.normpath(rpath) +# If the rpath shares a root with base_prefix determine a new dynamic rpath from the +# base_prefix shared root +if rpath.find(basedir) != -1: +depth = fpath.partition(basedir)[2].count('/') +libpath = rpath.partition(basedir)[2].strip() +# otherwise (i.e. cross packages) determine a shared root based on the TMPDIR +# NOTE: This will not work reliably for cross packages, particularly in the case +# where your TMPDIR is a short path (i.e. /usr/poky) as chrpath cannot insert an +# rpath longer than that which is already set. +elif rpath.find(tmpdir) != -1: +depth = fpath.rpartition(tmpdir)[2].count('/') +libpath = rpath.partition(tmpdir)[2].strip() +else: +new_rpaths.append(rpath.strip()) +return +base = "$ORIGIN" +while depth > 1: +base += "/.." +depth-=1 +new_rpaths.append("%s%s" % (base, libpath)) + +# if we have modified some rpaths call chrpath to update the binary +if len(new_rpaths): +args = ":".join(new_rpaths) +#bb.note("Setting rpath for %s to %s" %(fpath, args)) +p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE) +out, err = p.communicate() +if p.returncode != 0: +bb.error("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN', True), p.returncode, out, err)) +raise bb.build.FuncFailed + +def process_file_darwin(cmd, fpath, basedir, tmpdir, d): +import subprocess as sub + +p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE) +err, out = p.communicate() +# If returned succesfully, process stderr for results +if p.returncode != 0: +return +for l in err.split("\n"): +if "(compatibility" not in l: +continue +rpath = l.partition("(compatibility")[0].strip() +if rpath.find(basedir) != -1: +depth = fpath.partition(basedir)[2].count('/') +libpath = rpath.partition(basedir)[2].strip() +else: +continue + +base = "@loader_path" +while depth > 1: +base += "/.." +depth-=1 +base = base + libpath +p = sub.Popen([d.expand("${HOST_PREFIX}install_name_tool"), '-change', rpath, base, fpath],stdout=sub.PIPE,stderr=sub.PIPE) +err, out = p.communicate() + +def process_dir (directory, d): import stat cmd = d.expand('${CHRPATH_BIN}') tmpdir = os.path.normpath(d.getVar('TMPDIR')) basedir = os.path.normpath(d.expand('${base_prefix}')) +hostos = d.getVar("HOST_OS", True) #bb.debug("Checking %s for binaries to process" % directory) if not os.path.exists(directory): return +if "linux" in hostos: +process_file = process_file_linux +elif "darwin" in hostos: +process_file = process_file_darwin +else: +# Relocations not supported +return + dirs = os.listdir(directory) for file in dirs: fpath = directory + "/" + file @@ -35,55 +120,8 @@ def process_dir (directory, d): else: # Temporarily make the file writeable so we can chrpath it os.chmod(fpath, perms|stat.S_IRWXU) - -p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) -err, out = p.communicate() -# If returned succesfully,
[OE-core] [PATCH 25/28] gcc-common.inc: Drop unused LIBGCCS_VAR variable
Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index a09fd54..25a3142 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -25,9 +25,6 @@ EXTRA_OECONF_PATHS = " \ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" -LIBGCCS_VAR = "-lgcc_s" -LIBGCCS_VAR_avr32 = "" - do_configure_prepend () { sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure } -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 26/28] bitbake.conf: Work around dev symlink problems on darwin
On darwin, we have: libxxx.dylib -> libxxx.Y.dylib compared to Linux which has: libxxx.so -> libxxx.so.Y Our ordering of PACKAGES with -dev first and then ${PN} makes it impossible to match the files correctly using simple globbing. This makes darwin targets completely broken since both the libs and the dev symlinks end up in ${PN}-dev. Whilst this commit is a hack, it at least puts the files into ${PN} and allows the builds to be used. Symlinks don't take up much space so this isn't the end of the world. I'm open to better solutions to this. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4535f68..45a5221 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -259,14 +259,17 @@ RPROVIDES = "" MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" SOLIBS = ".so.*" -SOLIBS_darwin = ".*.dylib" -SOLIBS_darwin8 = ".*.dylib" -SOLIBS_darwin9 = ".*.dylib" +SOLIBS_darwin = ".dylib" +SOLIBS_darwin8 = ".dylib" +SOLIBS_darwin9 = ".dylib" SOLIBSDEV = ".so" -SOLIBSDEV_darwin = ".dylib" -SOLIBSDEV_darwin8 = ".dylib" -SOLIBSDEV_darwin9 = ".dylib" +# Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin, +# we can't make the symlinks end up in the -dev packages easily at this point. This hack +# at least means builds aren't completely broken and symlinks don't take up much space. +SOLIBSDEV_darwin = ".dylibbroken" +SOLIBSDEV_darwin8 = ".dylibbroken" +SOLIBSDEV_darwin9 = ".dylibbroken" PACKAGE_BEFORE_PN ?= "" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 19/28] libgcc: Move common code to libgcc.inc
Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/libgcc.inc| 143 +++ meta/recipes-devtools/gcc/libgcc_4.7.bb | 144 +-- meta/recipes-devtools/gcc/libgcc_4.8.bb | 145 +--- 3 files changed, 145 insertions(+), 287 deletions(-) create mode 100644 meta/recipes-devtools/gcc/libgcc.inc diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc new file mode 100644 index 000..fe98238 --- /dev/null +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -0,0 +1,143 @@ +INHIBIT_DEFAULT_DEPS = "1" + +DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +PACKAGES = "\ + ${PN} \ + ${PN}-dev \ + ${PN}-dbg \ + libgcov-dev \ + " + +FILES_${PN} = "${base_libdir}/libgcc*.so.*" +FILES_${PN}-dev = " \ + ${base_libdir}/libgcc*.so \ + ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ + ${libdir}/${TARGET_SYS}/${BINV}/64 \ + ${libdir}/${TARGET_SYS}/${BINV}/32 \ + ${libdir}/${TARGET_SYS}/${BINV}/x32 \ + ${libdir}/${TARGET_SYS}/${BINV}/n32 \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" +FILES_libgcov-dev = " \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ + " +FILES_${PN}-dbg += "${base_libdir}/.debug/" + +do_configure () { + target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + install -d ${D}${base_libdir} ${D}${libdir} + cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${B} + mkdir -p ${B}/${BPN} + cd ${B}/${BPN} + chmod a+x ${S}/${BPN}/configure + ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} +} + +do_compile () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + cd ${B}/${BPN} + oe_runmake MULTIBUILDTOP=${B}/$target/${BPN}/ +} + +do_install () { + target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` + cd ${B}/${BPN} + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${BPN}/ install + + # Move libgcc_s into /lib + mkdir -p ${D}${base_libdir} + if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then + mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir} + else + mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true + fi + + # install the runtime in /usr/lib/ not in /usr/lib/gcc on target + # so that cross-gcc can find it in the sysroot + + mv ${D}${libdir}/gcc/* ${D}${libdir} + rm -rf ${D}${libdir}/gcc/ + # unwind.h is installed here which is shipped in gcc-cross + # as well as target gcc and they are identical so we dont + # ship one with libgcc here + rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include +} + +do_package[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" +do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" + +BBCLASSEXTEND = "nativesdk" + +INSANE_SKIP_${PN}-dev = "staticdev" +INSANE_SKIP_${MLPREFIX}libgcov-dev = "staticdev" + +addtask multilib_install after do_install before do_package do_populate_sysroot +# this makes multilib gcc files findable for target gcc +# e.g. +#/usr/lib/i586-pokymllib32-linux/4.7/ +# by creating this symlink to it +#/usr/lib64/x86_64-poky-linux/4.7/32 + +python do_multilib_install() { +import re + +multilibs = d.getVar('MULTILIB_VARIANTS', True) +if not multilibs or bb.data.inherits_class('nativesdk', d): +return + +binv = d.getVar('BINV', True) + +mlprefix = d.getVar('MLPREFIX', True) +if ('%slibgcc' % mlprefix) != d.getVar('PN', True): +return + +if mlprefix: +orig_tune = d.getVar('DEFAULTTUNE_MULTILIB_ORIGINAL', True) +orig_tune_params = get_tune_parameters(orig_tune, d) +orig_tune_baselib = orig_tune_params['baselib'] +orig_tune_bitness = orig_tune_baselib.replace('lib', '') +if not orig_tune_bitness: +orig_tune_bitness = '32' + +src = '../../../' + orig_tune_baselib + '/' + \ +d.getVar('TARGET_SYS_MULTILIB_ORIGINAL', True) + '/' + binv + '/' + +dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \ +d.getVar('TARGET_SYS', True) + '/' + binv + '/' + orig_tune_bitness + +if os.path.lexists(dest): +os.unlink(dest) +os.symlink(src, dest) +return + + +for ml in multilibs.split(): +tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml, True) +if not tune: +bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml) +continue + +tune_parameters = get_tune_parameters(tune, d) +tune_baselib = tune_parameters['baselib'] +if not tune_baselib: +bb.warn("Tune %s doesn't have a baselib set. Skipping..." % tune) +continue + +tune_arch = tune_parameters[
[OE-core] [PATCH 22/28] gcc-*-runtime.inc: Fold configuration into gcc-runtime.inc
Signed-off-by: Richard Purdie --- .../recipes-devtools/gcc/gcc-configure-runtime.inc | 64 - meta/recipes-devtools/gcc/gcc-package-runtime.inc | 80 meta/recipes-devtools/gcc/gcc-runtime.inc | 145 + meta/recipes-devtools/gcc/gcc-runtime_4.7.bb | 3 +- meta/recipes-devtools/gcc/gcc-runtime_4.8.bb | 3 +- 5 files changed, 147 insertions(+), 148 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-configure-runtime.inc delete mode 100644 meta/recipes-devtools/gcc/gcc-package-runtime.inc create mode 100644 meta/recipes-devtools/gcc/gcc-runtime.inc diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc deleted file mode 100644 index 2ff8561..000 --- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc +++ /dev/null @@ -1,64 +0,0 @@ -require gcc-configure-common.inc - -CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" - -EXTRA_OECONF_PATHS = " \ ---with-gxx-include-dir=${includedir}/c++/ \ ---with-sysroot=${STAGING_DIR_TARGET} \ ---with-build-sysroot=${STAGING_DIR_TARGET}" - -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" - -EXTRA_OECONF += "--disable-libunwind-exceptions" -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" - -RUNTIMETARGET = "libssp libstdc++-v3 libgomp" -# ? -# libiberty -# libmudflap -# libgfortran - -do_configure () { - export CXX="${CXX} -nostdinc++ -nostdlib++" - mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B} - for d in libgcc ${RUNTIMETARGET}; do - echo "Configuring $d" - rm -rf ${B}/$target/$d/ - mkdir -p ${B}/$target/$d/ - cd ${B}/$target/$d/ - chmod a+x ${S}/$d/configure - ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} - done -} - -do_compile () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - for d in libgcc ${RUNTIMETARGET}; do - cd ${B}/$target/$d/ - oe_runmake MULTIBUILDTOP=${B}/$target/$d/ - done -} - -do_install () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - for d in ${RUNTIMETARGET}; do - cd ${B}/$target/$d/ - oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install - done - rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir - if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then - rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude - fi - if [ -d ${D}${infodir} ]; then - rmdir --ignore-fail-on-non-empty -p ${D}${infodir} - fi - chown -R root:root ${D} -} - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc" -PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc deleted file mode 100644 index 2e2f75a..000 --- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc +++ /dev/null @@ -1,80 +0,0 @@ -PACKAGES = "\ - ${PN}-dbg \ - libstdc++ \ - libstdc++-precompile-dev \ - libstdc++-dev \ - libstdc++-staticdev \ - libg2c \ - libg2c-dev \ - libssp \ - libssp-dev \ - libssp-staticdev \ - libgfortran \ - libgfortran-dev \ - libmudflap \ - libmudflap-dev \ - libgomp \ - libgomp-dev \ - libgomp-staticdev \ -" -# The base package doesn't exist, so we clear the recommends. -RRECOMMENDS_${PN}-dbg = "" - -# include python debugging scripts -FILES_${PN}-dbg += "\ - ${libdir}/libstdc++.so.*-gdb.py \ - ${datadir}/gcc-${BINV}/python/libstdcxx" - -FILES_libg2c = "${target_libdir}/libg2c.so.*" -FILES_libg2c-dev = "\ - ${libdir}/libg2c.so \ - ${libdir}/libg2c.a \ - ${libdir}/libfrtbegin.a" - -FILES_libstdc++ = "${libdir}/libstdc++.so.*" -FILES_libstdc++-dev = "\ - ${includedir}/c++/ \ - ${libdir}/libstdc++.so \ - ${libdir}/libstdc++.la \ - ${libdir}/libsupc++.la" -FILES_libstdc++-staticdev = "\ - ${libdir}/libstdc++.a \ - ${libdir}/libsupc++.a" - -FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" - -FILES_libssp = "${libdir}/libssp.so.*" -FILES_libssp-dev = " \ - ${libdir}/libssp*.so \ - ${libdir}/libssp*_nonshared.a \ - ${libdir}/libssp*.la \ - ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp" -FILES_libssp-staticdev = " \ - ${libdir}/libssp*.a" - -FILES_libgfortran = "${libdir}/libgfortran.so.*" -FILES_libgfortran-dev = " \ - ${libdir}/libgfortran.a \ - ${libdir}/libgfortran.so \ - ${libdir}/libgfortranbegin.a" - -FILES_libmudflap = "${libdir}/libmudflap*.so.*" -FILES_libmudflap-dev = "\ - ${libdir}/libmudflap*.so \ - $