Skip to content

Conversation

@opsiff
Copy link
Member

@opsiff opsiff commented Dec 26, 2025

deepin inclusion
category: bugfix

This reverts commit 1195f54.
Our release scripts echo version to init/build-version:
echo "echo $build_version_id" > init/build-verion (should sync to scripts)

This change should be reverted after we modified the script.

Summary by Sourcery

Bug Fixes:

  • Restore compatibility with existing Deepin release scripts that expect the build-version helper under init rather than in scripts.

@sourcery-ai
Copy link

sourcery-ai bot commented Dec 26, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Reverts the earlier change that moved the kbuild build-version helper into scripts/, restoring the helper path to init/ to stay compatible with Deepin’s existing release tooling until those scripts are updated.

File-Level Changes

Change Details Files
Restore build-version helper location used during UTS version generation to init/build-version instead of scripts/build-version to match existing Deepin release scripts.
  • Change the Makefile rule that generates include/generated/utsversion.h to invoke $(src)/build-version from the init directory rather than scripts/build-version.
  • Keep the automatic build timestamp generation and uts_version file checking behavior unchanged.
  • Touch packaging helper scripts mkdebian and mkspec without functional modifications (context-only in this diff).
init/Makefile
scripts/package/mkdebian
scripts/package/mkspec

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

deepin inclusion
category: bugfix

This reverts commit 1195f54.
Our release scripts echo version to init/build-version:
echo "echo $build_version_id" > init/build-verion (should sync to scripts)

This change should be reverted after we modified the script.

And this is different to upstream version, we will use the upstream version.
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
@opsiff opsiff force-pushed the linux-6.6.y-2025-12-26-debscripts branch from cf3d516 to d90af56 Compare December 26, 2025 15:09
@deepin-ci-robot
Copy link

deepin pr auto review

我将对这个git diff进行全面的代码审查:

  1. 语法逻辑审查:
  • 所有修改都是路径更改,从 scripts/build-version 改为 init/build-version
  • 语法上没有问题,路径引用都是正确的
  • 修改是一致的,所有引用该脚本的地方都做了相应更改
  1. 代码质量审查:
  • 重构是合理的,将 build-version 脚本从 scripts 目录移动到 init 目录
  • 这个改动看起来是有意义的,因为:
    • init 目录是初始化相关的代码
    • build-version 与版本初始化更相关
  • 移动位置后的代码组织更加合理
  1. 代码性能审查:
  • 这些更改不会影响性能
  • 脚本执行路径的改变不会带来性能差异
  • 文件访问路径的改变不会影响执行效率
  1. 代码安全审查:
  • 路径更改不会引入新的安全风险
  • 脚本的执行权限保持不变
  • 没有引入新的安全漏洞

改进建议:

  1. 考虑添加注释说明移动的原因
  2. 建议在移动脚本时更新相关文档
  3. 可以考虑添加一个符号链接在原位置,以保持向后兼容性

其他观察:

  • 这是一个纯粹的目录重构,没有功能性的改变
  • 修改涉及三个文件:Makefile、mkdebian 和 mkspec
  • 所有修改都是一致的,没有遗漏
  • 文件权限保持不变(从 rename 操作可以看出)

总体来说,这是一个合理的重构,将 build-version 脚本移动到更合适的位置,修改是完整且正确的。建议在提交信息中说明这次移动的原因,以帮助其他开发者理解这个改动。

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: lanlanxiyiji
Once this PR has been reviewed and has the lgtm label, please ask for approval from opsiff. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@lanlanxiyiji lanlanxiyiji merged commit 73ab9aa into deepin-community:linux-6.6.y Dec 26, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants