Commit Graph

43 Commits

Author SHA1 Message Date
Javier Viguera
70bc5626b3 cherokee: fix SRC_URI
The package is no longer available in the official cherokee site,
so download it from a mirror.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
2013-10-10 21:30:33 +02:00
Paul Eggleton
cca735e1eb apache2: fix multilib builds
Change PN -> BPN in a number of places so that files are stored in the
correct location and packaged correctly.

Based on a patch by Song.Li <Song.Li@windriver.com> with additional
PN -> BPN replacements.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-04-30 21:25:09 +02:00
Marcin Juszkiewicz
6cbeee1537 modphp: update to 5.4.14
Only build tested.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2013-04-30 21:25:05 +02:00
Jack Mitchell
05d7a650ca hiawatha: update to 9.1
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2013-04-30 21:25:01 +02:00
Martin Jansa
ceac9460e8 README: show github mirror URL in layer dependencies
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-29 11:06:48 +02:00
Eric Bénard
8a350e3b4d update README to dylan
Signed-off-by: Eric Bénard <eric@eukrea.com>
2013-04-23 18:52:43 +02:00
Jack Mitchell
e1a4953e29 Hiawatha: update to 9.0, add systemd support
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-22 09:51:47 +02:00
Martin Jansa
7c292ce287 cherokee: move systemd service file to meta-webserver too 2013-04-19 11:34:25 +02:00
Paul Eggleton
f593c454bc nostromo: move to meta-webserver and tweak
* Add SUMMARY
* Move SRC_URI checksums next to SRC_URI

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-19 02:45:28 +02:00
Paul Eggleton
9955ac116e cherokee: move to meta-webserver and tweak
* Set SUMMARY instead of DESCRIPTION

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-19 02:45:28 +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
Jackie Huang
29fa7f9ea7 modphp: enable mysql option in PACKAGECONFIG
* enable mysql option in PACKAGECONFIG
* add patch to support autoconf 2.59+ so we can use
  autotools do_configure to fix a libtool cross-compile issue

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-04-15 10:56:19 +01:00
Jackie Huang
12b72e1eaf modphp: revert pthread-check.patch and add one against threads.m4
revert pthread-check.patch which hacks the old configure,
instead, add one against threads.m4 to enable pthread support
when cross-compiling.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-04-15 10:56:19 +01:00
Jackie Huang
8bfd395b06 modphp: use libdir instead of baselib to load module
When we change the apache2 files layout to debian style,
the ServerRoot in httpd.conf was changed to "/" from "/usr",
then the relative path to libphp5 module in 70_mod_php5.conf
will be invalid so it fails to load the module, use libdir
(absolute path) instead so it will always find the module.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-04-03 18:07:50 +01:00
Jackie Huang
9b29616d08 phpmyadmin: fix PN->BPN in do_install for multilibs
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
2013-03-18 15:13:52 -04:00
Jack Mitchell
14082ab648 hiawatha: update to 8.8.1
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2013-03-08 15:03:06 +00:00
Jackie Huang
6c9ac38e8b modphp5: use ${baselib} instead of hardcoded "lib"
The hardcoded lib path will cause apache2 fail to start on
the target with other baselib like lib64.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2013-03-07 11:44:11 +00:00
Paul Eggleton
8b7fa82275 README: extend for meta-webadmin addition
* Add directory layout info
* Add meta-oe dependency for some recipes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-02-18 09:28:26 +00:00
Paul Eggleton
dbb905c978 ajenti: add new recipe
Add new recipe for the Ajenti web administration interface.

This was developed and tested with assistance from
Kevin Strasser <kevin.strasser@linux.intel.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-02-18 09:28:26 +00:00
Zhenhua Luo
d4051ea47c apache2: fix the race issue of parallel installation
fix following race issue when do parallel install
| mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists
...
| mkdir: cannot create directory `/home/mypc/workspace/poky/build_p4080ds_release/tmp/work/ppce500mc-fsl_networking-linux/apache2/2.4.3-r1/image/usr/share/apache2': File exists
| make[1]: *** [install-man] Error 1
| make[1]: *** Waiting for unfinished jobs....

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
2013-01-25 18:20:24 +00:00
Jack Mitchell
1e1afc219b hiawatha: update to 8.7
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2013-01-16 09:42:12 +00: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
Jack Mitchell
a103912e49 hiawatha: add new patch to fix xslt implementation
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2012-12-05 09:44:39 +00:00
Eric Bénard
e4236266b7 hiawatha: add CONFFILES and a php example
- add CONFFILES so that configuration files don't get overwritten
during upgrade
- add an example on how to launch php-cgi using php-fcgi

Signed-off-by: Eric Bénard <eric@eukrea.com>
2012-11-27 10:48:24 +00:00
Eric Bénard
9439d8132a modphp: enable bz2, zip and mbstring
- bz2 and zip remove warnings in phpmyadmin
- mbstring is usefull for multibyte strings

Signed-off-by: Eric Bénard <eric@eukrea.com>
2012-11-27 10:48:23 +00:00
Eric Bénard
0f14256bed modphp: upgrade to 5.3.19
Signed-off-by: Eric Bénard <eric@eukrea.com>
2012-11-27 10:48:23 +00:00
Eric Bénard
5b3749ca14 apache2: upgrade to 2.4.3
Signed-off-by: Eric Bénard <eric@eukrea.com>
2012-11-27 10:48:22 +00:00
Jack Mitchell
87d5eaf8a3 hiawatha: disable caching by default
Caching shouldn't be on by default as it can cause some unpredictable
results in certain situations.

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2012-11-12 10:24:38 +00:00
Jack Mitchell
b40884a5e5 hiawatha: update to 8.6
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2012-11-12 10:24:38 +00:00
Paul Eggleton
20506c8cb4 apache2: avoid injecting host include path
includedir (by way of EXTRA_INCLUDES) gets into the CFLAGS of modphp
via apxs; thus it should not point to a location on the host.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-24 14:50:27 +01:00
Jack Mitchell
4cd60deb11 hiawatha: add initial 8.5 recipe and associated files
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-18 15:12:31 +01:00
Paul Eggleton
6fe4073a26 modphp: call gnu-configize in do_configure
Since we override do_configure, gnu-configize doesn't get called and
using the old gnu-config files distributed with the PHP source can cause
problems for some people e.g. building for AArch64; so add a call to it
explicitly here.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-18 11:44:56 +01:00
Paul Eggleton
a660f4a028 modphp: make LICENSE more accurate
PHP 5 is distributed under the PHP 3.01 license (which we identify as
PHP-3.0 as far as common license files go).

Fixes the following warning:

WARNING: modphp: No generic license file exists for: PHP in any provider

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-15 11:02:22 +01:00
Paul Eggleton
13338589e5 modphp: fix rpath QA issue
Fixes the following QA issue:

ERROR: QA Issue: package modphp contains bad RPATH ${STAGING_DIR_TARGET}/usr/lib in file ${WORKDIR}/packages-split/modphp/usr/lib/apache2/modules/libphp5.so

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-15 11:02:22 +01:00
Paul Eggleton
a6614039ee apache2: reorganise packaging definitions
Move RDEPENDS to the end and PACKAGES before other packaging
definitions.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-11 09:28:09 +01:00
Paul Eggleton
dff2c1bd52 apache2: work around bug in apr-1-config/apu-1-config scripts
The apr-1-config and apu-1-config scripts (installed into the sysroot
by apr and apr-util respectively) report incorrect paths with current
OE-Core - see:

  http://bugzilla.yoctoproject.org/show_bug.cgi?id=3267

Since OE-Core is frozen at the moment, work around the issue by taking
a copy of the scripts and fixing them up. Additionally we need to not
mangle the libtool name as apr installs it into the sysroot as just
'libtool'.

This fixes building apache2 with rm_work enabled.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-11 09:26:14 +01:00
Paul Eggleton
edc5dd9a22 phpmyadmin: add new recipe
Add new recipe for phpMyAdmin 3.5.2.2, borrowing the apache.conf file
from Debian (with the addition of "Require all granted" to enable
access).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-09 11:09:23 +02:00
Paul Eggleton
0cd6b15d72 modphp: fix default php.ini & add PACKAGECONFIG
* Add "mysql" PACKAGECONFIG option
* Add "pgsql" PACKAGECONFIG option (untested)
* Use the correct template php.ini filename so that we actually get
  some content in the default file

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-09 11:09:23 +02:00
Paul Eggleton
6d182b316f apache2: fix configuration
* Include conf files in /etc/apache2/modules.d and conf.d
* Add -D PHP5 to options so that PHP is enabled if installed
* Fix "reload" action in initscript

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-09 11:09:23 +02:00
Paul Eggleton
6190260bea xdebug: add new recipe
Add new recipe for the Xdebug PHP debugger/profiler.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-03 14:36:56 +01:00
Paul Eggleton
418650c55d modphp: add from OE-Classic, update to 5.3.14 and fix
* Use working SRC_URI
* Fix to use correct headers and apxs script for cross-compiling
* Enable threading
* Install headers and scripts for building extension modules
* Use proper variables instead of /etc, /usr/lib etc.
* Fix rpath QA issues
* Add LIC_FILES_CHKSUM
* Put apache config file into SRC_URI instead of referring to it using
  FILESDIR

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-03 14:36:40 +01:00
Paul Eggleton
25ba859ab6 apache2: add from OE-Classic, update to version 2.4.2 and fix
* Enable threading for PHP
* Backport a number of patches
* Use apachectl in init script
* Install modules into a sane location
* Ensure apxs script is installed into sysroot in crossscripts directory
  and modified so that it works for building PHP
* Install httpd executable for native version so that PHP configure
  script can call it
* Rename server-makefile-patch to server-makefile.patch and drop
  apply=yes
* Add LIC_FILES_CHKSUM
* Fix packaging QA warnings
* Add LSB headers to init script
* Clean out some cruft and move packaging stuff after do_install

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-03 14:36:16 +01:00
Paul Eggleton
520d3a14c9 Add meta-webserver layer
Add a layer for web servers, web-based applications and other related
software.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-10-03 13:34:32 +01:00