To allow the use of Qt applications started manually to use the
configured graphics system the setting needs to be available in user
environment. This moves the setting to /etc/profile.d ensuring it is
set and available. This allow the removal of x11-common as dependency.
(From OE-Core rev: 3804784b6200f82f5d8d6f533ce5e1a36ee2aeac)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* PROVIDES does not need _${PN}
* CONFLICTS should be RCONFLICTS
* opkg needs RREPLACES to automatically remove older module-init-tools
instead of just reporting it conflicts with kmod
SHR root@gjama ~ $ opkg install kmod
Installing kmod (7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0) to root...
Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/kmod_7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0_armv4t.ipk.
Removing package module-init-tools-depmod from root...
update-alternatives: removing //sbin/depmod as no more alternatives exist for it
Removing package module-init-tools from root...
update-alternatives: Linking //sbin/insmod to ../bin/busybox
update-alternatives: Linking //sbin/modprobe to ../bin/busybox
update-alternatives: Linking //sbin/rmmod to ../bin/busybox
update-alternatives: removing //sbin/modinfo as no more alternatives exist for it
update-alternatives: removing //bin/lsmod as no more alternatives exist for it
update-alternatives: Linking //sbin/lsmod to ../bin/busybox
Configuring kmod.
update-alternatives: Linking //sbin/insmod to /sbin/insmod.kmod
update-alternatives: Linking //sbin/modprobe to /sbin/modprobe.kmod
update-alternatives: Linking //sbin/rmmod to /sbin/rmmod.kmod
update-alternatives: Linking //sbin/modinfo to /sbin/modinfo.kmod
update-alternatives: Linking //bin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/depmod to /sbin/depmod.kmod
(From OE-Core rev: 8de7f8045f28aecfe796afcdb013c557ce9d1372)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This also helps avoid QA errors about binaries
accessing contents from /usr/lib
Also fixes emptry libkmod problem since now
the files are installed in expected place
(From OE-Core rev: 6b74f2461735272bd950a4f060dab6e778a36f92)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The linux-yocto repository and scripts can support a mode of
meta data management that merges a base meta branch to every
BSP branch. In this case, the scripts don't have to restore
a checkpoint for the meta data to be globally accessible.
The decision to restore or not is made based on whether or
not the meta branch is part of all branches or not.
The linux-yocto recipes have a sanity check to determine if
the requested SRCREV for meta data matches the head of the
meta branch (via do_validate_branches). If the wrong commit
is at the head, the meta branch is moved aside and the branch
reset to the right commit. This creates two meta branches that
contain the base meta data.
The test for integrated meta data mistakes this for a globally
merged set of meta data and doesn't restore the checkpoint, which
leads to build failures.
The immediate fix is to allow two branches to have the meta
data. The long term fix is to make the detection only consider
if the build branch contains the meta data.
(From OE-Core rev: bd794b92d12ceda2728520701e980b7a3cabd23d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* until it's decided it should be installed in base_libdir or libdir
* fixes libkmod packaging
(From OE-Core rev: 87249372b4a9951f9e4dc6acece950718382a164)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updates to the kern-tools to be more flexible and support multiple
upstream repository formats means that KMACHINE should really only
map to a machine and that KBRANCH should specify branch information.
To adapt to this change, we split the hardware reference boards into
KMACHINE and KBRANCH mappings.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping the routerstationpro SRCREV for the following fix:
mm/msync: tweak tmpfs patch for syscall msync
Commit 1c3ae5441 "mm: msync: fix issues of sys_msync on tmpfs"
fixes the problem that sys_msync fails with tmpfs on MIPS CPU which
has feature "cache alias".
But it makes POSIX test cases mlockall/3-6 3-7 fail on MIPS.
Case mlockall/3-6 creates a share memory, and maps it to memory.
fd = shm_open(SHM_NAME, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
foo = mmap(NULL, BUF_SIZE, PROT_WRITE, MAP_SHARED, fd, 0);
Then calls mlockall to lock all of the virtual address space:
if (mlockall(MCL_CURRENT) == -1) {
At last tests whether the virtual address spaces are locked:
page_ptr = (void*) ((long)foo - ((long)foo % page_size));
result = msync(page_ptr, page_size, MS_SYNC|MS_INVALIDATE);
It espects msync returns -1 with EBUSY but returns 0.
Case mlockall/3-7 creates a normal file to mmap, and it fails too.
Tweak the patch to:
1 Moved the CONFIG_TMPFS block down in the loop so that the normal
vma flag checking will perform.
2 There may be other VMAs in the list after this VMA which belongs
to tmpfs file, and we should sync them after the tmpfs one. So
remove the break loop clauses.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the SRCREV to pick up two minor fixes:
1/2:
kgit-init: correct spelling of createme
kgit-init copies the kern-tools scripts and intends to copy createme.
The typo is in the usage() of updateme as well.
(From OE-Core rev: 043871d7e5d2d19c2ff43e54d2ff180c09e8903e)
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
2/2:
kconf_check: fix bad quoting around missing_required.cfg
missing_required.cfg won't have it's path truncated (if applicable), since
the quoting it wrong.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In order to support repositories of various types (with or without
meta data, branched, pristine, custom, etc) information about the
type of processing that is required was passed to the processing
phases via variables.
The combination of variables involved in coordinating the processing
creates a learning curve and overly complicates recipe extensions.
With minor tweaks to the kern-tools, adding flexibility and keying
off the existence of the meta branch it is possible to remove all
of the variables that were added to support different repository
types.
(From OE-Core rev: 06e5f45c8f38925cd5902a3a3f436f5e9451dd16)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.2 SRCREVs to import the following meta/config
changes:
6b3d4e0 meta: add mei feature
519abac meta: add usb/uhci-hcd feature
a67c5a3 meta/crownbay: use usb features
0855066 meta: add usb/ohci-hcd feature
15f1a99 meta: add usb/ehci-hcd feature
8fa6408 meta: add usb/xhci-hcd feature
c724a55 meta: add usb/base feature
b55b3a1 sys940x: Cleanup sys940x.scc
93f2e97 sys940x: Use PHYSICAL_START of 0x200000 to boot
aaa034b sys940x: Add common standard and preempt-rt features
e2b1286 sys940x: Add efi-ext to standard and preempt-rt configs
d188c21 sys940x: Move emgd-1.10 data to the standard scc file
72d9369 fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc
dbcb120 fri2: Use emgd-1.10 feature and branch
And the following driver fix:
f39a0a9 pch_gbe: Do not abort probe on bad MAC
(From OE-Core rev: 612047a20ca400b932ccc634ddb759460d69fdce)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Multi-libs of Pango need different modules, thus different config files and
utils. This patch separate config file and utils with different MLPREFIX to
avoid conflict.
[YOCTO #2356] got fixed.
(From OE-Core rev: 80c431989eef64d2c34a9cddb7fb95b7b9768706)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Restore INC_PR to r15 to prevent breakage with out of tree openssl
recipes (e.g, meta-oe).
(From OE-Core rev: 370b186b7c39897b868a5e3798a11a285277f145)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* evolution-data-server_git.bb provides 2.30.2 from 2010-06-20 and is default for a while
(From OE-Core rev: 3138acfe6bcd86e41900a2d5e90851e30ea44bec)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* some apps had issues in runtime when dbus-glib wasn't rebuilt and
reinstalled after glib upgrade, see:
http://www.shr-project.org/trac/ticket/1980
(From OE-Core rev: af04af955b1443861a9f7e5fbf87a93546f9acd9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Removed all patches, they've been integrated upstream. :)
Added --disable-doc-build to prevent creation of docs, which
otherwise fails with the following configure error:
could not find xmlto; set XMLTO or consider --disable-doc-build
Removed configure_prepend step that was deleting the m4/ directory,
since some macros needed for the build are defined there, and I've
not encountered any problems with keeping them there in my testing.
(From OE-Core rev: cbd055917b04bf8fc640eee289e443230de139a2)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
LICENSE checksum changed due to a trivial difference in the credits
list.
(From OE-Core rev: ce1fc60b0044bccf6cf8432700d6c0b6f042dae2)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In qt4's do_configure operation, it will refer to some variables that
are derived from 'd', however these variable values may be not correct
in multilib case since the extraction of these variables happens before
the multilib handler.
The fix is to move these python style functions back to shell style.
This fixes [YOCTO #2355]
[RP: Fix whitepace]
(From OE-Core rev: 977ba301a1063a84b865ddf7367c35827fbffc86)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This plugin doesn't build on powerpc due to powerpc's terminal ioctl defintions
being incompatible with assumptions being made by this module. Until someone has
need and can test this on powerpc, disabling is the safest option.
(From OE-Core rev: 672846b0262add037daa2c9e434fe09388b58da8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since its provided by kmod
(From OE-Core rev: 27bc204010b9dccb30847d7b3216f8b1e106f64e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* we have very old version and deprecated g_atexit is used even in current master
http://git.gnome.org/browse/evolution-data-server/log/libedataserver/e-categories.c
(From OE-Core rev: 155ea975f5e0287f9ed49413785d1948c56601a5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* g_once_init_enter.patch shouldn't be needed after upstream commit
794c1a30bc27b4c8d77537813acb1213d5ac80f2
* LIC_FILES_CHKSUM change is only because PCRE was upgraded and now
pcre.h says "Copyright (c) 1997-2012 University of Cambridge" instead
of 2010 and COPYING file
"Please see the file LICENCE in the PCRE distribution for licensing
details." but LICENSE file is not part of glib distribution (but still
BSD in standalone PCRE)
(From OE-Core rev: 231a3e046900f8fae2e0aa4fe5f2bee4c290b0b0)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These are required to build recent versions of glib-2.0
(From OE-Core rev: e9fd8e3d01091aebbc4b3584d9febc695836e4c3)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These are required to build recent versions of glib-2.0
(From OE-Core rev: 8fa607c1430674bee1f1f80d33f8939d7f0b1100)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We may meet certain command failure during build time, for example,
out of memory. In this case, we need to clear the "building" status.
This fixes [YOCTO #2371]
(Bitbake rev: 283dbbbf5d34adb4c9e3aa87e3925fdebe21ff42)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows some simplifications of the function and is slightly faster.
(Bitbake rev: 5999dc9985ad087c036611bfaa59b090a08781a6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otavio Salvador
Khem Raj
Martin Jansa
Bruce Ashfield
Zhai Edwin
Scott Garman
Richard Purdie
Dongxiao Xu
Saul Wold
Tomas Frydrych