Skip to content

Commit 96910b5

Browse files
committed
prepare v8.1.0-1
1 parent 267dd60 commit 96910b5

File tree

6 files changed

+229
-75
lines changed

6 files changed

+229
-75
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,28 @@
22

33
Entries in this file are in reverse chronological order.
44

5+
## 2023-08-28
6+
7+
* v8.1.0-1 prepared
8+
* 267dd60 READMEs update
9+
* 1d73428 package.json: rm xpack-dev-tools-build/*
10+
* 886242b package.json: bump deps
11+
12+
## 2023-08-21
13+
14+
* 1485a45 READMEs update
15+
* 4140333 package.json: bump deps
16+
17+
## 2023-08-19
18+
19+
* 20484ba READMEs update
20+
* 5be0d36 package.json: bump deps
21+
522
## 2023-08-15
623

24+
* 32b0ba0 CHANGELOG.update
25+
* 088b615 dot.*ignore update
26+
* 46712d9 re-generate workflows
727
* 8dd711a .vscode/settings.json ignoreWords
828
* bc8bf52 re-generate workflows
929
* 1aa7f46 README-MAINTAINER rename xbbla

README-MAINTAINER.md

Lines changed: 35 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ update the dependencies in `package.json`.
124124
### Check the latest upstream release
125125

126126
Identify the latest stable [tag](https://gitlab.com/qemu-project/qemu/-/tags),
127-
like `v7.2.0`.
127+
like `v8.1.0`.
128128

129129
Also check the very latest
130130
[VERSION](https://gitlab.com/qemu-project/qemu/-/blob/master/VERSION) file.
131131

132132
### Increase the version
133133

134-
Determine the version (like `7.2.0`) and update the `scripts/VERSION`
135-
file; the format is `7.2.0-1`. The fourth number is the xPack release number
134+
Determine the version (like `8.1.0`) and update the `scripts/VERSION`
135+
file; the format is `8.1.0-1`. The fourth number is the xPack release number
136136
of this version. A fifth number will be added when publishing
137137
the package on the `npm` server.
138138

@@ -143,7 +143,7 @@ Check GitHub issues and pull requests:
143143
- <https://github.com/xpack-dev-tools/qemu-riscv-xpack/issues/>
144144
- <https://github.com/xpack-dev-tools/qemu/issues/>
145145

146-
and fix them; assign them to a milestone (like `7.2.0-1`).
146+
and fix them; assign them to a milestone (like `8.1.0-1`).
147147

148148
### Check `README.md`
149149

@@ -164,20 +164,20 @@ Use a new version, suffixed by `.pre`.
164164

165165
- open the `CHANGELOG.md` file
166166
- check if all previous fixed issues are in
167-
- add a new entry like _* v7.2.0-1 prepared_
168-
- commit with a message like _prepare v7.2.0-1_
167+
- add a new entry like _* v8.1.0-1 prepared_
168+
- commit with a message like _prepare v8.1.0-1_
169169

170170
### Update qemu.git for development builds
171171

172172
- checkout the `master` branch
173-
- merge the upstream `v7.2.0` tag into current
173+
- merge the upstream `v8.1.0` tag into current
174174
- push `master`
175175
- checkout the `xpack-develop` branch
176176
- merge `master` into current
177177
- push `xpack-develop`
178178
- checkout the `xpack` branch
179179
- merge `xpack-develop` into current
180-
- add a `v7.2.0-xpack` tag
180+
- add a `v8.1.0-xpack` tag
181181
- push tag to `origin`
182182

183183
### Update the version specific code
@@ -207,48 +207,19 @@ triggered via the VS Code graphical interface, using the
207207
For Intel macOS, first run the build on the development machine
208208
(`wksi`, a recent macOS):
209209

210-
Update the build scripts (or clone them at the first use):
211-
212210
```sh
211+
# Update the build scripts.
213212
git -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git pull
214213

215-
xpm run deep-clean -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
216-
```
217-
218-
If the helper is also under development and needs changes,
219-
update it too:
220-
221-
```sh
222-
git -C ~/Work/xpack-dev-tools/xbb-helper-xpack.git pull
223-
```
224-
225-
Install project dependencies:
226-
227-
```sh
228214
xpm run install -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
229-
```
230215

231-
If the writable helper is used,
232-
link it in the place of the read-only package:
233-
234-
```sh
216+
git -C ~/Work/xpack-dev-tools/xbb-helper-xpack.git pull
235217
xpm link -C ~/Work/xpack-dev-tools/xbb-helper-xpack.git
236218

237219
xpm run link-deps -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
238-
```
239-
240-
For repeated builds, clean the build folder and install de
241-
build configuration dependencies:
242220

243-
```sh
244221
xpm run deep-clean --config darwin-x64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
245-
246222
xpm install --config darwin-x64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
247-
```
248-
249-
Run the native build:
250-
251-
```sh
252223
xpm run build-develop --config darwin-x64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
253224
```
254225

@@ -290,8 +261,8 @@ archive and its SHA signature, created in the `deploy` folder:
290261
```console
291262
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/darwin-x64/deploy
292263
total 35008
293-
-rw-r--r-- 1 ilg staff 17458565 Jan 31 10:56 xpack-qemu-riscv-7.2.0-1-darwin-x64.tar.gz
294-
-rw-r--r-- 1 ilg staff 109 Jan 31 10:56 xpack-qemu-riscv-7.2.0-1-darwin-x64.tar.gz.sha
264+
-rw-r--r-- 1 ilg staff 17458565 Jan 31 10:56 xpack-qemu-riscv-8.1.0-1-darwin-x64.tar.gz
265+
-rw-r--r-- 1 ilg staff 109 Jan 31 10:56 xpack-qemu-riscv-8.1.0-1-darwin-x64.tar.gz.sha
295266
```
296267

297268
#### Apple Silicon macOS
@@ -324,8 +295,8 @@ archive and its SHA signature, created in the `deploy` folder:
324295
```console
325296
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/darwin-arm64/deploy
326297
total 34480
327-
-rw-r--r-- 1 ilg staff 17129362 Jan 31 10:41 xpack-qemu-riscv-7.2.0-1-darwin-arm64.tar.gz
328-
-rw-r--r-- 1 ilg staff 111 Jan 31 10:41 xpack-qemu-riscv-7.2.0-1-darwin-arm64.tar.gz.sha
298+
-rw-r--r-- 1 ilg staff 17129362 Jan 31 10:41 xpack-qemu-riscv-8.1.0-1-darwin-arm64.tar.gz
299+
-rw-r--r-- 1 ilg staff 111 Jan 31 10:41 xpack-qemu-riscv-8.1.0-1-darwin-arm64.tar.gz.sha
329300
```
330301

331302
#### Intel GNU/Linux
@@ -360,8 +331,8 @@ archive and its SHA signature, created in the `deploy` folder:
360331
```console
361332
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/linux-x64/deploy
362333
total 19292
363-
-rw-r--r-- 1 ilg ilg 19747356 Jan 31 08:44 xpack-qemu-riscv-7.2.0-1-linux-x64.tar.gz
364-
-rw-r--r-- 1 ilg ilg 108 Jan 31 08:44 xpack-qemu-riscv-7.2.0-1-linux-x64.tar.gz.sha
334+
-rw-r--r-- 1 ilg ilg 19747356 Jan 31 08:44 xpack-qemu-riscv-8.1.0-1-linux-x64.tar.gz
335+
-rw-r--r-- 1 ilg ilg 108 Jan 31 08:44 xpack-qemu-riscv-8.1.0-1-linux-x64.tar.gz.sha
365336
```
366337

367338
##### Build the Windows binaries
@@ -387,8 +358,8 @@ archive and its SHA signature, created in the `deploy` folder:
387358
```console
388359
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/win32-x64/deploy
389360
total 21980
390-
-rw-r--r-- 1 ilg ilg 22501694 Jan 31 08:41 xpack-qemu-riscv-7.2.0-1-win32-x64.zip
391-
-rw-r--r-- 1 ilg ilg 105 Jan 31 08:41 xpack-qemu-riscv-7.2.0-1-win32-x64.zip.sha
361+
-rw-r--r-- 1 ilg ilg 22501694 Jan 31 08:41 xpack-qemu-riscv-8.1.0-1-win32-x64.zip
362+
-rw-r--r-- 1 ilg ilg 105 Jan 31 08:41 xpack-qemu-riscv-8.1.0-1-win32-x64.zip.sha
392363
```
393364

394365
#### Arm GNU/Linux 64-bit
@@ -421,8 +392,8 @@ archive and its SHA signature, created in the `deploy` folder:
421392
```console
422393
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/linux-arm64/deploy
423394
total 18660
424-
-rw-r--r-- 1 ilg ilg 19099789 Jan 30 22:57 xpack-qemu-riscv-7.2.0-1-linux-arm64.tar.gz
425-
-rw-r--r-- 1 ilg ilg 110 Jan 30 22:57 xpack-qemu-riscv-7.2.0-1-linux-arm64.tar.gz.sha
395+
-rw-r--r-- 1 ilg ilg 19099789 Jan 30 22:57 xpack-qemu-riscv-8.1.0-1-linux-arm64.tar.gz
396+
-rw-r--r-- 1 ilg ilg 110 Jan 30 22:57 xpack-qemu-riscv-8.1.0-1-linux-arm64.tar.gz.sha
426397
```
427398

428399
#### Arm GNU/Linux 32-bit
@@ -455,8 +426,8 @@ archive and its SHA signature, created in the `deploy` folder:
455426
```console
456427
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/linux-arm/deploy
457428
total 17636
458-
-rw-r--r-- 1 ilg ilg 18051448 Jan 30 22:54 xpack-qemu-riscv-7.2.0-1-linux-arm.tar.gz
459-
-rw-r--r-- 1 ilg ilg 108 Jan 30 22:54 xpack-qemu-riscv-7.2.0-1-linux-arm.tar.gz.sha
429+
-rw-r--r-- 1 ilg ilg 18051448 Jan 30 22:54 xpack-qemu-riscv-8.1.0-1-linux-arm.tar.gz
430+
-rw-r--r-- 1 ilg ilg 108 Jan 30 22:54 xpack-qemu-riscv-8.1.0-1-linux-arm.tar.gz.sha
460431
```
461432

462433
### Update README-MAINTAINER listing output
@@ -688,7 +659,7 @@ To test graphical mode, use Thomas Huth's presentation:
688659
curl -L https://www.qemu-advent-calendar.org/2018/download/day24.tar.xz \
689660
-o ${HOME}/Downloads/day24.tar.xz
690661
(cd ${HOME}/Downloads; tar xvf day24.tar.xz)
691-
export PATH=${HOME}/Downloads/xpack-qemu-riscv-7.2.0-1/bin:$PATH
662+
export PATH=${HOME}/Downloads/xpack-qemu-riscv-8.1.0-1/bin:$PATH
692663
bash ${HOME}/Downloads/day24/run.sh
693664
```
694665

@@ -702,14 +673,14 @@ They could be BIOS/firmware images, a guest kernel, initrd or some other file lo
702673
Check whether you intended to load all this guest code, and whether it has been built to load to the correct addresses.
703674

704675
The following two regions overlap (in the memory address space):
705-
/home/ilg/Downloads/xpack-qemu-riscv-7.2.0-1/bin/../share/qemu/opensbi-riscv64-generic-fw_dynamic.bin (addresses 0x0000000080000000 - 0x0000000080019b50)
676+
/home/ilg/Downloads/xpack-qemu-riscv-8.1.0-1/bin/../share/qemu/opensbi-riscv64-generic-fw_dynamic.bin (addresses 0x0000000080000000 - 0x0000000080019b50)
706677
/home/ilg/Downloads/day24/risk-v.elf ELF program header segment 0 (addresses 0x0000000080000000 - 0x000000008005d348)
707678
aplay: read_header:2861: read error
708679
```
709680

710681
## Create a new GitHub pre-release draft
711682

712-
- in `CHANGELOG.md`, add the release date and a message like _* v7.2.0-1 released_
683+
- in `CHANGELOG.md`, add the release date and a message like _* v8.1.0-1 released_
713684
- commit with _CHANGELOG update_
714685
- check and possibly update the `templates/body-github-release-liquid.md`
715686
- push the `xpack-develop` branch
@@ -720,8 +691,8 @@ The workflow result and logs are available from the
720691

721692
The result is a
722693
[draft pre-release](https://github.com/xpack-dev-tools/qemu-riscv-xpack/releases/)
723-
tagged like **v7.2.0-1** (mind the dash in the middle!) and
724-
named like **xPack QEMU RISC-V v7.2.0-1** (mind the dash),
694+
tagged like **v8.1.0-1** (mind the dash in the middle!) and
695+
named like **xPack QEMU RISC-V v8.1.0-1** (mind the dash),
725696
with all binaries attached.
726697

727698
- edit the draft and attach it to the `xpack-develop` branch (important!)
@@ -744,7 +715,7 @@ If any, refer to closed
744715
## Update the preview Web
745716

746717
- commit the `develop` branch of `xpack/web-jekyll` GitHub repo;
747-
use a message like _xPack QEMU RISC-V v7.2.0-1 released_
718+
use a message like _xPack QEMU RISC-V v8.1.0-1 released_
748719
- push to GitHub
749720
- wait for the GitHub Pages build to complete
750721
- the preview web is <https://xpack.github.io/web-preview/news/>
@@ -785,18 +756,18 @@ watching this project.
785756
- compare the SHA sums with those shown by `cat *.sha`
786757
- check the executable names
787758
- commit all changes, use a message like
788-
_package.json: update urls for 7.2.0-1.1 release_ (without _v_)
759+
_package.json: update urls for 8.1.0-1.1 release_ (without _v_)
789760

790761
## Publish on the npmjs.com server
791762

792763
- select the `xpack-develop` branch
793764
- check the latest commits `npm run git-log`
794-
- update `CHANGELOG.md`, add a line like _* v7.2.0-1.1 published on npmjs.com_
795-
- commit with a message like _CHANGELOG: publish npm v7.2.0-1.1_
765+
- update `CHANGELOG.md`, add a line like _* v8.1.0-1.1 published on npmjs.com_
766+
- commit with a message like _CHANGELOG: publish npm v8.1.0-1.1_
796767
- `npm pack` and check the content of the archive, which should list
797768
only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`;
798769
possibly adjust `.npmignore`
799-
- `npm version 7.2.0-1.1`; the first 4 numbers are the same as the
770+
- `npm version 8.1.0-1.1`; the first 4 numbers are the same as the
800771
GitHub release; the fifth number is the npm specific version
801772
- the commits and the tag should have been pushed by the `postversion` script;
802773
if not, push them with `git push origin --tags`
@@ -825,12 +796,12 @@ The tests results are available from the
825796
When the release is considered stable, promote it as `latest`:
826797

827798
- `npm dist-tag ls @xpack-dev-tools/qemu-riscv`
828-
- `npm dist-tag add @xpack-dev-tools/qemu-riscv@7.2.0-1.1 latest`
799+
- `npm dist-tag add @xpack-dev-tools/qemu-riscv@8.1.0-1.1 latest`
829800
- `npm dist-tag ls @xpack-dev-tools/qemu-riscv`
830801

831802
In case the previous version is not functional and needs to be unpublished:
832803

833-
- `npm unpublish @xpack-dev-tools/qemu-riscv@7.2.0-1.1`
804+
- `npm unpublish @xpack-dev-tools/qemu-riscv@8.1.0-1.1`
834805

835806
## Update the Web
836807

@@ -852,7 +823,7 @@ In case the previous version is not functional and needs to be unpublished:
852823

853824
- in a separate browser windows, open [TweetDeck](https://tweetdeck.twitter.com/)
854825
- using the `@xpack_project` account
855-
- paste the release name like **xPack QEMU RISC-V v7.2.0-1 released**
826+
- paste the release name like **xPack QEMU RISC-V v8.1.0-1 released**
856827
- paste the link to the Web page
857828
[release](https://xpack.github.io/qemu-riscv/releases/)
858829
- click the **Tweet** button

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ After install, the package should create a structure like this (macOS files;
105105
only the first two depth levels are shown):
106106

107107
```console
108-
$ tree -L 2 /Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/7.2.0-1.1/.content/
109-
/Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/7.2.0-1.1/.content/
108+
$ tree -L 2 /Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/8.1.0-1.1/.content/
109+
/Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/8.1.0-1.1/.content/
110110
├── README.md
111111
├── bin
112112
│   ├── qemu-system-riscv32
@@ -192,15 +192,15 @@ For more details please read the
192192
### Versioning
193193

194194
The version strings used by the QEMU project are three number strings
195-
like `7.2.0`; to this string the xPack distribution adds a four number,
195+
like `8.1.0`; to this string the xPack distribution adds a four number,
196196
but since semver allows only three numbers, all additional ones can
197197
be added only as pre-release strings, separated by a dash,
198-
like `7.2.0-1`. When published as a npm package, the version gets
199-
a fifth number, like `7.2.0-1.1`.
198+
like `8.1.0-1`. When published as a npm package, the version gets
199+
a fifth number, like `8.1.0-1.1`.
200200

201201
Since adherence of third party packages to semver is not guaranteed,
202-
it is recommended to use semver expressions like `^7.2.0` and `~7.2.0`
203-
with caution, and prefer exact matches, like `7.2.0-1.1`.
202+
it is recommended to use semver expressions like `^8.1.0` and `~8.1.0`
203+
with caution, and prefer exact matches, like `8.1.0-1.1`.
204204

205205
## Maintainer info
206206

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@xpack-dev-tools/qemu-riscv",
3-
"version": "7.2.0-1.1",
3+
"version": "8.1.0-1.1.pre",
44
"description": "A binary xPack with QEMU RISC-V executables",
55
"main": "",
66
"scripts": {
@@ -65,7 +65,7 @@
6565
"qemu-system-riscv64": "./.content/bin/qemu-system-riscv64"
6666
},
6767
"devDependencies": {
68-
"@xpack-dev-tools/xbb-helper": "^1.10.0"
68+
"@xpack-dev-tools/xbb-helper": "^1.10.7"
6969
},
7070
"properties": {
7171
"appName": "QEMU RISC-V",

scripts/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0-1
1+
8.1.0-1

0 commit comments

Comments
 (0)