Skip to content

[bsp][tools] support env shared package paths #11461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CYFS3 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[bsp][tools] support env shared package paths #11461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89f1a20
bsp: support env shared package paths
CYFS3 Jun 10, 2026
5b6ed56
ci: use env feat_env branch
CYFS3 Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/action_tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Install Tools
shell: bash
run: |
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh

@BernardXiong BernardXiong Jun 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里有问题的，会更改、调整到个人的路径。

chmod 777 install_ubuntu.sh
./install_ubuntu.sh

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bsp_buildings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Install Tools
shell: bash
run: |
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
pip install -r tools/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_bsp_with_drivers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Install Tools
shell: bash
run: |
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
git config --global http.postBuffer 524288000
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_bsp_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
shell: bash
run: |
sudo apt-get update
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
git config --global http.postBuffer 524288000
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_dist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Install Tools
shell: bash
run: |
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
pip install -r tools/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_trigger_scons_except_STM32_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ jobs:
shell: bash
run: |
sudo apt-get update
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
git config --global http.postBuffer 524288000
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_trigger_scons_fail_bsp_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
shell: bash
run: |
sudo apt-get update
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
git config --global http.postBuffer 524288000
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual_trigger_update_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
shell: bash
run: |
sudo apt-get update
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
wget https://raw.githubusercontent.com/CYFS3/env/feat_env/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
git config --global http.postBuffer 524288000
Expand Down
21 changes: 18 additions & 3 deletions bsp/ESP/ESP32_C3/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
if os.getenv('RTT_CC'):
CROSS_TOOL = os.getenv('RTT_CC')

if CROSS_TOOL == 'gcc':
if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc'
EXEC_PATH = r'~/.espressif/tools/riscv32-esp-elf/esp-2022r1-11.2.0/riscv32-esp-elf/bin'
else:
Expand All @@ -21,6 +21,20 @@

BUILD = 'debug'

def _get_package_path(package_name):
bsp_root = os.path.dirname(os.path.abspath(__file__))
candidates = [
os.path.join(bsp_root, 'libraries', package_name),
os.path.join(os.path.dirname(bsp_root), 'libraries', package_name),
os.path.join(bsp_root, 'packages', package_name),
]

for path in candidates:
if os.path.isdir(path):
return os.path.relpath(path, bsp_root).replace('\\', '/')

return os.path.join('packages', package_name).replace('\\', '/')

if PLATFORM == 'gcc':
# toolchains
PREFIX = 'riscv32-esp-elf-'
Expand All @@ -38,8 +52,9 @@
DEVICE = ' -nostartfiles -march=rv32imc --specs=nosys.specs -fasynchronous-unwind-tables '
CFLAGS = DEVICE + '-include ../../components/libc/compilers/common/include/sys/ioctl.h -gdwarf-4 -ggdb -Og '
AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
LFLAGS = DEVICE + ' -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0 -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,_start -T idf_port/ld/memory.ld -T idf_port/ld/sections.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.libgcc.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.newlib.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.version.ld -T packages/ESP-IDF-latest/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld -T packages/ESP-IDF-latest/components/soc/esp32c3/ld/esp32c3.peripherals.ld -Wl,--wrap=_Unwind_SetEnableExceptionFdeSorting -Wl,--wrap=__register_frame_info_bases -Wl,--wrap=__register_frame_info -Wl,--wrap=__register_frame -Wl,--wrap=__register_frame_info_table_bases -Wl,--wrap=__register_frame_info_table -Wl,--wrap=__register_frame_table -Wl,--wrap=__deregister_frame_info_bases -Wl,--wrap=__deregister_frame_info -Wl,--wrap=_Unwind_Find_FDE -Wl,--wrap=_Unwind_GetGR -Wl,--wrap=_Unwind_GetCFA -Wl,--wrap=_Unwind_GetIP -Wl,--wrap=_Unwind_GetIPInfo -Wl,--wrap=_Unwind_GetRegionStart -Wl,--wrap=_Unwind_GetDataRelBase -Wl,--wrap=_Unwind_GetTextRelBase -Wl,--wrap=_Unwind_SetIP -Wl,--wrap=_Unwind_SetGR -Wl,--wrap=_Unwind_GetLanguageSpecificData -Wl,--wrap=_Unwind_FindEnclosingFunction -Wl,--wrap=_Unwind_Resume -Wl,--wrap=_Unwind_RaiseException -Wl,--wrap=_Unwind_DeleteException -Wl,--wrap=_Unwind_ForcedUnwind -Wl,--wrap=_Unwind_Resume_or_Rethrow -Wl,--wrap=_Unwind_Backtrace -Wl,--wrap=__cxa_call_unexpected -Wl,--eh-frame-hdr -Wl,--wrap=__gxx_personality_v0 -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0'
CXXFLAGS = CFLAGS
idf_path = _get_package_path('ESP-IDF-latest')
LFLAGS = DEVICE + ' -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0 -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,_start -T idf_port/ld/memory.ld -T idf_port/ld/sections.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.libgcc.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.newlib.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.version.ld -T ' + idf_path + '/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld -T ' + idf_path + '/components/soc/esp32c3/ld/esp32c3.peripherals.ld -Wl,--wrap=_Unwind_SetEnableExceptionFdeSorting -Wl,--wrap=__register_frame_info_bases -Wl,--wrap=__register_frame_info -Wl,--wrap=__register_frame -Wl,--wrap=__register_frame_info_table_bases -Wl,--wrap=__register_frame_info_table -Wl,--wrap=__register_frame_table -Wl,--wrap=__deregister_frame_info_bases -Wl,--wrap=__deregister_frame_info -Wl,--wrap=_Unwind_Find_FDE -Wl,--wrap=_Unwind_GetGR -Wl,--wrap=_Unwind_GetCFA -Wl,--wrap=_Unwind_GetIP -Wl,--wrap=_Unwind_GetIPInfo -Wl,--wrap=_Unwind_GetRegionStart -Wl,--wrap=_Unwind_GetDataRelBase -Wl,--wrap=_Unwind_GetTextRelBase -Wl,--wrap=_Unwind_SetIP -Wl,--wrap=_Unwind_SetGR -Wl,--wrap=_Unwind_GetLanguageSpecificData -Wl,--wrap=_Unwind_FindEnclosingFunction -Wl,--wrap=_Unwind_Resume -Wl,--wrap=_Unwind_RaiseException -Wl,--wrap=_Unwind_DeleteException -Wl,--wrap=_Unwind_ForcedUnwind -Wl,--wrap=_Unwind_Resume_or_Rethrow -Wl,--wrap=_Unwind_Backtrace -Wl,--wrap=__cxa_call_unexpected -Wl,--eh-frame-hdr -Wl,--wrap=__gxx_personality_v0 -Wl,--cref -Wl,--defsym=IDF_TARGET_ESP32C3=0'
CXXFLAGS = CFLAGS

POST_ACTION = OBJCPY + ' -Oihex $TARGET rtthread.hex\n' + SIZE + ' $TARGET \n'

Expand Down
26 changes: 23 additions & 3 deletions bsp/Infineon/libraries/templates/XMC7200D/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
26 changes: 22 additions & 4 deletions bsp/Infineon/psoc6-cy8ckit-062-BLE/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

libraries_path_prefix = SDK_ROOT
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
26 changes: 22 additions & 4 deletions bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

libraries_path_prefix = SDK_ROOT
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
26 changes: 22 additions & 4 deletions bsp/Infineon/psoc6-cy8ckit-062S2-43012/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

libraries_path_prefix = SDK_ROOT
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
26 changes: 22 additions & 4 deletions bsp/Infineon/psoc6-cy8ckit-062s4/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

libraries_path_prefix = SDK_ROOT
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
26 changes: 22 additions & 4 deletions bsp/Infineon/psoc6-cy8cproto-062S3-4343W/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

libraries_path_prefix = SDK_ROOT
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
26 changes: 22 additions & 4 deletions bsp/Infineon/psoc6-evaluationkit-062S2/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

libraries_path_prefix = SDK_ROOT
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
26 changes: 22 additions & 4 deletions bsp/Infineon/xmc7100d-f144k4160aa/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,30 @@ Export('rtconfig')

SDK_ROOT = os.path.abspath('./')

libraries_path_prefix = SDK_ROOT
def _contains_infineon_package(path):
if not os.path.isdir(path):
return False

if os.path.exists(SDK_ROOT + '/packages'):
libraries_path_prefix = SDK_ROOT + '/packages'
else:
for name in os.listdir(path):
package_path = os.path.join(path, name)
if name.startswith('Infineon_mtb-pdl-cat1') and os.path.isdir(package_path):
return True

return False

libraries_path_prefix = None
for path in [
os.path.join(SDK_ROOT, 'libraries'),
os.path.join(os.path.dirname(SDK_ROOT), 'libraries'),
os.path.join(SDK_ROOT, 'packages')
]:
if _contains_infineon_package(path):
libraries_path_prefix = path
break

if not libraries_path_prefix:
print("Error: Packages for HAL_Driver does not exist, pull it in ENV using `pkg --update`.")
libraries_path_prefix = os.path.join(SDK_ROOT, 'packages')

SDK_LIB = libraries_path_prefix
Export('SDK_LIB')
Expand Down
Loading
Loading