Skip to content

Commit 8e1bb89

Browse files
astureltuxuser
authored andcommitted
Enable effect engine and json checks (#1)
* fix build (remove buildroot's perl) * enable effect engine * enable json checks
1 parent 13a289f commit 8e1bb89

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ jobs:
124124
-DHYPERION_LIGHT=ON \
125125
-DENABLE_QT=OFF \
126126
-DENABLE_AUDIO=OFF \
127-
-DENABLE_EFFECTENGINE=OFF \
128-
-DENABLE_JSONCHECKS=OFF \
127+
-DENABLE_EFFECTENGINE=ON \
128+
-DENABLE_JSONCHECKS=ON \
129129
-DENABLE_DEV_SERIAL=ON \
130130
-DENABLE_DEV_USB_HID=ON \
131131
-DENABLE_DEV_WS281XPWM=OFF \
@@ -149,14 +149,16 @@ jobs:
149149
150150
- name: Copy dependencies to release/
151151
env:
152-
dependency_libs: libpng16.so.16 libjpeg.so.8 libcrypto.so.1.1 libz.so.1 libssl.so.1.1 libQt5Sql.so.5.15.2 libpcre2-16.so.0 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libk5crypto.so.3 libatomic.so.1 libQt5Core.so.5 libkrb5support.so.0 libcom_err.so.3 libstdc++.so.6 libkrb5.so.3 libQt5Sql.so.5 libgssapi_krb5.so.2 libQt5SerialPort.so.5 libQt5Sql.so.5.15 libusb-1.0.so.0
152+
dependency_libs: libpython3.10.so.1.0 libpython3.so libpng16.so.16 libjpeg.so.8 libcrypto.so.1.1 libz.so.1 libssl.so.1.1 libQt5Sql.so.5.15.2 libpcre2-16.so.0 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libk5crypto.so.3 libatomic.so.1 libQt5Core.so.5 libkrb5support.so.0 libcom_err.so.3 libstdc++.so.6 libkrb5.so.3 libQt5Sql.so.5 libgssapi_krb5.so.2 libQt5SerialPort.so.5 libQt5Sql.so.5.15 libusb-1.0.so.0
153153
run: |
154154
for i in ${{ env.dependency_libs }}; do find ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/ -name $i -exec cp {} ./release/ \;; done
155155
mkdir -p ./release/sqldrivers
156156
mkdir -p ./release/imageformats
157+
mkdir -p ./release/python/lib
157158
cp ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/sqldrivers/libqsqlite.so ./release/sqldrivers/
158159
cp ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/imageformats/libqico.so ./release/imageformats/
159160
cp ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/qt/plugins/imageformats/libqjpeg.so ./release/imageformats/
161+
cp -r ${TOOLCHAIN_DIR}/arm-webos-linux-gnueabi/sysroot/usr/lib/python3.10 ./release/python/lib/
160162
find ./release
161163
162164
- name: Upload artifacts

service/src/daemon.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,17 @@ int daemon_spawn(pid_t *pid)
3737

3838
char *env_library_path;
3939
char *env_armcap;
40+
char *python_home;
4041
char *application_executable_path;
4142

4243
asprintf(&env_library_path, "LD_LIBRARY_PATH=%s", DAEMON_PATH);
4344
asprintf(&env_armcap, "OPENSSL_armcap=%d", 0);
4445
asprintf(&application_executable_path, "%s/%s", DAEMON_PATH, DAEMON_EXECUTABLE);
46+
asprintf(&python_home, "PYTHONHOME=%s/python", DAEMON_PATH);
4547

46-
char *env_vars[] = {env_library_path, env_armcap, "HOME=/home/root", NULL};
48+
char *env_vars[] = {env_library_path, env_armcap, python_home, "HOME=/home/root", NULL};
4749
char *argv[] = {application_executable_path, NULL};
48-
50+
4951
res = posix_spawn(pid, application_executable_path, NULL, NULL, argv, env_vars);
5052
DBG("pid=%d, application_path=%s, env={%s,%s}",
5153
*pid, application_executable_path, env_library_path, env_armcap);

0 commit comments

Comments
 (0)