Commit Graph

9 Commits

Author SHA1 Message Date
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
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
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
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
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
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