* Re: [CONSOLIDATED PULL 0/5] Collection of patches
From: Richard Purdie @ 2011-09-07 22:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1315329511.git.sgw@linux.intel.com>
On Tue, 2011-09-06 at 10:26 -0700, Saul Wold wrote:
> Richard,
>
> This is a collection of patches that have been sitting around,
> and unless I missed some comments should be good to go.
>
> I bumped gettext's PR in this request.
>
> Sau!
>
>
> The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:
>
> icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Denis Carikli (1):
> mtd-utils: update to version to 1.4.6
>
> Kumar Gala (1):
> scripts/oe-buildenv-internal: Add SOCKS5_{USER, PASSWD} to
> BB_ENV_EXTRAWHITE
>
> Phil Blundell (1):
> pango: use qemu to generate pango.modules during rootfs construction
>
> Saul Wold (2):
> gettext: use included libxml and libcroco
> web: Update SRCREV to address ccs_parser_parse_stylesheet arg
> mismatch
Merged to master with the exception of Kumar's change which I've
followed up with in the original thread.
Cheers,
Richard
^ permalink raw reply
* Re: [PATCH 1/1] hal: Add virtual/kernel as hal's build dependency
From: Richard Purdie @ 2011-09-07 21:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <28743d872244f343d525c21c8f1b63f33b531318.1315385757.git.dongxiao.xu@intel.com>
On Wed, 2011-09-07 at 16:58 +0800, Dongxiao Xu wrote:
> hal may need some kernel headers, thus we need virtual/kernel as its
> dependency.
>
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> ---
> meta/recipes-support/hal/hal.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [PATCH 0/2][PULL] multilib: Fix kernel-module dependency
From: Richard Purdie @ 2011-09-07 21:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1315384269.git.dongxiao.xu@intel.com>
On Wed, 2011-09-07 at 16:33 +0800, Dongxiao Xu wrote:
> Hi Richard,
>
> This pull request is to fix the dependency/recommends of kernel-module-* in
> other recipes. Besides, there is another patch to remove the linux-yocto
> extension in multilib.conf. Please help to review and pull.
>
> Thanks,
> Dongxiao
>
>
> The following changes since commit 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f:
>
> icu-3.6: fix building with big make -j (2011-09-05 20:38:50 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib dxu4/ml
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml
>
> Dongxiao Xu (2):
> multilib_global.bbclass: handle kernel-module-* for multilib
> multilib: Remove the multilib extension for linux-yocto
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [PATCH 1/1] telepathy-python: avoid duplicated installation of errors.py
From: Richard Purdie @ 2011-09-07 21:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <5aa88c90226af1c5822344de8ae4fce537533782.1315383334.git.dongxiao.xu@intel.com>
On Wed, 2011-09-07 at 16:18 +0800, Dongxiao Xu wrote:
> telepathy-python install fails on latest Fedora 16 due to the tighter
> check of duplicated file installation.
>
> Remove one errors.py entry in Makefile.am to fix this issue.
>
> [YOCTO #1453]
>
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> ---
> .../remove_duplicate_install.patch | 26 ++++++++++++++++++++
> .../telepathy/telepathy-python_0.15.19.bb | 5 ++-
> 2 files changed, 29 insertions(+), 2 deletions(-)
> create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [PULL v3 1/1] gcc: add patch for ice 50099, which caused lttng-ust not to build
From: Richard Purdie @ 2011-09-07 21:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <ebc08824e0f440526c40294f873e62b99daa7e1c.1315415799.git.sgw@linux.intel.com>
On Wed, 2011-09-07 at 10:19 -0700, Saul Wold wrote:
> [YOCTO #1381]
>
> This patch came from from GCC Bugzilla via Khem
>
> Cc: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
> .../gcc/gcc-4.6/fix-for-ice-50099.patch | 49 ++++++++++++++++++++
> 2 files changed, 51 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [PULL v2 1/1] cpan.bbclass: fix native perl issue
From: Richard Purdie @ 2011-09-07 21:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <68679302c46936d2e2f7b0980ec325c398dd5e73.1315411864.git.sgw@linux.intel.com>
On Wed, 2011-09-07 at 09:12 -0700, Saul Wold wrote:
> When configuring cpan packages, the directories passed to MakeMaker
> are the target directories. There was a patch that was applied to the
> native perl to find perl.real and convert that to perl. This does not
> apply for the target perl modules and therefore MakeMaker finds perl.real.
>
> This patch to cpan configure modifies the Makefile after configure and
> changes the perl.real to just straight perl so we have the correct paths
> and shared state info in usable.
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/classes/cpan.bbclass | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [PATCH 0/4] Some miscellaneous bugfixes
From: Richard Purdie @ 2011-09-07 21:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1315411459.git.paul.eggleton@linux.intel.com>
On Wed, 2011-09-07 at 17:05 +0100, Paul Eggleton wrote:
> The following changes since commit cb8efc0e1ec00892b46325aabfb1b4020a46c078:
>
> linux-yocto: re-enable utrace (2011-09-07 14:53:38 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib paule/fixes5
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes5
>
> Paul Eggleton (4):
> core-image.bbclass: zap root password if debug-tweaks not enabled
> sanity.bbclass: re-enable DISTRO check
> meta/recipes.txt: correct Qt capitalisation
> base.bbclass: fix substring matching in COMMERCIAL_LICENSE
Merged to master, thanks.
Richard
^ permalink raw reply
* [PATCH] dbus: fix paths in startup script, use useradd.bbclass for user creation
From: Phil Blundell @ 2011-09-07 20:28 UTC (permalink / raw)
To: openembedded-core
Replace various hard-coded references to /usr, /var and /etc with symbolic equivalents.
Also replace adhoc usage of adduser/addgroup with useradd.bbclass
functionality. This should, in theory, remove the need for a postinst
to be run at boot time.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init | 14 +++---
meta/recipes-core/dbus/dbus.inc | 58 ++++++++++++------------
meta/recipes-core/dbus/dbus_1.4.12.bb | 1 +
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init b/meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init
index 4abc4cb..1917ad3 100644
--- a/meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init
@@ -16,22 +16,22 @@
set -e
-DAEMON=/usr/bin/dbus-daemon
+DAEMON=@BINDIR@/dbus-daemon
NAME=dbus
DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
+PIDDIR=@LOCALSTATEDIR@/run/dbus
PIDFILE=$PIDDIR/pid
-UUIDDIR=/var/lib/dbus
+UUIDDIR=@LOCALSTATEDIR@/lib/dbus
DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
+EVENTDIR=@SYSCONFDIR@/dbus-1/event.d
test -x $DAEMON || exit 0
# Source defaults file; edit that file to configure this script.
ENABLED=1
PARAMS=""
-if [ -e /etc/default/dbus ]; then
- . /etc/default/dbus
+if [ -e @SYSCONFDIR@/default/dbus ]; then
+ . @SYSCONFDIR@/default/dbus
fi
test "$ENABLED" != "0" || exit 0
@@ -113,7 +113,7 @@ case "$1" in
start_it_up
;;
*)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: @SYSCONFDIR@/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
exit 1
;;
esac
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a8ecda8..34dbe4a 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -14,11 +14,19 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch; \
file://dbus-1.init"
-inherit autotools pkgconfig gettext update-rc.d
+inherit autotools pkgconfig gettext update-rc.d useradd
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "-d ${MESSAGEHOME} -g ${MESSAGEUSER} -r ${MESSAGEUSER}"
+GROUPADD_PARAM_${PN} = "${MESSAGEUSER}; netdev"
INITSCRIPT_NAME = "dbus-1"
INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
+MESSAGEUSER=messagebus
+MESSAGEHOME="${localstatedir}/run/dbus"
+UUIDDIR="${localstatedir}/lib/dbus"
+
CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
DEBIANNAME_${PN} = "dbus-1"
@@ -34,42 +42,27 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${bindir}/dbus-uuidgen \
${bindir}/dbus-cleanup-sockets \
${bindir}/dbus-send \
- ${bindir}/dbus-monitor \
+ ${bindir}/dbus-monitor \
+ ${bindir}/dbus-launch \
${libexecdir}/dbus* \
${sysconfdir} \
${datadir}/dbus-1/services \
- ${datadir}/dbus-1/system-services"
+ ${datadir}/dbus-1/system-services \
+ ${MESSAGEHOME} \
+ ${UUIDDIR}"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
RRECOMMENDS_${PN}-lib = "${PN}"
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-pkg_postinst_dbus() {
- # can't do adduser stuff offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
-
- MESSAGEUSER=messagebus
- MESSAGEHOME=/var/run/dbus
- UUIDDIR=/var/lib/dbus
-
- mkdir -p $MESSAGEHOME
- mkdir -p $UUIDDIR
- chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
- chown "$MESSAGEUSER":"$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
- adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \
- --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+pkg_postinst_${PN}() {
+ chgrp "${MESSAGEUSER}" "${MESSAGEHOME}"
+ chown "${MESSAGEUSER}":"${MESSAGEUSER}" "${MESSAGEHOME}"
+ chown "${MESSAGEUSER}":"${MESSAGEUSER}" "${UUIDDIR}"
- chown "$MESSAGEUSER":"$MESSAGEUSER" "$UUIDDIR"
+ chown root:"${MESSAGEUSER}" $D${libexecdir}/dbus-daemon-launch-helper
+ chmod 4754 $D${libexecdir}/dbus-daemon-launch-helper
- grep -q netdev: /etc/group || addgroup netdev
-
- chown root:"$MESSAGEUSER" /usr/libexec/dbus-daemon-launch-helper
- chmod 4754 /usr/libexec/dbus-daemon-launch-helper
-
- # add volatile after new user/grp are created
- echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus
- if [ -e /etc/init.d/populate-volatile.sh ] ; then
+ if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
/etc/init.d/populate-volatile.sh update
fi
}
@@ -90,11 +83,18 @@ do_install() {
autotools_do_install
install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+ sed 's:@SYSCONFDIR@:${sysconfdir}:;s:@BINDIR@:${bindir}:;s:@LOCALSTATEDIR@:${localstatedir}:' < ${WORKDIR}/dbus-1.init > ${D}${sysconfdir}/init.d/dbus-1
+ chmod 755 ${D}${sysconfdir}/init.d/dbus-1
# disable dbus-1 sysv script on systemd installs
# nearly all distros call the initscript plain 'dbus', but OE-core is different
ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
+
+ install -d ${D}${UUIDDIR}
+ install -d ${D}${MESSAGEHOME}
+
+ install -d ${D}${sysconfdir}/default/volatiles
+ echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" > ${D}${sysconfdir}/default/volatiles/99_dbus
}
do_install_virtclass-native() {
diff --git a/meta/recipes-core/dbus/dbus_1.4.12.bb b/meta/recipes-core/dbus/dbus_1.4.12.bb
index ada53c9..51604aa 100644
--- a/meta/recipes-core/dbus/dbus_1.4.12.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.12.bb
@@ -2,3 +2,4 @@ include dbus.inc
SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"
+PR = "r6"
--
1.7.4.1
^ permalink raw reply related
* [PATCH] avahi: only use gtk if DISTRO_FEATURES includes x11
From: Phil Blundell @ 2011-09-07 20:23 UTC (permalink / raw)
To: openembedded-core
Otherwise avahi isn't buildable for an x11-less DISTRO.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/recipes-connectivity/avahi/avahi.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index dc7a5ae..24ea458 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,8 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
+X11DEPENDS = "gtk+ libglade"
+DEPENDS = "expat libcap libdaemon dbus glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd \
@@ -30,6 +31,7 @@ EXTRA_OECONF = "--with-distro=debian \
--disable-mono \
--disable-monodoc \
--disable-gtk3 \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-gtk', '--disable-gtk', d)} \
--disable-qt3 \
--disable-qt4 \
--disable-python \
--
1.7.4.1
^ permalink raw reply related
* [PATCH] useradd.bbclass: use correct value for $D in postinst functions
From: Phil Blundell @ 2011-09-07 20:20 UTC (permalink / raw)
To: openembedded-core
This corrects the location of the password file used during package installation.
See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009183.html and subsequent discussion.
Signed-off-by: Phil Blundell <philb@gnu.org>
---
meta/classes/useradd.bbclass | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 5f5b68d..1e03a04 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -15,8 +15,8 @@ SYSROOT=""
if test "x$D" != "x"; then
# Installing into a sysroot
- SYSROOT="${STAGING_DIR_TARGET}"
- OPT="--root ${STAGING_DIR_TARGET}"
+ SYSROOT="$D"
+ OPT="--root $D"
# Add groups and users defined for all recipe packages
GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}"
@@ -79,7 +79,7 @@ useradd_sysroot () {
# Explicitly set $D since it isn't set to anything
# before do_install
- D=${D}
+ D=${STAGING_DIR_TARGET}
useradd_preinst
}
--
1.7.4.1
^ permalink raw reply related
* Re: [PATCH 1/1] image-types: add btrfs as a supported fstype
From: Kamble, Nitin A @ 2011-09-07 18:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Lock, Joshua
In-Reply-To: <20110907071541.GB4181@chargestorm.se>
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Anders Darander
> Sent: Wednesday, September 07, 2011 12:16 AM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 1/1] image-types: add btrfs as a
> supported fstype
>
> * nitin.a.kamble@intel.com <nitin.a.kamble@intel.com> [110906 23:07]:
> > From: Nitin A Kamble <nitin.a.kamble@intel.com>
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> > ---
> > meta/classes/image_types.bbclass | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/classes/image_types.bbclass
> b/meta/classes/image_types.bbclass
> > index c24b326..3e303ed 100644
> > --- a/meta/classes/image_types.bbclass
> > +++ b/meta/classes/image_types.bbclass
> > @@ -141,4 +141,4 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native"
> > IMAGE_DEPENDS_ubifs = "mtd-utils-native"
> >
> > # This variable is available to request which values are suitable
> for IMAGE_FSTYPES
> > -IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext3 ext3.gz live squashfs
> squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz
> cpio.lzma"
> > +IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext3 ext3.gz btrfs live
> squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz
> cpio.xz cpio.lzma"
>
> As Joshua already replied, this isn't enough.
> This raises one question, though. Have you successfully built
> btrfs-image? If so, I assume that you have more patches locally,
> otherwise you should resist submitting patches, unless they're clearly
> marked as RFC (request for comments, and thus not to be applied).
>
> Cheers,
> Anders
All these pieces Josh mentioned are already in the tree. I found this new line, and saw btrfs was not listed in it so added there also. The btrfs support in yocto is working with Linux-yocto 3.x kernel. The btrfs kernel config needs to be enabled, I have sent a patch for that implementing it as a kernel feature, Once that is there then also need to enable the btrfs feature in the Linux-yocto kernel recipe. I will send a patch for that too.
Thanks,
Nitin
^ permalink raw reply
* Race condition when building external kernel modules
From: Anders Darander @ 2011-09-07 17:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
I've seen a race condition when building multiple external kernel
modules.
We are running with BB_NUMBER_THREADS set to 8 or 16, depending on the
build host, thus multiple external kernel modules can be built
simultaneously.
In our layer, we have two small kernel modules, whose recipes inherits
module.bbclass. Often when doing either a clean build, or after cleaning
the two packages, we get a race issue.
At the end of the mail is a short excerpt of the bitbake output after
the failure. The exact failure differs from run to run, but generally it
is similar to this:
| HOSTCC scripts/mod/mk_elfconfig
| fixdep: error opening depfile: scripts/mod/.mk_elfconfig.d: No such
file or directory
i.e. something under scripts in the sysroot gets rebuild in bitbake
threads, but one will fail as the depfile has been removed. At least
that's my interpretation of the most common failure. (Previously, it has
often been the depfile scripts/basic/.fixdeps.d that has been missing).
Do there exist any framework (locks?) to disallow two different recipes
to be build simultaneously?
Should the compile stage in the module bbclass be guarded with a
lock/mutex?
Any other ideas at how this should be attacked?
For our developers, this is mostly an annoying issue; the real issue will
start when we're setting up some autobuilders for our own distro...
Thanks in advance for all ideas/suggestions!
Regards,
Anders
---------- Failure ----------------
NOTE: Running task 714 of 726 (ID: 7,
/home/anders/oe-build/openembedded-core/../chargestorm/recipes/ccudrv/ccudrv.bb,
do_compile)
NOTE: package at91-bootcount-1.0-r3: task do_compile: Started
NOTE: package ccudrv-1.0-r4: task do_compile: Started
ERROR: Function 'do_compile' failed (see
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/at91-bootcount-1.0-r3/temp/log.do_compile.6959
for further information)
ERROR: Logfile of failure stored in:
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/at91-bootcount-1.0-r3/temp/log.do_compile.6959
Log data follows:
| + cd
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/at91-bootcount-1.0-r3/git
| + do_compile
| + module_do_compile
| + do_make_scripts
| + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
| + oe_runmake 'CC=arm-oe-linux-gnueabi-gcc -mno-thumb-interwork
-mno-thumb' 'LD=arm-oe-linux-gnueabi-ld ' 'AR=arm-oe-linux-gnueabi-ar '
-C /home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel
scripts
| + '[' xmake = x ']'
| + bbnote make -e MAKEFLAGS= 'CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb' 'LD=arm-oe-linux-gnueabi-ld '
'AR=arm-oe-linux-gnueabi-ar ' -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts
| + echo 'NOTE: make -e MAKEFLAGS= CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb LD=arm-oe-linux-gnueabi-ld
AR=arm-oe-linux-gnueabi-ar -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts'
| NOTE: make -e MAKEFLAGS= CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb LD=arm-oe-linux-gnueabi-ld
AR=arm-oe-linux-gnueabi-ar -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts
| + make -e MAKEFLAGS= 'CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb' 'LD=arm-oe-linux-gnueabi-ld '
'AR=arm-oe-linux-gnueabi-ar ' -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts
| make: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[1]: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| HOSTCC scripts/basic/fixdep
| HOSTCC scripts/basic/docproc
| make[1]: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[1]: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[2]: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| CC scripts/mod/empty.o
| HOSTCC scripts/mod/mk_elfconfig
| MKELF scripts/mod/elfconfig.h
| /bin/sh: scripts/mod/mk_elfconfig: Text file busy
| make[2]: *** [scripts/mod/elfconfig.h] Error 1
| make[2]: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[1]: *** [scripts/mod] Error 2
| make[1]: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make: *** [scripts] Error 2
| make: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| + die 'oe_runmake failed'
| + bbfatal 'oe_runmake failed'
| + echo 'ERROR: oe_runmake failed'
| ERROR: oe_runmake failed
| + exit 1
| ERROR: Function 'do_compile' failed (see
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/at91-bootcount-1.0-r3/temp/log.do_compile.6959
for further information)
NOTE: package at91-bootcount-1.0-r3: task do_compile: Failed
ERROR: Function 'do_compile' failed (see
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/ccudrv-1.0-r4/temp/log.do_compile.6973
for further information)
ERROR: Logfile of failure stored in:
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/ccudrv-1.0-r4/temp/log.do_compile.6973
Log data follows:
| + cd
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/ccudrv-1.0-r4/git
| + do_compile
| + module_do_compile
| + do_make_scripts
| + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
| + oe_runmake 'CC=arm-oe-linux-gnueabi-gcc -mno-thumb-interwork
-mno-thumb' 'LD=arm-oe-linux-gnueabi-ld ' 'AR=arm-oe-linux-gnueabi-ar '
-C /home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel
scripts
| + '[' xmake = x ']'
| + bbnote make -e MAKEFLAGS= 'CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb' 'LD=arm-oe-linux-gnueabi-ld '
'AR=arm-oe-linux-gnueabi-ar ' -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts
| + echo 'NOTE: make -e MAKEFLAGS= CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb LD=arm-oe-linux-gnueabi-ld
AR=arm-oe-linux-gnueabi-ar -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts'
| NOTE: make -e MAKEFLAGS= CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb LD=arm-oe-linux-gnueabi-ld
AR=arm-oe-linux-gnueabi-ar -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts
| + make -e MAKEFLAGS= 'CC=arm-oe-linux-gnueabi-gcc
-mno-thumb-interwork -mno-thumb' 'LD=arm-oe-linux-gnueabi-ld '
'AR=arm-oe-linux-gnueabi-ar ' -C
/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel scripts
| make: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[1]: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| HOSTCC scripts/basic/docproc
| make[1]: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[1]: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[2]: Entering directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| HOSTCC scripts/mod/mk_elfconfig
| fixdep: error opening depfile: scripts/mod/.mk_elfconfig.d: No such
file or directory
| make[2]: *** [scripts/mod/mk_elfconfig] Error 2
| make[2]: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make[1]: *** [scripts/mod] Error 2
| make[1]: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| make: *** [scripts] Error 2
| make: Leaving directory
`/home/anders/oe-build/build-ccu/tmp-eglibc/sysroots/ccu/kernel'
| + die 'oe_runmake failed'
| + bbfatal 'oe_runmake failed'
| + echo 'ERROR: oe_runmake failed'
| ERROR: oe_runmake failed
| + exit 1
| ERROR: Function 'do_compile' failed (see
/home/anders/oe-build/build-ccu/tmp-eglibc/work/ccu-oe-linux-gnueabi/ccudrv-1.0-r4/temp/log.do_compile.6973
for further information)
NOTE: package ccudrv-1.0-r4: task do_compile: Failed
ERROR: Task 19
(/home/anders/oe-build/openembedded-core/../chargestorm/recipes/at91-bootcount/at91-bootcount.bb,
do_compile) failed with exit code '1'
ERROR: Task 7
(/home/anders/oe-build/openembedded-core/../chargestorm/recipes/ccudrv/ccudrv.bb,
do_compile) failed with exit code '1'
ERROR:
'/home/anders/oe-build/openembedded-core/../chargestorm/recipes/at91-bootcount/at91-bootcount.bb'
failed
ERROR:
'/home/anders/oe-build/openembedded-core/../chargestorm/recipes/ccudrv/ccudrv.bb'
failed
--
Anders Darander
ChargeStorm AB
^ permalink raw reply
* terminal.bbclass: Improve environment handling
From: Richard Purdie @ 2011-09-07 17:39 UTC (permalink / raw)
To: openembedded-core
Currently the environment handling for terminals is inconsistent. There
are two fixes here:
a) Ensure the environment is setup before all oe.terminal call
b) Actually set the environment before the spawn calls since we need
variables like DISPLAY when the commands are being executed, not just
within the terminal environment. If this doesn't happen, DISPLAY can end
up not set with the errors that brings with it when trying to run X
commands.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index f29aeb0..ca28bd2 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -15,6 +15,11 @@ def oe_terminal(command, title, d):
import oe.data
import oe.terminal
+ for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d):
+ value = d.getVar(export, True)
+ if value is not None:
+ os.environ[export] = str(value)
+
terminal = oe.data.typed_value('OE_TERMINAL', d).lower()
if terminal == 'none':
bb.fatal('Devshell usage disabled with OE_TERMINAL')
@@ -28,14 +33,8 @@ def oe_terminal(command, title, d):
except oe.terminal.ExecutionError as exc:
bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc))
- env = dict(os.environ)
- for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d):
- value = d.getVar(export, True)
- if value is not None:
- env[export] = str(value)
-
try:
- oe.terminal.spawn_preferred(command, title, env)
+ oe.terminal.spawn_preferred(command, title)
except oe.terminal.NoSupportedTerminals:
bb.fatal('No valid terminal found, unable to open devshell')
except oe.terminal.ExecutionError as exc:
^ permalink raw reply related
* sstate: Avoid contention between sstate packages
From: Richard Purdie @ 2011-09-07 17:34 UTC (permalink / raw)
To: openembedded-core
If several sstate packages are decompressing at the same time, they can
conflict over the "fixmepath". If two packages try to write to this at
the same time it results in an error. To avoid this we remove the file
once we've finished processing it.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index d7631ca..91f209a 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -183,6 +183,9 @@ def sstate_installpkg(ss, d):
os.system("sed -i -e s:FIXMESTAGINGDIRTARGET:%s:g %s" % (staging_target, sstateinst + file))
os.system("sed -i -e s:FIXMESTAGINGDIRHOST:%s:g %s" % (staging_host, sstateinst + file))
os.system("sed -i -e s:FIXMESTAGINGDIR:%s:g %s" % (staging, sstateinst + file))
+ # Need to remove this or we'd copy it into the target directory and may
+ # conflict with another writer
+ os.remove(fixmefn)
for state in ss['dirs']:
prepdir(state[1])
^ permalink raw reply related
* [PULL v3 0/1] Fix for beagleboard ICE when building lttng-ust
From: Saul Wold @ 2011-09-07 17:19 UTC (permalink / raw)
To: openembedded-core
v2 has a patch header!
v3 removed bad patch file
Been a rough morning!
Sau!
The following changes since commit cb8efc0e1ec00892b46325aabfb1b4020a46c078:
linux-yocto: re-enable utrace (2011-09-07 14:53:38 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/gcc-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/gcc-fix
Saul Wold (1):
gcc: add patch for ice 50099, which caused lttng-ust not to build
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
.../gcc/gcc-4.6/fix-for-ice-50099.patch | 49 ++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
--
1.7.6
^ permalink raw reply
* [PULL v3 1/1] gcc: add patch for ice 50099, which caused lttng-ust not to build
From: Saul Wold @ 2011-09-07 17:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1315415799.git.sgw@linux.intel.com>
[YOCTO #1381]
This patch came from from GCC Bugzilla via Khem
Cc: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
.../gcc/gcc-4.6/fix-for-ice-50099.patch | 49 ++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 380f9f7..f7bcf30 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r9"
+PR = "r10"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -67,6 +67,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://volatile_access_backport.patch \
file://use-defaults.h-and-t-oe-in-B.patch \
file://powerpc-e5500.patch \
+ file://fix-for-ice-50099.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
new file mode 100644
index 0000000..57b03d2
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
@@ -0,0 +1,49 @@
+
+This patch address an issue with the compiler generating an ICE
+during compliation of lttng-ust.
+
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50099
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <khem.raj@gmail.com>
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: gcc/config/arm/arm.md
+===================================================================
+--- gcc-4.6.0/gcc/config/arm/arm.md (revision 178135)
++++ gcc-4.6.0/gcc/config/arm/arm.md (working copy)
+@@ -4217,6 +4217,7 @@ (define_split
+ "TARGET_32BIT"
+ [(set (match_dup 0) (ashiftrt:SI (match_dup 1) (const_int 31)))]
+ {
++ rtx srcop = operands[1];
+ rtx lo_part = gen_lowpart (SImode, operands[0]);
+ enum machine_mode src_mode = GET_MODE (operands[1]);
+
+@@ -4224,14 +4225,21 @@ (define_split
+ && !reg_overlap_mentioned_p (operands[0], operands[1]))
+ emit_clobber (operands[0]);
+
++ if (TARGET_ARM && src_mode == QImode
++ && !arm_reg_or_extendqisi_mem_op (srcop, QImode))
++ {
++ rtx dest = gen_lowpart (QImode, lo_part);
++ emit_move_insn (dest, srcop);
++ srcop = dest;
++ }
+ if (!REG_P (lo_part) || src_mode != SImode
+- || !rtx_equal_p (lo_part, operands[1]))
++ || !rtx_equal_p (lo_part, srcop))
+ {
+ if (src_mode == SImode)
+- emit_move_insn (lo_part, operands[1]);
++ emit_move_insn (lo_part, srcop);
+ else
+ emit_insn (gen_rtx_SET (VOIDmode, lo_part,
+- gen_rtx_SIGN_EXTEND (SImode, operands[1])));
++ gen_rtx_SIGN_EXTEND (SImode, srcop)));
+ operands[1] = lo_part;
+ }
+ operands[0] = gen_highpart (SImode, operands[0]);
+
--
1.7.6
^ permalink raw reply related
* Re: [PATCH] scripts/oe-buildenv-internal: Add SOCKS5_{USER, PASSWD} to BB_ENV_EXTRAWHITE
From: Richard Purdie @ 2011-09-07 17:04 UTC (permalink / raw)
To: Kumar Gala; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <BCA18FF8-8F94-4E3D-836A-D7B99830E4E6@kernel.crashing.org>
On Wed, 2011-08-31 at 00:06 -0500, Kumar Gala wrote:
> On Jul 28, 2011, at 8:10 AM, Kumar Gala wrote:
>
> > If a SOCKS5 gateway is needed for a proxy access like git it might also
> > require authentication to the proxy via a password and username. Adding
> > SOCKS5_USER & SOCKS5_PASSWD to BB_ENV_EXTRAWHITE allow for automation
> > of the authentication request to occur when something like a git fetch
> > is going through the proxy.
> >
> > Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> > ---
> > * Fixes issue with a git fetch request failing to get pass a firewall
> >
> > scripts/oe-buildenv-internal | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
> > index c13fc40..b223292 100755
> > --- a/scripts/oe-buildenv-internal
> > +++ b/scripts/oe-buildenv-internal
> > @@ -55,4 +55,4 @@ unset BITBAKEDIR
> > export BUILDDIR
> > export PATH
> >
> > -export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND"
> > +export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND SOCKS5_PASSWD SOCSK5_USER"
> > --
> > 1.7.3.4
>
> Richard,
>
> I'm able reproduce this, with out my patch I get prompted for a socks password, w/it having SOCKS5_PASSWD set in my environment the git clone is able to succeed.
>
> So from our discussion a while back on IRC:
>
> Aug 11 10:54:20 <RP__> galak: Well, it will but it will only place it in the internal data store
> Aug 11 10:54:42 <RP__> galak: there isn't anything to say "also export this from the data store into the environment that bitbake uses"
>
> From the way I read bitbake/lib/bb/utils.py:
>
> def approved_variables():
> """
> Determine and return the list of whitelisted variables which are approved
> to remain in the environment.
> """
> ...
>
> [ this will add SOCKS5_PASSWD to the 'approved' list ]
>
> and
>
> def filter_environment(good_vars):
>
> [ will not skip unsetting it from the environment since its in the 'approved' list ]
>
> That seems to explain how this ends up working.
>
> So question is what else needs to be done to get this accepted ?
To put this simply, this patch shouldn't work. The fact that it does
worried me and there is a bitbake bug. You can do something like this:
BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE FOO" FOO=1 bitbake quilt-native -c devshell
and see FOO=1 in the shell. It should only do that if the metadata also
does "export FOO" which it does not.
So, no, this patch isn't right and we'll need to actually export the
variables once I fix the above bug.
Cheers,
Richard
^ permalink raw reply
* [PULL v2 1/1] gcc: add patch for ice 50099, which caused lttng-ust not to build
From: Saul Wold @ 2011-09-07 16:15 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1315411996.git.sgw@linux.intel.com>
[YOCTO #1381]
This patch came from from GCC Bugzilla via Khem
Cc: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
.../gcc/gcc-4.6/fix-for-ice-25202.patch | 38 +++++++++++++++
.../gcc/gcc-4.6/fix-for-ice-50099.patch | 49 ++++++++++++++++++++
3 files changed, 89 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-25202.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 380f9f7..f7bcf30 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r9"
+PR = "r10"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -67,6 +67,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://volatile_access_backport.patch \
file://use-defaults.h-and-t-oe-in-B.patch \
file://powerpc-e5500.patch \
+ file://fix-for-ice-50099.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-25202.patch b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-25202.patch
new file mode 100644
index 0000000..4b9f70d
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-25202.patch
@@ -0,0 +1,38 @@
+Index: gcc/config/arm/arm.md
+===================================================================
+--- gcc-4.6.0/gcc/config/arm/arm.md (revision 178135)
++++ gcc-4.6.0/gcc/config/arm/arm.md (working copy)
+@@ -4217,6 +4217,7 @@ (define_split
+ "TARGET_32BIT"
+ [(set (match_dup 0) (ashiftrt:SI (match_dup 1) (const_int 31)))]
+ {
++ rtx srcop = operands[1];
+ rtx lo_part = gen_lowpart (SImode, operands[0]);
+ enum machine_mode src_mode = GET_MODE (operands[1]);
+
+@@ -4224,14 +4225,21 @@ (define_split
+ && !reg_overlap_mentioned_p (operands[0], operands[1]))
+ emit_clobber (operands[0]);
+
++ if (TARGET_ARM && src_mode == QImode
++ && !arm_reg_or_extendqisi_mem_op (srcop, QImode))
++ {
++ rtx dest = gen_lowpart (QImode, lo_part);
++ emit_move_insn (dest, srcop);
++ srcop = dest;
++ }
+ if (!REG_P (lo_part) || src_mode != SImode
+- || !rtx_equal_p (lo_part, operands[1]))
++ || !rtx_equal_p (lo_part, srcop))
+ {
+ if (src_mode == SImode)
+- emit_move_insn (lo_part, operands[1]);
++ emit_move_insn (lo_part, srcop);
+ else
+ emit_insn (gen_rtx_SET (VOIDmode, lo_part,
+- gen_rtx_SIGN_EXTEND (SImode, operands[1])));
++ gen_rtx_SIGN_EXTEND (SImode, srcop)));
+ operands[1] = lo_part;
+ }
+ operands[0] = gen_highpart (SImode, operands[0]);
+
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
new file mode 100644
index 0000000..57b03d2
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
@@ -0,0 +1,49 @@
+
+This patch address an issue with the compiler generating an ICE
+during compliation of lttng-ust.
+
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50099
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <khem.raj@gmail.com>
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: gcc/config/arm/arm.md
+===================================================================
+--- gcc-4.6.0/gcc/config/arm/arm.md (revision 178135)
++++ gcc-4.6.0/gcc/config/arm/arm.md (working copy)
+@@ -4217,6 +4217,7 @@ (define_split
+ "TARGET_32BIT"
+ [(set (match_dup 0) (ashiftrt:SI (match_dup 1) (const_int 31)))]
+ {
++ rtx srcop = operands[1];
+ rtx lo_part = gen_lowpart (SImode, operands[0]);
+ enum machine_mode src_mode = GET_MODE (operands[1]);
+
+@@ -4224,14 +4225,21 @@ (define_split
+ && !reg_overlap_mentioned_p (operands[0], operands[1]))
+ emit_clobber (operands[0]);
+
++ if (TARGET_ARM && src_mode == QImode
++ && !arm_reg_or_extendqisi_mem_op (srcop, QImode))
++ {
++ rtx dest = gen_lowpart (QImode, lo_part);
++ emit_move_insn (dest, srcop);
++ srcop = dest;
++ }
+ if (!REG_P (lo_part) || src_mode != SImode
+- || !rtx_equal_p (lo_part, operands[1]))
++ || !rtx_equal_p (lo_part, srcop))
+ {
+ if (src_mode == SImode)
+- emit_move_insn (lo_part, operands[1]);
++ emit_move_insn (lo_part, srcop);
+ else
+ emit_insn (gen_rtx_SET (VOIDmode, lo_part,
+- gen_rtx_SIGN_EXTEND (SImode, operands[1])));
++ gen_rtx_SIGN_EXTEND (SImode, srcop)));
+ operands[1] = lo_part;
+ }
+ operands[0] = gen_highpart (SImode, operands[0]);
+
--
1.7.6
^ permalink raw reply related
* [PULL v2 0/1] Fix for beagleboard ICE when building lttng-ust
From: Saul Wold @ 2011-09-07 16:15 UTC (permalink / raw)
To: openembedded-core
v2 has a patch header!
Sau!
The following changes since commit cb8efc0e1ec00892b46325aabfb1b4020a46c078:
linux-yocto: re-enable utrace (2011-09-07 14:53:38 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/gcc-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix2
Saul Wold (1):
gcc: add patch for ice 50099, which caused lttng-ust not to build
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
.../gcc/gcc-4.6/fix-for-ice-25202.patch | 38 +++++++++++++++
.../gcc/gcc-4.6/fix-for-ice-50099.patch | 49 ++++++++++++++++++++
3 files changed, 89 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-25202.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
--
1.7.6
^ permalink raw reply
* [PULL v2 1/1] cpan.bbclass: fix native perl issue
From: Saul Wold @ 2011-09-07 16:12 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1315411864.git.sgw@linux.intel.com>
When configuring cpan packages, the directories passed to MakeMaker
are the target directories. There was a patch that was applied to the
native perl to find perl.real and convert that to perl. This does not
apply for the target perl modules and therefore MakeMaker finds perl.real.
This patch to cpan configure modifies the Makefile after configure and
changes the perl.real to just straight perl so we have the correct paths
and shared state info in usable.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/cpan.bbclass | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index cb1c2f4..587e688 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -24,7 +24,8 @@ cpan_do_configure () {
for f in `find -name Makefile.PL`; do
f2=`echo $f | sed -e 's/.PL//'`
sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
- $f2
+ -e 's/perl.real/perl/' \
+ $f2
done
fi
}
--
1.7.6
^ permalink raw reply related
* [PULL v2 0/1] fix perl sstate issue
From: Saul Wold @ 2011-09-07 16:12 UTC (permalink / raw)
To: openembedded-core
This fixes a problem where a sstate build will be using perl.real
directly instead of perl.
Sau!
The following changes since commit cb8efc0e1ec00892b46325aabfb1b4020a46c078:
linux-yocto: re-enable utrace (2011-09-07 14:53:38 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix2
Saul Wold (1):
cpan.bbclass: fix native perl issue
meta/classes/cpan.bbclass | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
--
1.7.6
^ permalink raw reply
* [PATCH 4/4] base.bbclass: fix substring matching in COMMERCIAL_LICENSE
From: Paul Eggleton @ 2011-09-07 16:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1315411459.git.paul.eggleton@linux.intel.com>
Previously, if for example you had a package called "mx", and a second
package called "libomxil" listed in COMMERCIAL_LICENSE (without mx being
listed there), it would match mx as being commercially licensed because
mx is a substring of libomxil. Fix the search to ensure it only matches
the listed package name exactly.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/base.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3501f4b..104bec8 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -340,9 +340,9 @@ python () {
if license == "INVALID":
bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn)
- commercial_license = bb.data.getVar('COMMERCIAL_LICENSE', d, 1)
+ commercial_license = " %s " % bb.data.getVar('COMMERCIAL_LICENSE', d, 1)
import re
- pnr = pn.replace('+', "\+")
+ pnr = "[ \t]%s[ \t]" % pn.replace('+', "\+")
if commercial_license and re.search(pnr, commercial_license):
bb.debug(1, "Skipping %s because it's commercially licensed" % pn)
raise bb.parse.SkipPackage("because it may require a commercial license to ship in a product (listed in COMMERCIAL_LICENSE)")
--
1.7.4.1
^ permalink raw reply related
* [PATCH 3/4] meta/recipes.txt: correct Qt capitalisation
From: Paul Eggleton @ 2011-09-07 16:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1315411459.git.paul.eggleton@linux.intel.com>
"Qt" is correct according to the documentation.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes.txt b/meta/recipes.txt
index 51bb746..bf7f19e 100644
--- a/meta/recipes.txt
+++ b/meta/recipes.txt
@@ -8,6 +8,6 @@ recipes-gnome - All things related to the GTK+ application framework
recipes-graphics - X and other graphically related system libraries
recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies
recipes-multimedia - Codecs and support utilties for audio, images and video
-recipes-qt - All things related to the QT application framework
+recipes-qt - All things related to the Qt application framework
recipes-sato - The Sato demo/reference UI/UX, its associated apps and configuration
--
1.7.4.1
^ permalink raw reply related
* [PATCH 2/4] sanity.bbclass: re-enable DISTRO check
From: Paul Eggleton @ 2011-09-07 16:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1315411459.git.paul.eggleton@linux.intel.com>
If DISTRO has been specified, ensure it is valid. (Unset or empty string
is valid for DISTRO in OE-core by the use of defaultsetup.conf.)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/sanity.bbclass | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 44b0688..93008cc 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -269,10 +269,12 @@ def check_sanity(e):
if os.path.exists(dldir) and not os.access(dldir, os.W_OK):
messages = messages + "DL_DIR: %s exists but you do not appear to have write access to it. \n" % dldir
- # Check that the DISTRO is valid
+ # Check that the DISTRO is valid, if set
# need to take into account DISTRO renaming DISTRO
- #if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ):
- # messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True )
+ distro = data.getVar('DISTRO', e.data, True)
+ if distro:
+ if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ):
+ messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True )
missing = ""
--
1.7.4.1
^ permalink raw reply related
* [PATCH 1/4] core-image.bbclass: zap root password if debug-tweaks not enabled
From: Paul Eggleton @ 2011-09-07 16:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1315411459.git.paul.eggleton@linux.intel.com>
If you do not have debug-tweaks in IMAGE_FEATURES, then zap the root
password so that you can't log in as root without a password in an image
potentially intended for a production system.
Also mention debug-tweaks in the comments listing IMAGE_FEATURES in this
file.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/core-image.bbclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 507d6a6..8e83d4a 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - nfs-server - NFS server (exports / over NFS to everybody)
# - ssh-server-dropbear - SSH server (dropbear)
# - ssh-server-openssh - SSH server (openssh)
+# - debug-tweaks - makes an image suitable for development
#
PACKAGE_GROUP_apps-console-core = "task-core-apps-console"
PACKAGE_GROUP_x11-base = "task-core-x11-base"
@@ -65,3 +66,7 @@ inherit image
# Create /etc/timestamp during image construction to give a reasonably sane default time setting
ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
+
+# Zap the root password if debug-tweaks feature is not enabled
+ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "", "zap_root_password ; ",d)}'
+
--
1.7.4.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox