CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

apache2: change files layout to debian style

Browse Source 
The default layout installs log files and pid files into /var/apache2/logs.
This is odd and also will cause security issues because selinux does not know
how to label the security contexts for the files.

Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
dengke.du@windriver.com 2017-09-14 23:18:21 -04:00 committed by Martin Jansa
parent 2630b26862
commit 4bd83dd9df
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb
View File

@ -59,9 +59,13 @@ EXTRA_OECONF = "--enable-ssl \
ac_cv_have_threadsafe_pollset=no"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
PACKAGECONFIG[selinux] = "--enable-selinux --enable-layout=Debian --prefix=${base_prefix}/,--disable-selinux,libselinux,libselinux"
PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
do_configure_prepend() {
sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' ${S}/config.layout
}
do_install_append() {
install -d ${D}/${sysconfdir}/init.d
cat ${WORKDIR}/init | \
@ -111,6 +115,7 @@ do_install_append_class-target() {
sed -i -e 's,${STAGING_DIR_HOST},,g' \
-e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice
rm -rf ${D}${localstatedir}/run
}
SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
@ -184,3 +189,6 @@ FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
RDEPENDS_${PN}-scripts += "perl ${PN}"
RDEPENDS_${PN}-dev = "perl"
FILES_${PN} += "${libdir}/cgi-bin"
FILES_${PN} += "${datadir}/${BPN}/"