diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb index 5200111520..9b80bbff67 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb | |||
| @@ -20,9 +20,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ | |||
| 20 | SRC_URI_append_class-target = " \ | 20 | SRC_URI_append_class-target = " \ |
| 21 | file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ | 21 | file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ |
| 22 | file://init \ | 22 | file://init \ |
| 23 | file://apache2-volatile.conf \ | ||
| 24 | file://apache2.service \ | 23 | file://apache2.service \ |
| 25 | file://volatiles.04_apache2 \ | ||
| 26 | " | 24 | " |
| 27 | 25 | ||
| 28 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" | 26 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" |
| @@ -128,16 +126,10 @@ do_install_append_class-target() { | |||
| 128 | -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice | 126 | -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice |
| 129 | 127 | ||
| 130 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 128 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 131 | install -d ${D}${sysconfdir}/tmpfiles.d/ | ||
| 132 | install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ | ||
| 133 | |||
| 134 | install -d ${D}${systemd_unitdir}/system | 129 | install -d ${D}${systemd_unitdir}/system |
| 135 | install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system | 130 | install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system |
| 136 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service | 131 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service |
| 137 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service | 132 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service |
| 138 | elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | ||
| 139 | install -d ${D}${sysconfdir}/default/volatiles | ||
| 140 | install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 | ||
| 141 | fi | 133 | fi |
| 142 | 134 | ||
| 143 | rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* | 135 | rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* |
