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

connectcore-demo-example: cosmetic, clean up the recipe 

Use ${servicedir} instead of hardcoded /srv, disable unnecessary
configure/compile steps and reorder the recipe according to Yocto coding
style.

No functional change.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2025-11-10 15:52:10 +01:00
parent 62f2f0d911
commit b1f6954004
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc
View File

@ -1,4 +1,4 @@
# Copyright (C) 2022-2024, Digi International Inc. # Copyright (C) 2022-2025, Digi International Inc.
require dey-examples-src.inc require dey-examples-src.inc
@ -13,20 +13,10 @@ SRC_URI += " \
file://connectcore-demo-server.service \ file://connectcore-demo-server.service \
file://suspendtarget-connectcore-demo-server.service \ file://suspendtarget-connectcore-demo-server.service \
" "
S = "${WORKDIR}/git/connectcore-demo-example"
RDEPENDS:${PN}-server = " \ do_configure[noexec] = "1"
busybox-httpd \ do_compile[noexec] = "1"
libdigiapix-python3 \
mpg123 \
python3-connectcore-ble \
python3-core \
python3-httplib2 \
python3-json \
python3-logging \
python3-netserver \
"
S = "${WORKDIR}/connectcore-demo-example"
inherit systemd update-rc.d inherit systemd update-rc.d
@ -37,11 +27,11 @@ BOARD_IMAGE_FILE:ccimx6qpsbc = "ccimx6sbc_board.png"
BOARD_IMAGE_FILE:ccimx91-dvk = "ccimx93-dvk_board.png" BOARD_IMAGE_FILE:ccimx91-dvk = "ccimx93-dvk_board.png"
do_install() { do_install() {
install -d ${D}/srv/www install -d ${D}${servicedir}/www
cp -r ${WORKDIR}/git/connectcore-demo-example/* ${D}/srv/www/ \cp --remove-destination -r * ${D}${servicedir}/www/
# Remove unused images # Remove unused images
find ${D}/srv/www/static/images/ -type f -name '*_board.png' -not -name '${BOARD_IMAGE_FILE}' -delete find ${D}${servicedir}/www/static/images/ -type f -name '*_board.png' -not -name '${BOARD_IMAGE_FILE}' -delete
# Install systemd service # Install systemd service
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
@ -57,28 +47,29 @@ do_install() {
ln -sf ${sysconfdir}/connectcore-demo-server ${D}${sysconfdir}/init.d/connectcore-demo-server ln -sf ${sysconfdir}/connectcore-demo-server ${D}${sysconfdir}/init.d/connectcore-demo-server
} }
PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGES =+ "${PN}-server ${PN}-multimedia" PACKAGES =+ "${PN}-server ${PN}-multimedia"
FILES:${PN} += " \ FILES:${PN} += " \
/srv/www/* \ ${servicedir}/www/* \
" "
FILES:${PN}-multimedia += " \ FILES:${PN}-multimedia += " \
/srv/www/multimedia* \ ${servicedir}/www/multimedia* \
/srv/www/static/images/aquarium.jpg \ ${servicedir}/www/static/images/aquarium.jpg \
/srv/www/static/images/big_buck_bunny.jpg \ ${servicedir}/www/static/images/big_buck_bunny.jpg \
/srv/www/static/images/blob.jpg \ ${servicedir}/www/static/images/blob.jpg \
/srv/www/static/images/cpu.png \ ${servicedir}/www/static/images/cpu.png \
/srv/www/static/images/electricflower.jpg \ ${servicedir}/www/static/images/electricflower.jpg \
/srv/www/static/images/multiple-views.jpg \ ${servicedir}/www/static/images/multiple-views.jpg \
/srv/www/static/images/ram.png \ ${servicedir}/www/static/images/ram.png \
/srv/www/static/images/spacerocks.jpg \ ${servicedir}/www/static/images/spacerocks.jpg \
/srv/www/static/images/toon-shading.jpg \ ${servicedir}/www/static/images/toon-shading.jpg \
/srv/www/static/js/multimedia.js \ ${servicedir}/www/static/js/multimedia.js \
" "
FILES:${PN}-server = " \ FILES:${PN}-server += " \
/srv/www/demoserver.py \ ${servicedir}/www/demoserver.py \
${systemd_unitdir}/system/connectcore-demo-server.service \ ${systemd_unitdir}/system/connectcore-demo-server.service \
${systemd_unitdir}/system/suspendtarget-connectcore-demo-server.service \ ${systemd_unitdir}/system/suspendtarget-connectcore-demo-server.service \
${sysconfdir}/connectcore-demo-server \ ${sysconfdir}/connectcore-demo-server \
@ -87,6 +78,17 @@ FILES:${PN}-server = " \
RDEPENDS:${PN} = "${PN}-server" RDEPENDS:${PN} = "${PN}-server"
RDEPENDS:${PN}-multimedia = "${PN}" RDEPENDS:${PN}-multimedia = "${PN}"
RDEPENDS:${PN}-server = " \
busybox-httpd \
libdigiapix-python3 \
mpg123 \
python3-connectcore-ble \
python3-core \
python3-httplib2 \
python3-json \
python3-logging \
python3-netserver \
"
INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_PACKAGES = "${PN}-server"
INITSCRIPT_NAME:${PN}-server = "connectcore-demo-server" INITSCRIPT_NAME:${PN}-server = "connectcore-demo-server"
@ -97,5 +99,3 @@ SYSTEMD_SERVICE:${PN}-server = " \
connectcore-demo-server.service \ connectcore-demo-server.service \
suspendtarget-connectcore-demo-server.service \ suspendtarget-connectcore-demo-server.service \
" "
PACKAGE_ARCH = "${MACHINE_ARCH}"