[meta-virtualization] [meta-cloud-services][PATCH] apache2: remove bbappend

Yi Zhao yi.zhao at windriver.com
Thu Apr 18 17:26:09 PDT 2019


The apache2 in meta-webserver has been upgraded to 2.4.39. This bbappend
has been integrated into apache2 recipe. So remove it.

Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
---
 .../recipes-httpd/apache2/apache2_2.4.%.bbappend           | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend

diff --git a/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend b/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend
deleted file mode 100644
index 5fc832d..0000000
--- a/meta-openstack/recipes-httpd/apache2/apache2_2.4.%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-do_install_append() {
-    sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
-    # Keep our logs together, also matches ubuntu and debian
-    sed -i -e 's@^\(.*\)/var/apache2/logs\(.*\)$@\1/var/log/apache2\2 at g' ${D}${sysconfdir}/apache2/httpd.conf
-
-    # default layout for htdocsdir in 2.4.7 is different, create the following for
-    # backward compatibility reasons
-
-    mkdir -p ${D}${datadir}/${BPN}/default-site
-    ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
-}
-
-FILES_${PN} += "${datadir}/${BPN}/default-site"
-SYSTEMD_AUTO_ENABLE_${PN} = "enable"
-- 
2.7.4



More information about the meta-virtualization mailing list