Re: [OE-core] [PATCH v2] xinit: Fix `startx` looking for `mcookie` in sysroot
On 11/08/2011 04:58 AM, Paul Menzel wrote: Date: Tue, 8 Nov 2011 13:00:32 +0100 `startx` run on a system based on the demo systemd image [1] and `opkg`-installed packages fails with the following error. /usr/bin/startx: line 139: /OE/tentacle/build/tmp-angstrom_2010_x/sysroots/x68_64-linux/usr/bin/mcookie: No such file or directory Applying commit 443bcc07 [1] from OE-classic Author: Tom Rinitom_r...@mentor.com Date: Thu Apr 7 10:36:43 2011 -0700 xinit: Fix mcookie / util-linux-ng dependency xinit just needs to know the runtime path of mcookie so we need to RDEPEND on util-linux-ng and pass the runtime path in via EXTRA_OECONF Signed-off-by: Tom Rinitom_r...@mentor.com fixes this issue. Commit 7f6cec6f [2] Author: Frans Meulenbroeksfransmeulenbro...@gmail.com Date: Sun Feb 21 18:11:30 2010 +0100 xinit: add dependency on util-linux-ng […] tried to address the same problem but apparently did not help, because Tom still had problems. [1] http://www.angstrom-distribution.org/demo/beagleboard/Angstrom-systemd-image-eglibc-ipk-v2011.11-core-beagleboard.rootfs.tar.bz2 [2] http://git.openembedded.org/openembedded/commit/443bcc0785bc004e471b3750a34d12d2fd2e5dad [3] http://git.openembedded.org/openembedded/commit/7f6cec6f0adb6203a6dbaf8a43c67c2c4f8bf84e Signed-off-by: Paul Menzelpaulepan...@users.sourceforge.net --- 1. Please note that I did neither build nor run tested this patch and just noticed the error trying the demo image. 2. Koen mentioned something on IRC wanting to get rid of `startx` entirely. But this patch should be applied nevertheless. v2: move `RDEPENDS` further down as suggested by Koen --- meta/recipes-graphics/xorg-app/xinit_1.3.0.bb |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb index ee7c64d..20b378c 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb @@ -9,9 +9,14 @@ systems. When this first client exits, xinit will kill the X server and \ then terminate. LIC_FILES_CHKSUM = file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407 -PR = r0 + +PR = r1 PE = 1 +EXTRA_OECONF = ac_cv_path_MCOOKIE=${bindir}/mcookie + +RDEPENDS_${PN} += util-linux-ng + Do you really mean util-linux in oe-core? Sau! FILES_${PN} += ${libdir}X11/xinit SRC_URI[md5sum] = bc4e8b7d1919597cc37a0d24aa149dda ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] ncurses: refactor configure to avoid configuring widec when disabled
On 11/08/2011 11:08 AM, Darren Hart wrote: The ENABLE_WIDEC variable can be used to disable ncurses wide character support when your C library doesn't support it. Currently, the do_configure step configures for both narrow and wide characters regardless and only checks ENABLE_WIDEC during compilation. This leads to QA failures with host contamination during configure if the C library doesn't support wide characters. Refactor do_configure with a new ncurses_configure helper function and only configure for wide character support if ENABLE_WIDEC is true. Ensure that configure errors are propogated back through to do_configure. Tested with ENABLE_WIDEC as true and false via an ncurses bbappend on i586, including basic error injection. Signed-off-by: Darren Hartdvh...@linux.intel.com --- meta/recipes-core/ncurses/ncurses.inc | 64 +--- 1 files changed, 34 insertions(+), 30 deletions(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index be7d387..d3a9b1c 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -26,6 +26,36 @@ ENABLE_WIDEC = true # builds. BUILD_CPPFLAGS += -D_GNU_SOURCE No PR Bump! Sau! +# Helper function for do_configure to allow multiple configurations +# $1 the directory to run configure in +# $@ the arguments to pass to configure +ncurses_configure() { + mkdir -p $1 + cd $1 + shift + oe_runconf \ + --disable-static \ + --without-debug \ + --without-ada \ + --without-gpm \ + --enable-hard-tabs \ + --enable-xmc-glitch \ + --enable-colorfgbg \ + --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \ + --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \ + --with-shared \ + --disable-big-core \ + --program-prefix= \ + --with-ticlib \ + --with-termlib=tinfo \ + --enable-sigwinch \ + --enable-pc-files \ + --disable-rpath-hack \ + --with-manpage-format=normal \ + $@ || return 1 + cd .. +} + # Override the function from the autotools class; ncurses requires a # patched autoconf213 to generate the configure script. This autoconf # is not available so that the shipped script will be used. @@ -35,36 +65,10 @@ do_configure() { # not the case for /dev/null redirections) export cf_cv_working_poll=yes -for i in \ -'narrowc' \ -'widec --enable-widec --without-progs'; do -set -- $i -mkdir -p $1 -cd $1 -shift - -oe_runconf \ ---disable-static \ ---without-debug \ ---without-ada \ ---without-gpm \ ---enable-hard-tabs \ ---enable-xmc-glitch \ ---enable-colorfgbg \ - --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \ - --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \ ---with-shared \ ---disable-big-core \ ---program-prefix= \ ---with-ticlib \ ---with-termlib=tinfo \ ---enable-sigwinch \ ---enable-pc-files \ ---disable-rpath-hack \ ---with-manpage-format=normal \ -$@ -cd .. -done + ncurses_configure narrowc || \ + return 1 + ! ${ENABLE_WIDEC} || \ + ncurses_configure widec --enable-widec --without-progs } do_compile() { ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] xinit: Fix `startx` looking for `mcookie` in sysroot
Date: Tue, 8 Nov 2011 13:00:32 +0100 `startx` run on a system based on the demo systemd image [1] and `opkg`-installed packages fails with the following error. /usr/bin/startx: line 139: /OE/tentacle/build/tmp-angstrom_2010_x/sysroots/x68_64-linux/usr/bin/mcookie: No such file or directory Applying commit 443bcc07 [1] from OE-classic Author: Tom Rini tom_r...@mentor.com Date: Thu Apr 7 10:36:43 2011 -0700 xinit: Fix mcookie / util-linux-ng dependency xinit just needs to know the runtime path of mcookie so we need to RDEPEND on util-linux-ng and pass the runtime path in via EXTRA_OECONF Signed-off-by: Tom Rini tom_r...@mentor.com fixes this issue. Commit 7f6cec6f [2] Author: Frans Meulenbroeks fransmeulenbro...@gmail.com Date: Sun Feb 21 18:11:30 2010 +0100 xinit: add dependency on util-linux-ng […] tried to address the same problem but apparently did not help, because Tom still had problems. [1] http://www.angstrom-distribution.org/demo/beagleboard/Angstrom-systemd-image-eglibc-ipk-v2011.11-core-beagleboard.rootfs.tar.bz2 [2] http://git.openembedded.org/openembedded/commit/443bcc0785bc004e471b3750a34d12d2fd2e5dad [3] http://git.openembedded.org/openembedded/commit/7f6cec6f0adb6203a6dbaf8a43c67c2c4f8bf84e Signed-off-by: Paul Menzel paulepan...@users.sourceforge.net --- 1. Please note that I did neither build nor run tested this patch and just noticed the error trying the demo image. 2. Koen mentioned something on IRC wanting to get rid of `startx` entirely. But this patch should be applied nevertheless. v2: move `RDEPENDS` further down as suggested by Koen v3: there is no util-linux-ng in OE-core as noted by Saul --- meta/recipes-graphics/xorg-app/xinit_1.3.0.bb |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb index ee7c64d..6953ccc 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.0.bb @@ -9,9 +9,14 @@ systems. When this first client exits, xinit will kill the X server and \ then terminate. LIC_FILES_CHKSUM = file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407 -PR = r0 + +PR = r1 PE = 1 +EXTRA_OECONF = ac_cv_path_MCOOKIE=${bindir}/mcookie + +RDEPENDS_${PN} += util-linux + FILES_${PN} += ${libdir}X11/xinit SRC_URI[md5sum] = bc4e8b7d1919597cc37a0d24aa149dda -- 1.7.7.2 signature.asc Description: This is a digitally signed message part ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] udev-extraconf: blacklist /dev/md
Do not mount /dev/md by default via udev, this resolved a problem with the sanity test failing due to seeing the error while attempting to mount /dev/md0 Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-core/udev/files/mount.blacklist |1 + meta/recipes-core/udev/udev-extraconf_0.0.bb |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/udev/files/mount.blacklist b/meta/recipes-core/udev/files/mount.blacklist index d3ebb17..7c7d938 100644 --- a/meta/recipes-core/udev/files/mount.blacklist +++ b/meta/recipes-core/udev/files/mount.blacklist @@ -1,3 +1,4 @@ /dev/loop /dev/ram /dev/mtdblock +/dev/md diff --git a/meta/recipes-core/udev/udev-extraconf_0.0.bb b/meta/recipes-core/udev/udev-extraconf_0.0.bb index e17d944..d0d0e84 100644 --- a/meta/recipes-core/udev/udev-extraconf_0.0.bb +++ b/meta/recipes-core/udev/udev-extraconf_0.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = Extra machine specific configuration files for udev, specifically LICENSE = GPLv2 LIC_FILES_CHKSUM = file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe -PR = r1 +PR = r2 SRC_URI = file://mount.blacklist \ file://COPYING.GPL -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 2/5] Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE
From: Matthew McClintock m...@freescale.com Just define additional serial consoles like so: SERIAL_CONSOLES=115200;ttyS0 115200;ttyS1 ... 115200;ttySN Also be sure to remove SERIAL_CONSOLE (lacking the S) from your machine as they can conflict. Signed-off-by: Matthew McClintock m...@freescale.com --- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index ba60c74..3a716d7 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -25,6 +25,16 @@ do_install() { if [ ! -z ${SERIAL_CONSOLE} ]; then echo S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE} ${D}${sysconfdir}/inittab fi + +idx=0 +tmp=${SERIAL_CONSOLES} +for i in $tmp +do + j=`echo ${i} | sed s/\;/\ /g` +echo ${idx}:2345:respawn:${base_sbindir}/getty ${j} ${D}${sysconfdir}/inittab + idx=`expr $idx + 1` +done + if [ ${USE_VT} = 1 ]; then cat EOF ${D}${sysconfdir}/inittab # ${base_sbindir}/getty invocations for the runlevels. -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 5/5] udev-extraconf: blacklist /dev/md
Do not mount /dev/md by default via udev, this resolved a problem with the sanity test failing due to seeing the error while attempting to mount /dev/md0 Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-core/udev/files/mount.blacklist |1 + meta/recipes-core/udev/udev-extraconf_0.0.bb |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/udev/files/mount.blacklist b/meta/recipes-core/udev/files/mount.blacklist index d3ebb17..7c7d938 100644 --- a/meta/recipes-core/udev/files/mount.blacklist +++ b/meta/recipes-core/udev/files/mount.blacklist @@ -1,3 +1,4 @@ /dev/loop /dev/ram /dev/mtdblock +/dev/md diff --git a/meta/recipes-core/udev/udev-extraconf_0.0.bb b/meta/recipes-core/udev/udev-extraconf_0.0.bb index e17d944..d0d0e84 100644 --- a/meta/recipes-core/udev/udev-extraconf_0.0.bb +++ b/meta/recipes-core/udev/udev-extraconf_0.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = Extra machine specific configuration files for udev, specifically LICENSE = GPLv2 LIC_FILES_CHKSUM = file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe -PR = r1 +PR = r2 SRC_URI = file://mount.blacklist \ file://COPYING.GPL -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 3/5] libarchive: Remove obsolete comment and empty line at the end
From: Paul Menzel paulepan...@users.sourceforge.net This is a fix up for commit fb19df5b21e551c5dfdfa340438952560c5fa528 Author: Xiaofeng Yan xiaofeng@windriver.com Date: Mon Nov 7 20:03:53 2011 +0800 libarchive: update to 2.8.5 Remove patch 0003-Patch-from-upstream-rev-2516.patch because it has been merged to source codes. Signed-off-by: Xiaofeng Yan xiaofeng@windriver.com removing a now obsolete comment because the undistributable content was removed [1] from upstream’s tarball. Also remove an empty line at the end introduced in the above commit. [1] http://code.google.com/p/libarchive/issues/detail?id=162 Signed-off-by: Paul Menzel paulepan...@users.sourceforge.net --- .../libarchive/libarchive_2.8.5.bb |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb index 1bc49e2..5cf13e6 100644 --- a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb +++ b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb @@ -7,8 +7,6 @@ PR = r0 DEPENDS = libxml2 -# We need to repack the tarball due undistributable content on the upstream one. -# More details at http://code.google.com/p/libarchive/issues/detail?id=162 SRC_URI = http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \ file://0001-Patch-from-upstream-revision-1990.patch \ file://0002-Patch-from-upstream-revision-1991.patch \ @@ -24,4 +22,3 @@ SRC_URI[sha256sum] = 13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c inherit autotools lib_package BBCLASSEXTEND = nativesdk - -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 0/5] Various Fixes
Minor clean-up patches. I added a PR bump to the udev-extraconf recipe for the /dev/md issue. Sau! The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839: python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +) 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 Matthew McClintock (1): Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE Paul Menzel (1): libarchive: Remove obsolete comment and empty line at the end Saul Wold (2): Distro_tracking: Update Manual Check Date udev-extraconf: blacklist /dev/md Xiaofeng Yan (1): local.conf.sample.extended: Fix bug 1674 .../conf/distro/include/distro_tracking_fields.inc | 94 meta/conf/local.conf.sample.extended |3 + .../sysvinit/sysvinit-inittab_2.88dsf.bb | 10 ++ meta/recipes-core/udev/files/mount.blacklist |1 + meta/recipes-core/udev/udev-extraconf_0.0.bb |2 +- .../libarchive/libarchive_2.8.5.bb |3 - 6 files changed, 72 insertions(+), 41 deletions(-) -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 4/5] Distro_tracking: Update Manual Check Date
Checked the following Upstreams: apt libaio sysstat unzip zip linexif boost libcheck ncurses sysfsutils util-linux - Offline lsb eds-tools libmad lame glew squashfs-tools Signed-off-by: Saul Wold s...@linux.intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 94 1 files changed, 57 insertions(+), 37 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index c4d33a7..5cd4c37 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -484,7 +484,7 @@ RECIPE_LATEST_VERSION_pn-ncurses = 5.9 RECIPE_LAST_UPDATE_pn-ncurses = Apr 06, 2011 RECIPE_INTEL_SECTION_pn-ncurses = base libs RECIPE_MAINTAINER_pn-ncurses = Saul Wold s...@linux.intel.com -RECIPE_MANUAL_CHECK_DATE_pn-ncurses = Sep 29, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-ncurses = Nov 08, 2011 RECIPE_STATUS_pn-popt = green RECIPE_LAST_UPDATE_pn-popt = Jul 5, 2010 @@ -570,20 +570,22 @@ RECIPE_COMMENTS_pn-tcp-wrappers = Consider looking at ipv6.4 version RECIPE_NO_UPDATE_REASON_pn-tcp-wrapers = 7.6 is last Stable release RECIPE_STATUS_pn-libaio = green +RECIPE_LATEST_VERSION_pn-libaio = 0.3.109 +RECIPE_LATEST_RELEASE_DATE_pn-libaio = Aug 30, 2011 RECIPE_LAST_UPDATE_pn-libaio = Aug 27, 2010 RECIPE_MAINTAINER_pn-libaio = Saul Wold s...@linux.intel.com -RECIPE_LATEST_VERSION_pn-libaio = 0.3.107 -RECIPE_MANUAL_CHECK_DATE_pn-libaio = Jun 6, 2011 -RECIPE_COMMENTS_pn-libaio = 1.0.9 is current unstable +RECIPE_MANUAL_CHECK_DATE_pn-libaio = Nov 8, 2011 +RECIPE_COMMENTS_pn-libaio = RECIPE_STATUS_pn-libcheck = green RECIPE_DEPENDENCY_CHECK_pn-libcheck = done +RECIPE_LATEST_VERSION_pn-libcheck = 0.9.8 +RECIPE_LATEST_RELEASE_DATE_pn-libcheck = Sep 23, 2009 RECIPE_LAST_UPDATE_pn-libcheck = Aug 20, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-libcheck = Nov 8, 2011 RECIPE_MAINTAINER_pn-libcheck = Saul Wold s...@linux.intel.com -RECIPE_LATEST_VERSION_pn-libcheck = 0.9.8 RECIPE_INTEL_SECTION_pn-libcheck = base libs RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcheck = 9 months -RECIPE_LATEST_RELEASE_DATE_pn-libcheck = Sep 01, 2009 RECIPE_COMMENTS_pn-libcheck = DISTRO_PN_ALIAS_pn-libcheck = Ubuntu=check Fedora=check OpenSuSE=check @@ -1171,10 +1173,10 @@ RECIPE_LAST_UPDATE_pn-apr-util = Jul 28, 2011 RECIPE_MAINTAINER_pn-apr-util = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-apt = red -RECIPE_LATEST_VERSION_pn-apt = 0.8.15.8 -RECIPE_LATEST_RELEASE_DATE_pn-apt = Sep 14, 2011 +RECIPE_LATEST_VERSION_pn-apt = 0.8.15.9 +RECIPE_LATEST_RELEASE_DATE_pn-apt = Oct 14, 2011 RECIPE_LAST_UPDATE_pn-apt = Oct 6, 2011 -RECIPE_MAINTAINER_pn-apt = Mei Lei lei@intel.com +RECIPE_MANUAL_CHECK_DATE_pn-apt = Nov 08, 2011 RECIPE_NO_UPDATE_REASON_pn-apt=similar to zypper, defer the upgrading RECIPE_STATUS_pn-chrpath = red @@ -1313,14 +1315,18 @@ RECIPE_LATEST_VERSION_pn-psmisc = 22.13 RECIPE_LAST_UPDATE_pn-psmisc = Jan 18, 2008 RECIPE_MAINTAINER_pn-psmisc = Yu Ke ke...@intel.com -RECIPE_STATUS_pn-boost = red -RECIPE_LATEST_VERSION_pn-boost = 1.44.0 +RECIPE_STATUS_pn-boost = yellow +RECIPE_LATEST_VERSION_pn-boost = 1.47.0 +RECIPE_LATEST_RELEASE_DATE_pn-boost = Jul 12, 2011 RECIPE_LAST_UPDATE_pn-boost = Aug 19, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-boost = Nov 08, 2011 RECIPE_MAINTAINER_pn-boost = Saul Wold s...@linux.intel.com -RECIPE_STATUS_pn-boost-jam-native = red +RECIPE_STATUS_pn-boost-jam-native = green RECIPE_LATEST_VERSION_pn-boost-jam-native = 3.1.18 +RECIPE_LATEST_RELEASE_DATE_pn-boost-jam-native = Mar 22, 2011 RECIPE_LAST_UPDATE_pn-boost-jam-native = Aug 19, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-boost-jam-native = Nov 08, 2011 RECIPE_MAINTAINER_pn-boost-jam-native = Saul Wold s...@linux.intel.com RECIPE_STATUS_pn-libfribidi = red @@ -1453,15 +1459,15 @@ RECIPE_LATEST_RELEASE_DATE_pn-sysvinit = Apr 01, 2010 RECIPE_COMMENTS_pn-sysvinit = RECIPE_STATUS_pn-sysfsutils = green +RECIPE_LATEST_VERSION_pn-sysfsutils = 2.1.0 +RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = Aug 23, 2006 RECIPE_LAST_UPDATE_pn-sysfsutils = Jun 18, 2010 -RECIPE_MAINTAINER_pn-sysfsutils = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = not done -RECIPE_LATEST_VERSION_pn-sysfsutils = 2.1.0 RECIPE_INTEL_SECTION_pn-sysfsutils = base utils RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = n/a -RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = Aug 23, 2006 -RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = Sep 27, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = Nov 08, 2011 RECIPE_COMMENTS_pn-sysfsutils = +RECIPE_MAINTAINER_pn-sysfsutils = Saul Wold s...@linux.intel.com RECIPE_STATUS_pn-curl = green RECIPE_LAST_UPDATE_pn-curl = Sep 30, 2011 @@ -1652,25 +1658,25 @@ RECIPE_LATEST_RELEASE_DATE_pn-pcmciautils = Jan 01, 2010 RECIPE_COMMENTS_pn-pcmciautils = RECIPE_STATUS_pn-unzip = green +RECIPE_LATEST_VERSION_pn-unzip = 6.0 +RECIPE_LATEST_RELEASE_DATE_pn-unzip = Apr 25, 2009
[OE-core] [CONSOLIDATED PULL 1/5] local.conf.sample.extended: Fix bug 1674
From: Xiaofeng Yan xiaofeng@windriver.com [YOCTO #1674] local.conf.sample.extended: An image based on gtk+-directfb don't need x11 for DEFAULT_FEATURES Remove x11 from DEFAULT_FEATURES and add directfb to it because someone could don't need x11 in their project, perhaps gtk over directfb will meet his reqirement. Signed-off-by: Xiaofeng Yan xiaofeng@windriver.com --- meta/conf/local.conf.sample.extended |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index e9935ce..7c26572 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -15,6 +15,9 @@ #DISTRO_FEATURES = alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC} +# If you want to get an image based on gtk+directfb without x11, Please copy this variable to build/conf/local.conf +#DISTRO_FEATURES = alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC} + # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale # packages at build time using qemu-native. Disabling it (by setting it to 0) # will save some build time at the expense of breaking i18n on devices with -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven: This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND It looks that will break a number of things in meta-oe, why was it dropped? * mime.bbclass: - updated coding style - use which to find update-mime-database program rather than hard coded - fix typo in populate_packges_append such that it's actually called Will it drag in the shared-mime-info-data package you created automatically now? Also, do you have matching patches to update meta-oe now that these things are heading into oe-core? regards, Koen signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] openssl 1.0?
Op 9 nov. 2011, om 03:02 heeft Scott Garman het volgende geschreven: Hello, I wanted to get some feedback from the community about OpenSSL 1.0. We currently only support 0.9.8 in oe-core. Specifically: should we add openssl 1.0 to oe-core, and should the rest of our recipes build against it by default? The openssl in meta-oe is working fine, just keep in mind that the SOVERSION changed, so you need a PR bump for everything that links against openssl when switching. regards, Koen signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven: This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND It looks that will break a number of things in meta-oe, why was it dropped? Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed. Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 17/17] python: skip setup.py 'import check' when cross-compiling
Missing PR bump! Op 8 nov. 2011, om 20:22 heeft Saul Wold het volgende geschreven: From: Tom Zanussi tom.zanu...@intel.com build_extension() in setup.py, as part of the build process, does an 'import check' on the built extension. The import check in turn dlopen()'s the shared library associated with the extension, which isn't something that makes sense if that library was cross-compiled for a different architecture. This was noticed with an x86_64 target that was compiled with avx support, because it caused 'illegal instruction' exceptions: | /bin/sh: line 1: 14575 Illegal instruction ... -E ./setup.py -q build For other target architectures, it doesn't necessarily cause illegal instruction exceptions, but still fails. For example, on arm, the failure pathway causes this warning: *** WARNING: renaming cmath since importing it failed: .../cmath.so: wrong ELF class: ELFCLASS32 This patch to setup.py and the associated recipe changes allow the whole 'import check' logic to be skipped when cross-compiling. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- .../python/setup_py_skip_cross_import_check.patch | 27 meta/recipes-devtools/python/python_2.7.2.bb |5 +++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch diff --git a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch new file mode 100644 index 000..6ccdb94 --- /dev/null +++ b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch @@ -0,0 +1,27 @@ +This patch skips over the 'import check' setup.py does when building +extensions. This generally won't work when cross-compiling. + +Upstream-Status: Inappropriate [embedded-specific] + +Signed-off-by: Tom Zanussi tom.zanu...@intel.com + +Index: Python-2.7.2/setup.py +=== +--- Python-2.7.2.orig/setup.py 2011-11-04 16:46:34.553796410 -0500 Python-2.7.2/setup.py2011-11-04 16:59:49.692802313 -0500 +@@ -287,6 +287,15 @@ + (ext.name, sys.exc_info()[1])) + self.failed.append(ext.name) + return ++ ++# If we're cross-compiling, we want to skip the import check ++# i.e. we shouldn't be dynamically loading target shared libs ++if os.environ.get('CROSS_COMPILE') is not None: ++self.announce( ++'WARNING: skipping import check for cross-compiled %s' % ++ext.name) ++return ++ + # Workaround for Mac OS X: The Carbon-based modules cannot be + # reliably imported into a command-line Python + if 'Carbon' in ext.extra_link_args: diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index bb088a4..360e64e 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb @@ -18,6 +18,7 @@ SRC_URI += \ file://multilib.patch \ file://cgi_py.patch \ file://remove_sqlite_rpath.patch \ + file://setup_py_skip_cross_import_check.patch \ S = ${WORKDIR}/Python-${PV} @@ -57,6 +58,8 @@ do_compile() { # then call do_install twice we get Makefile.orig == Makefile.sysroot install -m 0644 Makefile Makefile.sysroot + export CROSS_COMPILE=${TARGET_PREFIX} + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -78,6 +81,8 @@ do_install() { # make install needs the original Makefile, or otherwise the inclues would # go to ${D}${STAGING...}/... install -m 0644 Makefile.orig Makefile + + export CROSS_COMPILE=${TARGET_PREFIX} oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] openssl 1.0?
On Wed, Nov 09, 2011 at 10:28:21AM +0100, Koen Kooi wrote: Op 9 nov. 2011, om 03:02 heeft Scott Garman het volgende geschreven: Hello, I wanted to get some feedback from the community about OpenSSL 1.0. We currently only support 0.9.8 in oe-core. Specifically: should we add openssl 1.0 to oe-core, and should the rest of our recipes build against it by default? The openssl in meta-oe is working fine, just keep in mind that the SOVERSION changed, so you need a PR bump for everything that links against openssl when switching. FWIW I've list of packages to rebuild and manual fix for git-native needed after openssl upgrade. http://wiki.shr-project.org/trac/wiki/Building%20SHR#Cannotparserecipesordo_rootfsafteropensslupgrade Regards, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven: On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven: This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND It looks that will break a number of things in meta-oe, why was it dropped? Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed. Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(. The list of -native needed in meta-gnome: bison-native cairo-native docbook-utils-native flex-native gconf-native gdk-pixbuf-native glib-2.0-native gnome-doc-utils-native gobject-introspection-native gtk-doc-native icon-naming-utils-native intltool-native libffi-native libidl-native libxml-parser-perl-native orbit2-native pango-native perl-native popt-native python-native regards, Koen signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] BB_SIGNATURE_HANDLER = basichash unusable strict?
On Tue, 2011-11-08 at 15:37 +0100, Martin Jansa wrote: Today I've started build from scratch and dediced to give basichash a try (as it is supposed to become default IIRC): So after cleaning tmpdir, sstate cache, pseudo I've started clean build.. 1) bitbake -k gcc-cross | tee -a log.${MACHINE}; 2) bitbake -k virtual/kernel | tee -a log.${MACHINE}; 3) bitbake -k core-image-core | tee -a log.${MACHINE}; 4) bitbake -k shr-lite-image | tee -a log.${MACHINE}; But then I've noticed that after successfull build of gcc-cross in step 1 it started another gcc-* build in step 2.. [...] Ah.. yes I did 2 small patches to libxml2 and openssl between step 1 and step2: http://patchwork.openembedded.org/patch/14521/ http://patchwork.openembedded.org/patch/14519/ But do we want to rebuild everything after every change small like this? The biggest problem we have here is deciding when to rebuild and when not to. Can you define when this should/shouldn't happen? Or is it configuration issue or just bug in sstate implementation? I think its behaving as currently configured. Whether that configuration is right/wrong and what it should be is the question. If we can define the configuration, we can then work out how to implement it which is a separate issue. Btw libxml2 isn't first difference.. I can dig more.. [...] I have few extra patches in my branch so for this particular test case you also need ie http://patchwork.openembedded.org/patch/13699/ But it shouldn't be hard to find similar issue for any other dependency tree (ie with git-native instead of subversion-native). The situation is currently configurable through: BB_HASHTASK_WHITELIST ?= (.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*) however I have to admit looking at the bitbake code handling this its not that simple. The code only triggers for recipes which are not matched by the whitelist. For those not matching, it iterates through their dependencies and removes anything that matches the expression. So effectively it only modified target recipes, removes dependencies matching the above expressions. This isn't an easy problem and this is reminding me I wanted to revisit this code. I think we actually need some kind of double expression to match a regexp against like: depender___depend So we could then do: REGEXP_NONNATIVE = (.*-cross|.*-native|.*-cross-initial|.*-cross-intermediate|virtual:native:.*|virtual:nativesdk:.*) BB_HASHTASK_WHITELIST ?= ^.(?!${REGEXP_NONNATIVE})___${REGEXP_NONNATIVE}$ which would function as above but move more of the control into the code. I was then trying to come up with a further example to extend this but its not scaling. So lets throw away the idea of using regexps and use python. Coding off the top of my head, we could have something like: def filter_dep(depender, depend): # Return True if we should keep the dependency, False to drop it def isNative(x): return x.startswith(virtual:native:) or x.endswith(-native) def isCross(x): return x.endswith(-cross) or x.endswith(-cross-initial) or x.endswith(-cross-intermediate) def isNativeSDK(x): return x.startswith(virtual:nativesdk:) if isNative(depender) or isCross(depender) or isNativeSDK(depender): return True # Only target packages beyond here if isNative(depend) or isCross(depend) or isNativeSDK(depend): return False return True which would then be easy to extend to for example ensure the python dependency on python-native is kept. The siggen code was designed to be a plugin so changing it to the above form isn't the problem. The real problem is deciding what the policy it implements should be. So to go back to the original question, out of those changes you made, which ones would you expect to change the hash and which ones would you not expect to see changes for? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
On Wed, 2011-11-09 at 11:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven: On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven: This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND It looks that will break a number of things in meta-oe, why was it dropped? Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed. Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(. The list of -native needed in meta-gnome: bison-native cairo-native docbook-utils-native flex-native gconf-native gdk-pixbuf-native glib-2.0-native gnome-doc-utils-native gobject-introspection-native gtk-doc-native icon-naming-utils-native intltool-native libffi-native libidl-native libxml-parser-perl-native orbit2-native pango-native perl-native popt-native python-native Many of which are not gnome bbclass derived recipes. I therefore think it makes sense to put the BBCLASSEXTEND in the recipes where its needed and not the core class... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
Op 9 nov. 2011, om 11:35 heeft Richard Purdie het volgende geschreven: On Wed, 2011-11-09 at 11:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven: On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven: This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND It looks that will break a number of things in meta-oe, why was it dropped? Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed. Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(. The list of -native needed in meta-gnome: bison-native cairo-native docbook-utils-native flex-native gconf-native gdk-pixbuf-native glib-2.0-native gnome-doc-utils-native gobject-introspection-native gtk-doc-native icon-naming-utils-native intltool-native libffi-native libidl-native libxml-parser-perl-native orbit2-native pango-native perl-native popt-native python-native Many of which are not gnome bbclass derived recipes. I therefore think it makes sense to put the BBCLASSEXTEND in the recipes where its needed and not the core class... Exactly! I did a lot of dependency cleanup when importing them, so the situation isn't as bad as it was in OE classic. Josh, what kind of test builds did you do for the meta-gnome recipes after moving the classes? regards, Koen signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qt-mobility: qa_configure stage failed
Saul, Even with this patch, I am still seeing Host Contamination issue with all the QtMobility recipes. I performed git pull and then rebuilt all packages. Both qt-mobility recipes built successfully. Do you mean that your build is still failed, or the build is not failed but there are some warnings? If the build is failed, then could you please provide the file .../tmp/work/armv5te-poky-linux-gnueabi/qt-mobility-embedded-1.2.0-r0/qt-mobility-opensource-src-1.2.0/config.log ? Dima Sau! Signed-off-by: Dmitry Cherukhindima...@emcraft.com --- .../qt4/files/qt-mobility-configure.patch | 17 + meta/recipes-qt/qt4/qt-mobility_1.2.0.inc |3 ++- 2 files changed, 19 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-configure.patch diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch new file mode 100644 index 000..d61ec03 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch @@ -0,0 +1,17 @@ +When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib +is used in some Makefiles within configure tests. We manually removed this catalogue. + +Upstream-Status: Inappropriate [embedded] +Signed-off-by: Dmitry Cherukhindima...@emcraft.com + +--- qt-mobility-opensource-src-1.2.0/configure.orig2011-05-10 10:06:01.0 +0200 qt-mobility-opensource-src-1.2.0/configure 2011-11-08 12:34:56.347645968 +0100 +@@ -583,6 +583,8 @@ + fi + + $QMAKE_EXEC $QMKSPEC $relpath/config.tests/$2/$2.pro 2 $CONFIG_LOG $CONFIG_LOG ++cp Makefile Makefile.old ++sed -e 's@-L/usr/lib@@'Makefile.oldMakefile + printf . + $MAKE clean $CONFIG_LOG + printf . diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc index f665e64..11aad8b 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -5,7 +5,8 @@ LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354 -SRC_URI = http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz +SRC_URI = http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \ + file://qt-mobility-configure.patch SRC_URI[md5sum]=ea5db5a8d3dd4709c2926dceda646bd8 SRC_URI[sha256sum]=ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] BB_SIGNATURE_HANDLER = basichash unusable strict?
On Wed, Nov 09, 2011 at 10:32:18AM +, Richard Purdie wrote: On Tue, 2011-11-08 at 15:37 +0100, Martin Jansa wrote: Today I've started build from scratch and dediced to give basichash a try (as it is supposed to become default IIRC): So after cleaning tmpdir, sstate cache, pseudo I've started clean build.. 1) bitbake -k gcc-cross | tee -a log.${MACHINE}; 2) bitbake -k virtual/kernel | tee -a log.${MACHINE}; 3) bitbake -k core-image-core | tee -a log.${MACHINE}; 4) bitbake -k shr-lite-image | tee -a log.${MACHINE}; But then I've noticed that after successfull build of gcc-cross in step 1 it started another gcc-* build in step 2.. [...] Ah.. yes I did 2 small patches to libxml2 and openssl between step 1 and step2: http://patchwork.openembedded.org/patch/14521/ http://patchwork.openembedded.org/patch/14519/ But do we want to rebuild everything after every change small like this? The biggest problem we have here is deciding when to rebuild and when not to. Can you define when this should/shouldn't happen? Or is it configuration issue or just bug in sstate implementation? I think its behaving as currently configured. Whether that configuration is right/wrong and what it should be is the question. If we can define the configuration, we can then work out how to implement it which is a separate issue. Btw libxml2 isn't first difference.. I can dig more.. [...] I have few extra patches in my branch so for this particular test case you also need ie http://patchwork.openembedded.org/patch/13699/ But it shouldn't be hard to find similar issue for any other dependency tree (ie with git-native instead of subversion-native). The situation is currently configurable through: BB_HASHTASK_WHITELIST ?= (.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*) however I have to admit looking at the bitbake code handling this its not that simple. The code only triggers for recipes which are not matched by the whitelist. For those not matching, it iterates through their dependencies and removes anything that matches the expression. So effectively it only modified target recipes, removes dependencies matching the above expressions. This isn't an easy problem and this is reminding me I wanted to revisit this code. I think we actually need some kind of double expression to match a regexp against like: depender___depend So we could then do: REGEXP_NONNATIVE = (.*-cross|.*-native|.*-cross-initial|.*-cross-intermediate|virtual:native:.*|virtual:nativesdk:.*) BB_HASHTASK_WHITELIST ?= ^.(?!${REGEXP_NONNATIVE})___${REGEXP_NONNATIVE}$ which would function as above but move more of the control into the code. I was then trying to come up with a further example to extend this but its not scaling. So lets throw away the idea of using regexps and use python. Coding off the top of my head, we could have something like: def filter_dep(depender, depend): # Return True if we should keep the dependency, False to drop it def isNative(x): return x.startswith(virtual:native:) or x.endswith(-native) def isCross(x): return x.endswith(-cross) or x.endswith(-cross-initial) or x.endswith(-cross-intermediate) def isNativeSDK(x): return x.startswith(virtual:nativesdk:) if isNative(depender) or isCross(depender) or isNativeSDK(depender): return True # Only target packages beyond here if isNative(depend) or isCross(depend) or isNativeSDK(depend): return False return True which would then be easy to extend to for example ensure the python dependency on python-native is kept. The siggen code was designed to be a plugin so changing it to the above form isn't the problem. The real problem is deciding what the policy it implements should be. So to go back to the original question, out of those changes you made, which ones would you expect to change the hash and which ones would you not expect to see changes for? I have talked with kergoth on IRC yesterday and he had very nice remark: 16:40:50 kergoth_ JaMa: heh, the biggest weakness of the sstate signature bits, in my opinion, is that it only tracks inputs, not outputs. If task A depends on B, and the metadata input to B changes, then A will be rebuilt, even if the *output* of B didn't change as a result of the change to its metadata. And with this idea applied on those 2 changes I think that PR change in libxml2 should of course invalidate checksum for sstate-libxml2-native-x86_64-linux-2.7.8-r*populate-sysroot.tgz.siginfo and probably wont hurt so much when neon-native is also rebuilt, but then if the output of neon build is the same with new sstate checksum as it was with older one (I know it's hard to detect ie if some file in build has generation timestamp inside), then we won't continue to rebuild subversion,
[OE-core] bb.data.*Var - d.*Var conversion
I'm tempted to run the following over the metata to convert the bb.data.*Var(...,d) and similar expressions to the form d.*Var(...). Why? We get a lot of people doing copy, paste and edit of the code and this way, we'll increase the chances of them finding better examples. I'm still looking at the diff this generates to see if there are any more corner cases I need to tweak the expression for but feedback welcome. sed \ -e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] [Yocto Bug 1700] Fix for buildstats diskio on non physical disks
On 11/08/2011 04:57 PM, Flanagan, Elizabeth wrote: On Tue, Nov 8, 2011 at 7:53 AM, Wolfram Stering wolfram.ster...@hale.at wrote: On 11/08/2011 03:12 PM, Richard Purdie wrote: On Tue, 2011-11-08 at 11:15 +0100, Wolfram Stering wrote: On 11/02/2011 07:41 AM, Beth Flanagan wrote: From: Elizabeth Flanagan elizabeth.flana...@intel.com tmpfs/encryptfs/ramfs have no entry in /proc/diskstats. This modifies buildstats to not collect diskio statistics when we encounter a case where the os.major/os.minor is not represented with an entry in /proc/diskstats. A similar issue exists for building on a btrfs partition. I posted a message on Oct 28 concerning buildstats on btrfs volumes. The problem there is, that btrfs's stat() reports fake device ids that cannot be found in /proc/diskstats. Did this patch help address that problem for you too? I'll be able to check that tomorrow and report back. It should as the patch will just disable diskio collection if it cannot find a valid device id in /proc/diskstats. Let me know if it doesn't and I'll rework it and resubmit. -b Your patch fixes the buildstats issue for building on a btrfs volume as well. bitbake no longer hits the exception and diskstats are omitted. Theoretically, this information would be available for btrfs, but it is not discoverable in the way buildstats currently collects the disk statistics. However, this is a seaprate issue, I think. Thanks a lot for fixing this, -wolfi -- Wolfram Stering (Entwicklung) HALE electronic GmbH Eugen-Müller-Straße 18, 5020 Salzburg, Austria Tel: +43 (662) 439011 550 Fax: +43 (662) 439011 9 http://www.hale.at/ Firmenbuchnummer: FN 66801m HG Salzburg -- Scanned by MailScanner. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] busybox: add grep to temporary links during uninstall
In the busybox package prerm we set up some temporary links and modify PATH so that certain utilities are provided for the purpose of running update-alternatives; if grep is not among these then you get errors when removing busybox, so add a temporary link for grep as well. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-core/busybox/busybox.inc |1 + meta/recipes-core/busybox/busybox_1.18.5.bb |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index acd635b..f8fee51 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -270,6 +270,7 @@ pkg_prerm_${PN} () { ln -s /bin/busybox $tmpdir/rm ln -s /bin/busybox $tmpdir/sed ln -s /bin/busybox $tmpdir/sort + ln -s /bin/busybox $tmpdir/grep export PATH=$PATH:$tmpdir while read link diff --git a/meta/recipes-core/busybox/busybox_1.18.5.bb b/meta/recipes-core/busybox/busybox_1.18.5.bb index bdafb31..17d583e 100644 --- a/meta/recipes-core/busybox/busybox_1.18.5.bb +++ b/meta/recipes-core/busybox/busybox_1.18.5.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = r1 +PR = r2 SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \ -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] RPM/upgrade fixes
This is the fix for the problem Anders reported on the Yocto mailing list (now filed as Yocto bug #1760). I've checked through usage of postrm/prerm in oe-core and meta-oe and it looks OK to me, but it would help for others to double-check it. I considered whether or not it would be worth bumping PR on every recipe that uses prerm/postrm, however this is a *lot* of recipes. Also included is another fix for a minor issue I discovered when uninstalling busybox. The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839: python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/rmscripts http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/rmscripts Paul Eggleton (2): classes/package_rpm: disable uninstall scripts for upgrades busybox: add grep to temporary links during uninstall meta/classes/package_rpm.bbclass| 18 -- meta/recipes-core/busybox/busybox.inc |1 + meta/recipes-core/busybox/busybox_1.18.5.bb |2 +- 3 files changed, 18 insertions(+), 3 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] classes/package_rpm: disable uninstall scripts for upgrades
Our current assumption (based on the behaviour of opkg) when writing recipes is that prerm and postrm do not get called during an upgrade. When using rpm however, these are mapped to the rpm preun and postun events which occur after postinst for upgrades, and when these contain removal type operations (such as update-alternatives --remove) this causes problems. This patch wraps each preun and postun script for rpm in a check that determines whether or not the script is being called during an upgrade, and skips the entire script if it is, which mimics the behaviour of opkg under the same conditions. Fixes [YOCTO #1760] Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/classes/package_rpm.bbclass | 18 -- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index df5a2db..2679e9f 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -471,6 +471,16 @@ python write_specfile () { else: target.append(path + / + file) + # Prevent the prerm/postrm scripts from being run during an upgrade + def wrap_uninstall(scriptvar): + scr = scriptvar.strip() + if scr.startswith(#!): + pos = scr.find(\n) + 1 + else: + pos = 0 + scr = scr[:pos] + 'if [ $1 = 0 ] ; then\n' + scr[pos:] + '\nfi' + return scr + packages = bb.data.getVar('PACKAGES', d, True) if not packages or packages == '': bb.debug(1, No packages; nothing to do) @@ -671,8 +681,10 @@ python write_specfile () { spec_scriptlets_bottom.append('%%post -n %s' % splitname) elif script == 'prerm': spec_scriptlets_bottom.append('%%preun -n %s' % splitname) + scriptvar = wrap_uninstall(scriptvar) elif script == 'postrm': spec_scriptlets_bottom.append('%%postun -n %s' % splitname) + scriptvar = wrap_uninstall(scriptvar) spec_scriptlets_bottom.append(scriptvar) spec_scriptlets_bottom.append('') @@ -758,11 +770,13 @@ python write_specfile () { spec_scriptlets_top.append('') if srcprerm: spec_scriptlets_top.append('%preun') - spec_scriptlets_top.append(srcprerm) + scriptvar = wrap_uninstall(srcprerm) + spec_scriptlets_top.append(scriptvar) spec_scriptlets_top.append('') if srcpostrm: spec_scriptlets_top.append('%postun') - spec_scriptlets_top.append(srcpostrm) + scriptvar = wrap_uninstall(srcpostrm) + spec_scriptlets_top.append(scriptvar) spec_scriptlets_top.append('') # Write the SPEC file -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] BB_SIGNATURE_HANDLER = basichash unusable strict?
On Wed, 2011-11-09 at 12:51 +0100, Martin Jansa wrote: I have talked with kergoth on IRC yesterday and he had very nice remark: 16:40:50 kergoth_ JaMa: heh, the biggest weakness of the sstate signature bits, in my opinion, is that it only tracks inputs, not outputs. If task A depends on B, and the metadata input to B changes, then A will be rebuilt, even if the *output* of B didn't change as a result of the change to its metadata. And with this idea applied on those 2 changes I think that PR change in libxml2 should of course invalidate checksum for sstate-libxml2-native-x86_64-linux-2.7.8-r*populate-sysroot.tgz.siginfo and probably wont hurt so much when neon-native is also rebuilt, but then if the output of neon build is the same with new sstate checksum as it was with older one (I know it's hard to detect ie if some file in build has generation timestamp inside), then we won't continue to rebuild subversion, gcc, ... all (just because neon was rebuilt due to libxml2 PR change which didn't influence neon output). The same with openssl PR change.. which can cause python-native rebuild, but as long as python-native build output is the same we don't need to rebuild everything which (even transitively) depends on python-native. In an ideal world it would be nice to track the output. I've never seen a proposal for how we could make this work in practise though. There are at least two big problems that spring to mind: a) How do you compare two sets of output and decide whether they're the same? Same list of files? Same contents? How to deal with timestamps? b) You can't know in advance that the output will or won't match and its near impossible to calculate any kind of checksum without having the output available to perform that calculation on. This breaks a lot of the way bitbake runs the builds and makes it hard to compare two configurations. Is A compatible with B? You'd have to build them both to find out. Whilst output tracking sounds nice, I think its trading one set of problems for another and in the end, I'm not sure its the perfect solution it might look like from our current position. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] [Yocto Bug 1700] Fix for buildstats diskio on non physical disks
Op 8 nov. 2011, om 16:57 heeft Flanagan, Elizabeth het volgende geschreven: On Tue, Nov 8, 2011 at 7:53 AM, Wolfram Stering wolfram.ster...@hale.at wrote: On 11/08/2011 03:12 PM, Richard Purdie wrote: On Tue, 2011-11-08 at 11:15 +0100, Wolfram Stering wrote: On 11/02/2011 07:41 AM, Beth Flanagan wrote: From: Elizabeth Flanagan elizabeth.flana...@intel.com tmpfs/encryptfs/ramfs have no entry in /proc/diskstats. This modifies buildstats to not collect diskio statistics when we encounter a case where the os.major/os.minor is not represented with an entry in /proc/diskstats. A similar issue exists for building on a btrfs partition. I posted a message on Oct 28 concerning buildstats on btrfs volumes. The problem there is, that btrfs's stat() reports fake device ids that cannot be found in /proc/diskstats. Did this patch help address that problem for you too? I'll be able to check that tomorrow and report back. It should as the patch will just disable diskio collection if it cannot find a valid device id in /proc/diskstats. Let me know if it doesn't and I'll rework it and resubmit. Related question: what do you use to visualize the buildstats? I heard rumours about getting bootchart to support our format natively, is that the case? I will be needing pretty graphics for a report on the oe-core buildflow in a few weeks :) regards, Koen signature.asc Description: Message signed with OpenPGP using GPGMail ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] BB_SIGNATURE_HANDLER = basichash unusable strict?
On Wed, Nov 09, 2011 at 12:06:23PM +, Richard Purdie wrote: On Wed, 2011-11-09 at 12:51 +0100, Martin Jansa wrote: I have talked with kergoth on IRC yesterday and he had very nice remark: 16:40:50 kergoth_ JaMa: heh, the biggest weakness of the sstate signature bits, in my opinion, is that it only tracks inputs, not outputs. If task A depends on B, and the metadata input to B changes, then A will be rebuilt, even if the *output* of B didn't change as a result of the change to its metadata. And with this idea applied on those 2 changes I think that PR change in libxml2 should of course invalidate checksum for sstate-libxml2-native-x86_64-linux-2.7.8-r*populate-sysroot.tgz.siginfo and probably wont hurt so much when neon-native is also rebuilt, but then if the output of neon build is the same with new sstate checksum as it was with older one (I know it's hard to detect ie if some file in build has generation timestamp inside), then we won't continue to rebuild subversion, gcc, ... all (just because neon was rebuilt due to libxml2 PR change which didn't influence neon output). The same with openssl PR change.. which can cause python-native rebuild, but as long as python-native build output is the same we don't need to rebuild everything which (even transitively) depends on python-native. In an ideal world it would be nice to track the output. I've never seen a proposal for how we could make this work in practise though. There are at least two big problems that spring to mind: a) How do you compare two sets of output and decide whether they're the same? Same list of files? Same contents? How to deal with timestamps? b) You can't know in advance that the output will or won't match and its near impossible to calculate any kind of checksum without having the output available to perform that calculation on. This breaks a lot of the way bitbake runs the builds and makes it hard to compare two configurations. Is A compatible with B? You'd have to build them both to find out. Whilst output tracking sounds nice, I think its trading one set of problems for another and in the end, I'm not sure its the perfect solution it might look like from our current position. This could be completely silly idea and I don't have any tmpdir to check it on real sstate data, but what if we extend sstate-libxml2-native-x86_64-linux-2.7.8-r4-x86_64-2-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.siginfo to contain checksums for every file included in sstate-libxml2-native-x86_64-linux-2.7.8-r4-x86_64-2-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz maybe store them in new extra file like sstate-libxml2-native-x86_64-linux-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.files.siginfo and add only checksum of this file to oridinal siginfo file And then when neon-native do_configure task is in runqueue because of: Hash for dependent task virtual:native:/OE/shr-core/openembedded-core/meta/recipes-core/libxml/libxml2_2.7.8.bb.do_populate_sysroot changed from 85a14f7a73ea96fe85227c5a4bac3f1f to f3bbb2f69cdef3ee60360fbbd6fab311 We'll compare sstate-libxml2-native-x86_64-linux-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.files.siginfo and sstate-libxml2-native-x86_64-linux-f3bbb2f69cdef3ee60360fbbd6fab311_populate-sysroot.tgz.files.siginfo and if they're the same, we can skip neon-native.do_configure and all followning tasks pulled to runqueue just because of libxml2-native PR change. I know this still has a lot of false positives, but we can whitelist some files with something like filesdepsexclude (as vardepsexclude) so that files matching some pattern won't be included in files.siginfo because they contain ie build timestamp (in generated files) or they change name without change of content (like /usr/doc/share/foo-1.0/README could be the same as /usr/doc/share/foo-1.1/README and it's not important for other packages depending on foo). What I fear is that change like this will force rebuild almost from scratch too often to finish build before another such change is pushed in some layer (= cannot do continual builds on current hw anymore) Or that auto-PR-bump thing is going to use same checksum mechanism, so even opkg upgrade will be slower then reflashing the device. And my last thought yesterday was that it would be nice to be able to disable sstate completely, to save some IO (generating sstate-cache and siginfos) for people who know what they're doing (and can rebuild stuff manually when needed), as with basic signature handler it doesn't reuse sstate much in multimachine builds (when everything is built acording to basic signature handler, but sstate checksums are already somewhere else) http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012053.html and when it does reuse sstate package, it sometimes causes troubles http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012149.html
[OE-core] invalid recipe or a bug in bitbake?
Hi, I was trying to buld a simple native-only recipe and ran into a strange problem that can be triggered using theattached test recipe. The actual problem is that do_populate_sysroot fails, although I do not do anything in regard to that in my recipe, I only have a custom do_install. I do not see what I could be doing wrong in the recipe itself, it looks valid to me... but it always triggers the error where tar is getting wrong directories as parameters. I did look into sysroot_stage_dirs() in staging.bbclass, it's basically doing things like: sysroot_stage_dir $from${includedir} $to${includedir} My $from and $to seem to be correct, but the appended dirs seem to be wrong. I did echo ${includedir} and ${includedir_native} in my do_install() in the recipe, and it looked OK there... I did build quite a few packages in this setup already, so it seems that my overall configuration is OK (setup is based angstrom 2010). I am using OE core with bitbake: BitBake Build Tool Core version 1.13.3, bitbake version 1.13.3 Any ideas? Kind regards, Jin DESCRIPTION=test for the sysroot staging error LICENSE=GPL SRC_URI = http://www.deadlock.dhs.org/jin/COPYING; LIC_FILES_CHKSUM = file://${WORKDIR}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f PR=r1 inherit native do_configure() { : } do_install() { install -d ${D}${includedir_native} echo test ${D}${includedir_native}/sometest.h } + cd /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/native-test-0.1 + sysroot_stage_all + sysroot_stage_dirs /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir/ + from=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image + to=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir/ + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include ']' + return + '[' x86_64-linux = x86_64-linux ']' + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin ']' + return + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin ']' + return + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/bin /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/bin + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/bin +
Re: [OE-core] [CONSOLIDATED PULL 17/17] python: skip setup.py 'import check' when cross-compiling
On Wed, 2011-11-09 at 02:34 -0800, Cui, Dexuan wrote: How I wish I could notice the patch this morning so I could save 1 day! ??? Can you please explain what you mean? Anyway, thanks TomZ for the patch! :-) You're welcome, I guess! Tom Thanks, -- Dexuan -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Saul Wold Sent: Wednesday, November 09, 2011 3:23 AM To: openembedded-core@lists.openembedded.org Subject: [OE-core] [CONSOLIDATED PULL 17/17] python: skip setup.py 'import check' when cross-compiling From: Tom Zanussi tom.zanu...@intel.com build_extension() in setup.py, as part of the build process, does an 'import check' on the built extension. The import check in turn dlopen()'s the shared library associated with the extension, which isn't something that makes sense if that library was cross-compiled for a different architecture. This was noticed with an x86_64 target that was compiled with avx support, because it caused 'illegal instruction' exceptions: | /bin/sh: line 1: 14575 Illegal instruction ... -E ./setup.py -q build For other target architectures, it doesn't necessarily cause illegal instruction exceptions, but still fails. For example, on arm, the failure pathway causes this warning: *** WARNING: renaming cmath since importing it failed: .../cmath.so: wrong ELF class: ELFCLASS32 This patch to setup.py and the associated recipe changes allow the whole 'import check' logic to be skipped when cross-compiling. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- .../python/setup_py_skip_cross_import_check.patch | 27 meta/recipes-devtools/python/python_2.7.2.bb |5 +++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check. patch diff --git a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_chec k.patch b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_chec k.patch new file mode 100644 index 000..6ccdb94 --- /dev/null +++ b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_chec k.patch @@ -0,0 +1,27 @@ +This patch skips over the 'import check' setup.py does when building +extensions. This generally won't work when cross-compiling. + +Upstream-Status: Inappropriate [embedded-specific] + +Signed-off-by: Tom Zanussi tom.zanu...@intel.com + +Index: Python-2.7.2/setup.py +== = +--- Python-2.7.2.orig/setup.py 2011-11-04 16:46:34.553796410 -0500 Python-2.7.2/setup.py 2011-11-04 16:59:49.692802313 -0500 +@@ -287,6 +287,15 @@ + (ext.name, sys.exc_info()[1])) + self.failed.append(ext.name) + return ++ ++# If we're cross-compiling, we want to skip the import check ++# i.e. we shouldn't be dynamically loading target shared libs ++if os.environ.get('CROSS_COMPILE') is not None: ++self.announce( ++'WARNING: skipping import check for cross-compiled %s' % ++ext.name) ++return ++ + # Workaround for Mac OS X: The Carbon-based modules cannot be + # reliably imported into a command-line Python + if 'Carbon' in ext.extra_link_args: diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index bb088a4..360e64e 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb @@ -18,6 +18,7 @@ SRC_URI += \ file://multilib.patch \ file://cgi_py.patch \ file://remove_sqlite_rpath.patch \ + file://setup_py_skip_cross_import_check.patch \ S = ${WORKDIR}/Python-${PV} @@ -57,6 +58,8 @@ do_compile() { # then call do_install twice we get Makefile.orig == Makefile.sysroot install -m 0644 Makefile Makefile.sysroot + export CROSS_COMPILE=${TARGET_PREFIX} + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ STAGING_LIBDIR=${STAGING_LIBDIR} \ @@ -78,6 +81,8 @@ do_install() { # make install needs the original Makefile, or otherwise the inclues would # go to ${D}${STAGING...}/... install -m 0644 Makefile.orig Makefile + + export CROSS_COMPILE=${TARGET_PREFIX} oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] BB_SIGNATURE_HANDLER = basichash unusable strict?
On Wed, 2011-11-09 at 13:45 +0100, Martin Jansa wrote: On Wed, Nov 09, 2011 at 12:06:23PM +, Richard Purdie wrote: On Wed, 2011-11-09 at 12:51 +0100, Martin Jansa wrote: I have talked with kergoth on IRC yesterday and he had very nice remark: 16:40:50 kergoth_ JaMa: heh, the biggest weakness of the sstate signature bits, in my opinion, is that it only tracks inputs, not outputs. If task A depends on B, and the metadata input to B changes, then A will be rebuilt, even if the *output* of B didn't change as a result of the change to its metadata. And with this idea applied on those 2 changes I think that PR change in libxml2 should of course invalidate checksum for sstate-libxml2-native-x86_64-linux-2.7.8-r*populate-sysroot.tgz.siginfo and probably wont hurt so much when neon-native is also rebuilt, but then if the output of neon build is the same with new sstate checksum as it was with older one (I know it's hard to detect ie if some file in build has generation timestamp inside), then we won't continue to rebuild subversion, gcc, ... all (just because neon was rebuilt due to libxml2 PR change which didn't influence neon output). The same with openssl PR change.. which can cause python-native rebuild, but as long as python-native build output is the same we don't need to rebuild everything which (even transitively) depends on python-native. In an ideal world it would be nice to track the output. I've never seen a proposal for how we could make this work in practise though. There are at least two big problems that spring to mind: a) How do you compare two sets of output and decide whether they're the same? Same list of files? Same contents? How to deal with timestamps? b) You can't know in advance that the output will or won't match and its near impossible to calculate any kind of checksum without having the output available to perform that calculation on. This breaks a lot of the way bitbake runs the builds and makes it hard to compare two configurations. Is A compatible with B? You'd have to build them both to find out. Whilst output tracking sounds nice, I think its trading one set of problems for another and in the end, I'm not sure its the perfect solution it might look like from our current position. This could be completely silly idea and I don't have any tmpdir to check it on real sstate data, but what if we extend sstate-libxml2-native-x86_64-linux-2.7.8-r4-x86_64-2-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.siginfo to contain checksums for every file included in sstate-libxml2-native-x86_64-linux-2.7.8-r4-x86_64-2-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz maybe store them in new extra file like sstate-libxml2-native-x86_64-linux-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.files.siginfo and add only checksum of this file to oridinal siginfo file And then when neon-native do_configure task is in runqueue because of: Hash for dependent task virtual:native:/OE/shr-core/openembedded-core/meta/recipes-core/libxml/libxml2_2.7.8.bb.do_populate_sysroot changed from 85a14f7a73ea96fe85227c5a4bac3f1f to f3bbb2f69cdef3ee60360fbbd6fab311 We'll compare sstate-libxml2-native-x86_64-linux-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.files.siginfo and sstate-libxml2-native-x86_64-linux-f3bbb2f69cdef3ee60360fbbd6fab311_populate-sysroot.tgz.files.siginfo and if they're the same, we can skip neon-native.do_configure and all followning tasks pulled to runqueue just because of libxml2-native PR change. Two problems spring to mind to start with: a) bitbake could have to checksum the .tgz file each time it runs (yes we can add caches and so on but we've tried to be clever to avoid needing to md5sum data we don't already have) b) I can't calculate in advance what the checksum of a given task should be without executing the task itself and generating the output files to checksum. This means remote sstate packages become effectively useless. I know this still has a lot of false positives, but we can whitelist some files with something like filesdepsexclude (as vardepsexclude) so that files matching some pattern won't be included in files.siginfo because they contain ie build timestamp (in generated files) or they change name without change of content (like /usr/doc/share/foo-1.0/README could be the same as /usr/doc/share/foo-1.1/README and it's not important for other packages depending on foo). I suspect this logic is going to get very difficult to write maintain :(. What I fear is that change like this will force rebuild almost from scratch too often to finish build before another such change is pushed in some layer (= cannot do continual builds on current hw anymore) Or that auto-PR-bump thing is going to use same checksum mechanism, so even opkg upgrade will be slower then reflashing the device. And my
Re: [OE-core] [PATCH 1/1] ncurses: refactor configure to avoid configuring widec when disabled
On 11/09/2011 12:33 AM, Saul Wold wrote: On 11/08/2011 11:08 AM, Darren Hart wrote: The ENABLE_WIDEC variable can be used to disable ncurses wide character support when your C library doesn't support it. Currently, the do_configure step configures for both narrow and wide characters regardless and only checks ENABLE_WIDEC during compilation. This leads to QA failures with host contamination during configure if the C library doesn't support wide characters. Refactor do_configure with a new ncurses_configure helper function and only configure for wide character support if ENABLE_WIDEC is true. Ensure that configure errors are propogated back through to do_configure. Tested with ENABLE_WIDEC as true and false via an ncurses bbappend on i586, including basic error injection. Signed-off-by: Darren Hartdvh...@linux.intel.com --- meta/recipes-core/ncurses/ncurses.inc | 64 +--- 1 files changed, 34 insertions(+), 30 deletions(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index be7d387..d3a9b1c 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -26,6 +26,36 @@ ENABLE_WIDEC = true # builds. BUILD_CPPFLAGS += -D_GNU_SOURCE No PR Bump! Right, duh. Thanks for catching. I've pushed to the same location having added: -INC_PR = r1 +INC_PR = r2 http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=dvhart/tinyid=170541c552017ca784f395a9b52aae6b7c9f3592 Thanks, -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] BB_SIGNATURE_HANDLER = basichash unusable strict?
On Wed, Nov 09, 2011 at 02:13:06PM +, Richard Purdie wrote: On Wed, 2011-11-09 at 13:45 +0100, Martin Jansa wrote: On Wed, Nov 09, 2011 at 12:06:23PM +, Richard Purdie wrote: On Wed, 2011-11-09 at 12:51 +0100, Martin Jansa wrote: I have talked with kergoth on IRC yesterday and he had very nice remark: 16:40:50 kergoth_ JaMa: heh, the biggest weakness of the sstate signature bits, in my opinion, is that it only tracks inputs, not outputs. If task A depends on B, and the metadata input to B changes, then A will be rebuilt, even if the *output* of B didn't change as a result of the change to its metadata. And with this idea applied on those 2 changes I think that PR change in libxml2 should of course invalidate checksum for sstate-libxml2-native-x86_64-linux-2.7.8-r*populate-sysroot.tgz.siginfo and probably wont hurt so much when neon-native is also rebuilt, but then if the output of neon build is the same with new sstate checksum as it was with older one (I know it's hard to detect ie if some file in build has generation timestamp inside), then we won't continue to rebuild subversion, gcc, ... all (just because neon was rebuilt due to libxml2 PR change which didn't influence neon output). The same with openssl PR change.. which can cause python-native rebuild, but as long as python-native build output is the same we don't need to rebuild everything which (even transitively) depends on python-native. In an ideal world it would be nice to track the output. I've never seen a proposal for how we could make this work in practise though. There are at least two big problems that spring to mind: a) How do you compare two sets of output and decide whether they're the same? Same list of files? Same contents? How to deal with timestamps? b) You can't know in advance that the output will or won't match and its near impossible to calculate any kind of checksum without having the output available to perform that calculation on. This breaks a lot of the way bitbake runs the builds and makes it hard to compare two configurations. Is A compatible with B? You'd have to build them both to find out. Whilst output tracking sounds nice, I think its trading one set of problems for another and in the end, I'm not sure its the perfect solution it might look like from our current position. This could be completely silly idea and I don't have any tmpdir to check it on real sstate data, but what if we extend sstate-libxml2-native-x86_64-linux-2.7.8-r4-x86_64-2-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.siginfo to contain checksums for every file included in sstate-libxml2-native-x86_64-linux-2.7.8-r4-x86_64-2-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz maybe store them in new extra file like sstate-libxml2-native-x86_64-linux-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.files.siginfo and add only checksum of this file to oridinal siginfo file And then when neon-native do_configure task is in runqueue because of: Hash for dependent task virtual:native:/OE/shr-core/openembedded-core/meta/recipes-core/libxml/libxml2_2.7.8.bb.do_populate_sysroot changed from 85a14f7a73ea96fe85227c5a4bac3f1f to f3bbb2f69cdef3ee60360fbbd6fab311 We'll compare sstate-libxml2-native-x86_64-linux-85a14f7a73ea96fe85227c5a4bac3f1f_populate-sysroot.tgz.files.siginfo and sstate-libxml2-native-x86_64-linux-f3bbb2f69cdef3ee60360fbbd6fab311_populate-sysroot.tgz.files.siginfo and if they're the same, we can skip neon-native.do_configure and all followning tasks pulled to runqueue just because of libxml2-native PR change. Two problems spring to mind to start with: a) bitbake could have to checksum the .tgz file each time it runs (yes we can add caches and so on but we've tried to be clever to avoid needing to md5sum data we don't already have) checksum for whole .tgz is easy, but is tgz.files.siginfo would be checksum per file (except excluded files), so it would be IMHO easier to store it when we have all required metadata (from time of .tgz creation) then on each time it runs. b) I can't calculate in advance what the checksum of a given task should be without executing the task itself and generating the output files to checksum. This means remote sstate packages become effectively useless. That's why I think that we have to build neon-native (after libxml2-native change) to see that libxml2 change was contained in libxml2 and doesn't influence neon-native output (and then of course everything after neon-native). But it would build only 1 extra step (maybe unneeded) and then stop. And sstate-cache dir will have neon-native siginfo and tgz.files.siginfo for remote builder to find that even with different hash those 2 neon-native populate-sysroot.tgz are compatible. I know this still has a
Re: [OE-core] bb.data.*Var - d.*Var conversion
Hi Richard, On 11/09/2011 03:52 AM, Richard Purdie wrote: I'm tempted to run the following over the metata to convert the bb.data.*Var(...,d) and similar expressions to the form d.*Var(...). Oh yes please! Why? We get a lot of people doing copy, paste and edit of the code and this way, we'll increase the chances of them finding better examples. I'm still looking at the diff this generates to see if there are any more corner cases I need to tweak the expression for but feedback welcome. sed \ -e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \ Be sure to escape your periods, they are single character wildcards. It's unlikely you'll match something else, but better safe than sorry. -e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Why ignore case? I suggest running the grep first redirected to the file, then editing the contents to ensure you don't get things like CHANGELOG and probably be careful with the Documentation. The groups look sane to me. The only other thing I'd make sure to try and watch (not necessarily handle) are multi-line bb.data.[sg]et(Flag)? calls. I suspect there are few enough of them, if any, that they could be managed by hand. -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] python: bump PR
From: Tom Zanussi tom.zanu...@intel.com Commit 23d2eaf9 ('skip setup.py 'import check' when cross-compiling') neglected bumping the PR, this adds it. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- meta/recipes-devtools/python/python_2.7.2.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index 360e64e..5682e05 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = python-native db gdbm openssl readline sqlite3 zlib DEPENDS_sharprom = python-native db readline zlib gdbm openssl -PR = ${INC_PR}.1 +PR = ${INC_PR}.2 DISTRO_SRC_URI ?= file://sitecustomize.py DISTRO_SRC_URI_linuxstdbase = -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] python: fix missing PR bump
From: Tom Zanussi tom.zanu...@intel.com Simple one-liner adding the missing PR bump for my previous python commit. Thanks to Koen Kooi for pointing it out... The following changes since commit 23d2eaf9d283cae47e52d1151f0d4ad53bbbe8a0: Tom Zanussi (1): python: skip setup.py 'import check' when cross-compiling are available in the git repository at: git://git.yoctoproject.org/poky-contrib.git tzanussi/python-pr-bump http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/python-pr-bump Tom Zanussi (1): python: bump PR meta/recipes-devtools/python/python_2.7.2.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
On Tue, 2011-11-08 at 16:53 -0800, Joshua Lock wrote: The D-Bus backend has been integrated into upstream GConf so we can switch to upstream and drop gconf-dbus. I've gone for a release in the 3.2 series as we disable Gtk+, and therefore are not impacted by the gtk+3 changes, and the D-Bus backend was unstable before this release. Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/conf/distro/include/default-providers.inc |2 - meta/conf/multilib.conf|2 +- meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 meta/recipes-gnome/gnome/gconf-dbus_705.bb | 43 -- meta/recipes-gnome/gnome/gconf_3.2.3.bb| 43 ++ 5 files changed, 103 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index be23d36..afea5e7 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth # PREFERRED_PROVIDER_dbus-glib ?= dbus-glib PREFERRED_PROVIDER_dbus-glib-native ?= dbus-glib-native -PREFERRED_PROVIDER_gconf ?= gconf-dbus -PREFERRED_PROVIDER_gconf-native ?= gconf-dbus-native PREFERRED_PROVIDER_gdk-pixbuf ?= gdk-pixbuf PREFERRED_PROVIDER_libgcc ?= libgcc PREFERRED_PROVIDER_libgcc-nativesdk ?= libgcc-nativesdk diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 5e4b435..de53540 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = ${MULTILIBS} BBCLASSEXTEND_append_pn-gcc-cross-intermediate = ${MULTILIBS} BBCLASSEXTEND_append_pn-gcc-cross = ${MULTILIBS} BBCLASSEXTEND_append_pn-gcc-runtime = ${MULTILIBS} -BBCLASSEXTEND_append_pn-gconf-dbus = ${MULTILIBS} +BBCLASSEXTEND_append_pn-gconf = ${MULTILIBS} BBCLASSEXTEND_append_pn-gdbm = ${MULTILIBS} BBCLASSEXTEND_append_pn-gdb = ${MULTILIBS} BBCLASSEXTEND_append_pn-gdk-pixbuf = ${MULTILIBS} diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch new file mode 100644 index 000..29181e3 --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch @@ -0,0 +1,59 @@ +This is a hacky way to prevent GConf from trying to build the introspection related pieces. +Clearly not appropriate for upstream. + +Upstream-Status: Inappropriate + +Signed-off-by: Joshua Lock j...@linux.intel.com + +Index: GConf-3.2.2/gconf/Makefile.am +=== +--- GConf-3.2.2.orig/gconf/Makefile.am GConf-3.2.2/gconf/Makefile.am +@@ -145,34 +145,6 @@ libgconf_2_la_LDFLAGS = -version-info $( + + libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS) + +--include $(INTROSPECTION_MAKEFILE) +-INTROSPECTION_GIRS = +-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) +-INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir) +- +-if HAVE_INTROSPECTION +-introspection_files = \ +-$(gconfinclude_HEADERS) \ +-$(filter-out $(CORBA_SOURCECODE), $(filter %.c,$(libgconf_2_la_SOURCES))) +-GConf-2.0.gir: libgconf-2.la Makefile +-GConf_2_0_gir_INCLUDES = GObject-2.0 +-GConf_2_0_gir_CFLAGS = \ +-$(INCLUDES) +-GConf_2_0_gir_LIBS = libgconf-2.la +-GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +-GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf --c-include gconf/gconf.h +-GConf_2_0_gir_EXPORT_PACKAGES = gconf-2.0 +-INTROSPECTION_GIRS += GConf-2.0.gir +- +-girdir = $(datadir)/gir-1.0/ +-gir_DATA = $(INTROSPECTION_GIRS) +- +-typelibsdir = $(libdir)/girepository-1.0/ +-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +- +-CLEANFILES += $(gir_DATA) $(typelibs_DATA) +-endif +- + EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh + + default.path: $(srcdir)/default.path.in +Index: GConf-3.2.2/configure.in +=== +--- GConf-3.2.2.orig/configure.in GConf-3.2.2/configure.in +@@ -354,8 +354,6 @@ AM_GLIB_GNU_GETTEXT + + AC_CHECK_FUNCS(bind_textdomain_codeset) + +-GOBJECT_INTROSPECTION_CHECK([0.9.5]) +- + AC_SUBST(CFLAGS) + AC_SUBST(CPPFLAGS) + AC_SUBST(LDFLAGS) diff --git a/meta/recipes-gnome/gnome/gconf-dbus_705.bb b/meta/recipes-gnome/gnome/gconf-dbus_705.bb deleted file mode 100644 index 52e8a08..000 ---
Re: [OE-core] bb.data.*Var - d.*Var conversion
On Wed, Nov 9, 2011 at 7:59 AM, Darren Hart dvh...@linux.intel.com wrote: Hi Richard, On 11/09/2011 03:52 AM, Richard Purdie wrote: I'm tempted to run the following over the metata to convert the bb.data.*Var(...,d) and similar expressions to the form d.*Var(...). Oh yes please! Why? We get a lot of people doing copy, paste and edit of the code and this way, we'll increase the chances of them finding better examples. I'm still looking at the diff this generates to see if there are any more corner cases I need to tweak the expression for but feedback welcome. sed \ -e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \ Be sure to escape your periods, they are single character wildcards. It's unlikely you'll match something else, but better safe than sorry. -e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Why ignore case? I suggest running the grep first redirected to the file, then editing the contents to ensure you don't get things like CHANGELOG and probably be careful with the Documentation. The groups look sane to me. The only other thing I'd make sure to try and watch (not necessarily handle) are multi-line bb.data.[sg]et(Flag)? calls. I suspect there are few enough of them, if any, that they could be managed by hand. Heh, too bad bitbake doesn't know how to emit metadata back out from its ast. This seems like it'd be an ideal case for writing a custom 2to3 fixer rather than using sed. It would catch the multi-line case you mention, since it lets you specify grammatical patterns against the python parse tree and do transforms against it. -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] invalid recipe or a bug in bitbake?
One small addition: I tried removing inherit native from my test-recipe and added: BBCLASSEXTEND = native bitbake native-test did build without problems. However, bitbake native-test-native aborted with exactly the same issue, as I described in my previous mail. I hope this detail helps in hinting where the problem might be... so far I could not figure it out myself. Kind regards, Jin On Wed, Nov 09, 2011 at 02:04:24PM +0100, Sergey 'Jin' Bostandzhyan wrote: Hi, I was trying to buld a simple native-only recipe and ran into a strange problem that can be triggered using theattached test recipe. The actual problem is that do_populate_sysroot fails, although I do not do anything in regard to that in my recipe, I only have a custom do_install. I do not see what I could be doing wrong in the recipe itself, it looks valid to me... but it always triggers the error where tar is getting wrong directories as parameters. I did look into sysroot_stage_dirs() in staging.bbclass, it's basically doing things like: sysroot_stage_dir $from${includedir} $to${includedir} My $from and $to seem to be correct, but the appended dirs seem to be wrong. I did echo ${includedir} and ${includedir_native} in my do_install() in the recipe, and it looked OK there... I did build quite a few packages in this setup already, so it seems that my overall configuration is OK (setup is based angstrom 2010). I am using OE core with bitbake: BitBake Build Tool Core version 1.13.3, bitbake version 1.13.3 Any ideas? Kind regards, Jin DESCRIPTION=test for the sysroot staging error LICENSE=GPL SRC_URI = http://www.deadlock.dhs.org/jin/COPYING; LIC_FILES_CHKSUM = file://${WORKDIR}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f PR=r1 inherit native do_configure() { : } do_install() { install -d ${D}${includedir_native} echo test ${D}${includedir_native}/sometest.h } + cd /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/native-test-0.1 + sysroot_stage_all + sysroot_stage_dirs /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir/ + from=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image + to=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir/ + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include ']' + return + '[' x86_64-linux = x86_64-linux ']' + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin ']' + return + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin ']' + return + sysroot_stage_dir
Re: [OE-core] [oe-core 1/6] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe
On Tue, Nov 08, 2011 at 11:15:56AM -0800, Saul Wold wrote: On 11/07/2011 06:19 AM, Martin Jansa wrote: * virtual/libsdl is used in sdl.bbclass but nothing was providing it * rpath disabled because otherwise libtool and ld try to link against ${libdir}/libdl.so.2 on the host (see OE-classic commit af1a2e0e7626e372f22afbcabf08d9ae6b0d7b01) Signed-off-by: Martin Jansamartin.ja...@gmail.com --- meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 18 -- 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb index 6b23344..17a3103 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb @@ -10,10 +10,12 @@ SECTION = libs LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4 -DEPENDS = ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender +PROVIDES = virtual/libsdl + +DEPENDS = ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk Shouldn't the enabling of alsa be based on the DISTRO_FEATURE of alsa? OK I'll send patch changing this and opengl to PACKAGECONFIG options. Sau! -PR = r0 +PR = r1 SRC_URI = http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://configure_tweak.patch \ @@ -26,25 +28,29 @@ SRC_URI[sha256sum] = 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642 inherit autotools binconfig pkgconfig -EXTRA_OECONF = --disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \ ---enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \ +EXTRA_OECONF = --disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ +--enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ ---enable-input-events --enable-pthreads \ +--enable-input-events --enable-input-tslib --enable-pthreads \ ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ --disable-video-svga \ ---disable-video-picogui --disable-video-qtopia --enable-dlopen +--disable-video-picogui --disable-video-qtopia --enable-dlopen \ +--disable-rpath PARALLEL_MAKE = +EXTRA_AUTORECONF += --include=acinclude --exclude=autoheader + do_configure_prepend() { # Remove old libtool macros. MACROS=libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 for i in ${MACROS}; do rm -f acinclude/$i done +export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } BBCLASSEXTEND = nativesdk -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] invalid recipe or a bug in bitbake?
Sorry for the spam, me again :P It seems that the trick is to use: ${D}/${includedir} in do_install(), then the error disappears. So as far as my issue is concerned, the problem is resolved now. Kind regards, Jin On Wed, Nov 09, 2011 at 04:38:41PM +0100, Sergey 'Jin' Bostandzhyan wrote: One small addition: I tried removing inherit native from my test-recipe and added: BBCLASSEXTEND = native bitbake native-test did build without problems. However, bitbake native-test-native aborted with exactly the same issue, as I described in my previous mail. I hope this detail helps in hinting where the problem might be... so far I could not figure it out myself. Kind regards, Jin On Wed, Nov 09, 2011 at 02:04:24PM +0100, Sergey 'Jin' Bostandzhyan wrote: Hi, I was trying to buld a simple native-only recipe and ran into a strange problem that can be triggered using theattached test recipe. The actual problem is that do_populate_sysroot fails, although I do not do anything in regard to that in my recipe, I only have a custom do_install. I do not see what I could be doing wrong in the recipe itself, it looks valid to me... but it always triggers the error where tar is getting wrong directories as parameters. I did look into sysroot_stage_dirs() in staging.bbclass, it's basically doing things like: sysroot_stage_dir $from${includedir} $to${includedir} My $from and $to seem to be correct, but the appended dirs seem to be wrong. I did echo ${includedir} and ${includedir_native} in my do_install() in the recipe, and it looked OK there... I did build quite a few packages in this setup already, so it seems that my overall configuration is OK (setup is based angstrom 2010). I am using OE core with bitbake: BitBake Build Tool Core version 1.13.3, bitbake version 1.13.3 Any ideas? Kind regards, Jin DESCRIPTION=test for the sysroot staging error LICENSE=GPL SRC_URI = http://www.deadlock.dhs.org/jin/COPYING; LIC_FILES_CHKSUM = file://${WORKDIR}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f PR=r1 inherit native do_configure() { : } do_install() { install -d ${D}${includedir_native} echo test ${D}${includedir_native}/sometest.h } + cd /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/native-test-0.1 + sysroot_stage_all + sysroot_stage_dirs /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir/ + from=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image + to=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir/ + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/include ']' + return + '[' x86_64-linux = x86_64-linux ']' + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + src=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + dest=/dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin + '[' '!' -d /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/bin ']' + return + sysroot_stage_dir /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/image/dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin /dss-oe/angstrom-devel-build-eglibc/work/x86_64-linux/native-test-0.1-r1/sysroot-destdir//dss-oe/angstrom-devel-build-eglibc/sysroots/x86_64-linux/usr/sbin +
[OE-core] [PATCH 1/1] linux-yocto: config cleanups + romely rt support
Updating the meta branch SRCREV to pickup a series of BSP cleanups and add -rt support to the romely. ae3e64c meta/romley: Add rt support Add rt support to the meta branch for romley. 6c78969 meta/fishriver: enable hpet bc4452a meta/jasperforest: use power/intel feature 6e9634e meta/fri2: use power/intel feature ec949f5 meta/fishriver: use power/intel feature Signed-off-by: Tom Zanussi tom.zanu...@intel.com Signed-off-by: Kishore Bodke kishore.k.bo...@intel.com Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto_3.0.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 688999f..ed93fbe 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= 16eb6506148ff163cfc4f4516110275726831014 SRCREV_machine_qemux86 ?= fea3842615c13a54180b6600783b222f499002ef SRCREV_machine_qemux86-64 ?= 5f86f8f0a3102e1c7d0164abefcd50d825aa468f SRCREV_machine ?= a811486d28dd9b0e1af0672a65ad9fa97873b82a -SRCREV_meta ?= 4095bb597a7bcd647856aa35b5fb8637ed7ff975 +SRCREV_meta ?= ae3e64c077972fe87f09946bd215620df68ca327 PR = r2 PV = ${LINUX_VERSION}+git${SRCPV} -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] linux-yocto: config cleanups + romely rt support
The patch itself has all the details for this one. Just a minor update to the meta branch of the 3.0 kernel to pickup the latest BSP config updates from Tom and add -rt support from Kishore. These are also present in the -dev kernel tree. Cheers, Bruce cc: Tom Zanussi tom.zanu...@intel.com cc: Kishore Bodke kishore.k.bo...@intel.com The following changes since commit 23d2eaf9d283cae47e52d1151f0d4ad53bbbe8a0: python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:48:30 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (1): linux-yocto: config cleanups + romely rt support meta/recipes-kernel/linux/linux-yocto_3.0.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] invalid recipe or a bug in bitbake?
On 11/09/2011 05:04 AM, Sergey 'Jin' Bostandzhyan wrote: Hi, I was trying to buld a simple native-only recipe and ran into a strange problem that can be triggered using theattached test recipe. The actual problem is that do_populate_sysroot fails, although I do not do anything in regard to that in my recipe, I only have a custom do_install. I do not see what I could be doing wrong in the recipe itself, it looks valid to me... but it always triggers the error where tar is getting wrong directories as parameters. I did look into sysroot_stage_dirs() in staging.bbclass, it's basically doing things like: sysroot_stage_dir $from${includedir} $to${includedir} My $from and $to seem to be correct, but the appended dirs seem to be wrong. I did echo ${includedir} and ${includedir_native} in my do_install() in the recipe, and it looked OK there... I understand you solved your problem, but I have a follow-up question/comment for you. Based on your solution, it would be interesting to see the output of bitbake -e native-test both before and after your change to to adding the / and also the BBCLASSEXTEND change. I do not think that the BBCLASSEXTEND change is correct, since you do really only want a native built not a target and native. You should just be using ${includedir} directly in your do_install() since the native.bbclass fixes the ${exec_prefix} which ${includedir} uses. Give that a try and you can use bitbake -e to check the variables. Sau! I did build quite a few packages in this setup already, so it seems that my overall configuration is OK (setup is based angstrom 2010). I am using OE core with bitbake: BitBake Build Tool Core version 1.13.3, bitbake version 1.13.3 Any ideas? Kind regards, Jin ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 00/10] Merge more stuff from meta-oe
v2: 3 more libsdl patches based on sgw review to cleanup libsdl dir and use PACKAGECONFIG The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839: python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/pull2 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2 Martin Jansa (10): kbd: import from meta-oe kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all keymaps: depend on kbd instead of console-tools task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and graphical_init_manager libsdl: drop unused files libsdl: rename files dir to libsdl-1.2.14 for faster lookup libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES libsdl: replace tabs with spaces meta/recipes-bsp/keymaps/keymaps_1.0.bb|9 +++- meta/recipes-core/kbd/kbd_1.15.2.bb| 24 + meta/recipes-core/tasks/task-core-boot.bb |6 ++- .../libsdl/files/directfb_obsolete_calls.patch | 35 .../recipes-graphics/libsdl/files/extra-keys.patch | 55 .../{files = libsdl-1.2.14}/configure_tweak.patch |0 meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 28 +++--- meta/recipes-sato/tasks/task-core-x11.bb | 10 +++- 8 files changed, 62 insertions(+), 105 deletions(-) create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb delete mode 100644 meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch delete mode 100644 meta/recipes-graphics/libsdl/files/extra-keys.patch rename meta/recipes-graphics/libsdl/{files = libsdl-1.2.14}/configure_tweak.patch (100%) -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 01/10] kbd: import from meta-oe
* replaces console-tools used in keymaps Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-core/kbd/kbd_1.15.2.bb | 19 +++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb new file mode 100644 index 000..36e68a0 --- /dev/null +++ b/meta/recipes-core/kbd/kbd_1.15.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = This package contains keytable files and keyboard utilities +# everything minus console-fonts is GPLv2+ +LICENSE = GPLv2+ +LIC_FILES_CHKSUM = file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb + +inherit autotools gettext + +BBCLASSEXTEND = native + +SRC_URI=${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2 +SRC_URI[md5sum] = e850eb91e4d3b94b194efe8e953204c5 +SRC_URI[sha256sum] = b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6 + +PACKAGES += ${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans + +FILES_${PN}-consolefonts = ${datadir}/consolefonts +FILES_${PN}-consoletrans = ${datadir}/consoletrans +FILES_${PN}-keymaps = ${datadir}/keymaps +FILES_${PN}-unimaps = ${datadir}/unimaps -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 02/10] kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-core/kbd/kbd_1.15.2.bb |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb index 36e68a0..2e0406b 100644 --- a/meta/recipes-core/kbd/kbd_1.15.2.bb +++ b/meta/recipes-core/kbd/kbd_1.15.2.bb @@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb inherit autotools gettext BBCLASSEXTEND = native +RREPLACES_${PN} = console-tools +RPROVIDES_${PN} = console-tools +RCONFLICTS_${PN} = console-tools + +PR = r1 SRC_URI=${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2 SRC_URI[md5sum] = e850eb91e4d3b94b194efe8e953204c5 -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 03/10] task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-bsp/keymaps/keymaps_1.0.bb |6 +- meta/recipes-core/tasks/task-core-boot.bb |6 -- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index 23a3051..4fe7987 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb @@ -1,7 +1,11 @@ SUMMARY = Keyboard maps DESCRIPTION = Keymaps and initscript to set the keymap on bootup. SECTION = base -RDEPENDS_${PN} = initscripts console-tools + +# Distro can override initscripts provider +VIRTUAL-RUNTIME_initscripts ?= initscripts + +RDEPENDS_${PN} = ${VIRTUAL-RUNTIME_initscripts} console-tools LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe PACKAGE_ARCH = ${MACHINE_ARCH} diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb index 9e63ebb..05c280d 100644 --- a/meta/recipes-core/tasks/task-core-boot.bb +++ b/meta/recipes-core/tasks/task-core-boot.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PACKAGE_ARCH = ${MACHINE_ARCH} DEPENDS = virtual/kernel ALLOW_EMPTY = 1 -PR = r8 +PR = r9 # # Set by the machine configuration with packages essential for device bootup @@ -23,6 +23,8 @@ VIRTUAL-RUNTIME_dev_manager ?= udev VIRTUAL-RUNTIME_login_manager ?= tinylogin # Distro can override init_manager provider VIRTUAL-RUNTIME_init_manager ?= sysvinit +# Distro can override initscripts provider +VIRTUAL-RUNTIME_initscripts ?= initscripts PACKAGES = \ task-core-boot \ @@ -34,7 +36,7 @@ RDEPENDS_task-core-boot = \ base-files \ base-passwd \ busybox \ -initscripts \ +${VIRTUAL-RUNTIME_initscripts} \ ${@base_contains(MACHINE_FEATURES, keyboard, keymaps, , d)} \ modutils-initscripts \ netbase \ -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 04/10] keymaps: depend on kbd instead of console-tools
* nowadays kbd seems more active Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-bsp/keymaps/keymaps_1.0.bb |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index 4fe7987..1876db8 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb @@ -5,11 +5,12 @@ SECTION = base # Distro can override initscripts provider VIRTUAL-RUNTIME_initscripts ?= initscripts -RDEPENDS_${PN} = ${VIRTUAL-RUNTIME_initscripts} console-tools +RDEPENDS_${PN} = ${VIRTUAL-RUNTIME_initscripts} kbd + LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe PACKAGE_ARCH = ${MACHINE_ARCH} -PR = r19 +PR = r20 INHIBIT_DEFAULT_DEPS = 1 -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 05/10] task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and graphical_init_manager
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-sato/tasks/task-core-x11.bb | 10 -- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb index 26d550a..106bc0f 100644 --- a/meta/recipes-sato/tasks/task-core-x11.bb +++ b/meta/recipes-sato/tasks/task-core-x11.bb @@ -30,6 +30,12 @@ ALLOW_EMPTY = 1 FILEMANAGER ?= pcmanfm FILEMANAGER_mips ?= +# xserver-common, x11-common +VIRTUAL-RUNTIME_xserver_common ?= x11-common + +# elsa, xserver-nodm-init +VIRTUAL-RUNTIME_graphical_init_manager ?= xserver-nodm-init + RDEPENDS_task-core-x11-base = \ dbus \ @@ -42,8 +48,8 @@ RDEPENDS_task-core-x11-base = \ matchbox-desktop \ matchbox-session \ ${XSERVER} \ -x11-common \ -xserver-nodm-init \ +${VIRTUAL-RUNTIME_xserver_common} \ +${VIRTUAL-RUNTIME_graphical_init_manager} \ liberation-fonts \ xauth \ xhost \ -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 06/10] libsdl: drop unused files
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../libsdl/files/directfb_obsolete_calls.patch | 35 .../recipes-graphics/libsdl/files/extra-keys.patch | 55 2 files changed, 0 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch delete mode 100644 meta/recipes-graphics/libsdl/files/extra-keys.patch diff --git a/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch b/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch deleted file mode 100644 index 3c526a6..000 --- a/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Pending - tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:40:38.0 -0500 -+++ SDL/src/video/directfb/SDL_DirectFB_video.c2007-02-18 11:00:07.0 -0500 -@@ -376,7 +376,7 @@ - { - int i; - DFBResultret; -- DFBCardCapabilities caps; -+ DFBGraphicsDeviceDescription caps; - DFBDisplayLayerConfigdlc; - struct DirectFBEnumRect *rect; - IDirectFB *dfb= NULL; -@@ -448,7 +448,7 @@ - - - /* Query card capabilities to get the video memory size */ -- dfb-GetCardCapabilities (dfb, caps); -+ dfb-GetDeviceDescription (dfb, caps); - - this-info.wm_available = 1; - this-info.hw_available = 1; -diff -u'rNF^function' tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_Direct -/SDL_DirectFB_events.c tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_events.c 2004-0 -+++ SDL/src/video/directfb/SDL_DirectFB_events.c2007-02-18 11:00:07.0 -0500 -@@ -161,7 +161,7 @@ - keymap[DIKI_SHIFT_L - DIKI_UNKNOWN] = SDLK_LSHIFT; - keymap[DIKI_SHIFT_R - DIKI_UNKNOWN] = SDLK_RSHIFT; - keymap[DIKI_ALT_L - DIKI_UNKNOWN] = SDLK_LALT; -- keymap[DIKI_ALTGR - DIKI_UNKNOWN] = SDLK_RALT; -+ keymap[DIKI_ALT_R - DIKI_UNKNOWN] = SDLK_RALT; - keymap[DIKI_TAB - DIKI_UNKNOWN] = SDLK_TAB; - keymap[DIKI_ENTER - DIKI_UNKNOWN] = SDLK_RETURN; - keymap[DIKI_SPACE - DIKI_UNKNOWN] = SDLK_SPACE; diff --git a/meta/recipes-graphics/libsdl/files/extra-keys.patch b/meta/recipes-graphics/libsdl/files/extra-keys.patch deleted file mode 100644 index 745b04e..000 --- a/meta/recipes-graphics/libsdl/files/extra-keys.patch +++ /dev/null @@ -1,55 +0,0 @@ -Upstream-Status: Pending - -diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/include/SDL_keysym.h libsdl1.2-1.2.4-arm/include/SDL_keysym.h libsdl1.2-1.2.4/include/SDL_keysym.h 2002-03-06 11:23:01.0 + -+++ libsdl1.2-1.2.4-arm/include/SDL_keysym.h 2002-11-08 20:43:09.0 + -@@ -286,6 +286,12 @@ typedef enum { - SDLK_EURO = 321, /* Some european keyboards */ - SDLK_UNDO = 322, /* Atari keyboard has Undo */ - -+ SDLK_RECORD = 322, -+ SDLK_CALENDAR = 323, -+ SDLK_TELEPHONE = 324, -+ SDLK_MAIL = 325, -+ SDLK_START = 326, -+ - /* Add any other keys here */ - - SDLK_LAST -diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c 2002-03-06 11:23:08.0 + -+++ libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c 2002-11-08 21:01:41.0 + -@@ -34,6 +34,7 @@ static char rcsid = - #include X11/Xlib.h - #include X11/Xutil.h - #include X11/keysym.h -+#include X11/XF86keysym.h - #ifdef __SVR4 - #include X11/Sunkeysym.h - #endif -@@ -655,6 +656,25 @@ SDL_keysym *X11_TranslateKey(Display *di - case 0xFF: - keysym-sym = MISC_keymap[xsym0xFF]; - break; -+ case 0x1008ff: -+ switch (xsym) { -+ case XF86XK_AudioRecord: -+ keysym-sym = SDLK_RECORD; -+ break; -+ case XF86XK_PowerDown: -+ keysym-sym = SDLK_POWER; -+ break; -+ case XF86XK_Calendar: -+ keysym-sym = SDLK_CALENDAR; -+ break; -+ case XF86XK_Mail: -+ keysym-sym = SDLK_MAIL; -+ break; -+ case XF86XK_Start: -+ keysym-sym =
[OE-core] [PATCHv2][oe-core 07/10] libsdl: rename files dir to libsdl-1.2.14 for faster lookup
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../{files = libsdl-1.2.14}/configure_tweak.patch |0 1 files changed, 0 insertions(+), 0 deletions(-) rename meta/recipes-graphics/libsdl/{files = libsdl-1.2.14}/configure_tweak.patch (100%) diff --git a/meta/recipes-graphics/libsdl/files/configure_tweak.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch similarity index 100% rename from meta/recipes-graphics/libsdl/files/configure_tweak.patch rename to meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 08/10] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe
* virtual/libsdl is used in sdl.bbclass but nothing was providing it * rpath disabled because otherwise libtool and ld try to link against ${libdir}/libdl.so.2 on the host (see OE-classic commit af1a2e0e7626e372f22afbcabf08d9ae6b0d7b01) Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 18 -- 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb index 6b23344..17a3103 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb @@ -10,10 +10,12 @@ SECTION = libs LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4 -DEPENDS = ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender +PROVIDES = virtual/libsdl + +DEPENDS = ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk -PR = r0 +PR = r1 SRC_URI = http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://configure_tweak.patch \ @@ -26,25 +28,29 @@ SRC_URI[sha256sum] = 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642 inherit autotools binconfig pkgconfig -EXTRA_OECONF = --disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \ ---enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \ +EXTRA_OECONF = --disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ +--enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ ---enable-input-events --enable-pthreads \ +--enable-input-events --enable-input-tslib --enable-pthreads \ ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ --disable-video-svga \ ---disable-video-picogui --disable-video-qtopia --enable-dlopen +--disable-video-picogui --disable-video-qtopia --enable-dlopen \ +--disable-rpath PARALLEL_MAKE = +EXTRA_AUTORECONF += --include=acinclude --exclude=autoheader + do_configure_prepend() { # Remove old libtool macros. MACROS=libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 for i in ${MACROS}; do rm -f acinclude/$i done +export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } BBCLASSEXTEND = nativesdk -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 09/10] libsdl: enable alsa/opengl based on PACKAGECONFIG and respect DISTRO_FEATURES
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb index 17a3103..2f49f16 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4 PROVIDES = virtual/libsdl -DEPENDS = ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib +DEPENDS = virtual/libx11 libxext libxrandr libxrender tslib DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk PR = r1 @@ -29,17 +29,21 @@ SRC_URI[sha256sum] = 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642 inherit autotools binconfig pkgconfig EXTRA_OECONF = --disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ ---enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \ +--enable-file --disable-oss --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ --enable-input-events --enable-input-tslib --enable-pthreads \ - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ --disable-video-svga \ --disable-video-picogui --disable-video-qtopia --enable-dlopen \ --disable-rpath +PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} +PACKAGECONFIG[alsa] = --enable-alsa,--disable-alsa,alsa-lib, +PACKAGECONFIG[opengl] = --enable-video-opengl,--disable-video-opengl,virtual/libgl, + PARALLEL_MAKE = EXTRA_AUTORECONF += --include=acinclude --exclude=autoheader -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2][oe-core 10/10] libsdl: replace tabs with spaces
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-graphics/libsdl/libsdl_1.2.14.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb index 2f49f16..b1b2137 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb @@ -18,7 +18,7 @@ DEPENDS_virtclass-nativesdk = libx11-nativesdk libxrandr-nativesdk libxrender-n PR = r1 SRC_URI = http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://configure_tweak.patch \ + file://configure_tweak.patch \ S = ${WORKDIR}/SDL-${PV} @@ -35,7 +35,7 @@ EXTRA_OECONF = --disable-static --disable-debug --enable-cdrom --enable-threads --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \ --disable-video-xbios --disable-video-gem --disable-video-dummy \ --enable-input-events --enable-input-tslib --enable-pthreads \ - --disable-video-svga \ +--disable-video-svga \ --disable-video-picogui --disable-video-qtopia --enable-dlopen \ --disable-rpath -- 1.7.8.rc1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] [Yocto Bug 1700] Fix for buildstats diskio on non physical disks
On Wed, Nov 9, 2011 at 4:00 AM, Wolfram Stering wolfram.ster...@hale.at wrote: On 11/08/2011 04:57 PM, Flanagan, Elizabeth wrote: On Tue, Nov 8, 2011 at 7:53 AM, Wolfram Stering wolfram.ster...@hale.at wrote: On 11/08/2011 03:12 PM, Richard Purdie wrote: On Tue, 2011-11-08 at 11:15 +0100, Wolfram Stering wrote: On 11/02/2011 07:41 AM, Beth Flanagan wrote: From: Elizabeth Flanagan elizabeth.flana...@intel.com tmpfs/encryptfs/ramfs have no entry in /proc/diskstats. This modifies buildstats to not collect diskio statistics when we encounter a case where the os.major/os.minor is not represented with an entry in /proc/diskstats. A similar issue exists for building on a btrfs partition. I posted a message on Oct 28 concerning buildstats on btrfs volumes. The problem there is, that btrfs's stat() reports fake device ids that cannot be found in /proc/diskstats. Did this patch help address that problem for you too? I'll be able to check that tomorrow and report back. It should as the patch will just disable diskio collection if it cannot find a valid device id in /proc/diskstats. Let me know if it doesn't and I'll rework it and resubmit. -b Your patch fixes the buildstats issue for building on a btrfs volume as well. bitbake no longer hits the exception and diskstats are omitted. Theoretically, this information would be available for btrfs, but it is not discoverable in the way buildstats currently collects the disk statistics. However, this is a seaprate issue, I think. Yes, and I'm open for suggestions on the best way to implement finding disk io data for the myriad of filesystem types out there. :/ Or at the very list a way to pull diskstats from a trimmed down list that includes: ext2/3/4 btrfs tmpfs encryptfs I'm not sure performance data is even collected for for non-block devices. dstat and iostat as far as I can tell can't collect data for tmpfs. Ideas? -b -- Elizabeth Flanagan Yocto Project Build and Release ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] [Yocto Bug 1700] Fix for buildstats diskio on non physical disks
On Wed, Nov 9, 2011 at 4:13 AM, Koen Kooi k...@dominion.thruhere.net wrote: Op 8 nov. 2011, om 16:57 heeft Flanagan, Elizabeth het volgende geschreven: On Tue, Nov 8, 2011 at 7:53 AM, Wolfram Stering wolfram.ster...@hale.at wrote: On 11/08/2011 03:12 PM, Richard Purdie wrote: On Tue, 2011-11-08 at 11:15 +0100, Wolfram Stering wrote: On 11/02/2011 07:41 AM, Beth Flanagan wrote: From: Elizabeth Flanagan elizabeth.flana...@intel.com tmpfs/encryptfs/ramfs have no entry in /proc/diskstats. This modifies buildstats to not collect diskio statistics when we encounter a case where the os.major/os.minor is not represented with an entry in /proc/diskstats. A similar issue exists for building on a btrfs partition. I posted a message on Oct 28 concerning buildstats on btrfs volumes. The problem there is, that btrfs's stat() reports fake device ids that cannot be found in /proc/diskstats. Did this patch help address that problem for you too? I'll be able to check that tomorrow and report back. It should as the patch will just disable diskio collection if it cannot find a valid device id in /proc/diskstats. Let me know if it doesn't and I'll rework it and resubmit. Related question: what do you use to visualize the buildstats? I heard rumours about getting bootchart to support our format natively, is that the case? I will be needing pretty graphics for a report on the oe-core buildflow in a few weeks :) regards, Koen, There is a patch to pybootchartgui that allows visualization. RP has the patchset IIRC. I'm going to be working on buildstats visualization soon and I'm leaning towards using jquery/flot to create a way to allow end users to generate via browser some comparative graphing of buildstats against different builds/statistics. This way I can set it up for the AB to compare all the builds we're doing there and end users can just use it through a browser either locally or via a server. -b Koen -BEGIN PGP SIGNATURE- iEYEARECAAYFAk66bmcACgkQMkyGM64RGpHMCQCguHdgtS3SrIVV5+T1dOktTpAT FkQAnRZzZqwPJlGa3QlGGmxRrZnNtv/8 =fEA3 -END PGP SIGNATURE- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Elizabeth Flanagan Yocto Project Build and Release ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] classes/package_rpm: disable uninstall scripts for upgrades
On 11/9/11 6:05 AM, Paul Eggleton wrote: Our current assumption (based on the behaviour of opkg) when writing recipes is that prerm and postrm do not get called during an upgrade. When using rpm however, these are mapped to the rpm preun and postun events which occur after postinst for upgrades, and when these contain removal type operations (such as update-alternatives --remove) this causes problems. This patch wraps each preun and postun script for rpm in a check that determines whether or not the script is being called during an upgrade, and skips the entire script if it is, which mimics the behaviour of opkg under the same conditions. Fixes [YOCTO #1760] Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com Looks like the right solution to me. (Paul and I previously discussed how to correct this.) Signed-off-by: Mark Hatle mark.ha...@windriver.com --- meta/classes/package_rpm.bbclass | 18 -- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index df5a2db..2679e9f 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -471,6 +471,16 @@ python write_specfile () { else: target.append(path + / + file) + # Prevent the prerm/postrm scripts from being run during an upgrade + def wrap_uninstall(scriptvar): + scr = scriptvar.strip() + if scr.startswith(#!): + pos = scr.find(\n) + 1 + else: + pos = 0 + scr = scr[:pos] + 'if [ $1 = 0 ] ; then\n' + scr[pos:] + '\nfi' + return scr + packages = bb.data.getVar('PACKAGES', d, True) if not packages or packages == '': bb.debug(1, No packages; nothing to do) @@ -671,8 +681,10 @@ python write_specfile () { spec_scriptlets_bottom.append('%%post -n %s' % splitname) elif script == 'prerm': spec_scriptlets_bottom.append('%%preun -n %s' % splitname) + scriptvar = wrap_uninstall(scriptvar) elif script == 'postrm': spec_scriptlets_bottom.append('%%postun -n %s' % splitname) + scriptvar = wrap_uninstall(scriptvar) spec_scriptlets_bottom.append(scriptvar) spec_scriptlets_bottom.append('') @@ -758,11 +770,13 @@ python write_specfile () { spec_scriptlets_top.append('') if srcprerm: spec_scriptlets_top.append('%preun') - spec_scriptlets_top.append(srcprerm) + scriptvar = wrap_uninstall(srcprerm) + spec_scriptlets_top.append(scriptvar) spec_scriptlets_top.append('') if srcpostrm: spec_scriptlets_top.append('%postun') - spec_scriptlets_top.append(srcpostrm) + scriptvar = wrap_uninstall(srcpostrm) + spec_scriptlets_top.append(scriptvar) spec_scriptlets_top.append('') # Write the SPEC file ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
On 09/11/11 01:27, Koen Kooi wrote: Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven: This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND It looks that will break a number of things in meta-oe, why was it dropped? Richard didn't want us to add native variants of everything that uses the gnome class. At least in the short term it should be easy enough to keep meta-oe's gnome.bbclass where the BBCLASSEXTEND is still set. Whether you'd want to keep that or instead set BBCLASSEXTEND in the required places feels like a policy decision for meta-oe. * mime.bbclass: - updated coding style - use which to find update-mime-database program rather than hard coded - fix typo in populate_packges_append such that it's actually called Will it drag in the shared-mime-info-data package you created automatically now? Also, do you have matching patches to update meta-oe now that these things are heading into oe-core? I have not, I wanted to see what the feedback on this series was. Particularly the BBCLASSEXTEND bit as above. Joshua -- Joshua Lock Yocto Project Johannes factotum Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] busybox: add grep to temporary links during uninstall
Am Mittwoch, den 09.11.2011, 12:05 + schrieb Paul Eggleton: In the busybox package prerm we set up some temporary links and modify PATH so that certain utilities are provided for the purpose of running update-alternatives; if grep is not among these then you get errors when removing busybox, so add a temporary link for grep as well. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-core/busybox/busybox.inc |1 + meta/recipes-core/busybox/busybox_1.18.5.bb |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index acd635b..f8fee51 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -270,6 +270,7 @@ pkg_prerm_${PN} () { ln -s /bin/busybox $tmpdir/rm ln -s /bin/busybox $tmpdir/sed ln -s /bin/busybox $tmpdir/sort + ln -s /bin/busybox $tmpdir/grep Should it be sorted? […] Thanks, Paul signature.asc Description: This is a digitally signed message part ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
On 09/11/11 03:18, Koen Kooi wrote: Op 9 nov. 2011, om 11:35 heeft Richard Purdie het volgende geschreven: On Wed, 2011-11-09 at 11:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven: On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote: Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven: This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND It looks that will break a number of things in meta-oe, why was it dropped? Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed. Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(. The list of -native needed in meta-gnome: bison-native cairo-native docbook-utils-native flex-native gconf-native gdk-pixbuf-native glib-2.0-native gnome-doc-utils-native gobject-introspection-native gtk-doc-native icon-naming-utils-native intltool-native libffi-native libidl-native libxml-parser-perl-native orbit2-native pango-native perl-native popt-native python-native Many of which are not gnome bbclass derived recipes. I therefore think it makes sense to put the BBCLASSEXTEND in the recipes where its needed and not the core class... Exactly! I did a lot of dependency cleanup when importing them, so the situation isn't as bad as it was in OE classic. Josh, what kind of test builds did you do for the meta-gnome recipes after moving the classes? I'm sorry to say almost zero. Joshua -- Joshua Lock Yocto Project Johannes factotum Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Trouble by last dbus patch (46e6c3fa8034b12d178d605f3f5d7efe69671a13)?
On Saturday, October 29, 2011 12:33:46 AM Andreas Müller wrote: On Friday, October 28, 2011 12:22:11 PM Richard Purdie wrote: On Thu, 2011-10-27 at 22:30 +0200, Andreas Müller wrote: Since the last updates of all layers (angstrom based) I have issues with * networkmanager/nm-applet (meta-oe): I am not allowed to change the settings any more * xfce-session (meta-oe): Logging out takes very long and Restart/Shutdown is disabled I remember that I had similar issues a while ago. That could be worked around by starting some dbus stuff ( do not exactly remember what it was ). With this vague idea I checked and found in oe-core: | dbus: use useradd class to allow use in read-only filesystems | author Otavio Salvador ota...@ossystems.com.br | commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13 Not understanding totally what is all about I see in /etc/passw | messagebus:x:999:998::/var/lib/dbus:/bin/sh but I don't have /var/lib/dbus on my sytem!! I did not check yet, but maybe this is an incompatibilty with angstrom custom | FILESYSTEM_PERMS_TABLES = fs-perms-angstrom.txt somebody around to enlight the darkness? There are some issues due to the orcering of when we now start some of the services. After the above change the dbus service starts much earlier on first boot, before some of the other postinstalls have run. This can mean you see errors due to users which have not yet been created by postinstalls (e.g. avahi or xuser) yet the dbus files reference these and its trying to start those services. We're looking at fixing the remaining adduser type postinstalls to address this. I'm not sure if this is related to the problem you were seeing above or not. FYI: reverting the patch fixes mentioned issues here. Maybe I missed something but after starting a new image - to get the errors mentioned above worked around - I still have to do manually on the machine : chown messagebus:messagebus /var/run/dbus ${D}${localstatedir}/lib/dbus chown root:messagebus /usr/libexec/dbus-daemon-launch-helper chmod 4754 /usr/libexec/dbus-daemon-launch-helper As long as this is not fixed, can we have this additionally in pkg_postinst_dbus temporary? Andreas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] systemd packages - image
Hi, Imagine a recipe is included into an image by a task and later gets systemd- native support. How about forcing the packages in SYSTEMD_PACKAGES packed into images in case IMAGE_INIT_MANAGER = systemd is found in the image definition? Andreas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] systemd packages - image
On Wednesday, November 09, 2011 11:15:30 PM Andreas Müller wrote: Hi, Imagine a recipe is included into an image by a task and later gets systemd- native support. How about forcing the packages in SYSTEMD_PACKAGES packed into images in case IMAGE_INIT_MANAGER = systemd is found in the image definition? Andreas Sorry wrong list :( ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] user and group default policies
With shadow-utils enabled, a default user and group add policy is installed in /etc/default/adduser. This policy specifies that group 1000 is used when adding new users, unless you specify a group. Well, we don't have a user 1000 by default, which results in the warning: useradd: group '1000' does not exist useradd: the GROUP= configuration in /etc/default/useradd will be ignored So my question is -- how should we resolve this. What I see are a couple of possibilities: 1) We create a default user group.. We then adjust the /etc/default/useradd to use that number... (if we don't user 1000 we'd have to change it.) 2) Remove that setting.. I believe this means that useradd will always add a group for each user added. 3) -- we do something else.. Any comments? I'd like to fix this -- but I'm not sure historically if OE has had a policy on this, or if we need to create one.. If we create one, it needs to be reasonable for the majority of the oe-core uses. --Mark ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] useradd: Add missing DEPEND on shadow
Without this rootfs generation fails as an RDEPENDS is added but the package might not have bneen built. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 8cd7f4f..7faf1a7 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -2,7 +2,7 @@ # target sysroot, and shadow -native and -sysroot provide the utilities # and support files needed to add and modify user and group accounts DEPENDS_append = ${USERADDDEPENDS} -USERADDDEPENDS = base-passwd shadow-native shadow-sysroot +USERADDDEPENDS = base-passwd shadow-native shadow-sysroot shadow USERADDDEPENDS_virtclass-nativesdk = # This preinstall function will be run in two contexts: once for the ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] bb.data.*Var - d.*Var conversion
On Wed, 2011-11-09 at 08:24 -0700, Chris Larson wrote: On Wed, Nov 9, 2011 at 7:59 AM, Darren Hart dvh...@linux.intel.com wrote: Hi Richard, On 11/09/2011 03:52 AM, Richard Purdie wrote: I'm tempted to run the following over the metata to convert the bb.data.*Var(...,d) and similar expressions to the form d.*Var(...). Oh yes please! Why? We get a lot of people doing copy, paste and edit of the code and this way, we'll increase the chances of them finding better examples. I'm still looking at the diff this generates to see if there are any more corner cases I need to tweak the expression for but feedback welcome. sed \ -e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \ Be sure to escape your periods, they are single character wildcards. It's unlikely you'll match something else, but better safe than sorry. Right, I've not noticed it doing anything nasty but I understand the concern. -e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Why ignore case? Accidentally left in from something else I borrowed it from. Its harmless. I suggest running the grep first redirected to the file, then editing the contents to ensure you don't get things like CHANGELOG and probably be careful with the Documentation. Well, we'd probably want to update those references too. I checked the resulting diff and it didn't find anything like that though. The groups look sane to me. The only other thing I'd make sure to try and watch (not necessarily handle) are multi-line bb.data.[sg]et(Flag)? calls. I suspect there are few enough of them, if any, that they could be managed by hand. I was careful not to make this replacement too aggressive. Its currently ignoring anything multiline and anything where there are expressions within expressions. There are much less of those and can be handled either manually or a more targeted expression. I also want to change: d.getVar(x, 1) - d.getVar(x, True) but that is something for a follow up too. Heh, too bad bitbake doesn't know how to emit metadata back out from its ast. This seems like it'd be an ideal case for writing a custom 2to3 fixer rather than using sed. It would catch the multi-line case you mention, since it lets you specify grammatical patterns against the python parse tree and do transforms against it. Indeed, if only I had more time... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] bb.data.*Var - d.*Var conversion
On Wed, 2011-11-09 at 11:52 +, Richard Purdie wrote: I'm tempted to run the following over the metata to convert the bb.data.*Var(...,d) and similar expressions to the form d.*Var(...). Why? We get a lot of people doing copy, paste and edit of the code and this way, we'll increase the chances of them finding better examples. I'm still looking at the diff this generates to see if there are any more corner cases I need to tweak the expression for but feedback welcome. sed \ -e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Incidentally this is worth about a 1.5% increase in parsing speed which makes sense since it removed one level of function indirection. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 17/17] python: skip setup.py 'import check' when cross-compiling
On Wed, 2011-11-09 at 16:57 -0800, Cui, Dexuan wrote: Zanussi, Tom wrote on 2011-11-09: On Wed, 2011-11-09 at 02:34 -0800, Cui, Dexuan wrote: How I wish I could notice the patch this morning so I could save 1 day! ??? Can you please explain what you mean? I meant I spent 1 day on debugging the same issue and got the cause but wasn't sure how the patch should be made, so I wanted to ask for suggestion in the ML and before that I tried to find out if anybody reported the same issue and I saw your patch that was sent 1.5 days ago... :-) Yeah, sure - I'm just kind of curious since I'd never seen it before until I added the avx instruction support. Just out of curiosity, what were your host and target arches? Tom Anyway, thanks TomZ for the patch! :-) You're welcome, I guess! Tom Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 17/17] python: skip setup.py 'import check' when cross-compiling
Zanussi, Tom wrote on 2011-11-10: On Wed, 2011-11-09 at 16:57 -0800, Cui, Dexuan wrote: Zanussi, Tom wrote on 2011-11-09: On Wed, 2011-11-09 at 02:34 -0800, Cui, Dexuan wrote: How I wish I could notice the patch this morning so I could save 1 day! ??? Can you please explain what you mean? I meant I spent 1 day on debugging the same issue and got the cause but wasn't sure how the patch should be made, so I wanted to ask for suggestion in the ML and before that I tried to find out if anybody reported the same issue and I saw your patch that was sent 1.5 days ago... :-) Yeah, sure - I'm just kind of curious since I'd never seen it before until I added the avx instruction support. Actually I think the issue is always there(at least from when python was upgrade to 2.7.x). e.g., in target, run python and try import grp, we'll get an error saying the built-in module grp couldn't be found; in python's log.do_compile, we can see the obvious warnings. Just out of curiosity, what were your host and target arches? I'm trying the task self hosted image(https://wiki.yoctoproject.org/wiki/Build_Appliance_Design): in target, I found bitbake's do_package failed because import grp failed, so I had to look into the issue. Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] task-core-clutter: use clutter-1.8
Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/recipes-graphics/tasks/task-core-clutter.bb |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/tasks/task-core-clutter.bb b/meta/recipes-graphics/tasks/task-core-clutter.bb index 970970c..4044131 100644 --- a/meta/recipes-graphics/tasks/task-core-clutter.bb +++ b/meta/recipes-graphics/tasks/task-core-clutter.bb @@ -24,13 +24,14 @@ PACKAGES = \ ALLOW_EMPTY = 1 RDEPENDS_task-core-clutter-core = \ -clutter-1.6 \ -clutter-gst-1.6 \ +clutter-1.8 \ +clutter-gst-1.8 \ +clutter-gtk-1.8 \ #RDEPENDS_task-core-clutter-tests = \ -#clutter-gst-1.6-examples \ -#clutter-gtk-1.6-examples +#clutter-gst-1.8-examples \ +#clutter-gtk-1.8-examples #RDEPENDS_task-core-clutter-apps = \ #clutter-box2d -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] Tidy Clutter recipes
This series tidies up the Clutter recipes by dropping the -1.6 recipes, as Clutter 1.8 is API/ABI compatible with 1.6. I added a PROVIDES += clutter-1.6 to the clutter-1.8 recipe to ease the pain for layers using Clutter but I'm not wed to the idea - RFC? Further the clutter-box2d recipe doesn't build due to, I think, stricter warnings and -Werror with gcc 4.6 - I haven't had time to look into this yet but I'm not sure the upstream is very active. Thoughts on dropping or keeping this recipe? Cheers, Joshua The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839: python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib josh/clutter http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/clutter Joshua Lock (7): mutter: switch to clutter-1.8 to satisfy dependency multilib.conf: update clutter task-core-clutter: use clutter-1.8 distro-tracking-fields: add entries for clutter-1.8 recipes clutter-*-1.6: drop clutter 1.6 recipes clutter: PROVIDES clutter-1.6 multilibs: remove clutter-1.6 recipes .../conf/distro/include/distro_tracking_fields.inc | 36 meta/conf/multilib.conf|4 ++- .../recipes-graphics/clutter/clutter-1.6_1.6.18.bb | 26 -- meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |3 ++ .../clutter/clutter-gst-1.6_1.3.6.bb | 21 --- meta/recipes-graphics/mutter/mutter.inc|2 +- meta/recipes-graphics/tasks/task-core-clutter.bb |9 +++-- 7 files changed, 34 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] mutter: switch to clutter-1.8 to satisfy dependency
It's API and ABI compatible with 1.6 so just update the DEPENDS entry. Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/recipes-graphics/mutter/mutter.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc index d87c30e..4b73d97 100644 --- a/meta/recipes-graphics/mutter/mutter.inc +++ b/meta/recipes-graphics/mutter/mutter.inc @@ -1,7 +1,7 @@ SECTION = x11/wm DESCRIPTION = Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter. LICENSE = GPLv2 -DEPENDS = startup-notification gtk+ gconf clutter-1.6 gdk-pixbuf-native intltool glib-2.0-native +DEPENDS = startup-notification gtk+ gconf clutter-1.8 gdk-pixbuf-native intltool glib-2.0-native # gobject-introspection inherit gnome update-alternatives -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] multilib.conf: update clutter
Add clutter-1.8 recipes Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/conf/multilib.conf |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 5e4b435..53c0bbb 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -43,6 +43,9 @@ BBCLASSEXTEND_append_pn-calibrateproto = ${MULTILIBS} BBCLASSEXTEND_append_pn-chkconfig = ${MULTILIBS} BBCLASSEXTEND_append_pn-clutter-1.6 = ${MULTILIBS} BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = ${MULTILIBS} +BBCLASSEXTEND_append_pn-clutter-1.8 = ${MULTILIBS} +BBCLASSEXTEND_append_pn-clutter-gst-1.8 = ${MULTILIBS} +BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = ${MULTILIBS} BBCLASSEXTEND_append_pn-compositeproto = ${MULTILIBS} BBCLASSEXTEND_append_pn-connman-gnome = ${MULTILIBS} BBCLASSEXTEND_append_pn-connman = ${MULTILIBS} -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] distro-tracking-fields: add entries for clutter-1.8 recipes
Signed-off-by: Joshua Lock j...@linux.intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 36 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index c4d33a7..28dc081 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -2667,10 +2667,10 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libmusicbrainz=2 years RECIPE_LAST_UPDATE_pn-libmusicbrainz = Nov 16, 2010 RECIPE_MAINTAINER_pn-libmusicbrainz = Dongxiao Xu dongxiao...@intel.com -RECIPE_STATUS_pn-clutter-gst-1.6 = red -DISTRO_PN_ALIAS_pn-clutter-gst-1.6 = Fedora=clutter-gst Debian=libclutter-gst -RECIPE_LATEST_VERSION_pn-clutter-gst-1.6 = 1.3.8 -RECIPE_LAST_UPDATE_pn-clutter-gst-1.6 = Mar 28, 2011 +RECIPE_STATUS_pn-clutter-gst-1.8 = red +DISTRO_PN_ALIAS_pn-clutter-gst-1.8 = Fedora=clutter-gst Debian=libclutter-gst +RECIPE_LATEST_VERSION_pn-clutter-gst-1.8 = 1.4.2 +RECIPE_LAST_UPDATE_pn-clutter-gst-1.6 = Nov 09, 2011 RECIPE_MAINTAINER_pn-clutter-gst-1.6 = Dongxiao Xu dongxiao...@intel.com RECIPE_STATUS_pn-farsight2 = red @@ -5401,10 +5401,12 @@ RECIPE_MAINTAINER_pn-clutter-box2d = Zhai Edwin edwin.z...@intel.com DISTRO_PN_ALIAS_pn-clutter-box2d = OpenedHand -RECIPE_STATUS_pn-clutter-gtk-1.4 = red -DISTRO_PN_ALIAS_pn-clutter-gtk-1.4 = Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk -RECIPE_LATEST_VERSION_pn-clutter-gtk-1.4 = 0.90.0+git0+e8d828ba1d87937baa571e68fdff22f3e2d79ca8 -RECIPE_MAINTAINER_pn-clutter-gtk-1.4 = Zhai Edwin edwin.z...@intel.com +RECIPE_STATUS_pn-clutter-gtk-1.8 = red +DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk +RECIPE_LATEST_VERSION_pn-clutter-gtk-1.8 = 0.11.4 +RECIPE_MAINTAINER_pn-clutter-gtk-1.8 = Zhai Edwin edwin.z...@intel.com +RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d = Nov 09, 2011 +RECIPE_LAST_UPDATE_pn-clutter-box2d = Nov 09, 2011 RECIPE_STATUS_pn-tidy = red RECIPE_LATEST_VERSION_pn-tidy = 0.1.0+git0+e25416e1293e1074bfa6727c80527dcff5b1f3cb @@ -5421,12 +5423,18 @@ RECIPE_LATEST_VERSION_pn-libgalago = 0.5.2 RECIPE_LAST_UPDATE_pn-libgalago = Apr 11, 2007 RECIPE_MAINTAINER_pn-libgalago = Zhai Edwin edwin.z...@intel.com -RECIPE_STATUS_pn-clutter-1.6 = red -DISTRO_PN_ALIAS_pn-clutter-1.6 = Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter -RECIPE_LATEST_VERSION_pn-clutter-1.6 = 1.6.14 -RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.6 = Jun 28, 2011 -RECIPE_LAST_UPDATE_pn-clutter-1.6 = Apr 19, 2011 -RECIPE_MAINTAINER_pn-clutter-1.6 = Zhai Edwin edwin.z...@intel.com +RECIPE_STATUS_pn-cogl = green +DISTRO_PN_ALIAS_pn-cogl = Fedora=cogl OpenSuse=cogl Ubuntu=cogl Mandriva=cogl Debian=cogl +RECIPE_LATEST_VERSION_pn-cogl = 1.8.0 +RECIPE_MANUAL_CHECK_DATE_pn-cogl = Nov 9, 2011 +RECIPE_LAST_UPDATE_pn-cogl = Nov 9, 2011 + +RECIPE_STATUS_pn-clutter-1.8 = green +DISTRO_PN_ALIAS_pn-clutter-1.8 = Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter +RECIPE_LATEST_VERSION_pn-clutter-1.8 = 1.8.0 +RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.8 = Nov 9, 2011 +RECIPE_LAST_UPDATE_pn-clutter-1.8 = Nov 9, 2011 +RECIPE_MAINTAINER_pn-clutter-1.8 = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-clutter = red DISTRO_PN_ALIAS_pn-clutter = Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] clutter-*-1.6: drop clutter 1.6 recipes
Clutter 1.8 is API and ABI compatible with Clutter 1.6 according to the release notes so there's no need to keep these recipes around. www.clutter-project.org/blogs/archive/2011-09/clutter-1.8.0-stable-release Signed-off-by: Joshua Lock j...@linux.intel.com --- .../recipes-graphics/clutter/clutter-1.6_1.6.18.bb | 26 .../clutter/clutter-gst-1.6_1.3.6.bb | 21 2 files changed, 0 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb deleted file mode 100644 index 9c32efd..000 --- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb +++ /dev/null @@ -1,26 +0,0 @@ -require recipes-graphics/clutter/clutter.inc - -PR = r2 - -# Internal json-glib was removed in Clutter 1.5.2 -STDDEPENDS += json-glib - -PACKAGES =+ ${PN}-examples -FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png - -SRC_URI = http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \ - file://enable_tests-1.4.patch \ - file://update_gettext_macro_version.patch - -LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 -S = ${WORKDIR}/clutter-${PV} - -BASE_CONF += --disable-introspection - -do_configure_prepend () { - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac -} - -SRC_URI[md5sum] = 7302513c96b00588b7779918fae0b33b -SRC_URI[sha256sum] = d849f92944be193e9d8e707f1371e6bab7fca473e09a492265e2e2296febd749 diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb b/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb deleted file mode 100644 index cf1da04..000 --- a/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -require clutter-gst.inc - -LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ - file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4 - -DEPENDS += clutter-1.6 - -PR = r1 - -SRC_URI = http://source.clutter-project.org/sources/clutter-gst/1.3/clutter-gst-${PV}.tar.bz2 \ - file://enable_tests.patch - -SRC_URI[md5sum] = 5ec828cd10713c1c32996e5fa65aa956 -SRC_URI[sha256sum] = 68c79596ae46ed54885409cac1eeeaf6819673e2f41ee3014fe9705dfbbc1b5a - -S = ${WORKDIR}/clutter-gst-${PV} - -do_configure_prepend () { - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac -} -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] multilibs: remove clutter-1.6 recipes
Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/conf/multilib.conf |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 53c0bbb..6cbac8c 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -41,9 +41,8 @@ BBCLASSEXTEND_append_pn-bzip2 = ${MULTILIBS} BBCLASSEXTEND_append_pn-cairo = ${MULTILIBS} BBCLASSEXTEND_append_pn-calibrateproto = ${MULTILIBS} BBCLASSEXTEND_append_pn-chkconfig = ${MULTILIBS} -BBCLASSEXTEND_append_pn-clutter-1.6 = ${MULTILIBS} -BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = ${MULTILIBS} BBCLASSEXTEND_append_pn-clutter-1.8 = ${MULTILIBS} +BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = ${MULTILIBS} BBCLASSEXTEND_append_pn-clutter-gst-1.8 = ${MULTILIBS} BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = ${MULTILIBS} BBCLASSEXTEND_append_pn-compositeproto = ${MULTILIBS} -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] clutter: PROVIDES clutter-1.6
Since the two are API/ABI compatible and this may make things easier for external layers using clutter. Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb index efafbc2..c67ea2a 100644 --- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb +++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb @@ -2,6 +2,9 @@ require recipes-graphics/clutter/clutter.inc PR = r2 +# We're API/ABI compatible and this may make things easier for layers +PROVIDES += clutter-1.6 + # Internal json-glib was removed in Clutter 1.5.2 STDDEPENDS += json-glib cogl atk -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 02/33] libxml2: use Copyright in LIC_FILES_CHKSUM instead of COPYING
From: Martin Jansa martin.ja...@gmail.com * COPYING is replaced by symlink to Copyright during do_configure (see configure.in), then we end with link to nonexistent file * same issue as libxslt had http://patchwork.openembedded.org/patch/14195/ Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-core/libxml/libxml2.inc |2 +- meta/recipes-core/libxml/libxml2_2.7.8.bb |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 6f79333..68c088c 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -4,7 +4,7 @@ HOMEPAGE = http://www.xmlsoft.org/; BUGTRACKER = http://bugzilla.gnome.org/buglist.cgi?product=libxml2; SECTION = libs LICENSE = MIT -LIC_FILES_CHKSUM = file://COPYING;md5=bb90c48926316d9af6e2d70ca7013ade \ +LIC_FILES_CHKSUM = file://Copyright;md5=bb90c48926316d9af6e2d70ca7013ade \ file://hash.c;beginline=6;endline=15;md5=ce702952bfddd7aee22639a2d6b54136 \ file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \ file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb index 71001a0..2fa246e 100644 --- a/meta/recipes-core/libxml/libxml2_2.7.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb @@ -1,6 +1,6 @@ require libxml2.inc -PR = r3 +PR = r4 SRC_URI[md5sum] = 8127a65e8c3b08856093099b52599c86 SRC_URI[sha256sum] = cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 01/33] local.conf.sample.extended: Fix bug 1674
From: Xiaofeng Yan xiaofeng@windriver.com [YOCTO #1674] local.conf.sample.extended: An image based on gtk+-directfb don't need x11 for DEFAULT_FEATURES Remove x11 from DEFAULT_FEATURES and add directfb to it because someone could don't need x11 in their project, perhaps gtk over directfb will meet his reqirement. Signed-off-by: Xiaofeng Yan xiaofeng@windriver.com --- meta/conf/local.conf.sample.extended |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index e9935ce..7c26572 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -15,6 +15,9 @@ #DISTRO_FEATURES = alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC} +# If you want to get an image based on gtk+directfb without x11, Please copy this variable to build/conf/local.conf +#DISTRO_FEATURES = alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC} + # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale # packages at build time using qemu-native. Disabling it (by setting it to 0) # will save some build time at the expense of breaking i18n on devices with -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 03/33] Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE
From: Matthew McClintock m...@freescale.com Just define additional serial consoles like so: SERIAL_CONSOLES=115200;ttyS0 115200;ttyS1 ... 115200;ttySN Also be sure to remove SERIAL_CONSOLE (lacking the S) from your machine as they can conflict. Signed-off-by: Matthew McClintock m...@freescale.com --- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index ba60c74..3a716d7 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -25,6 +25,16 @@ do_install() { if [ ! -z ${SERIAL_CONSOLE} ]; then echo S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE} ${D}${sysconfdir}/inittab fi + +idx=0 +tmp=${SERIAL_CONSOLES} +for i in $tmp +do + j=`echo ${i} | sed s/\;/\ /g` +echo ${idx}:2345:respawn:${base_sbindir}/getty ${j} ${D}${sysconfdir}/inittab + idx=`expr $idx + 1` +done + if [ ${USE_VT} = 1 ]; then cat EOF ${D}${sysconfdir}/inittab # ${base_sbindir}/getty invocations for the runlevels. -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 00/33] Loads of Change!
Richard, This set of changes is currently being built on the Autobuilder along with some change I dropped for this request. Based on the initial builds, I believe that most of these changes are correct and buildable. I an attempt to clear the decks and move things forward I am suggesting we take these changes in. I dropped Martin's SDL changes since they are causing some of the Autobuilder failures currently There still seems to be an issue with connman sanity, and shadow (populate_sysroot_setscene): ERROR: Task 3037 (/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc/build/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb, do_populate_sysroot_setscene) failed with exit code '1' I included many of your patches in this to verify them as part of this build. Please review the AB failures, to confirm my thoughts above. Thanks Sau! The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839: python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage2 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage2 Bruce Ashfield (1): linux-yocto: config cleanups + romely rt support Darren Hart (1): ncurses: refactor configure to avoid configuring widec when disabled Joshua Lock (3): shared-mime-info: package runtime data separately classes/[gnome|gnomebase|mime]: enhance gnome related classes gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus Martin Jansa (6): libxml2: use Copyright in LIC_FILES_CHKSUM instead of COPYING kbd: import from meta-oe kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all keymaps: depend on kbd instead of console-tools task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and graphical_init_manager Matthew McClintock (1): Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE Paul Eggleton (2): classes/package_rpm: disable uninstall scripts for upgrades busybox: add grep to temporary links during uninstall Paul Menzel (2): libarchive: Remove obsolete comment and empty line at the end xinit: Fix `startx` looking for `mcookie` in sysroot Richard Purdie (7): hacktastic patch to fix adduser under rpm bitbake.conf: Unload pseudo when its not required for a given task scripts/qemuimage-testlib: Output a slightly better error if expect is missing classes: Remove various bashisms Allow use of dash as /bin/sh qemu: Ensure an internal qemugl script uses bash as it has bashisms useradd: Add missing DEPEND on shadow Saul Wold (4): Distro_tracking: Update Manual Check Date libtasn1: update to 2.10 lame: update to 3.99.1 udev-extraconf: blacklist /dev/md Scott Garman (4): useradd.bbclass: only modify packages in USERADD_PACKAGES useradd.bbclass: do not modify -nativesdk packages useradd-example.bb: update example documentation comments avahi: remove USERADDPN Tom Zanussi (1): python: bump PR Xiaofeng Yan (1): local.conf.sample.extended: Fix bug 1674 .../recipes-skeleton/useradd/useradd-example.bb|9 +- meta/classes/gnome.bbclass | 18 +- meta/classes/gnomebase.bbclass | 30 + meta/classes/image-prelink.bbclass |2 +- meta/classes/kernel.bbclass|2 +- meta/classes/mime.bbclass | 58 + meta/classes/package_rpm.bbclass | 39 +- meta/classes/sanity.bbclass|3 - meta/classes/useradd.bbclass | 49 +- meta/conf/bitbake.conf |1 + meta/conf/distro/include/default-providers.inc |2 - .../conf/distro/include/distro_tracking_fields.inc | 94 +- meta/conf/local.conf.sample.extended |3 + meta/conf/multilib.conf|2 +- meta/recipes-bsp/keymaps/keymaps_1.0.bb|9 +- meta/recipes-connectivity/avahi/avahi.inc |1 - .../recipes-core/base-passwd/base-passwd_3.5.22.bb |8 +- meta/recipes-core/busybox/busybox.inc | 11 +- meta/recipes-core/busybox/busybox_1.18.5.bb|2 +- meta/recipes-core/kbd/kbd_1.15.2.bb| 24 + meta/recipes-core/libxml/libxml2.inc |2 +- meta/recipes-core/libxml/libxml2_2.7.8.bb |2 +- meta/recipes-core/ncurses/ncurses.inc | 66 +- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 10 + meta/recipes-core/tasks/task-core-boot.bb |6 +- meta/recipes-core/udev/files/mount.blacklist |1 + meta/recipes-core/udev/udev-extraconf_0.0.bb |2 +-
[OE-core] [CONSOLIDATED PULL (v2) 04/33] libarchive: Remove obsolete comment and empty line at the end
From: Paul Menzel paulepan...@users.sourceforge.net This is a fix up for commit fb19df5b21e551c5dfdfa340438952560c5fa528 Author: Xiaofeng Yan xiaofeng@windriver.com Date: Mon Nov 7 20:03:53 2011 +0800 libarchive: update to 2.8.5 Remove patch 0003-Patch-from-upstream-rev-2516.patch because it has been merged to source codes. Signed-off-by: Xiaofeng Yan xiaofeng@windriver.com removing a now obsolete comment because the undistributable content was removed [1] from upstream’s tarball. Also remove an empty line at the end introduced in the above commit. [1] http://code.google.com/p/libarchive/issues/detail?id=162 Signed-off-by: Paul Menzel paulepan...@users.sourceforge.net --- .../libarchive/libarchive_2.8.5.bb |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb index 1bc49e2..5cf13e6 100644 --- a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb +++ b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb @@ -7,8 +7,6 @@ PR = r0 DEPENDS = libxml2 -# We need to repack the tarball due undistributable content on the upstream one. -# More details at http://code.google.com/p/libarchive/issues/detail?id=162 SRC_URI = http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \ file://0001-Patch-from-upstream-revision-1990.patch \ file://0002-Patch-from-upstream-revision-1991.patch \ @@ -24,4 +22,3 @@ SRC_URI[sha256sum] = 13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c inherit autotools lib_package BBCLASSEXTEND = nativesdk - -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 06/33] libtasn1: update to 2.10
COPYING.LIB has white space formating changing README has Copyright update to year range Signed-off-by: Saul Wold s...@linux.intel.com --- .../gnutls/{libtasn1_2.9.bb = libtasn1_2.10.bb} |8 +++- 1 files changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-support/gnutls/{libtasn1_2.9.bb = libtasn1_2.10.bb} (65%) diff --git a/meta/recipes-support/gnutls/libtasn1_2.9.bb b/meta/recipes-support/gnutls/libtasn1_2.10.bb similarity index 65% rename from meta/recipes-support/gnutls/libtasn1_2.9.bb rename to meta/recipes-support/gnutls/libtasn1_2.10.bb index 9a80005..ef15be7 100644 --- a/meta/recipes-support/gnutls/libtasn1_2.9.bb +++ b/meta/recipes-support/gnutls/libtasn1_2.10.bb @@ -5,18 +5,16 @@ LICENSE = GPLv3+ LGPLv2.1+ LICENSE_${PN}-bin = GPLv3+ LICENSE_${PN} = LGPLv2.1+ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ -file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351 -#RREPLACES_${PN}-bin = libtasn1 ( 2.7) +SRC_URI[md5sum] = ef80c227d0dcdc2940fbc58faf8e0cf1 +SRC_URI[sha256sum] = 17e4c06212e00437c13633c26ed73dad21784805008cf7550f1399adbd1006d0 PR = r0 SRC_URI = ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-${PV}.tar.gz; -SRC_URI[md5sum] = f4f4035b84550100ffeb8ad4b261dea9 -SRC_URI[sha256sum] = fac46855fac8b08cf6f5a1b60cebad8e090bac1f06c335a044e84110d0b412c4 - inherit autotools binconfig lib_package BBCLASSEXTEND = native -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 09/33] lame: update to 3.99.1
Updated lame.h checksum due to change of LGPL Lessor - Library Signed-off-by: Saul Wold s...@linux.intel.com --- .../lame/{lame-3.98.4 = lame}/no-gtk1.patch |0 .../lame/{lame_3.98.4.bb = lame_3.99.1.bb}|6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-multimedia/lame/{lame-3.98.4 = lame}/no-gtk1.patch (100%) rename meta/recipes-multimedia/lame/{lame_3.98.4.bb = lame_3.99.1.bb} (82%) diff --git a/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch b/meta/recipes-multimedia/lame/lame/no-gtk1.patch similarity index 100% rename from meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch rename to meta/recipes-multimedia/lame/lame/no-gtk1.patch diff --git a/meta/recipes-multimedia/lame/lame_3.98.4.bb b/meta/recipes-multimedia/lame/lame_3.99.1.bb similarity index 82% rename from meta/recipes-multimedia/lame/lame_3.98.4.bb rename to meta/recipes-multimedia/lame/lame_3.99.1.bb index 680ea48..31766fd 100644 --- a/meta/recipes-multimedia/lame/lame_3.98.4.bb +++ b/meta/recipes-multimedia/lame/lame_3.99.1.bb @@ -4,14 +4,14 @@ BUGTRACKER = http://sourceforge.net/tracker/?group_id=290atid=100290; SECTION = console/utils LICENSE = LGPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ - file://include/lame.h;beginline=1;endline=20;md5=d3ff8cae3e79c4e9da7169c7928dc3a2 + file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b PR = r0 SRC_URI = ${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ file://no-gtk1.patch -SRC_URI[md5sum] = 8e9866ad6b570c6c95c8cba48060473f -SRC_URI[sha256sum] = ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8 +SRC_URI[md5sum] = 2576a7368b5c90a87adc9de6b9f0628c +SRC_URI[sha256sum] = 1eedcbe238f81cdef822f367f104a8ff918062727b61f0c62b24e9f79d941cf0 inherit autotools -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 08/33] python: bump PR
From: Tom Zanussi tom.zanu...@intel.com Commit 23d2eaf9 ('skip setup.py 'import check' when cross-compiling') neglected bumping the PR, this adds it. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- meta/recipes-devtools/python/python_2.7.2.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb index 360e64e..5682e05 100644 --- a/meta/recipes-devtools/python/python_2.7.2.bb +++ b/meta/recipes-devtools/python/python_2.7.2.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = python-native db gdbm openssl readline sqlite3 zlib DEPENDS_sharprom = python-native db readline zlib gdbm openssl -PR = ${INC_PR}.1 +PR = ${INC_PR}.2 DISTRO_SRC_URI ?= file://sitecustomize.py DISTRO_SRC_URI_linuxstdbase = -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 05/33] Distro_tracking: Update Manual Check Date
Checked the following Upstreams: apt libaio sysstat unzip zip linexif boost libcheck ncurses sysfsutils util-linux - Offline lsb eds-tools libmad lame glew squashfs-tools Signed-off-by: Saul Wold s...@linux.intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 94 1 files changed, 57 insertions(+), 37 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index c4d33a7..5cd4c37 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -484,7 +484,7 @@ RECIPE_LATEST_VERSION_pn-ncurses = 5.9 RECIPE_LAST_UPDATE_pn-ncurses = Apr 06, 2011 RECIPE_INTEL_SECTION_pn-ncurses = base libs RECIPE_MAINTAINER_pn-ncurses = Saul Wold s...@linux.intel.com -RECIPE_MANUAL_CHECK_DATE_pn-ncurses = Sep 29, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-ncurses = Nov 08, 2011 RECIPE_STATUS_pn-popt = green RECIPE_LAST_UPDATE_pn-popt = Jul 5, 2010 @@ -570,20 +570,22 @@ RECIPE_COMMENTS_pn-tcp-wrappers = Consider looking at ipv6.4 version RECIPE_NO_UPDATE_REASON_pn-tcp-wrapers = 7.6 is last Stable release RECIPE_STATUS_pn-libaio = green +RECIPE_LATEST_VERSION_pn-libaio = 0.3.109 +RECIPE_LATEST_RELEASE_DATE_pn-libaio = Aug 30, 2011 RECIPE_LAST_UPDATE_pn-libaio = Aug 27, 2010 RECIPE_MAINTAINER_pn-libaio = Saul Wold s...@linux.intel.com -RECIPE_LATEST_VERSION_pn-libaio = 0.3.107 -RECIPE_MANUAL_CHECK_DATE_pn-libaio = Jun 6, 2011 -RECIPE_COMMENTS_pn-libaio = 1.0.9 is current unstable +RECIPE_MANUAL_CHECK_DATE_pn-libaio = Nov 8, 2011 +RECIPE_COMMENTS_pn-libaio = RECIPE_STATUS_pn-libcheck = green RECIPE_DEPENDENCY_CHECK_pn-libcheck = done +RECIPE_LATEST_VERSION_pn-libcheck = 0.9.8 +RECIPE_LATEST_RELEASE_DATE_pn-libcheck = Sep 23, 2009 RECIPE_LAST_UPDATE_pn-libcheck = Aug 20, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-libcheck = Nov 8, 2011 RECIPE_MAINTAINER_pn-libcheck = Saul Wold s...@linux.intel.com -RECIPE_LATEST_VERSION_pn-libcheck = 0.9.8 RECIPE_INTEL_SECTION_pn-libcheck = base libs RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcheck = 9 months -RECIPE_LATEST_RELEASE_DATE_pn-libcheck = Sep 01, 2009 RECIPE_COMMENTS_pn-libcheck = DISTRO_PN_ALIAS_pn-libcheck = Ubuntu=check Fedora=check OpenSuSE=check @@ -1171,10 +1173,10 @@ RECIPE_LAST_UPDATE_pn-apr-util = Jul 28, 2011 RECIPE_MAINTAINER_pn-apr-util = Zhai Edwin edwin.z...@intel.com RECIPE_STATUS_pn-apt = red -RECIPE_LATEST_VERSION_pn-apt = 0.8.15.8 -RECIPE_LATEST_RELEASE_DATE_pn-apt = Sep 14, 2011 +RECIPE_LATEST_VERSION_pn-apt = 0.8.15.9 +RECIPE_LATEST_RELEASE_DATE_pn-apt = Oct 14, 2011 RECIPE_LAST_UPDATE_pn-apt = Oct 6, 2011 -RECIPE_MAINTAINER_pn-apt = Mei Lei lei@intel.com +RECIPE_MANUAL_CHECK_DATE_pn-apt = Nov 08, 2011 RECIPE_NO_UPDATE_REASON_pn-apt=similar to zypper, defer the upgrading RECIPE_STATUS_pn-chrpath = red @@ -1313,14 +1315,18 @@ RECIPE_LATEST_VERSION_pn-psmisc = 22.13 RECIPE_LAST_UPDATE_pn-psmisc = Jan 18, 2008 RECIPE_MAINTAINER_pn-psmisc = Yu Ke ke...@intel.com -RECIPE_STATUS_pn-boost = red -RECIPE_LATEST_VERSION_pn-boost = 1.44.0 +RECIPE_STATUS_pn-boost = yellow +RECIPE_LATEST_VERSION_pn-boost = 1.47.0 +RECIPE_LATEST_RELEASE_DATE_pn-boost = Jul 12, 2011 RECIPE_LAST_UPDATE_pn-boost = Aug 19, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-boost = Nov 08, 2011 RECIPE_MAINTAINER_pn-boost = Saul Wold s...@linux.intel.com -RECIPE_STATUS_pn-boost-jam-native = red +RECIPE_STATUS_pn-boost-jam-native = green RECIPE_LATEST_VERSION_pn-boost-jam-native = 3.1.18 +RECIPE_LATEST_RELEASE_DATE_pn-boost-jam-native = Mar 22, 2011 RECIPE_LAST_UPDATE_pn-boost-jam-native = Aug 19, 2010 +RECIPE_MANUAL_CHECK_DATE_pn-boost-jam-native = Nov 08, 2011 RECIPE_MAINTAINER_pn-boost-jam-native = Saul Wold s...@linux.intel.com RECIPE_STATUS_pn-libfribidi = red @@ -1453,15 +1459,15 @@ RECIPE_LATEST_RELEASE_DATE_pn-sysvinit = Apr 01, 2010 RECIPE_COMMENTS_pn-sysvinit = RECIPE_STATUS_pn-sysfsutils = green +RECIPE_LATEST_VERSION_pn-sysfsutils = 2.1.0 +RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = Aug 23, 2006 RECIPE_LAST_UPDATE_pn-sysfsutils = Jun 18, 2010 -RECIPE_MAINTAINER_pn-sysfsutils = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = not done -RECIPE_LATEST_VERSION_pn-sysfsutils = 2.1.0 RECIPE_INTEL_SECTION_pn-sysfsutils = base utils RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = n/a -RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = Aug 23, 2006 -RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = Sep 27, 2011 +RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = Nov 08, 2011 RECIPE_COMMENTS_pn-sysfsutils = +RECIPE_MAINTAINER_pn-sysfsutils = Saul Wold s...@linux.intel.com RECIPE_STATUS_pn-curl = green RECIPE_LAST_UPDATE_pn-curl = Sep 30, 2011 @@ -1652,25 +1658,25 @@ RECIPE_LATEST_RELEASE_DATE_pn-pcmciautils = Jan 01, 2010 RECIPE_COMMENTS_pn-pcmciautils = RECIPE_STATUS_pn-unzip = green +RECIPE_LATEST_VERSION_pn-unzip = 6.0 +RECIPE_LATEST_RELEASE_DATE_pn-unzip = Apr 25, 2009
[OE-core] [CONSOLIDATED PULL (v2) 23/33] useradd.bbclass: only modify packages in USERADD_PACKAGES
From: Scott Garman scott.a.gar...@intel.com Previously we injected the user/group preinstall script into all output packages. This fixes that so that only packages listed in USERADD_PACKAGES get modified. It also removes the USERADDPN variable, which is no longer needed. Signed-off-by: Scott Garman scott.a.gar...@intel.com --- meta/classes/useradd.bbclass | 42 -- 1 files changed, 16 insertions(+), 26 deletions(-) diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index a8a1c14..3b2d1db 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -1,5 +1,3 @@ -USERADDPN ?= ${PN} - # base-passwd-cross provides the default passwd and group files in the # target sysroot, and shadow -native and -sysroot provide the utilities # and support files needed to add and modify user and group accounts @@ -106,30 +104,29 @@ SYSROOTPOSTFUNC_virtclass-nativesdk = # Recipe parse-time sanity checks def update_useradd_after_parse(d): - if not d.getVar('USERADD_PACKAGES', False): - if not d.getVar('USERADD_PARAM', False) and not d.getVar('GROUPADD_PARAM', False): - raise bb.build.FuncFailed, %s inherits useradd but doesn't set USERADD_PARAM or GROUPADD_PARAM % bb.data.getVar('FILE', d) + useradd_packages = d.getVar('USERADD_PACKAGES', True) + + if not useradd_packages: + raise bb.build.FuncFailed, %s inherits useradd but doesn't set USERADD_PACKAGES % bb.data.getVar('FILE', d) + + for pkg in useradd_packages.split(): + if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True): + raise bb.build.FuncFailed, %s inherits useradd but doesn't set USERADD_PARAM or GROUPADD_PARAM for package %s % (bb.data.getVar('FILE', d), pkg) python __anonymous() { update_useradd_after_parse(d) } # Return a single [GROUP|USER]ADD_PARAM formatted string which includes the -# [group|user]add parameters for all packages in this recipe +# [group|user]add parameters for all USERADD_PACKAGES in this recipe def get_all_cmd_params(d, cmd_type): import string param_type = cmd_type.upper() + ADD_PARAM_%s params = [] - pkgs = d.getVar('USERADD_PACKAGES', True) - if not pkgs: - pkgs = d.getVar('USERADDPN', True) - packages = (d.getVar('PACKAGES', True) or ).split() - if packages and pkgs not in packages: - pkgs = packages[0] - - for pkg in pkgs.split(): + useradd_packages = d.getVar('USERADD_PACKAGES', True) or + for pkg in useradd_packages.split(): param = d.getVar(param_type % pkg, True) if param: params.append(param) @@ -156,17 +153,10 @@ fakeroot python populate_packages_prepend () { rdepends = d.getVar(RDEPENDS_%s % pkg, True) or rdepends += base-passwd shadow bb.data.setVar(RDEPENDS_%s % pkg, rdepends, d) - - # We add the user/group calls to all packages to allow any package - # to contain files owned by the users/groups defined in the recipe. - # The user/group addition code is careful not to create duplicate - # entries, so this is safe. - pkgs = d.getVar('USERADD_PACKAGES', True) - if not pkgs: - pkgs = d.getVar('USERADDPN', True) - packages = (d.getVar('PACKAGES', True) or ).split() - if packages and pkgs not in packages: - pkgs = packages[0] - for pkg in pkgs.split(): + + # Add the user/group preinstall scripts and RDEPENDS requirements + # to packages specified by USERADD_PACKAGES + useradd_packages = d.getVar('USERADD_PACKAGES', True) or + for pkg in useradd_packages.split(): update_useradd_package(pkg) } -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 16/33] busybox: add grep to temporary links during uninstall
From: Paul Eggleton paul.eggle...@linux.intel.com In the busybox package prerm we set up some temporary links and modify PATH so that certain utilities are provided for the purpose of running update-alternatives; if grep is not among these then you get errors when removing busybox, so add a temporary link for grep as well. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com Resorted the link list. Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-core/busybox/busybox.inc | 11 ++- meta/recipes-core/busybox/busybox_1.18.5.bb |2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index acd635b..ff31bb7 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -259,17 +259,18 @@ pkg_prerm_${PN} () { # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh tmpdir=`mktemp -d /tmp/busyboxrm-XX` ln -s /bin/busybox $tmpdir/[ - ln -s /bin/busybox $tmpdir/test - ln -s /bin/busybox $tmpdir/head - ln -s /bin/busybox $tmpdir/sh ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/dirname ln -s /bin/busybox $tmpdir/echo - ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/grep + ln -s /bin/busybox $tmpdir/head ln -s /bin/busybox $tmpdir/ln - ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/mv ln -s /bin/busybox $tmpdir/rm ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sh ln -s /bin/busybox $tmpdir/sort + ln -s /bin/busybox $tmpdir/test export PATH=$PATH:$tmpdir while read link diff --git a/meta/recipes-core/busybox/busybox_1.18.5.bb b/meta/recipes-core/busybox/busybox_1.18.5.bb index bdafb31..17d583e 100644 --- a/meta/recipes-core/busybox/busybox_1.18.5.bb +++ b/meta/recipes-core/busybox/busybox_1.18.5.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = r1 +PR = r2 SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \ -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 24/33] useradd.bbclass: do not modify -nativesdk packages
From: Scott Garman scott.a.gar...@intel.com Exclude the addition of user/group code and RDEPENDS changes for -nativesdk packages. Signed-off-by: Scott Garman scott.a.gar...@intel.com --- meta/classes/useradd.bbclass |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 3b2d1db..64d6861 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -153,10 +153,11 @@ fakeroot python populate_packages_prepend () { rdepends = d.getVar(RDEPENDS_%s % pkg, True) or rdepends += base-passwd shadow bb.data.setVar(RDEPENDS_%s % pkg, rdepends, d) - + # Add the user/group preinstall scripts and RDEPENDS requirements # to packages specified by USERADD_PACKAGES - useradd_packages = d.getVar('USERADD_PACKAGES', True) or - for pkg in useradd_packages.split(): - update_useradd_package(pkg) + if not bb.data.inherits_class('nativesdk', d): + useradd_packages = d.getVar('USERADD_PACKAGES', True) or + for pkg in useradd_packages.split(): + update_useradd_package(pkg) } -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 21/33] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
From: Joshua Lock j...@linux.intel.com The D-Bus backend has been integrated into upstream GConf so we can switch to upstream and drop gconf-dbus. I've gone for a release in the 3.2 series as we disable Gtk+, and therefore are not impacted by the gtk+3 changes, and the D-Bus backend was unstable before this release. Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/conf/distro/include/default-providers.inc |2 - meta/conf/multilib.conf|2 +- meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 meta/recipes-gnome/gnome/gconf-dbus_705.bb | 43 -- meta/recipes-gnome/gnome/gconf_3.2.3.bb| 43 ++ 5 files changed, 103 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index be23d36..afea5e7 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= update-alternatives-cworth # PREFERRED_PROVIDER_dbus-glib ?= dbus-glib PREFERRED_PROVIDER_dbus-glib-native ?= dbus-glib-native -PREFERRED_PROVIDER_gconf ?= gconf-dbus -PREFERRED_PROVIDER_gconf-native ?= gconf-dbus-native PREFERRED_PROVIDER_gdk-pixbuf ?= gdk-pixbuf PREFERRED_PROVIDER_libgcc ?= libgcc PREFERRED_PROVIDER_libgcc-nativesdk ?= libgcc-nativesdk diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 5e4b435..de53540 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = ${MULTILIBS} BBCLASSEXTEND_append_pn-gcc-cross-intermediate = ${MULTILIBS} BBCLASSEXTEND_append_pn-gcc-cross = ${MULTILIBS} BBCLASSEXTEND_append_pn-gcc-runtime = ${MULTILIBS} -BBCLASSEXTEND_append_pn-gconf-dbus = ${MULTILIBS} +BBCLASSEXTEND_append_pn-gconf = ${MULTILIBS} BBCLASSEXTEND_append_pn-gdbm = ${MULTILIBS} BBCLASSEXTEND_append_pn-gdb = ${MULTILIBS} BBCLASSEXTEND_append_pn-gdk-pixbuf = ${MULTILIBS} diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch new file mode 100644 index 000..29181e3 --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch @@ -0,0 +1,59 @@ +This is a hacky way to prevent GConf from trying to build the introspection related pieces. +Clearly not appropriate for upstream. + +Upstream-Status: Inappropriate + +Signed-off-by: Joshua Lock j...@linux.intel.com + +Index: GConf-3.2.2/gconf/Makefile.am +=== +--- GConf-3.2.2.orig/gconf/Makefile.am GConf-3.2.2/gconf/Makefile.am +@@ -145,34 +145,6 @@ libgconf_2_la_LDFLAGS = -version-info $( + + libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS) + +--include $(INTROSPECTION_MAKEFILE) +-INTROSPECTION_GIRS = +-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) +-INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir) +- +-if HAVE_INTROSPECTION +-introspection_files = \ +- $(gconfinclude_HEADERS) \ +- $(filter-out $(CORBA_SOURCECODE), $(filter %.c,$(libgconf_2_la_SOURCES))) +-GConf-2.0.gir: libgconf-2.la Makefile +-GConf_2_0_gir_INCLUDES = GObject-2.0 +-GConf_2_0_gir_CFLAGS = \ +- $(INCLUDES) +-GConf_2_0_gir_LIBS = libgconf-2.la +-GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +-GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf --c-include gconf/gconf.h +-GConf_2_0_gir_EXPORT_PACKAGES = gconf-2.0 +-INTROSPECTION_GIRS += GConf-2.0.gir +- +-girdir = $(datadir)/gir-1.0/ +-gir_DATA = $(INTROSPECTION_GIRS) +- +-typelibsdir = $(libdir)/girepository-1.0/ +-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +- +-CLEANFILES += $(gir_DATA) $(typelibs_DATA) +-endif +- + EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh + + default.path: $(srcdir)/default.path.in +Index: GConf-3.2.2/configure.in +=== +--- GConf-3.2.2.orig/configure.in GConf-3.2.2/configure.in +@@ -354,8 +354,6 @@ AM_GLIB_GNU_GETTEXT + + AC_CHECK_FUNCS(bind_textdomain_codeset) + +-GOBJECT_INTROSPECTION_CHECK([0.9.5]) +- + AC_SUBST(CFLAGS) + AC_SUBST(CPPFLAGS) + AC_SUBST(LDFLAGS) diff --git a/meta/recipes-gnome/gnome/gconf-dbus_705.bb b/meta/recipes-gnome/gnome/gconf-dbus_705.bb deleted file mode 100644 index 52e8a08..000 --- a/meta/recipes-gnome/gnome/gconf-dbus_705.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = Settings daemon using DBUS for communication. -SECTION =
[OE-core] [CONSOLIDATED PULL (v2) 28/33] bitbake.conf: Unload pseudo when its not required for a given task
From: Richard Purdie richard.pur...@linuxfoundation.org This yields a small performance boost due to the lack of the preload overhead on each task execution. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/conf/bitbake.conf |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d405b6a..44b8f31 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -586,6 +586,7 @@ export PSEUDO_DISABLED = 1 #export PSEUDO_BINDIR = ${STAGING_DIR_NATIVE}${bindir_native} #export PSEUDO_LIBDIR = ${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib FAKEROOTENV = PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${STAGING_DIR_TARGET} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0 +FAKEROOTNOENV = PSEUDO_UNLOAD=1 FAKEROOTDIRS = ${PSEUDO_LOCALSTATEDIR} PREFERRED_PROVIDER_virtual/fakeroot-native ?= pseudo-native -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 20/33] classes/[gnome|gnomebase|mime]: enhance gnome related classes
From: Joshua Lock j...@linux.intel.com This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies. These aren't an exact copy of the classes from meta-openembedded, notable differences are: * gnome.bbclass - I dropped the BBCLASSEXTEND * mime.bbclass: - updated coding style - use which to find update-mime-database program rather than hard coded - fix typo in populate_packges_append such that it's actually called CC: Koen Kooi k...@dominion.thruhere.net CC: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/classes/gnome.bbclass | 18 +--- meta/classes/gnomebase.bbclass | 30 meta/classes/mime.bbclass | 58 3 files changed, 90 insertions(+), 16 deletions(-) create mode 100644 meta/classes/gnomebase.bbclass create mode 100644 meta/classes/mime.bbclass diff --git a/meta/classes/gnome.bbclass b/meta/classes/gnome.bbclass index 3d68b12..a19dd17 100644 --- a/meta/classes/gnome.bbclass +++ b/meta/classes/gnome.bbclass @@ -1,17 +1,3 @@ -def gnome_verdir(v): - import re - m = re.match(^([0-9]+)\.([0-9]+), v) - return %s.%s % (m.group(1), m.group(2)) +inherit gnomebase gtk-icon-cache gconf mime -SECTION ?= x11/gnome -SRC_URI = ${GNOME_MIRROR}/${BPN}/${@gnome_verdir(${PV})}/${BPN}-${PV}.tar.bz2;name=archive - -DEPENDS += gnome-common - -FILES_${PN} += ${datadir}/application-registry \ -${datadir}/mime-info \ -${datadir}/gnome-2.0 - -inherit autotools pkgconfig gconf - -EXTRA_OEMAKE += GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +EXTRA_OECONF += --enable-introspection=no diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass new file mode 100644 index 000..a4209a0 --- /dev/null +++ b/meta/classes/gnomebase.bbclass @@ -0,0 +1,30 @@ +def gnome_verdir(v): + import re + m = re.match(^([0-9]+)\.([0-9]+), v) + return %s.%s % (m.group(1), m.group(2)) + +SECTION ?= x11/gnome +SRC_URI = ${GNOME_MIRROR}/${BPN}/${@gnome_verdir(${PV})}/${BPN}-${PV}.tar.bz2;name=archive + +DEPENDS += gnome-common + +FILES_${PN} += ${datadir}/application-registry \ + ${datadir}/mime-info \ + ${datadir}/mime/packages \ + ${datadir}/mime/application \ + ${datadir}/gnome-2.0 \ + ${datadir}/polkit* \ + ${datadir}/GConf \ + ${datadir}/glib-2.0/schemas \ + + +FILES_${PN}-doc += ${datadir}/devhelp + +inherit autotools pkgconfig + +do_install_append() { + rm -rf ${D}${localstatedir}/lib/scrollkeeper/* + rm -rf ${D}${localstatedir}/scrollkeeper/* + rm -f ${D}${datadir}/applications/*.cache +} + diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass new file mode 100644 index 000..4a2ce8b --- /dev/null +++ b/meta/classes/mime.bbclass @@ -0,0 +1,58 @@ +DEPENDS += shared-mime-info-native shared-mime-info + +mime_postinst() { +if [ $1 = configure ]; then + UPDATEMIMEDB=`which update-mime-database` + if [ -x $UPDATEMIMEDB ] ; then + echo Updating MIME database... this may take a while. + $UPDATEMIMEDB $D${datadir}/mime + else + echo Missing update-mime-database, update of mime database failed! + exit 1 + fi +fi +} + +mime_postrm() { +if [ $1 = remove ] || [ $1 = upgrade ]; then + UPDATEMIMEDB=`which update-mime-database` + if [ -x $UPDATEMIMEDB ] ; then + echo Updating MIME database... this may take a while. + $UPDATEMIMEDB $D${datadir}/mime + else + echo Missing update-mime-database, update of mime database failed! + exit 1 + fi +fi +} + +python populate_packages_append () { + import re + packages = d.getVar('PACKAGES', True).split() + pkgdest = d.getVar('PKGDEST', True) + + for pkg in packages: + mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg) + mimes = [] + mime_re = re.compile(.*\.xml$) + if os.path.exists(mime_dir): + for f in os.listdir(mime_dir): + if mime_re.match(f): + mimes.append(f) + if mimes: + bb.note(adding mime postinst and postrm scripts to %s % pkg) + postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + if not postinst: + postinst = '#!/bin/sh\n' + postinst += d.getVar('mime_postinst', True) + d.setVar('pkg_postinst_%s' % pkg, postinst) + postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) +
[OE-core] [CONSOLIDATED PULL (v2) 25/33] useradd-example.bb: update example documentation comments
From: Scott Garman scott.a.gar...@intel.com Clarify that only packages listed in USERADD_PACKAGES will include the user/group creation code. Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../recipes-skeleton/useradd/useradd-example.bb|9 - 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb index 02d56f6..b10c1d0 100644 --- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb +++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb @@ -17,13 +17,12 @@ PACKAGES =+ ${PN}-user3 inherit useradd -# Specify which package(s) should include the user/group code. -# Make sure that any packages which install files owned by custom -# users/groups are included here. The code which adds users and -# groups is idempotent. +# You must set USERADD_PACKAGES when you inherit useradd. This +# lists which output packages will include the user/group +# creation code. USERADD_PACKAGES = ${PN} ${PN}-user3 -# You *must* set USERADD_PARAM and/or GROUPADD_PARAM when +# You must also set USERADD_PARAM and/or GROUPADD_PARAM when # you inherit useradd. # USERADD_PARAM specifies command line options to pass to the -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 33/33] useradd: Add missing DEPEND on shadow
From: Richard Purdie richard.pur...@linuxfoundation.org Without this rootfs generation fails as an RDEPENDS is added but the package might not have bneen built. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/useradd.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index ae7349b..49a3d3f 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -2,7 +2,7 @@ # target sysroot, and shadow -native and -sysroot provide the utilities # and support files needed to add and modify user and group accounts DEPENDS_append = ${USERADDDEPENDS} -USERADDDEPENDS = base-passwd shadow-native shadow-sysroot +USERADDDEPENDS = base-passwd shadow-native shadow-sysroot shadow USERADDDEPENDS_virtclass-nativesdk = # This preinstall function will be run in two contexts: once for the -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 30/33] classes: Remove various bashisms
From: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/image-prelink.bbclass |2 +- meta/classes/kernel.bbclass|2 +- meta/classes/package_rpm.bbclass | 18 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index 350c29d..53ef47e 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -24,7 +24,7 @@ prelink_image () { ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf # Remove the prelink.conf if we had to add it. - if [ $dummy_prelink_conf == true ]; then + if [ $dummy_prelink_conf = true ]; then rm -f ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf fi diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 42543e0..dc711f2 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -152,7 +152,7 @@ kernel_do_install() { # cp -fR * $kerneldir cp .config $kerneldir - if [ ! ${S} == ${B} ]; then + if [ ${S} != ${B} ]; then cp -fR ${S}/* $kerneldir fi install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index c01863e..f122c70 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -87,22 +87,22 @@ package_generate_rpm_conf_common() { shift printf _solve_dbpath ${rpmconf_base}.macro - o_colon=false + o_colon=false for archvar in $@; do printf _solve_dbpath ${rpmconf_base}-${archvar}.macro - colon=false + colon=false for each in `cat ${rpmconf_base}-${archvar}.conf` ; do - if [ $o_colon == true ]; then + if [ $o_colon = true ]; then printf : ${rpmconf_base}.macro fi - if [ $colon == true ]; then + if [ $colon = true ]; then printf : ${rpmconf_base}-${archvar}.macro fi printf %s $each ${rpmconf_base}.macro - o_colon=true + o_colon=true printf %s $each ${rpmconf_base}-${archvar}.macro - colon=true + colon=true done printf \n ${rpmconf_base}-${archvar}.macro done @@ -214,7 +214,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed s,^${ml_prefix}-\(.*\),\1,) archvar=ml_archs manifest=install_multilib.manifest @@ -240,7 +240,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed s,^${ml_prefix}-\(.*\),\1,) archvar=ml_archs manifest=install_multilib.manifest @@ -276,7 +276,7 @@ package_install_internal_rpm () { ml_prefix=`echo ${pkg} | cut -d'-' -f1` ml_pkg=$pkg for i in ${MULTILIB_PREFIX_LIST} ; do - if [ ${ml_prefix} == ${i} ]; then + if [ ${ml_prefix} = ${i} ]; then ml_pkg=$(echo ${pkg} | sed s,^${ml_prefix}-\(.*\),\1,) archvar=ml_archs break -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 31/33] Allow use of dash as /bin/sh
From: Richard Purdie richard.pur...@linuxfoundation.org We've had the check for dash as /bin/sh for a long time. Dash has been around long enough now that most major issues have been identified and fixed from build perspective. This patch fixes a bashism in the openjade-native recipe. It also adjusts libtool so that the header at the script is used and not the value of $SHELL. This is because many Makefiles change $SHELL so dash can get used to execute what is otherwise configured as a bash shell script. Since we don't need to execute scripts this way on any system I'm aware of us building upon, the simplest fix is just to remove $SHELL. With these two changes the dash check can be removed and we can allow builds with dash as /bin/sh Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org [Note: I know I need to add the description of the libtool change above into the prefix.patch] --- meta/classes/sanity.bbclass|3 --- meta/recipes-devtools/libtool/libtool/prefix.patch | 11 ++- .../openjade/openjade-native_1.3.2.bb |4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 3f42b4f..838448f 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -331,9 +331,6 @@ def check_sanity(e): if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu': messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n' -if os.path.basename(os.readlink('/bin/sh')) == 'dash': -messages = messages + Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n - omask = os.umask(022) if omask 0755: messages = messages + Please use a umask which allows a+rx and u+rwx\n diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch index 1b20324..e6eca1f 100644 --- a/meta/recipes-devtools/libtool/libtool/prefix.patch +++ b/meta/recipes-devtools/libtool/libtool/prefix.patch @@ -8,6 +8,15 @@ Originally by: RP Updated: Date: 2010/06/28 Nitin A Kamble nitin.a.kam...@intel.com +It also adjusts libtool so that the header at the script is used for +script execution and not thevalue of $SHELL. This is because many +Makefiles change $SHELL so dash can get used to execute what is +otherwise configured as a bash shell script. Since we don't need to +execute scipts this way on any system I'm aware of us building upon, +the simplest fix is just to remove $SHELL. + +Updated: Date: 2011/11/09 +RP Index: libtool-2.4/libltdl/m4/libtool.m4 === @@ -18,7 +27,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 # Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL='$(top_builddir)' +LIBTOOL=$LIBTOOL/${host_alias}-libtool AC_SUBST(LIBTOOL)dnl diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index 6cc6bb5..0cce46e 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -53,7 +53,9 @@ do_install() { install -d ${D}${datadir}/sgml/openjade-${PV} install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV} - install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV} + install -m 644 dsssl/*.dtd ${D}${datadir}/sgml/openjade-${PV} + install -m 644 dsssl/*.dsl ${D}${datadir}/sgml/openjade-${PV} + install -m 644 dsssl/*.sgm ${D}${datadir}/sgml/openjade-${PV} install -d ${datadir}/sgml/openjade-${PV} install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 29/33] scripts/qemuimage-testlib: Output a slightly better error if expect is missing
From: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- scripts/qemuimage-testlib | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 6a1b900..d0d1b74 100644 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib @@ -96,6 +96,13 @@ expect { eof { exit [ lindex [wait] 3 ] } } EOF` + + expect=`which expect` + if [ ! -x $expect ]; then + Test_Error ERROR: Please install expect + return 1 + fi + expect -c $exp_cmd ret=$? rm -rf $tmpfile @@ -120,6 +127,13 @@ expect { eof { exit [ lindex [wait] 3 ] } } EOF` + + expect=`which expect` + if [ ! -x $expect ]; then + Test_Error ERROR: Please install expect + return 1 + fi + expect -c $exp_cmd ret=$? rm -rf $tmpfile -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL (v2) 26/33] avahi: remove USERADDPN
From: Scott Garman scott.a.gar...@intel.com USERADDPN is no longer used; remove it. Signed-off-by: Scott Garman scott.a.gar...@intel.com --- meta/recipes-connectivity/avahi/avahi.inc |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 728c38f..deebbd6 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -23,7 +23,6 @@ SRC_URI = http://avahi.org/download/avahi-${PV}.tar.gz \ file://99avahi-autoipd \ file://initscript.patch -USERADDPN = avahi-daemon USERADD_PACKAGES = avahi-daemon USERADD_PARAM_avahi-daemon = --system --home /var/run/avahi-daemon \ --no-create-home --shell /bin/false \ -- 1.7.6.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core