aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-08-24 11:40:11 +0800
committerKhem Raj <raj.khem@gmail.com>2018-08-24 08:58:13 -0700
commit8b021f35e343d5ea3b44ed9f9da8c9db6998bf3b (patch)
tree68241881958667e146a756e560d0df24067189d2
parent815f62beff873d1cdbd05e4e7e0c690aec7e7487 (diff)
downloadmeta-openembedded-8b021f35e343d5ea3b44ed9f9da8c9db6998bf3b.tar.gz
meta-openembedded-8b021f35e343d5ea3b44ed9f9da8c9db6998bf3b.tar.bz2
meta-openembedded-8b021f35e343d5ea3b44ed9f9da8c9db6998bf3b.zip
apache2: set files layout to debian style
The default layout installs log files to /var/apache2/logs. But we assume the log directory is /var/log/apache2 in volatile.conf. Specify the layout to debian style to set the correct the log directory. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb
index 6642f2bda..a92ec5458 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb
@@ -58,10 +58,12 @@ EXTRA_OECONF = "--enable-ssl \
--libexecdir=${libdir}/${BPN}/modules \
ap_cv_void_ptr_lt_long=no \
--enable-mpms-shared \
- ac_cv_have_threadsafe_pollset=no"
+ ac_cv_have_threadsafe_pollset=no \
+ --enable-layout=Debian \
+ --prefix=${base_prefix}/"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-PACKAGECONFIG[selinux] = "--enable-selinux --enable-layout=Debian --prefix=${base_prefix}/,--disable-selinux,libselinux,libselinux"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
PACKAGECONFIG[zlib] = "--enable-deflate --with-z=${STAGING_LIBDIR},,zlib,zlib"