We already patch configure.ac and we're not bypassing autoreconf,
so we don't need to patch configure as well.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This patch add the new Monkey HTTP Server v1.5.2. The new Bitbake file
contains the modifications suggested over the patch set for v1.5.1. It
specify each configuration file for CONFFILES_${PN}.
For more details about software changes please visit:
http://monkey-project.com/Announcements/v1.5.2
=== Build Tests ==
This version and new Bitbake file have been tested on Yocto/Daisy being
packaged and deployed on images based on rpm and ipk successfully.
monkey-yocto/70d57bfd19c01ec055db57e35385ffc4185ae186
Signed-off-by: Eduardo Silva <eduardo@monkey.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This patch add the minor release fix of Monkey HTTP Server v1.5.1. It fixes
some problems when switching user when started as root.
Signed-off-by: Eduardo Silva <eduardo@monkey.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
when move a file, test if this file exist or not
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* runtime dependencies are TUNE_PKGARCH causing do_package_write_*
task to have different signature for MACHINEs with different
TUNE_PKGARCH
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fixed SRC_URI:
* ${PN} -> ${BPN}, use ${BP} if it was ${PN}-${PV}
* ${P} -> ${BP}
Otherwise we would meet do_fetch errors when we do the multilib, native
or nativesdk build.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
These recipes were all missing pkgconfig dependencies.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* These recipes all use pkg-config in some way but were missing
dependencies on the tool, this patch adds them.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Also fixup apache2-native recipe to use autotools and SEPB.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Rather than put hardcoded values into the init scripts,
use a config file. The SRV_DIR is a special value as it
should be used in the conifg file and also passed to make
so it can put the html files in the correct directory.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The default set of themes taks up ~13MB, with a couple of them weighting in
at ~5MB each.
Let's split the themes to separate packages, to allow a considerable size
reduction of the core webmin package (from +15MB to 2.1MB on my build host).
Signed-off-by: Anders Darander <anders@chargestorm.se>
Don't hardcode the webmin login and password in the install script.
Instead, extract them to variables, to allow us to override them in
a bbappend.
Signed-off-by: Anders Darander <anders@chargestorm.se>
This patch make use of autotools-brokensep on main
recipe to avoid a broken build when using a different
build directory.
monkey-yocto/f15c9e7cd9143ce8486ae5e78db9092238c3d0ec
Signed-off-by: Eduardo Silva <eduardo@monkey.io>
This patch adds the Monkey HTTP Server v1.5.0 recipes. The content
on this patch includes the modifications suggested by people in the
Maling List.
Signed-off-by: Eduardo Silva <eduardo@monkey.io>
Add the Xdebug license file to avoid a missing generic license file
warning during building.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Both the two rules install-adminpyDATA and install-generatedDATA will
install the configured.py to the same location, they can run parallel,
and they use "install -m", which would might build failures:
/usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory
This is because the first install is setting the permission while the
second install is removing the file an re-install.
Only install the configured.py once will fix the problem, I think that
there is no side effect since it installed the same file to the same
location twice in the past.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
sstate processing for items in sysroot scans certain
file name patterns for absolute paths to be adjusted
when items are installed into sysroot from sstate.
phpize is not one of these patterns (surprise!) so we
add it to the list.
Signed-off-by: Joe Slater <jslater@windriver.com>
* LIC_FILES_CHKSUM changed because of the introduction of an extra blank
line in the LICENSE file (!)
* Refreshed TLS Next Protocol Negotiation support patch for conflict
with 2.4.7. Thanks to Hongxu Jia for doing this work.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Changes:
- rename SUMMARY with length > 80 to DESCRIPTION
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line
Note: don't bump PR
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
In recent versions, upstream has decided to place additional
restrictions on commercial use beyond a standard open source license
(LGPLv3) [1]. This makes it hard to set a LICENSE value that is easily
understood. Of course, as the authors, they have the right to decide
what licensing terms they wish to distribute their project under, and we
could always set LICENSE_FLAGS to denote the extra terms, but this is
somewhat messy and personally I feel less inclined to continue
maintaining this recipe in meta-webserver now, especially since I
originally put it together on my own time. At the moment due to a
branch/commit mismatch it is no longer fetching in any case.
(If someone wants to resurrect this recipe in another layer, they are
more than welcome to do so.)
[1] http://support.ajenti.org/topic/351265-clarify-licensing/
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Previously, modphp estimates endian on host rather than checks it on
target. If the host is little-endian and the target is big-endian,
modphp claims that endian is little. As a result, a memory location
that it is not allowed to access when calling libphp5.so module on
target. It will occur segmentation fault.
This patch enables endian check support for modphp.
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Initial recipe created by Steve Arnold. Original build patch and 1.0.10
recipe graciously contributed by bencoh (in #oe on irc.freenode.net).
New recipe and init script contributed by this author. Built and
tested on master branches using author's fork of meta-raspberrypi.
Signed-off-by: stephen.arnold42 <stephen.arnold42@gmail.com>
Signed-off-by: Sébastien Mennetrier <s.mennetrier@innotis.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Add LAYERVERSION and LAYERDEPENDS to layer.conf
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
* 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>
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>
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>
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>
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>
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>
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>
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>
* 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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
* 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>
* 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>
* 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>
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>
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>
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>
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>
- 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>
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>
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>
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>
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>
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>
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>
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>
* 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>
* 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>
* 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>
* 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>
