From f7c86fb0a43e38419d657bf08a1592023f59b599 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Wed, 9 Dec 2020 17:04:21 +0100
Subject: [PATCH] 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>
---
 .../busybox/busybox_1.31.%.bbappend             | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.31.%.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.31.%.bbappend
index b1aabfeb7..4d1640831 100644
--- a/meta-digi-dey/recipes-core/busybox/busybox_1.31.%.bbappend
+++ b/meta-digi-dey/recipes-core/busybox/busybox_1.31.%.bbappend
@@ -6,8 +6,6 @@ SRC_URI += "file://standby \
             file://standby-actions \
             file://standby-systemd \
             file://busybox-ntpd \
-            file://index.html \
-            file://digi-logo.png \
             file://busybox-httpd.service.in \
             file://nm \
             file://busybox-acpid \
@@ -17,6 +15,10 @@ SRC_URI += "file://standby \
             file://bridgeifupdown \
            "
 
+SRC_URI_append_ccimx6ul = " file://index.html \
+                            file://digi-logo.png \
+                          "
+
 HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
 
 # hwclock bootscript init parameters
@@ -54,8 +56,6 @@ do_install_append() {
 	fi
 	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
 		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/
 		if ${HAS_SYSTEMD}; then
 			install -d ${D}${systemd_unitdir}/system
@@ -93,4 +93,13 @@ do_install_append() {
 	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}"