p79813206
/
docs
mirror of https://gitee.com/openkylin/docs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update en/Community-Developer-Guides/Source_Package_Git_Workflows.md. 

Signed-off-by: jlspcdd1227dd <12046126+jlspcdd1227dd@user.noreply.gitee.com>
This commit is contained in:
jlspcdd1227dd 2023-03-22 08:20:29 +00:00 committed by Gitee
parent 18c4240922
commit fd5ee27962
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
en/Community-Developer-Guides/Source_Package_Git_Workflows.md
View File

@ -1,17 +1,13 @@
# openKylin source package git workflow
# 1. git branch settings
| branch | description | example |
| --------------- | ------------------------------------------------------------ | ---------------------------------------------------- -------- |
| upstream branch | A branch that does not contain a debian directory, holding the upstream source code for the package. Modifications to a package require only one upstream branch, named upstream. For self-published packages, there may be multiple versions developed in parallel, so there may be multiple upstream branches. To avoid confusion with the package branch, you cannot use "/" in the upstream branch name | upstream master 1.0 2.0 |
| native package branch | The branch for package maintainers to commit changes, including the debian directory. Changes made relative to the upstream branch can be committed directly to this branch. | The name format is: release code/series code Galaxy Kirin V10 SP1 development branch is named: yhkylin/v101openKylin Yangtze version development branch is named: openkylin/yangtze |
| quilt package branch | Modify package requirements to use the quilt branch for packaging, this branch, the package maintainer relative to the upstream branch to do changes are saved in the form of patch in the debian/patches directory, easy to update the upstream version of the trade-off. Self-developed packages can be packaged directly in the native branch or in quilt. The CI platform automatically synchronizes the native branch to the quilt branch. | openkylin/yangtze branch, add packaging/ in front of the branch name: packaging/openkylin/yangtze |
| patch-queue branch | A temporary branch used in the CI build environment, not committed to the source code management platform, to help save the changes of the native packaging branch as a patch to the quilt packaging branch. | patch-queue/packaging/openkylin/yangtze | 2.
| Branch | Description | Example |
| --------------- | --------------------------------- --------------------------- | ---------------------- ----------------------------------------- |
| Upstream branch | A branch that does not contain the debian directory, holding the upstream source code of the package. Only one upstream branch is needed to modify the package, which is uniformly named upstream. For self-developed packages, multiple versions may be developed in parallel, so there may be multiple upstream branches. In order to avoid confusion with the packaging branch, "/" cannot be used in the name of the upstream branch | upstream master 1.0 2.0 |
| native packaging branch | A branch for package maintainers to submit changes, including the debian directory. Modifications relative to the upstream branch can be submitted directly to this branch. | The format of the name is: release code name/series code name The development branch of Galaxy Kirin V10 SP1 is named: yhkylin/v101openKylin The development branch of the Yangtze River version is named: openkylin/yangtze |
| quilt packaging branch | The modified package requires the use of the quilt branch for packaging. Under this branch, the changes made by the package maintainer relative to the upstream branch are stored in the debian/patches directory in the form of a patch, which is convenient for choosing when updating the upstream version. The self-developed package can be directly packaged with the native branch or quilt. The CI platform automatically completes the synchronization from the native branch to the quilt branch. | The quilt packaging branch corresponding to openkylin/yangtze, add packaging/ in front of the branch name: packaging/openkylin/yangtze |
| patch-queue branch | The temporary branch used in the CI build environment will not be submitted to the source code management platform, and assists in generating a patch from the modified content of the native packaging branch and saving it to the quilt packaging branch. | patch-queue/packaging/openkylin/yangtze|
# 2. source package import