Skip to content

fix: regenerate orig tarball from clean unpatched source#7

Merged
Zeno-sole merged 2 commits into
masterfrom
zeno/fix
Jul 23, 2026
Merged

fix: regenerate orig tarball from clean unpatched source#7
Zeno-sole merged 2 commits into
masterfrom
zeno/fix

Conversation

@Zeno-sole

Copy link
Copy Markdown
Contributor

The orig tarball was generated from a source tree with quilt patches already applied, causing dpkg-source to fail with 'Reversed (or previously applied) patch detected'. Remove .pc/ from git tracking, add it to .gitignore, and revert source files to their unpatched upstream state so patches apply cleanly during package build.

@deepin-ci-robot
deepin-ci-robot requested a review from BLumia July 23, 2026 02:09
The orig tarball was generated from a source tree with quilt patches
already applied, and included .git/, .pc/, and debian/ directories.
dpkg-source detected patches as 'already applied' and failed.

Fix:
1. Remove .pc/ from git tracking, add to .gitignore
2. Revert source files to unpatched upstream state
3. Regenerate orig tarball from clean source (exclude .git/.pc/debian)
4. Restore skip-git-dir.patch removed in previous commit, since the
   clean orig tarball no longer contains the patched code and the
   patch is needed for build environments without git installed

Log: 修复 orig tarball 脏源码问题并恢复 skip-git-dir.patch

Influence:
1. dpkg-source 解包时补丁正常应用,不再报 'Reversed patch' 错误
2. 构建环境无 git 时不再报 'Invalid commit hash' 错误
3. 对生成的二进制包无功能影响

repo: libnvidia-container #master
Log: 更新 changelog,版本号升至 1deepin5

Influence:
1. 记录 orig tarball 重建和 skip-git-dir.patch 恢复的修复内容
2. 对生成的二进制包无功能影响

repo: libnvidia-container #master
@github-actions

Copy link
Copy Markdown

TAG Bot

TAG: 1.19.0-1deepin5
EXISTED: no
DISTRIBUTION: unstable

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hudeng-go

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

The pull request process is described 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

@Zeno-sole
Zeno-sole merged commit 935eb93 into master Jul 23, 2026
5 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants