Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

busybox: remove default http homepage elements 

We're going to be using the busybox http server to house the WebKit examples,
so we need to get rid of any files that might interfere with it. Keep the files
for the ccimx6ul, since it doesn't support WebKit.

https://jira.digi.com/browse/DEL-7314
https://jira.digi.com/browse/DEL-7339

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2020-12-09 17:04:21 +01:00
parent 4b94979d98
commit f7c86fb0a4
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta-digi-dey/recipes-core/busybox/busybox_1.31.%.bbappend
View File

@ -6,8 +6,6 @@ SRC_URI += "file://standby \
file://standby-actions \ file://standby-actions \
file://standby-systemd \ file://standby-systemd \
file://busybox-ntpd \ file://busybox-ntpd \
file://index.html \
file://digi-logo.png \
file://busybox-httpd.service.in \ file://busybox-httpd.service.in \
file://nm \ file://nm \
file://busybox-acpid \ file://busybox-acpid \
@ -17,6 +15,10 @@ SRC_URI += "file://standby \
file://bridgeifupdown \ file://bridgeifupdown \
" "
SRC_URI_append_ccimx6ul = " file://index.html \
file://digi-logo.png \
"
HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
# hwclock bootscript init parameters # hwclock bootscript init parameters
@ -54,8 +56,6 @@ do_install_append() {
fi fi
if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
install -d ${D}/srv/www/cgi-bin install -d ${D}/srv/www/cgi-bin
install -m 0644 ${WORKDIR}/index.html ${D}/srv/www/
install -m 0644 ${WORKDIR}/digi-logo.png ${D}/srv/www/
install -m 0755 ${WORKDIR}/nm ${D}/srv/www/cgi-bin/ install -m 0755 ${WORKDIR}/nm ${D}/srv/www/cgi-bin/
if ${HAS_SYSTEMD}; then if ${HAS_SYSTEMD}; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system
@ -93,4 +93,13 @@ do_install_append() {
fi fi
} }
do_install_append_ccimx6ul() {
install -d ${D}/srv/www
if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
install -m 0644 ${WORKDIR}/index.html ${D}/srv/www/
install -m 0644 ${WORKDIR}/digi-logo.png ${D}/srv/www/
fi
}
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"