Skip to content

[bsp] reduce SConscript absolute path usage#11514

Merged
Rbb666 merged 1 commit into
RT-Thread:masterfrom
CYFS3:bsp-sconscript-pathfix
Jun 25, 2026
Merged

[bsp] reduce SConscript absolute path usage#11514
Rbb666 merged 1 commit into
RT-Thread:masterfrom
CYFS3:bsp-sconscript-pathfix

Conversation

@CYFS3

@CYFS3 CYFS3 commented Jun 25, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

拉取/合并请求描述：(PR description)

[

为什么提交这份PR (why to submit this PR)

本 PR 是对 #11513 的同类问题补充修复。#11513 已经修复了 bsp/novosns/ns800/libraries/HAL_Drivers/SConscript 中普通子目录 SConscript() 调用传入绝对路径的问题；本 PR 继续修复其他 BSP 中相同模式的问题。

这些脚本原来会把 cwd 拼接后的源码绝对路径传给普通子目录或相邻目录的 SConscript() 调用。在部分构建场景下，这会让 SCons 依赖源码目录的绝对路径，甚至可能把中间产物残留到源码目录中。该问题与 #10477 相关。

你的解决方案是什么 (what is your solution)

将其他 BSP 中普通子目录/相邻目录脚本调用从 SConscript(os.path.join(cwd, ...)) 改为相对路径调用，避免把源码目录绝对路径传给普通 SConscript() 调用。

本次修复保留带 variant_dir 的特殊调用原状，因为这些调用依赖 SCons 的源码目录到变体目录映射，不能简单改成相对路径。

本次修改涉及以下 BSP 位置：

  • bsp/hpmicro/*/startup/SConscript
  • bsp/n32/n32hxxx/libraries/N32_Drivers/SConscript
  • bsp/nxp/lpc/lpc43xx/M0/SConscript
  • bsp/nxp/lpc/lpc43xx/M4/SConscript
  • bsp/renesas/libraries/HAL_Drivers/SConscript
  • bsp/stm32/libraries/HAL_Drivers/SConscript

请提供验证的bsp和config (provide the config and bsp)

  • BSP: 以上列出的 BSP SConscript 路径清理。

  • .config: 未修改 .config。

  • action: 已在本地执行以下检查：

    • git diff --check rtt/master..HEAD
    • 对所有改动的 SConscript 文件执行 Python compile() 语法检查。
    • 根据 CI 结果恢复了 mm32 和 rockchip 中带 variant_dir 的调用，避免破坏 SCons 变体目录映射。

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality：

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确，包括缩进空格，命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码，代码尽量精简，不包含#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@CYFS3 CYFS3 requested review from Rbb666 and kurisaW as code owners June 25, 2026 03:20
@github-actions

github-actions Bot commented Jun 25, 2026

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).

🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • 设置需排除的文件/目录（目录请以"/"结尾）
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to：bsp-sconscript-pathfix
  • 设置PR number为 \ Set the PR number to：11514
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后，提交将自动更新至 bsp-sconscript-pathfix 分支，关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the bsp-sconscript-pathfix branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们，再次感谢您的贡献！💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions

github-actions Bot commented Jun 25, 2026 •
edited
Loading

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: bsp_renesas

Reviewers: kurisaW

Changed Files (Click to expand)
  • bsp/renesas/libraries/HAL_Drivers/SConscript

🏷️ Tag: bsp_stm32

Reviewers: Liang1795 hamburger-os wdfk-prog

Changed Files (Click to expand)
  • bsp/stm32/libraries/HAL_Drivers/SConscript

📊 Current Review Status (Last Updated: 2026-06-25 11:31 CST)

  • ⌛ Liang1795 Pending Review
  • ⌛ hamburger-os Pending Review
  • ⌛ kurisaW Pending Review
  • ⌛ wdfk-prog Pending Review

📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@github-actions github-actions Bot added BSP: NXP Code related with NXP BSP: STM32 BSP related with ST/STM32 BSP BSP: Rockchip BSP related with Rockchip BSP: Renesas BSP related with Renesas labels Jun 25, 2026
@CYFS3 CYFS3 force-pushed the bsp-sconscript-pathfix branch from 1bc62d4 to ba0c072 Compare June 25, 2026 03:31
@github-actions

github-actions Bot commented Jun 25, 2026

Copy link
Copy Markdown

MemBrowse Memory Report

No memory changes detected for:

@Rbb666 Rbb666 merged commit bdae0ef into RT-Thread:master Jun 25, 2026
41 checks passed
@CYFS3 CYFS3 deleted the bsp-sconscript-pathfix branch June 25, 2026 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Rbb666 Rbb666 Rbb666 approved these changes
@kurisaW kurisaW Awaiting requested review from kurisaW kurisaW is a code owner

Assignees

No one assigned

Labels

BSP: NXP Code related with NXP BSP: Renesas BSP related with Renesas BSP: Rockchip BSP related with Rockchip BSP: STM32 BSP related with ST/STM32 BSP

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@CYFS3 @Rbb666