Commit Graph

12 Commits

Author SHA1 Message Date
Marcin Juszkiewicz
f91950e3ad php: update to 5.4.14
Build tested for AArch64 and x86.
Runtime tested on x86.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-22 09:51:47 +02:00
Martin Jansa
a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Marcin Juszkiewicz
357915b6d1 php: cleanup QA warnings
php-native had:

WARNING: The recipe php-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.filemap
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.lock
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.depdblock
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.depdb
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/pear.php.net.reg
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/pecl.php.net.reg
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/doc.php.net.reg
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/__uri.reg
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/.alias/pear.txt
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/.alias/pecl.txt
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/.alias/phpdocs.txt
Please verify which package should provide the above files.

php had:

WARNING: QA Issue: php: Files/directories were installed but not shipped
  /.filemap
  /.lock
  /.depdblock
  /.depdb
  /var
  /.registry
  /.channels
  /home
  /var/run
  /var/log
  /var/volatile
  /var/volatile/run
  /var/volatile/log
  /etc/php-fpm.conf.default
  /.registry/.channel.pecl.php.net
  /.registry/.channel.doc.php.net
  /.registry/.channel.__uri
  /.channels/pear.php.net.reg
  /.channels/pecl.php.net.reg
  /.channels/doc.php.net.reg
  /.channels/__uri.reg
  /.channels/.alias
  /.channels/.alias/pear.txt
  /.channels/.alias/pecl.txt
  /.channels/.alias/phpdocs.txt
  /home/hrw
  /home/hrw/HDD
  /home/hrw/HDD/devel
  /home/hrw/HDD/devel/canonical
  /home/hrw/HDD/devel/canonical/aarch64
  /home/hrw/HDD/devel/canonical/aarch64/openembedded
  /home/hrw/HDD/devel/canonical/aarch64/openembedded/build

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-22 13:19:17 +01:00
Martin Jansa
580fd6c743 meta-openembedded: use correct format of Upstream-Status
* some patches have also incorrect value, but e.g. "Unknown" is as good as
  "Pending" to me

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-23 09:40:44 +01:00
Marcin Juszkiewicz
8424c379fb php: add apache configuration for php-fpm
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-12-04 10:44:20 +01:00
Eric BENARD
94a59521dc php: enable php-fpm
- php-fpm is an alternative PHP FastCGI implementation which seems to
be now prefered to php-fcgi
- this patch enable the build of php-fpm and packages it in its own
package
- it's tested with hiawatha on an armv5te target

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-12-04 10:43:10 +01:00
Eric BENARD
c1a900b011 php: enable gettext and sqlite
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-12-04 10:43:09 +01:00
Eric BENARD
f8a7fc5574 php: upgrade to 5.3.19
Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-12-04 10:43:08 +01:00
Martin Jansa
fc9fad42f0 php: drop LD_LIBRARY_PATH settings
* it breaks do_fetch in some settings

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-08-20 10:02:09 +02:00
Martin Jansa
515935fb50 php: add build-defs.h to SSTATE_SCAN_FILES it defines path to sysroot where pear.conf is later created
* without this fails in do_install (shr-core-branches is workspace where
  we got SSTATE_MIRROR):
  | [PEAR] PEAR           - installed: 1.9.2
  | Wrote PEAR system config file at:
  /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/image//var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/sysroots/x86_64-linux/etc/pear.conf
  | You may want to add: /usr/lib/php to your php.ini include_path
  | Installing header files:
  /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/image/usr/include/php/
  | sed: can't read
  /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/image//etc/pear.conf:
  No such file or directory
  | ERROR: Function failed: do_install (see
  /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/php-5.3.6-r0.0/temp/log.do_install.3783
  for further information)
  NOTE: package php-5.3.6-r0.0: task do_install: Failed
* it also has couple of unpackaged dirs in ${D} (all used in STAGING_DIR_NATIVE)
  WARNING: QA Issue: php: Files/directories were installed but not shipped
  /var
  /var/lib
  /var/lib/jenkins
  /var/lib/jenkins/jobs
  /var/lib/jenkins/jobs/shr-core
  /var/lib/jenkins/jobs/shr-core/workspace
  /var/lib/jenkins/jobs/shr-core/workspace/shr-core
  /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc
  /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/sysroots

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-08-07 12:21:24 +02:00
Martin Jansa
8f1f90934d php: inherit pythonnative
* fixes:
| AUTOV is 1.12
| Traceback (most recent call last):
|   File "/OE/shr-core/openembedded-core/scripts/cp-noerror", line 8, in <module>
|     import shutil
|   File "/usr/lib/python2.7/shutil.py", line 12, in <module>
|     import collections
|   File "/usr/lib/python2.7/collections.py", line 9, in <module>
|     from operator import itemgetter as _itemgetter
| ImportError: /usr/lib/python2.7/lib-dynload/operator.so: undefined symbol: _PyUnicodeUCS4_AsDefaultEncodedString
| ERROR: Function failed: do_configure (see /OE/shr-core/tmp-eglibc/work/x86_64-linux/php-native-5.3.6-r1.0/temp/log.do_configure.14841 for further information)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-08-07 12:21:24 +02:00
Koen Kooi
120753e743 php 5.3.6: import from OE classic
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-11-03 15:02:20 +01:00