From 25147929c8b01dd4c5f7a7f6c7f108d9f9c9daf3 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Sat, 25 Oct 2025 23:09:18 +0200 Subject: [PATCH] Fix freezeFS location --- manifest.py | 2 +- manifest_fri3d-2024.py | 2 +- manifest_unix.py | 2 +- scripts/freezefs_mount_builtin.sh | 7 +++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/manifest.py b/manifest.py index 3c548e4b..fd5ad1ba 100644 --- a/manifest.py +++ b/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('freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps diff --git a/manifest_fri3d-2024.py b/manifest_fri3d-2024.py index b8c72e45..60fc0fbc 100644 --- a/manifest_fri3d-2024.py +++ b/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('freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps diff --git a/manifest_unix.py b/manifest_unix.py index c2a9945e..3048ce24 100644 --- a/manifest_unix.py +++ b/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('freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps diff --git a/scripts/freezefs_mount_builtin.sh b/scripts/freezefs_mount_builtin.sh index 10253d77..d4677a1d 100755 --- a/scripts/freezefs_mount_builtin.sh +++ b/scripts/freezefs_mount_builtin.sh @@ -1,5 +1,8 @@ -builtindir=$(readlink -f "internal_filesystem/builtin") +mydir=$(readlink -f "$0") +mydir=$(dirname "$mydir") # scripts dir -pushd ../freezeFS/ +builtindir=$(readlink -f "$mydir"/../internal_filesystem/builtin) + +pushd "$mydir"/../freezeFS/ python3 -m freezefs --target /builtin --on-import mount "$builtindir" freezefs_mount_builtin.py popd