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: create configuration file for systemd-tmpfiles

Browse Source 
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>
This commit is contained in:
Roy Li 2013-09-10 16:36:44 +08:00 committed by Paul Eggleton
parent 138f44f9bb
commit a40fcab604
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb
View File

@ -16,7 +16,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
file://replace-lynx-to-curl-in-apachectl-script.patch \
file://apache-ssl-ltmain-rpath.patch \
file://httpd-2.4.3-fix-race-issue-of-dir-install.patch \
file://init"
file://init \
file://apache2-volatile.conf"
LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc"
SRC_URI[md5sum] = "ea5e361ca37b8d7853404419dd502efe"
@ -70,6 +71,11 @@ do_install_append() {
printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
# match with that is in init script
printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf
if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d/
install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
fi
}
SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"

2
meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf Normal file
View File

@ -0,0 +1,2 @@
d /var/run/apache2 0755 root root -
d /var/log/apache2 0755 root root -