From b254ec36165493ad9f70975c5ebacf9799d5478a Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Sun, 2 Jul 2023 14:21:52 +0300 Subject: [PATCH] Fix microbe-web version for meldana project --- .../general/package/microbe-web/Config.in | 7 ++ .../package/microbe-web/files/S50httpd | 66 +++++++++++++++++++ .../package/microbe-web/files/httpd.conf | 8 +++ .../package/microbe-web/microbe-web.mk | 29 ++++++++ .../general/scripts/rootfs_script.sh | 22 ------- 5 files changed, 110 insertions(+), 22 deletions(-) create mode 100644 projects/gk7205v200_lite_meldana/general/package/microbe-web/Config.in create mode 100755 projects/gk7205v200_lite_meldana/general/package/microbe-web/files/S50httpd create mode 100644 projects/gk7205v200_lite_meldana/general/package/microbe-web/files/httpd.conf create mode 100644 projects/gk7205v200_lite_meldana/general/package/microbe-web/microbe-web.mk delete mode 100755 projects/gk7205v200_ultimate_baresip/general/scripts/rootfs_script.sh diff --git a/projects/gk7205v200_lite_meldana/general/package/microbe-web/Config.in b/projects/gk7205v200_lite_meldana/general/package/microbe-web/Config.in new file mode 100644 index 0000000..a9ad566 --- /dev/null +++ b/projects/gk7205v200_lite_meldana/general/package/microbe-web/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MICROBE_WEB + bool "microbe-web" + help + The simplest web interface constructor based on + httpd and haserl. + + https://openipc.org diff --git a/projects/gk7205v200_lite_meldana/general/package/microbe-web/files/S50httpd b/projects/gk7205v200_lite_meldana/general/package/microbe-web/files/S50httpd new file mode 100755 index 0000000..3283e8c --- /dev/null +++ b/projects/gk7205v200_lite_meldana/general/package/microbe-web/files/S50httpd @@ -0,0 +1,66 @@ +#!/bin/sh + +DAEMON="httpd" +PIDFILE="/var/run/$DAEMON.pid" +CONFFILE="/etc/httpd.conf" + +HTTPD_ARGS="httpd -p 85 -f -c $CONFFILE -r Authentication" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +if [ "$(fw_printenv -n debug)" ]; then + echo "Development mode" + sed -i "/^\/cgi-bin:admin:/s/^/#/" $CONFFILE +else + echo "Production mode" + sed -i "/^#\/cgi-bin:admin:/s/^#//" $CONFFILE +fi + +# The httpd does not create a pidfile, so pass "-n" in the command line +# and use "-m" to instruct start-stop-daemon to create one. +start() { + printf 'Starting %s: ' "$DAEMON" + [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $HTTPD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature. + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/projects/gk7205v200_lite_meldana/general/package/microbe-web/files/httpd.conf b/projects/gk7205v200_lite_meldana/general/package/microbe-web/files/httpd.conf new file mode 100644 index 0000000..4e019b6 --- /dev/null +++ b/projects/gk7205v200_lite_meldana/general/package/microbe-web/files/httpd.conf @@ -0,0 +1,8 @@ +# +H:/var/www +A:127.0.0.1 +A:* +D:8.8.8.8/32 +E401:401.html +/cgi-bin:root:* +# diff --git a/projects/gk7205v200_lite_meldana/general/package/microbe-web/microbe-web.mk b/projects/gk7205v200_lite_meldana/general/package/microbe-web/microbe-web.mk new file mode 100644 index 0000000..5d60771 --- /dev/null +++ b/projects/gk7205v200_lite_meldana/general/package/microbe-web/microbe-web.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# microbe-web +# +################################################################################ + +MICROBE_WEB_SITE_METHOD = git +MICROBE_WEB_SITE = https://github.com/openipc/microbe-web +MICROBE_WEB_VERSION = bbb49c57695c116a17219d0898dc11cc696261df + +MICROBE_WEB_LICENSE = MIT +MICROBE_WEB_LICENSE_FILES = LICENSE + +define MICROBE_WEB_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc + cp $(MICROBE_WEB_PKGDIR)/files/httpd.conf $(TARGET_DIR)/etc + + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d + cp $(MICROBE_WEB_PKGDIR)/files/S50httpd $(TARGET_DIR)/etc/init.d + cp -rv $(@D)/files/etc/init.d/* $(TARGET_DIR)/etc/init.d + + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr + cp -rv $(@D)/files/usr/sbin $(TARGET_DIR)/usr + + $(INSTALL) -m 755 -d $(TARGET_DIR)/var + cp -rv $(@D)/files/var/www $(TARGET_DIR)/var +endef + +$(eval $(generic-package)) diff --git a/projects/gk7205v200_ultimate_baresip/general/scripts/rootfs_script.sh b/projects/gk7205v200_ultimate_baresip/general/scripts/rootfs_script.sh deleted file mode 100755 index a9608e6..0000000 --- a/projects/gk7205v200_ultimate_baresip/general/scripts/rootfs_script.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -DATE=$(date +%y.%m.%d) -FILE=${TARGET_DIR}/usr/lib/os-release - -echo OPENIPC_VERSION=${DATE:0:1}.${DATE:1} >> ${FILE} -date +GITHUB_VERSION="\"${GIT_BRANCH-local}+${GIT_HASH-build}, %Y-%m-%d"\" >> ${FILE} -echo BUILD_OPTION=${OPENIPC_FLAVOR} >> ${FILE} -date +TIME_STAMP=%s >> ${FILE} - -CONF="INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|WIFIBROADCAST=y|WEBRTC_AUDIO_PROCESSING=y" -if ! grep -q "USES_GLIBC" ${BR2_CONFIG} && ! grep -qP ${CONF} ${BR2_CONFIG}; then - rm -f ${TARGET_DIR}/usr/lib/libstdc++* -fi - -if grep -q "USES_MUSL" ${BR2_CONFIG}; then - LIST=${BR2_EXTERNAL}/scripts/excludes/${OPENIPC_SOC_MODEL}_${OPENIPC_FLAVOR}.list - test -e ${LIST} && xargs -a ${LIST} -I % rm -rf ${TARGET_DIR}/% - - ln -sf /lib/libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0 - ln -sf ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd -fi