Commit Graph

68 Commits

Author SHA1 Message Date
Martin Jansa
191499a2b5 recipes: Remove PR = r0 from all recipes
* Remove all PR = "r0" from all .bb files in meta-oe repo. This was done
  with the command sed -e '/^PR.*=.*r0\"/d' meta*/recipes*/*/*.bb -i

* We've switching to the PR server, PR bumps are no longer needed and
  this saves people either accidentally bumping them or forgetting to
  remove the lines (r0 is the default anyway).

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-01 15:30:48 +01:00
Joe Slater
29390a3a81 xdebug: update to version 2.2.3
Version 2.2.1 will not build with modphp 5.5.

Signed-off-by: Joe Slater <jslater@windriver.com>
2013-10-14 14:31:41 +01:00
Hongxu Jia
0ffc5f7ae9 apache2: fix error messages when restart apache service
There are error messages when restart apache service:

Observed Behavior
======================
root@qemu0:/etc/php# apachectl restart
AH00557: httpd: apr_sockaddr_info_get() failed for qemu0
AH00558: httpd: Could not reliably determine the server's fully qualified domain name, using 127.0.0.1. Set the 'ServerName' directive        globally to suppress this message
root@qemu0:/etc/php# /etc/init.d/apache2 restart
AH00557: httpd: apr_sockaddr_info_get() failed for qemu0
AH00558: httpd: Could not reliably determine the server's fully qualified domain name, using 127.0.0.1. Set the 'ServerName' directive        globally to suppress this message
root@qemu0:/etc/php# /etc/init.d/apache2 stop
AH00557: httpd: apr_sockaddr_info_get() failed for qemu0
AH00558: httpd: Could not reliably determine the server's fully qualified domain name, using 127.0.0.1. Set the 'ServerName' directive        globally to suppress this message

Add 'ServerName localhost:80' to httpd.conf could fix this issue.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
2013-09-26 09:35:56 +01:00
Javier Viguera
3000970fcd 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>
2013-09-19 09:10:19 +01:00
Martin Jansa
1d536390dc cherokee: Add PACKAGECONFIG for ffmpeg and ldap
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-17 19:18:21 +02:00
Roy.Li
4ddfb3e92f apache2: add apxs to SSTATE_SCAN_FILES
apxs is installed under /usr/bin/crossscripts of sysroot, its hardcode paths
should be handled when store or extracts the sstate archives.

Signed-off-by: Roy Li <rongqing.li@windriver.com>
2013-09-16 13:36:22 +01:00
Roy Li
a40fcab604 apache2: create configuration file for systemd-tmpfiles
when use systemd as a system and service manager, systemd-tmpfiles will replace
/etc/init.d/populate-volatile.sh to handle temporary files, so we need to create
the configuration file for apache2

Signed-off-by: Roy Li <rongqing.li@windriver.com>
2013-09-16 13:36:21 +01:00
Jonathan Liu
4dc8ba955f nostromo: specify configuration for systemd-tmpfiles --update
Running systemd-tmpfiles --update without specifying a configuration
file results in all tmpfiles.d configuration files being processed.

/usr/lib/tmpfiles.d/systemd.conf creates /run/nologin on boot to
prevent non-root users from logging in while the system is booting.
If systemd-tmpfiles --update is run after the system has started,
it will still create /run/nologin which would prevent non-root users
from logging in with the message "System is booting up.".

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-10 22:42:46 +02:00
Paul Eggleton
336123c49e phpmyadmin: update to 4.0.5
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-08-27 16:39:31 +01:00
Paul Eggleton
128283fee4 modphp: update to 5.5.2
* LIC_FILES_CHKSUM needed to change because the copyright year changed
* Enabled mcrypt since upstream recommend this for acceptable
  performance (and we now have a libmcrypt recipe in meta-oe)
* Disabled the opcache; this is a new feature in 5.5 and the configure
  check for it currently breaks when cross-compiling.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-08-27 16:39:31 +01:00
Paul Eggleton
e25a025f9e apache2: update to 2.4.6
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-08-27 16:39:31 +01:00
Joe Slater
45777abe87 nostromo: make sure usr/group www-data exist
CQID: 422203

nostromo runs as user/group www-data and needs these
to exist when we install it.

Signed-off-by: Joe Slater <jslater@windriver.com>
2013-08-13 08:50:06 +01:00
Paul Eggleton
246bedc1c6 webmin: add from meta-baryon
No changes.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-07-31 17:41:21 +01:00
Riku Voipio
16fad8e619 apache2: move pidfile to run
pidile was stored in /var/apache2/log which is saved over boots.
This might prevent startup of apache2 on boots. Move it to /run
where pidfiles in general belong.
2013-07-26 10:06:01 +01:00
Jonathan Liu
a8e0bfb912 nostromo: fix installed but not shipped /run and /run/nostromo warnings
Changes:
- Remove unnecessary -c option from install
- Add tmpfiles.d config to create /run/nostromo when systemd is
  enabled in DISTRO_FEATURES
- Add postinst script to create /run/nostromo using tmpfiles.d if
  running systemd (detected by existence of /sys/fs/cgroup/systemd),
  otherwise using populate-volatile.sh if it exists
- Remove /var/log/nostromo and /var/run/nostromo from package

Signed-off-by: Jonathan Liu <net147@gmail.com>
2013-07-09 17:04:40 +01:00
Jonathan Liu
1cb1c6103d hiawatha: remove empty /var/run directory
The /var/run directory is already created by base-files.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-08 10:36:41 +02:00
Jonathan Liu
20e0708594 cherokee: remove empty /var/run directory
The /var/run directory is already created by base-files.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-08 10:35:58 +02:00
Jack Mitchell
7e13ec6e23 Hiawatha: update to 9.2
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2013-06-28 17:33:54 +01:00
Randy MacLeod
f7fc06cc51 nostromo: make SRC_URI work for multilib builds.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
2013-06-18 23:40:06 +01:00
Paul Eggleton
fcc900a459 phpmyadmin: remove dependency on bash
Remove some mostly superfluous scripts for adding additional mimetype
support that add an explicit dependency on bash.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-14 23:47:37 +01:00
Paul Eggleton
3ae196f269 phpmyadmin: update to 3.5.8.1
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-14 23:47:37 +01:00
Paul Eggleton
e1e316edee modphp: fix re-exec of do_install
Copying files and then modifying them is preferred rather than the other
way around because then the modification can never be run twice if the
function is re-executed on an existing work directory.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-14 23:47:37 +01:00
Paul Eggleton
25ddcf5d9e modphp: fix text relocation QA warning
Fixes the following warning:

WARNING: QA Issue: ELF binary '${WORKDIR}/packages-split/modphp/usr/lib/apache2/modules/libphp5.so' has relocations in .text

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-14 23:47:37 +01:00
Paul Eggleton
3f5eb8849c modphp: update to 5.4.15
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-14 23:47:37 +01:00
Paul Eggleton
13ab18503f apache2: drop unneeded workaround for apr/apr-util config script issue
The fix for the apr-1-config/apu-1-config path issue has been in OE-Core
for some time now (OE-Core commit
ab56f1063a666df5faddd97f44758c8ae378e51c) so we no longer need these
workarounds.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-14 23:47:36 +01:00
Paul Eggleton
3190369ddb apache2: update to 2.4.4
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-14 23:47:36 +01:00
Martin Jansa
2d54ce17a7 README: show github mirror URL in layer dependencies
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-03 13:32:03 +02:00
Paul Eggleton
a5f631eefd sthttpd: add recipe
This is the "supported" fork of thttpd which has a rewritten build
system to avoid the need to patch it, as well as other minor
fixes. The recipe was based on the thttpd recipe in meta-arago-extras
(originally migrated from OE-Classic by
Franklin S. Cooper Jr <fcooper@ti.com>) with the following improvements:

* Set SUMMARY
* Remove PARALLEL_MAKE = "" (new build system should avoid previous issues)
* Use more accurate LICENSE
* Rearrange recipe to conform with current style
* Use += instead of _append for FILES definitions
* Add LSB headers to initscript
* Fix hardcoded ${sbindir} in initscript

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-05-02 11:11:54 +01:00
Paul Eggleton
3c47bd59d0 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-29 10:25:17 +01:00
Marcin Juszkiewicz
e0851379ef modphp: update to 5.4.14
Only build tested.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2013-04-29 10:24:29 +01:00
Jack Mitchell
444bce01ab hiawatha: update to 9.1
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
2013-04-29 10:24:29 +01: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