From 38a586ffa2f272f7f34d7d4228d779f9ebb032e5 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Sun, 26 Oct 2025 09:13:05 +0100 Subject: [PATCH] Try to fix manifests --- manifests/manifest.py | 8 ++++---- manifests/manifest_fri3d-2024.py | 6 +++--- manifests/manifest_unix.py | 8 ++++---- scripts/build_mpos.sh | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifests/manifest.py b/manifests/manifest.py index fd5ad1ba..39f577ee 100644 --- a/manifests/manifest.py +++ b/manifests/manifest.py @@ -1,4 +1,4 @@ -freeze('internal_filesystem/', 'boot.py') # Hardware initialization -freeze('internal_filesystem/', 'main.py') # User Interface initialization -freeze('internal_filesystem/lib', '') # Additional libraries -freeze('freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps +freeze('../internal_filesystem/', 'boot.py') # Hardware initialization +freeze('../internal_filesystem/', 'main.py') # User Interface initialization +freeze('../internal_filesystem/lib', '') # Additional libraries +freeze('../freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps diff --git a/manifests/manifest_fri3d-2024.py b/manifests/manifest_fri3d-2024.py index 60fc0fbc..6b5c3aa1 100644 --- a/manifests/manifest_fri3d-2024.py +++ b/manifests/manifest_fri3d-2024.py @@ -1,4 +1,4 @@ freeze('/tmp/', 'boot.py') # Hardware initialization - this file is copied from boot_fri3d-2024.py to /tmp by the build script to have it named boot.py -freeze('internal_filesystem/', 'main.py') # User Interface initialization -freeze('internal_filesystem/lib', '') # Additional libraries -freeze('freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps +freeze('../internal_filesystem/', 'main.py') # User Interface initialization +freeze('../internal_filesystem/lib', '') # Additional libraries +freeze('../freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps diff --git a/manifests/manifest_unix.py b/manifests/manifest_unix.py index 3048ce24..5012e02a 100644 --- a/manifests/manifest_unix.py +++ b/manifests/manifest_unix.py @@ -1,4 +1,4 @@ -freeze('internal_filesystem/', 'boot_unix.py') # Hardware initialization -freeze('internal_filesystem/', 'main.py') # User Interface initialization -freeze('internal_filesystem/lib', '') # Additional libraries -freeze('freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps +freeze('../internal_filesystem/', 'boot_unix.py') # Hardware initialization +freeze('../internal_filesystem/', 'main.py') # User Interface initialization +freeze('../internal_filesystem/lib', '') # Additional libraries +freeze('../freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps diff --git a/scripts/build_mpos.sh b/scripts/build_mpos.sh index 35f41349..953a264b 100755 --- a/scripts/build_mpos.sh +++ b/scripts/build_mpos.sh @@ -47,8 +47,8 @@ fi echo "Check need to add lvgl_micropython manifest to micropython-camera-API's manifest..." camani="$codebasedir"/micropython-camera-API/src/manifest.py rellvglmani=lvgl_micropython/build/manifest.py +abslvglmani="$codebasedir"/"$rellvglmani" if ! grep "$rellvglmani" "$camani"; then - abslvglmani="$codebasedir"/"$rellvglmani" echo "Adding include(\"$abslvglmani\") to $camani" echo >> "$camani" # needs newline because file doesn't have newline at the end echo "include(\"$abslvglmani\") # workaround to prevent micropython-camera-API from overriding the lvgl_micropython manifest..." >> "$camani"