From 99800d24c5f79b50a3f90869230ff420981d1997 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Thu, 18 Jul 2024 23:07:26 -0400 Subject: [PATCH] apache2: use update-alternatives for httpd Busybox can optionally provide an httpd server, but by default The Yocto Project defconfig for busybox does not enable it. If it is enabled, busybox puts the resulting /usr/sbin/httpd object under the control of update-alternatives. apache2, on the other hand, does not put /usr/sbin/httpd under the control of update-alternatives. Therefore, in the off chance a user enables the busybox httpd server, it does not play well with apache2. Add update-alternatives information to apache2 so that it plays nicely with busybox which can optionally provide an httpd server at /usr/sbin/httpd. Signed-off-by: Trevor Woerner Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/apache2/apache2_2.4.61.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.61.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.61.bb index ec8a1a6119..f90e9ee3dc 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.61.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.61.bb @@ -190,6 +190,10 @@ INITSCRIPT_PARAMS = "defaults 91 20" SYSTEMD_SERVICE:${PN} = "apache2.service" SYSTEMD_AUTO_ENABLE:${PN} = "enable" +ALTERNATIVE:${PN} = "httpd" +ALTERNATIVE_LINK_NAME[httpd] = "${sbindir}/httpd" +ALTERNATIVE_PRIORITY[httpd] = "60" + ALTERNATIVE:${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"