diff options
author | dengke.du@windriver.com <dengke.du@windriver.com> | 2017-09-14 23:18:21 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-09-18 10:18:12 +0200 |
commit | 4bd83dd9df75d31c8a302a8e89bf99f1042fc5bc (patch) | |
tree | b132d21b5e3146710c12924f75e85283d4355206 /meta-webserver/recipes-httpd | |
parent | 2630b26862a64f32f81fd455df31270125ea5487 (diff) | |
download | meta-openembedded-4bd83dd9df75d31c8a302a8e89bf99f1042fc5bc.tar.gz |
apache2: change files layout to debian style
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>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb index c7e7b54c6..18808676a 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.27.bb | |||
@@ -59,9 +59,13 @@ EXTRA_OECONF = "--enable-ssl \ | |||
59 | ac_cv_have_threadsafe_pollset=no" | 59 | ac_cv_have_threadsafe_pollset=no" |
60 | 60 | ||
61 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" | 61 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" |
62 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" | 62 | PACKAGECONFIG[selinux] = "--enable-selinux --enable-layout=Debian --prefix=${base_prefix}/,--disable-selinux,libselinux,libselinux" |
63 | PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" | 63 | PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" |
64 | 64 | ||
65 | do_configure_prepend() { | ||
66 | sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' ${S}/config.layout | ||
67 | } | ||
68 | |||
65 | do_install_append() { | 69 | do_install_append() { |
66 | install -d ${D}/${sysconfdir}/init.d | 70 | install -d ${D}/${sysconfdir}/init.d |
67 | cat ${WORKDIR}/init | \ | 71 | cat ${WORKDIR}/init | \ |
@@ -111,6 +115,7 @@ do_install_append_class-target() { | |||
111 | 115 | ||
112 | sed -i -e 's,${STAGING_DIR_HOST},,g' \ | 116 | sed -i -e 's,${STAGING_DIR_HOST},,g' \ |
113 | -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice | 117 | -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice |
118 | rm -rf ${D}${localstatedir}/run | ||
114 | } | 119 | } |
115 | 120 | ||
116 | SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" | 121 | SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" |
@@ -184,3 +189,6 @@ FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug" | |||
184 | RDEPENDS_${PN} += "openssl libgcc" | 189 | RDEPENDS_${PN} += "openssl libgcc" |
185 | RDEPENDS_${PN}-scripts += "perl ${PN}" | 190 | RDEPENDS_${PN}-scripts += "perl ${PN}" |
186 | RDEPENDS_${PN}-dev = "perl" | 191 | RDEPENDS_${PN}-dev = "perl" |
192 | |||
193 | FILES_${PN} += "${libdir}/cgi-bin" | ||
194 | FILES_${PN} += "${datadir}/${BPN}/" | ||