Disconnect the connection by poll() timeout.
If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then
apr_socket_recv() returns EAGAIN.
(From OE-Core rev: cef4de5cd6c12091146dc1ef02cd80e094c6728e)
Signed-off-by: Noriaki Yoshitane <yoshitane.nrs@cnt.ncos.nec.co.jp>
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updated upgrade-and-fix-1.5.1.patch.
(From OE-Core rev: 49dd0b1ae91bd869c55ec3bd22bda1bdd4815088)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This adds 'nativesdk' in the BBCLASSEXTEND.
Building apr-util for the SDK requires that some paths in the rules.mk
file are fixed to point to the actual enviroment. These include pointing
the apr configuration variables to the actual apr builddir and
correcting the name of the libtool.
(From OE-Core rev: 4595e4832418afc651300c88ad2b835f0aedd8bc)
Signed-off-by: Timo Mueller <timo.mueller@bmw-carit.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This adds 'nativesdk' in the BBCLASSEXTEND.
(From OE-Core rev: de17201509d16210ead076f0e11d30593d65df25)
Signed-off-by: Timo Mueller <timo.mueller@bmw-carit.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
And bump PR to avoid:
x86_64-linux-libtool: error: 'dbm/apr_dbm_gdbm.la' is not a valid libtool archive
(From OE-Core rev: e712a31287eb830f365df456e68bc95bdacb1a4a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The apr provides usr/share/build-1/libtool which is required by
the recipe such as apache2, and it will find grep on the host
and set absolute paths in libtool: GREP="/usr/bin/grep"
If we build apr/apr-native on a host that grep is in "/usr/bin/grep",
and re-use the sstate on another host with "/bin/grep", it will fail
when build apache2/apache2-native with:
| tmp/sysroots/x86_64-linux/usr/share/build-1/libtool: line 1093: /usr/bin/grep: No such file or directory
| tmp/sysroots/intel-x86-64/usr/share/build-1/libtool: line 1093: /usr/bin/grep: No such file or directory
(From OE-Core rev: 475709fc4f32e1ed01f45ee44819cd24e739eb43)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The apr-native provides usr/share/build-1/libtool which is required by
the recipe such as apache2-native. If we don't set the CONFIG_SHELL to
/bin/bash, then:
1) If we build apr-native on a host which is "/bin/sh -> bash", the
interpreter in usr/share/build-1/libtool would be "#!/bin/sh".
2) When we re-use apr-native's sstate on a host which is
"/bin/sh -> dash", there would be errors.
(From OE-Core rev: 38d83009dfe77437533969ce681605a9ab9534ac)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bashsim in apr-dev/usr/share/build-1/libtool:
possible bashism in apr-dev/usr/share/build-1/libtool line 1004 ($RANDOM):
my_tmpdir="${my_template}-${RANDOM-0}$$"
possible bashism in apr-dev/usr/share/build-1/libtool line 3797 (should be '.', not 'source'):
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
possible bashism in apr-dev/usr/share/build-1/libtool line 8237 (shopt):
test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
possible bashism in apr-dev/usr/share/build-1/libtool line 8240 (shopt):
shopt -s nocaseglob
possible bashism in apr-dev/usr/share/build-1/libtool line 9255 (should be VAR="${VAR}foo"):
rpath+=" $flag"
(From OE-Core rev: c9bf36cfd577a77f505b72d22144e5a6d608c129)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The LICENSE has no change, except a newline added.
Fix do_compile failed:
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127
The tools/gen_test_char was invoked at build time, and it didn't
work for the cross compiling, so we built it with $BUILD_CC.
To make sure there was no side effect on the change, not adding this
patch, I did the test:
1. Built the native tools/gen_test_char on x86-64 host, and invoke
it on that host;
2. Built the target tools/gen_test_char which arch was arm, and invoke
it on the qemuarm;
3. Comparing the results, they were total the same;
...
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
static const unsigned char test_char_table[256] = {
32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
};
...
Fix do_install failed:
| DEBUG: Executing shell function do_install
| NOTE: make -j 16 DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image
install
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools
| gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/
build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe
tools/gen_test_char.c -o tools/gen_test_char
| make[1]: Entering directory `tmp/work/x86_64-linux/apr-native/1.5.1-r0/
apr-1.5.1'
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools
| gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/
build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe
tools/gen_test_char.c -o tools/gen_test_char
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh
include/private
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: Permission denied
Remove the 'tools' dir creation, it always existed. And it caused
gen_test_char unexpected rebuilt at do_install time.
(From OE-Core rev: b751144ba467b1358af2db8a4c30b8e0644cffa5)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we let configure look for sctp.h it might find it
on the host, so suppress the search with two cached
config variables.
(From OE-Core rev: 4aa6616661cc7a0eda4e9ba3e82a22472b444595)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
While multible hosts sharing a common sstate cache, the fist host using
bash as default shell and build apr, the second host using dash as
default shell and build apr-util, there was a failure in apr-util:
...
| /bin/sh: 0: Can't open i586-poky-linux-libtool
| make[1]: *** [dbm/apr_dbm_gdbm.lo] Error 127
| make[1]: *** Waiting for unfinished jobs....
| make[1]: Leaving directory
`tmp/work/i586-poky-linux/apr-util/1.5.2-r0/apr-util-1.5.2'
...
The quick way to reproduce the defect in Ubuntu 1204:
1. Create a new build
2. sudo dpkg-reconfigure dash <set bash as /bin/sh>
3. bitbake apr
4. sudo dpkg-reconfigure dash <set dash as /bin/sh>
5. bitbake apr-util
Remove the use of $(SHELL) in the apr could avoid this issue.
(From OE-Core rev: 53af71200b6f6d117e1e7dc2e7a7d21c6faab8f9)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.
This doesn't introduce any change in behaviour in its own right.
(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Install apr-util test suite and run it as ptest.
(From OE-Core rev: d132900b04a48193f05c04a77c324aa927970328)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Install apr test suite and run it as ptest.
(From OE-Core rev: d8cfe2ce6d45a375449dc3a7370516b8473b0996)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.
(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Working with the meta-ros project we detected that the ROS nodes didn't launch properly
the reason was that by default apr_cv_mutex_recursive in apr is set to no and this leads
to the APRENOTIMPL return value of apr_thread_mutex_create in thread_mutex.c when
APR_THREAD_MUTEX_NESTED is requested via flags.
Added CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" to sources/openembedded-core/meta/recipes-support/apr/apr_1.4.6.bb
to fix this issue. It has also been removed the mention of this variable in
meta/site/powerpc32-linux.
(From OE-Core rev: 20b9151f877978c086dcc8cbae7e0d9c9e89a45d)
Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The hardcoded paths in libtool will cause apache2 compile fail at
link stage when the package apr is installed from sstate cache, so
add libtool to SSTATE_SCAN_FILES.
[ CQID: WIND00405372 ]
(From OE-Core rev: 9d590d714c67ffcf1cd3f3844f5b102f72c2d006)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
NOTE:
There were 2 errors in libcap.inc, the BUILD_LDFLAGS_virtclass_native
should be BUILD_LDFLAGS_virtclass-native (the "_" should be "-"),
otherwise it doesn't work, and the value was: "-Wl,rpath=...", this is
incorrect, it shoudl be: "-Wl,-rpath=..." (lacked a - ), but we don't
need this line, since it is already in the default BUILD_LDFLAGS. Remove
it and we don't need to bump the PR since we just removed a unused line.
[YOCTO #3297]
(From OE-Core rev: cafb550fe9034754933f1708446dde155dcc3d51)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building target packages, it used to be enought to check for PN == BPN, however
with the multilib configurations, this can lead to subtle errors. Change instances
of PN == BPN, to ${CLASSOVERRIDE} == 'class-target'.
(From OE-Core rev: acc988272b4e74a9ad1e6da5af5b2d208584197b)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The copying for rules.mk was happened in do_configure_prepend, but it will be
replaced by the one generated by configure, in which APR_MKEXPORT points to
the workdir of apr and cause compile filure when the workdir of apr is removed.
So change the copying in _prepend to _append.
[YOCTO #2947]
(From OE-Core rev: d6aa123fdbfa82c07e33a9b4c7aacad821184790)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If cross-compiling, apr's configure script assumes that pid_t is
64-bit which is wrong - it appears that 32-bit is a safe assumption
for Linux no matter what the architecture, so use that instead by
default.
This fixes Apache writing garbage to its pid file when built using apr
produced from this recipe.
(From OE-Core rev: 81eb71736a4d14abe85d810f9862d8a9421e9ef5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
apr will use libuuid if it is present, and thus we should require that
it is there so that we have a deterministic build.
(From OE-Core rev: b880cebf503ca13cd4fcb741895e57e6353065be)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Building apache with this version of apr would blow up on the results
from:
apr_config --apr-libtool
Errors of the form:
/bin/sh: /media/large/tmp/sysroots/x86_64-linux/usr/share/build-1/libtool: No such file or directory
Fix that by ensuring libtool from apr's build lands in
.../usr/share/build-1/.
(From OE-Core rev: eefbc2f219571dd0c66e1099ea4ad72b1a973fd4)
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is done because of this change in gdbm:
"gdbm: Package compat libs in gdbm-compat"
(From OE-Core rev: b91d8a07f736b7698650d25609245c89e0ed73d5)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* needed for native subversion
* do_configure_append_virtclass-native is needed, because apr_builddir points to
/OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/build-1
and we're not installing libtool from apr there
(From OE-Core rev: 1cd0967672b1a82acb30baaf23eb1cbd2b2e4c67)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libtool-cross uses ${HOST_SYS}- prefix while building and installing.
In some cases that may be different from ${TARGET_PREFIX}, that is currently
used in apr recipe. It's better to have them consistent.
(From OE-Core rev: 61cedb87446a27ddaaa880a5f3296399def441df)
Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The pqsql config script will check host path and add host paths to compiler and linker options:
adding "-I/usr/include/postgresql" to CPPFLAGS
adding "-L/usr/lib" to LDFLAGS
Disable pqsql support since we didn't use this feature in other recipes.
(From OE-Core rev: a0034efba2c5960ef946de318438794acb13f454)
Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
in multilibcase, PN has multilib prefix, so it is not
correct to use PN in SRC_URI and S. instead, we've
dedicately pruned multilib prefix in BPN, so BPN is
the right alternative for PN.
(From OE-Core rev: d6dca85028640034b1a5356920aad3268bd4f1c2)
Signed-off-by: Yu Ke <ke.y@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
apr.h conflicts between 32-bit and 64-bit versions
(From OE-Core rev: 6e280bf3e2edf3a9e7dfe0e86bcc5c763d52211a)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I've cleaned up some odd license fields, fixed some license
names and corrected some incorrect licenses. LICENSE really needs
a pass through by the maintainers as some of the licensing is
incorrect.
Also, every license with Artistic should be gone through and noted as
which version of Artistic.
(From OE-Core rev: 4786ecdf7cd427089464dcb62579110d494e7cd7)
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Original we used absolute path in sysroot-destdir for both native and
target recipes. This commit changes target recipes to use relative path
which is same as the image directory.
[sgw: merged with libtool sysroot work]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Add buildconf_fix.patch of removing new libtool detection method to avoid config
failure. Handled build/libtool.m4 & apr_rules.mk after configure to take place
of "top_builddir" by "apr_builddir", as these files would be reused by apr-util.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Li Wang
Robert Yang
Timo Mueller
Hongxu Jia
Jackie Huang
Joe Slater
Richard Purdie
Chong Lu
Paul Eggleton
Radu Moisan
victor
Ross Burton
Mark Hatle
Joe MacDonald
Andrei Gherzan
Shane Wang
Martin Jansa
Saul Wold
Zhai Edwin
Andrew Gabbasov
Mei Lei
Yu Ke
Beth Flanagan
Dongxiao Xu