Commit Graph

43 Commits

Author SHA1 Message Date
Eric Bénard 20f352810d cherokee: use cherokee-project.de mirror
Signed-off-by: Eric Bénard <eric@eukrea.com>
2013-11-11 13:11:15 +00:00
Roy Li 176db0f7e1 apache2: add config_var.mk and config.nice into SSTATE_SCAN_FILES
Since both config_var.mk and config.nice will be packaged into sstate cache,
and be reused, add them into SSTATE_SCAN_FILES to replace the hardcoded paths

Signed-off-by: Roy Li <rongqing.li@windriver.com>
2013-10-28 16:35:15 +00:00
Robert Yang b71a6567f8 cherokee: fix the installed but not shipped issue
We will get the following ERROR/WARN if we enable the
installed-vs-shipped check in QA:

ERROR: QA Issue: cherokee: Files/directories were installed but not shipped
  /srv
  /srv/www
  /srv/www/htdocs
  /srv/www/htdocs/index.html
  /srv/www/htdocs/images
  /srv/www/htdocs/images/cherokee-logo.png
  /srv/www/htdocs/images/default-bg.png
  /srv/www/htdocs/images/favicon.ico
  /srv/www/htdocs/images/powered_by_cherokee.png

I think that we can pack these files into cherokee just like what
apache2 does.

Fedora 17 also packs them

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2013-10-28 16:31:55 +00:00
Nick Glynn 603c635feb sthttpd: add systemd service
Signed-off-by: Nick Glynn <n.s.glynn@gmail.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2013-10-28 16:31:38 +00: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 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
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 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
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
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
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
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 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 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 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 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