From 12e736b2830767248d8dd460998baca2920c150f Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Fri, 17 Nov 2023 02:35:27 +0300 Subject: [PATCH 1/2] fix ci, temp workaround for manifest --- .drone.yml | 8 ++++++++ scripts/fbt/appmanifest.py | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d58733504..db85f5d9d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,6 +46,8 @@ steps: - export FBT_GIT_SUBMODULE_SHALLOW=1 - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz - tar zxvf all-the-apps-base.tgz + - mkdir -p applications/main/clock_app/resources/apps + - mkdir -p applications/main/clock_app/resources/apps_data - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/ - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/ - rm -rf base_pack_build @@ -66,6 +68,7 @@ steps: commands: - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz - tar zxvf all-the-apps-extra.tgz + - mkdir -p applications/main/clock_app/resources/apps - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/ - rm -rf extra_pack_build - export DIST_SUFFIX=${DRONE_TAG}e @@ -118,6 +121,8 @@ steps: - ./fbt COMPACT=1 DEBUG=0 updater_package - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz - tar zxvf all-the-apps-base.tgz + - mkdir -p applications/main/clock_app/resources/apps + - mkdir -p applications/main/clock_app/resources/apps_data - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/ - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/ - rm -rf base_pack_build @@ -421,6 +426,8 @@ steps: - export FBT_GIT_SUBMODULE_SHALLOW=1 - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-base.tgz - tar zxvf all-the-apps-base.tgz + - mkdir -p applications/main/clock_app/resources/apps + - mkdir -p applications/main/clock_app/resources/apps_data - cp -R base_pack_build/artifacts-base/* applications/main/clock_app/resources/apps/ - cp -R base_pack_build/apps_data/* applications/main/clock_app/resources/apps_data/ - rm -rf base_pack_build @@ -441,6 +448,7 @@ steps: commands: - wget https://github.com/xMasterX/all-the-plugins/releases/latest/download/all-the-apps-extra.tgz - tar zxvf all-the-apps-extra.tgz + - mkdir -p applications/main/clock_app/resources/apps - cp -R extra_pack_build/artifacts-extra/* applications/main/clock_app/resources/apps/ - rm -rf extra_pack_build - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py index d32869b10..04aafb1f9 100644 --- a/scripts/fbt/appmanifest.py +++ b/scripts/fbt/appmanifest.py @@ -166,7 +166,10 @@ class AppManager: f"App {kw.get('appid')} of type {apptype} cannot have '{app_property}' in manifest" ) else: - for app_property in ("fap_extbuild", "fap_private_libs", "fap_icon_assets"): + for app_property in ( + "fap_extbuild", + "fap_private_libs", + ): # , "fap_icon_assets"): TODO: Find a workaround for subghz_remote app if kw.get(app_property): raise FlipperManifestException( f"App {kw.get('appid')} of type {apptype} must not have '{app_property}' in manifest" From 9513ff530798931df85d495b87e7448f6411fe7e Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Fri, 17 Nov 2023 02:43:47 +0300 Subject: [PATCH 2/2] fix rgb patch --- .ci_files/rgb.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci_files/rgb.patch b/.ci_files/rgb.patch index 7011c9801..d4f98aaec 100644 --- a/.ci_files/rgb.patch +++ b/.ci_files/rgb.patch @@ -462,10 +462,10 @@ index 0000000..68dacda + */ +const char* rgb_backlight_get_color_text(uint8_t index); \ No newline at end of file -diff --git a/firmware/targets/f7/furi_hal/furi_hal_light.c b/firmware/targets/f7/furi_hal/furi_hal_light.c +diff --git a/targets/f7/furi_hal/furi_hal_light.c b/targets/f7/furi_hal/furi_hal_light.c index 83e1603..45798ca 100644 ---- a/firmware/targets/f7/furi_hal/furi_hal_light.c -+++ b/firmware/targets/f7/furi_hal/furi_hal_light.c +--- a/targets/f7/furi_hal/furi_hal_light.c ++++ b/targets/f7/furi_hal/furi_hal_light.c @@ -3,6 +3,7 @@ #include #include