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: fix multilib file conflicts

Browse Source 
There are errors of apache2 about files conflicts when multilib enabled:

| Error: Transaction check error:
|   file /etc/apache2/extra/httpd-ssl.conf conflicts between attempted installs of lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64
|   file /etc/apache2/httpd.conf conflicts between attempted installs of lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64
|   file /usr/sbin/envvars conflicts between attempted installs of lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64
|   file /usr/sbin/envvars-std conflicts between attempted installs of lib32-apache2-2.4.41-r0.core2_32 and apache2-2.4.41-r0.core2_64

It makes libexecdir point to ${libdir}. Reset to ${libexecdir} which could
eliminate file conflicts of the conf files. And remove /usr/sbin/envvars and
/usr/sbin/envvars-std which only used by apachectl. They only add standard
library path ${libdir} to LD_LIBRARY_PATH, so remove them to avoid multilib
file conflicts.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8d4d608b4e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Kai Kang 2019-09-06 06:38:38 +08:00 committed by Armin Kuster
parent b3a2441534
commit 8bb6955cf8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb
View File

@ -53,7 +53,7 @@ EXTRA_OECONF_class-target = "\
--sysconfdir=${sysconfdir}/${BPN} \ --sysconfdir=${sysconfdir}/${BPN} \
--datadir=${datadir}/${BPN} \ --datadir=${datadir}/${BPN} \
--libdir=${libdir} \ --libdir=${libdir} \
--libexecdir=${libdir}/${BPN}/modules \ --libexecdir=${libexecdir}/${BPN}/modules \
--localstatedir=${localstatedir} \ --localstatedir=${localstatedir} \
--enable-ssl \ --enable-ssl \
--with-dbm=sdbm \ --with-dbm=sdbm \
@ -78,7 +78,7 @@ EXTRA_OECONF_class-native = "\
" "
do_configure_prepend() { do_configure_prepend() {
sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' ${S}/config.layout sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout
} }
do_install_append_class-target() { do_install_append_class-target() {
@ -139,7 +139,7 @@ do_install_append_class-target() {
install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2
fi fi
rm -rf ${D}${localstatedir} rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars*
chown -R root:root ${D} chown -R root:root ${D}
} }