将Fedora dist git中的修补程序应用到不同的组件。
ferrypick的Python项目详细描述
费雷皮克
将Fedora dist git中的修补程序应用到不同的组件。在
此简单工具可执行3个步骤：
- 从下载修补程序文件src.fedoraproject.org在
- 将包名替换为当前dist git work dir包名
- 在产品上运行
git am --reject
用法：
[python36 (f32 %)]$ git switch -c f32-backport Switched to a new branch 'f32-backport'[python36 (f32-backport %)]$ ferrypick https://src.fedoraproject.org/rpms/python3.6/pull-request/2 Downloading https://src.fedoraproject.org/rpms/python3.6/pull-request/2.patch $ git am --reject /tmp/tmp7pa062j6.patch Applying: Fix python3-config --configdir Checking patch 00102-lib64.patch... .git/rebase-apply/patch:26: new blank line at EOF. + Checking patch 00205-make-libpl-respect-lib64.patch... Checking patch python36.spec... error: while searching for: #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 4%{?dist} License: Python error: patch failed: python36.spec:17 error: while searching for: # ====================================================== %changelog * Wed May 062020 Miro Hrončok <mhroncok@redhat.com> - 3.6.10-4 - Rename from python36 to python3.6 error: patch failed: python36.spec:1535 Applied patch 00102-lib64.patch cleanly. Applied patch 00205-make-libpl-respect-lib64.patch cleanly. Applying patch python36.spec with 2 rejects... Rejected hunk #1. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. Patch failed at 0001 Fix python3-config --configdir hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
享受吧。在
- 项目
标签：
欢迎加入QQ群-->： 979659372
