davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Maintainer Guide

Don Zickus 2020-05-01 15:47:13 +00:00
parent 6b4faa5dca
commit 7fe3a1f564
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Maintainer-Guide.md

@ -22,8 +22,8 @@ git checkout master
git reset --hard upstream/master
git checkout ark-patches
git reset --hard upstream/ark-patches
git checkout internal
git reset --hard upstream/internal
git checkout os-build
git reset --hard upstream/os-build
```
2. Rebase the kernel patches onto master: `./redhat/scripts/ci/ark-rebase-patches.sh "master"`. If you'd like for the script to drop patches that conflict and file issues on the GitLab issue tracker, ensure the "REPORT_BUGS" environment variable is set to something other than an empty string.
@ -61,17 +61,17 @@ Once the patches are rebased, update the configuration branch:
1. Set defaults for any new configuration files:
```
git checkout internal
git checkout os-build
./redhat/scripts/ci/ark-update-configs.sh "master"
```
2. Open a merge request for each branch created in step 1 (if any):
```
git checkout internal
git checkout os-build
if git branch | grep configs/"$(date +%F)"; then
git push upstream internal
git push upstream os-build
for branch in $(git branch | grep configs/"$(date +%F)"); do
git push -o merge_request.create -o merge_request.target=internal -o merge_request.remove_source_branch upstream "$branch"
git push -o merge_request.create -o merge_request.target=os-build -o merge_request.remove_source_branch upstream "$branch"
done
fi
```
@ -84,7 +84,7 @@ Once the kernel patches and configuration have been updated for the new release,
```
git checkout -b build-branch ark-patches
git merge -m "Merge configuration and build scripts" internal
git merge -m "Merge configuration and build scripts" os-build
# If there's a temporary fix you want in just this build, you can run git-cherry-pick here.
touch localversion
make rh-release
@ -97,7 +97,7 @@ git branch -D build-branch
```
UPSTREAM_REF=<tag>
git checkout -b ark/"$UPSTREAM_REF" ark/patches/"$UPSTREAM_REF"
git merge -m "Merge configuration and build scripts" internal
git merge -m "Merge configuration and build scripts" os-build
touch localversion
make rh-release
make rh-release-tag