Skip to content

Commit 997af96

Browse files
committed
README-RELEASE update
1 parent d94d23b commit 997af96

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

README-RELEASE.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ In the `xpack-dev-tools/qemu-riscv-xpack` Git repo:
1818

1919
No need to add a tag here, it'll be added when the release is created.
2020

21+
### Update helper
22+
23+
With a git client, go to the helper repo and update to the latest master commit.
24+
2125
### Check the latest upstream release
2226

2327
Identify the latest stable [tag](https://gitlab.com/qemu-project/qemu/-/tags),
@@ -67,27 +71,27 @@ recreate the archives with the correct file.
6771

6872
### Update qemu.git for development builds
6973

70-
In the `xpack-dev-tools/qemu` git repo:
74+
In the <https://github.com/xpack-dev-tools/qemu.git> repo, with
75+
<https://gitlab.com/qemu-project/qemu.git> as `upstream`:
7176

7277
- checkout the `master` branch
7378
- merge the `v7.1.0` tag into current
7479
- push `master`
7580
- checkout the `xpack-develop` branch
7681
- merge `master` into current
7782
- push `xpack-develop`
78-
- add a `v7.1.0-tag` tag
83+
- checkout the `xpack` branch
84+
- merge `xpack-develop` into current
85+
- add a `v7.1.0-xpack` tag
7986
- push tag to `origin`
8087

8188
### Update the version specific code
8289

8390
- open the `common-versions-source.sh` file
8491
- add a new `if` with the new version before the existing code
85-
- check if `QEMU_GIT_BRANCH=xpack`
86-
- update the `QEMU_GIT_COMMIT` to latest Git commit ID
92+
- check if `QEMU_GIT_BRANCH=xpack` (or `xpack-develop`)
93+
- update the `QEMU_GIT_COMMIT` to latest Git commit ID (`v${QEMU_VERSION}-xpack`)
8794

88-
### Update helper
89-
90-
With a git client, go to the helper repo and update to the latest master commit.
9195

9296
## Build
9397

0 commit comments

Comments
 (0)