Dongxiao Xu [Thu, 18 Aug 2011 06:55:33 +0000 (14:55 +0800)]
acl: Use BPN instead of PN for style like lib${PN}
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Dongxiao Xu [Thu, 18 Aug 2011 06:54:55 +0000 (14:54 +0800)]
attr: Use BPN instead of PN for style like lib${PN}
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Dongxiao Xu [Thu, 18 Aug 2011 06:53:02 +0000 (14:53 +0800)]
ea-acl: Use BPN instead of PN for style like lib${PN}
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Dongxiao Xu [Thu, 18 Aug 2011 06:51:32 +0000 (14:51 +0800)]
curl: Use BPN instead of PN for style like lib${PN}
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Jingdong Lu [Thu, 18 Aug 2011 07:59:58 +0000 (15:59 +0800)]
initrdscripts: fix init-live.sh
Fix bug: [YOCTO #686]
Because the variable "ROOT_IMAGE" in init-live.sh is not correct, it fails to
run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img".
If we want to use liveCD, we also need to add some kernel options related to
CDROM support when compling kernel.
Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
Anders Darander [Wed, 17 Aug 2011 13:19:46 +0000 (15:19 +0200)]
scripts/runqemu: modify search paths for libgl
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.
Signed-off-by: Anders Darander <anders@chargestorm.se>
Anders Darander [Wed, 17 Aug 2011 13:18:58 +0000 (15:18 +0200)]
qemu: modify search paths for libgl
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.
Signed-off-by: Anders Darander <anders@chargestorm.se>
Wenzong Fan [Tue, 16 Aug 2011 06:53:59 +0000 (14:53 +0800)]
perl-native: Update find_perl to find the perl wrapper
[YOCTO #1157] [YOCTO #829]
This is a common issue to the packages which using 'MakeMaker.pm' to
generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm'
will be used to figure out the path/link of 'PERL/FULLPERL', but it
always find the 'perl.real' instead of perl wrapper.
Just update it to find the perl wrapper correctly.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Anders Darander [Wed, 17 Aug 2011 17:47:51 +0000 (19:47 +0200)]
qt4: allow a reduction in build time
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
all tools.
* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()
Signed-off-by: Anders Darander <anders@chargestorm.se>
If SANITY_TESTED_DISTROS is defined, we will attempt to detect the host
distribution. If the distribution is not in SANITY_TESTED_DISTROS or we
could not detect the distribution then we show a warning during sanity
checking.
Provides the mechanism for fixing [YOCTO #1096].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Paul Eggleton [Tue, 16 Aug 2011 17:13:04 +0000 (18:13 +0100)]
image.bbclass, kernel.bbclass: create warning file about deleting deploydir files
New users sometimes delete files in tmp/deploy/images assuming they will
be re-created just by re-running the build, and then are confused when
this doesn't work. To discourage people from doing this, create a file
called README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt in
tmp/deploy/images containing an explanation of what needs to be done to
re-create files there.
Fixes [YOCTO #1315] and [YOCTO #1346].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Darren Hart [Wed, 17 Aug 2011 04:16:53 +0000 (21:16 -0700)]
kernel: restore crtsavres.o to enable building external modules on powerpc
Fixes [YOCTO #1276]
As of Linux kernel version 3.0.1, and much earlier, the make clean target
removes arch/powerpc/lib/crtsavres.o. As this object is present in
KBUILD_LDFLAGS_MODULE, it is required to build external modules, and should
therefor not be removed by make clean.
While I do not advocate fixing buggy kernels in the generic kernel classes,
we should probably account for this one in kernel.bbclass as it affects
such a long list of kernel versions.
Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Bruce Ashfield <bruce.ashfield@windriver.com> CC: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Anders Darander [Tue, 16 Aug 2011 08:36:34 +0000 (10:36 +0200)]
qmake_base: add uclibceabi
Partial sync of qmake_base from meta-oe.
* Add a matching rule for *linux-uclibceabi-oe-g++, to make qmake_base.bbclase more
similar to the version in meta-oe.
Signed-off-by: Anders Darander <anders@chargestorm.se>
Dexuan Cui [Tue, 16 Aug 2011 08:17:28 +0000 (16:17 +0800)]
freetype: upgrade from 2.4.4 to 2.4.6
freetype-2.4.6/docs/LICENSE.TXT changed a little to describe more clearly
the compatibility about FreeTypeLicense and GPLv2+, but the actual license
remains unchanged: it's still LICENSE = "FreeTypeLicense | GPLv2+".
Dexuan Cui [Tue, 16 Aug 2011 06:37:14 +0000 (14:37 +0800)]
tcf-agent: add openssl into DEPENDS
[YOCTO #1330]
If tcf-agent's do_compile happens before openssl does populate_root, we'll
get such a compilation failure:
framework/channel_tcp.c:34:27: fatal error: openssl/ssl.h: No such file or directory
Thanks Kumar Gala for reporting this!
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Cc: Kumar Gala <galak@kernel.crashing.org>
Lianhao Lu [Tue, 16 Aug 2011 08:26:49 +0000 (16:26 +0800)]
package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHS
[YOCTO #1345]
The new variable ALL_MULTILIB_PACKAGE_ARCHS contains all the values of
PACKAGE_ARCHS for each multilib variants. The opkg backend now uses this
new value insteald of the PACKAGE_ARCHS to update the opkg indexes and
to generate the opkg configuration files. This allows the normal
packages and multilib packages may be installed into the same rootfs.
Bruce Ashfield [Mon, 15 Aug 2011 17:33:21 +0000 (13:33 -0400)]
qemu: change default kernel to 3.0.x
The explicit setting of version preference to 2.6.37 is
no longer required. All of the qemu targets have been built
and boot tested on 3.0.1 for core-image-minimal and core-image-sato
and are safe for wider build/boot testing.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Bruce Ashfield [Mon, 15 Aug 2011 17:31:44 +0000 (13:31 -0400)]
linux-yocto: bump version string to 3.0.1
There was some confusion around the 3.0 version string in the
linux-yocto recipe when the merged version was 3.0.1. Bumping
the version string should clarify what version will be fetched.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Dongxiao Xu [Wed, 3 Aug 2011 14:53:15 +0000 (22:53 +0800)]
package_rpm: Fix package rename issue in multilib case
do_package task will write information into pkgdata and
do_package_write_rpm will read them out. Take lib32-dates as an example,
one of its RDEPENDS is li32-gtk+, and PKG_lib32-gtk+ = "libgtk-2.0",
these info is stored at:
tmp/pkgdata/x86_64-pokymllib32-linux/runtime/lib32-dates.
Function "mapping_rename_hook" in do_package_write_rpm is to handle
those renamed packages. However before it executes, translate_vers
has stripped the multilib prefix out, making it failed to find PKG_gtk+
value in pkgdata.
This commit moves the strip_multilib out of translate_vers and call it
after "mapping_rename_hook".
[YOCTO #1368]
CC: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Dongxiao Xu [Wed, 3 Aug 2011 14:52:48 +0000 (22:52 +0800)]
package_rpm: enhance strip_multilib function
The previous logic could only strip MLPREFIX from the first element in
an array, take an example, strip_multilib the [lib32-a lib32-b lib32-c]
will result in [a lib32-b lib32-c]. We need to strip prefix one by one.
This commit change the logic to strip all elements' multilib prefix.
[YOCTO #1368]
CC: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Zhai Edwin [Thu, 11 Aug 2011 07:13:32 +0000 (15:13 +0800)]
qemu: Make qemu buildable inside qemux86/qemuppc target
It requires libx11 and libGL(if enabled GL) for building, which introduce extra
dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus
some hacks needed for building in qemupcc. For simplicity, just make qemu GL's
code for native only, so that qemu building is okay in world build.
Phil Blundell [Mon, 15 Aug 2011 15:21:27 +0000 (16:21 +0100)]
libproxy: remove dependency on X libs
Nothing in the source refers to libX11 or libXmu so there would appear to be
no good reason for them to be in DEPENDS. It looks as though these are perhaps
a relic from an earlier version which did need those libraries.
Phil Blundell [Mon, 15 Aug 2011 16:16:31 +0000 (17:16 +0100)]
cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native
When CMake is looking for perl, it only searches in the specific directories
that it's told about and ignores ${PATH}. If perlnative is in use, ensure
that the appropriate installation path is added to the list of places that
cmake will look for perl, otherwise it won't ever be found.
Xiaofeng Yan [Mon, 15 Aug 2011 06:44:26 +0000 (14:44 +0800)]
libx11-diet: Fix bug 1050
[YOCTO #1050]
I got do_compile failure during building qemux86 image
| ../../../doltlibtool: line 17:
/distro/dcui/0704/pc1/build/tmp/work/i586-poky-linux/libx11-diet-1.3-r2/libX11-1.3/modules/im/ximcp/../../../libtool:
No such file or directory
This is due to not found libtool, but i586-poky-linux-libtool in libX11-1.3
So I disable dolt for solving this problem.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Robert Yang [Mon, 15 Aug 2011 08:26:55 +0000 (16:26 +0800)]
The Skeleton initscript doesn't work on minimal image
Fixes bug [YOCTO #1165]
The /etc/init.d/skeleton doesn't work on minimal image, this is
because of the pidofproc doesn't return "$?" correctly, so store
$? in the variable status would fix it.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Yu Ke [Mon, 15 Aug 2011 10:39:16 +0000 (18:39 +0800)]
qt4.inc: expand the package name for multilib case
in the qt4.inc python annomyous code, there is case where package name
is set to "${QT_BASE_LIB}-tool", and FILE_${QT_BASE_LIB}-tool is set to xxx.
here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to
FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no
FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined.
to fix this issue, this patch expand the QT_BASE_LIB when assigning the package
name.
Jiajun Xu [Mon, 15 Aug 2011 12:58:42 +0000 (20:58 +0800)]
libsdl: enable opengl for libsdl
To enable opengl for libsdl, we need DEPENDS on virtual/libgl. Add a check for
"opengl" in DISTRO_FEATURES and when it's set, "--enable-video-opengl"
and "virtual/libgl" will be added into EXTRA_CONF and DEPENDS.
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com> Acked-by: Phil Blundell <philb@gnu.org>
Paul Eggleton [Thu, 11 Aug 2011 22:25:27 +0000 (23:25 +0100)]
qt4: package QML plugins and correct their install directory
QML components from Qt were installed to ${prefix} before and never got
packaged. This is now fixed and QML components are now installed into
${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins
package.
Additionally qmlviewer and the examples/demos are now dependent upon
these plugins as needed.
Paul Eggleton [Wed, 10 Aug 2011 11:40:20 +0000 (12:40 +0100)]
qt4-native: restore build of uic3, qdbuscpp2xml and qdbusxml2cpp
These tools are required to build some external utilities (such as those
found in KDE). We avoid building qdbus and qdbusviewer as these are
not required.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Paul Eggleton [Wed, 10 Aug 2011 11:38:55 +0000 (12:38 +0100)]
qt4: replace qt4-tools-native with qt4-native
Installs native versions of the Qt libraries in addition to the tools,
allowing compilation of external native tools that require Qt libs.
PROVIDES qt4-tools-native so it should be a drop-in replacement.
Developed with reference to the corresponding qt4-native changes in OE.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Lianhao Lu [Fri, 29 Jul 2011 14:26:42 +0000 (22:26 +0800)]
eglibc: Modify ldd script according to multilib config.
Bug fixing [YOCTO #1236].
1. Collect all the values for RTLDLIST for the current multilib
configuration to modify the ldd scripts.
2. Collect all the values for KNOWN_INTERPRETER_NAMES for the current
multilib configuration. Set the correct ld.so names for ldconfig to deal
with the multilib configuration.
Lin Tong [Thu, 11 Aug 2011 06:01:52 +0000 (14:01 +0800)]
valgrind: supporting on Linux kernel 3.x
The old valgrind package do not support for Linux kernel 3.x, only for
kernel 2.4 and 2.6. Now adding the configuration to the configure.in
file to support Linux kernel 3.0.
This commit fixes the problem in valgrind [YOCTO #1129]
Kumar Gala [Fri, 12 Aug 2011 04:53:50 +0000 (23:53 -0500)]
tune-ppc: Update to pass glibc configure option to get cpu specific support
We need --with-cpu based to glibc to get proper support on 603e & e500mc
to pickup proper math libs to deal with sqrt. These core do not
implement the fsqrt[s] instructions that the normal PPC math libs
utilize.
This causes use to not set AVAILTUNES specifically to the sub-arch only
as we arent generically compatiable.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Darren Hart [Mon, 25 Jul 2011 18:10:17 +0000 (11:10 -0700)]
Move meta-rt recipes to oe-core (meta)
Keeping the rt recipes in their own layer has led to maintenance issues,
particularly with the linux-yocto-rt recipes. As these kernel types are part of
the same linux-yocto source repository, it seems reasonable to include the rt
kernel recipes alongside the standard recipes. A new recipes-rt directory for
the other recipes provides adequate separation and eliminates the need for a
separate layer.
As there is no meta-rt/conf/layer.conf to force the kernel, users must now
specify the rt kernel in their local.conf or in the machine.conf:
The merging of the rt recipes into the core also eliminates complications with
multiple layer dependencies for new BSP layers. Having to either separate RT
BSPs from standard BSPs or force users to add meta-rt to bblayers even when not
building an RT BSP (because the RT BSPs in the same layer would fail to parse
without it) was sub-optimal at best.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Darren Hart [Fri, 22 Jul 2011 22:53:18 +0000 (15:53 -0700)]
meta-rt: default KMACHINE and SRCREV_machine to avoid parsing errors
Without a default KMACHINE and SRCREV_machine the git URL will fail to
expand to something usable and we get a parsing error. This approach was
also used in the non-rt version of this recipe.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Darren Hart [Fri, 22 Jul 2011 19:43:01 +0000 (12:43 -0700)]
meta-rt: rename minimal-rt images to -rt, drop live image
Remove "minimal" from the image recipe names for -rt. Additional recipes types
will be added (-rt-sdk for example) and there is no need to keep so many image
type descriptors.
Drop the -live image as it is now obsolete.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Darren Hart [Wed, 20 Jul 2011 15:55:30 +0000 (08:55 -0700)]
meta-rt: rt-tests v0.73 instead of AUTOREV
AUTOREV is handy is a development aid, but it really shouldn't be used as a
default as it breaks the consistency and repeatability of a build. It also
causes additional fetches which may not be desired or expected.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Mark Hatle [Fri, 12 Aug 2011 00:23:48 +0000 (19:23 -0500)]
package_rpm: Fix attemptonly and suggest packages
[YOCTO #1325] [YOCTO #1366]
Packages that were in the PACKAGE_ATTEMPTONLY and SUGGESTS were not
being properly found, which was causing image creation failures.
In PACKAGE_ATTEMPTONLY, when an item was not found, it caused an
error. This should have been a note, followed by skipping the
package.
The SUGGESTS processing was simply broken. It was using a
non-existant function, due to an apparently typo.
In addition to the above, the MLPREFIX processing was not being
done properly, preventing multilib packages from working in this
with PACKAGE_ATTEMPTONLY. (SUGGESTS doesn't need this as the names
are munged when creating the packages.)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Kumar Gala [Thu, 11 Aug 2011 06:26:34 +0000 (01:26 -0500)]
xcb-proto: update based on changes to python.m4 in automake
1. We dont need the aclocal patch as this will be handled by automake
2. We need to update xcb-proto.pc.in to know about ${libdir} since
we'll end up with something like:
pythondir=${libdir}/python2.6/site-packages
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala [Thu, 11 Aug 2011 06:26:33 +0000 (01:26 -0500)]
automake: Update for python.m4 to respect libdir
As we tweak libdir we need python libs that utilize configure to respect
it setting. By updating the python.m4 template, when we regen automake
files they will than respect the setting of libdir which is standard for
any autotools based recipe.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Mei Lei [Wed, 10 Aug 2011 14:35:59 +0000 (22:35 +0800)]
init-install.sh: Fix make partition and make file system issues
[YOCTO #1151]
Change the offset from the beginning of the disk to aligne the blocks.
In this script, we use mkfs.ext3 to create file system after partition, but we use mkpartfs to create file system repeatly,
and get some warnings about choose another specific tools to create file system for reliability.
So use mkpart instead of mkpartfs and only use mkfs.ext3 to create file system.
Mark Hatle [Thu, 11 Aug 2011 15:38:30 +0000 (10:38 -0500)]
package_rpm.bbclass: Update the platform config and --target
When constructing the /etc/rpm/platform file, we need to ensure that
the any, all, and noarch platforms will allow any "linux" variant to
be installable, not just matching variants.. i.e.
arm-oe-linux-gnueabi should be able to install noarch-oe-linux
Also ensure that we pass the full canonical arch via the --target=
parameter. This allows us to define the proper platform settings
for all packages.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Richard Purdie [Fri, 12 Aug 2011 12:44:43 +0000 (13:44 +0100)]
local.conf.sample: Cleanup and improve
local.conf is the first thing anyone new to the project sees. Over time it
has built up a ton cruft and isn't even accurate in places.
This patch:
* Moves things to local.conf.sample.extended if a new user is unlikely
to need to immediately care about the options
* Reorders the file to be more intuitive to a new user
* Moves certain default values to default-distrovars.inc in cases where
most users wouldn't want to change the value
* Adds large blocks of text to explain what an option does. There have
been too many cases of a user not realising what some of these
settings do and how they can use them to their advantage (like DL_DIR
for example).
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
From d54b975506c392cfb59dbb3caf313ac061b6fa01 Mon Sep 17 00:00:00 2001
From: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
Date: Thu, 11 Aug 2011 18:37:56 +0300
Subject: [PATCH] Magic file path should be given for rpmbuild in
_rpmfc_magic_path define so that build system default file
is not used by accident. Not doing this caused many
packages to fail building in several systems.
Fixes [YOCTO #1358]
Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
