From 8d7dd1e5a637cdd1816aa48e5e223cf6576da1a3 Mon Sep 17 00:00:00 2001
From: Sebastian Krzyszkowiak <dos@dosowisko.net>
Date: Wed, 5 Mar 2025 02:01:35 +0100
Subject: [PATCH] fix game's module loading
"PetalHero" in /flash/sys was taking precendence over app's module
---
.gitlab-ci.yml | 1 +
.gitmodules | 4 ++--
.../PetalHero => songs}/Jono Bacon - Free Software Song | 0
3 files changed, 3 insertions(+), 2 deletions(-)
rename {python_payload/PetalHero => songs}/Jono Bacon - Free Software Song (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 436463d8b7..0d8afcbc72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ default:
image: registry.gitlab.com/flow3r-badge/flow3r-build:kfjixcricw2358zp5vg15b784l9jnpzz
before_script:
- sed -i 's/clk_info->bclk_div = 8;/clk_info->bclk_div = 13;/g' $IDF_PATH/components/driver/i2s/i2s_pdm.c
+ - ln -s ../../../songs python_payload/apps/PetalHero/songs
build:
stage: build
diff --git a/.gitmodules b/.gitmodules
index ec255e965c..757f087a86 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,7 +7,7 @@
[submodule "python_payload/apps/PetalHero"]
path = python_payload/apps/PetalHero
url = https://git.flow3r.garden/dos/PetalHero.git
-[submodule "python_payload/PetalHero/Jono Bacon - Free Software Song"]
- path = python_payload/PetalHero/Jono Bacon - Free Software Song
+[submodule "songs/Jono Bacon - Free Software Song"]
+ path = songs/Jono Bacon - Free Software Song
url = https://git.flow3r.garden/dos/PetalHero-songs.git
branch = freesoftwaresong
diff --git a/python_payload/PetalHero/Jono Bacon - Free Software Song b/songs/Jono Bacon - Free Software Song
similarity index 100%
rename from python_payload/PetalHero/Jono Bacon - Free Software Song
rename to songs/Jono Bacon - Free Software Song
--
GitLab