Skip to content

Commit 5ce314e

Browse files
committed
prepare v7.2.5-1
1 parent 354b2f0 commit 5ce314e

File tree

4 files changed

+73
-54
lines changed

4 files changed

+73
-54
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22

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

5+
## 2023-09-03
6+
7+
* v7.2.5-1 prepared
8+
9+
## 2023-09-02
10+
11+
* 354b2f0 versioning.sh: add libunistring for 7.2.*
12+
* f12dcf2 VERSION 7.2.5-1
13+
* bb0ea5e versioning.sh: add 7.2.5
14+
* 5e4fb2a package.json: bump gcc 13.2
15+
* 072e28e package.json: docker xbb 5.1.0
16+
* bd81fb7 versioning.sh cosmetics
17+
* 2cb9e83 application.sh: update deps
18+
* 36f6b35 versioning.sh: add libunistring_build
19+
* 06dbd92 versioning.sh: autotools no longer needed
20+
* ee7254d package-lock.json update
21+
* 0824f75 dot.*ignore update
22+
* 96910b5 prepare v8.1.0-1
23+
524
## 2023-08-28
625

726
* v8.1.0-1 prepared

README-MAINTAINER.md

Lines changed: 45 additions & 45 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 `v8.1.0`.
127+
like `v7.2.5`.
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 `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
134+
Determine the version (like `7.2.5`) and update the `scripts/VERSION`
135+
file; the format is `7.2.5-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 `8.1.0-1`).
146+
and fix them; assign them to a milestone (like `7.2.5-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 _* v8.1.0-1 prepared_
168-
- commit with a message like _prepare v8.1.0-1_
167+
- add a new entry like _* v7.2.5-1 prepared_
168+
- commit with a message like _prepare v7.2.5-1_
169169

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

172172
- checkout the `master` branch
173-
- merge the upstream `v8.1.0` tag into current
173+
- merge the upstream `v7.2.5` 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 `v8.1.0-xpack` tag
180+
- add a `v7.2.5-xpack` tag
181181
- push tag to `origin`
182182

183183
### Update the version specific code
@@ -255,14 +255,14 @@ xpm install --config darwin-x64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git &
255255
xpm run build-develop --config darwin-x64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
256256
```
257257

258-
About 25 minutes later, the output of the build script is a compressed
258+
About 21 minutes later, the output of the build script is a compressed
259259
archive and its SHA signature, created in the `deploy` folder:
260260

261261
```console
262262
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/darwin-x64/deploy
263-
total 35008
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
263+
total 34456
264+
-rw-r--r-- 1 ilg staff 17202461 Sep 2 23:26 xpack-qemu-riscv-7.2.5-1-darwin-x64.tar.gz
265+
-rw-r--r-- 1 ilg staff 109 Sep 2 23:26 xpack-qemu-riscv-7.2.5-1-darwin-x64.tar.gz.sha
266266
```
267267

268268
#### Apple Silicon macOS
@@ -289,14 +289,14 @@ xpm install --config darwin-arm64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
289289
xpm run build-develop --config darwin-arm64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
290290
```
291291

292-
About 10 minutes later, the output of the build script is a compressed
292+
About 14 minutes later, the output of the build script is a compressed
293293
archive and its SHA signature, created in the `deploy` folder:
294294

295295
```console
296296
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/darwin-arm64/deploy
297-
total 34480
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
297+
total 32792
298+
-rw-r--r-- 1 ilg staff 16331374 Sep 2 23:19 xpack-qemu-riscv-7.2.5-1-darwin-arm64.tar.gz
299+
-rw-r--r-- 1 ilg staff 111 Sep 2 23:19 xpack-qemu-riscv-7.2.5-1-darwin-arm64.tar.gz.sha
300300
```
301301

302302
#### Intel GNU/Linux
@@ -325,14 +325,14 @@ xpm run docker-link-deps --config linux-x64 -C ~/Work/xpack-dev-tools/qemu-riscv
325325
xpm run docker-build-develop --config linux-x64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
326326
```
327327

328-
About 15 minutes later, the output of the build script is a compressed
328+
About 11 minutes later, the output of the build script is a compressed
329329
archive and its SHA signature, created in the `deploy` folder:
330330

331331
```console
332332
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/linux-x64/deploy
333-
total 19292
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
333+
total 19124
334+
-rw-r--r-- 1 ilg ilg 19577701 Sep 2 19:37 xpack-qemu-riscv-7.2.5-1-linux-x64.tar.gz
335+
-rw-r--r-- 1 ilg ilg 108 Sep 2 19:37 xpack-qemu-riscv-7.2.5-1-linux-x64.tar.gz.sha
336336
```
337337

338338
##### Build the Windows binaries
@@ -352,14 +352,14 @@ xpm run docker-link-deps --config win32-x64 -C ~/Work/xpack-dev-tools/qemu-riscv
352352
xpm run docker-build-develop --config win32-x64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
353353
```
354354

355-
About 15 minutes later, the output of the build script is a compressed
355+
About 10 minutes later, the output of the build script is a compressed
356356
archive and its SHA signature, created in the `deploy` folder:
357357

358358
```console
359359
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/win32-x64/deploy
360-
total 21980
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
360+
total 21824
361+
-rw-r--r-- 1 ilg ilg 22342128 Sep 2 19:48 xpack-qemu-riscv-7.2.5-1-win32-x64.zip
362+
-rw-r--r-- 1 ilg ilg 105 Sep 2 19:48 xpack-qemu-riscv-7.2.5-1-win32-x64.zip.sha
363363
```
364364

365365
#### Arm GNU/Linux 64-bit
@@ -386,14 +386,14 @@ xpm run docker-link-deps --config linux-arm64 -C ~/Work/xpack-dev-tools/qemu-ris
386386
xpm run docker-build-develop --config linux-arm64 -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
387387
```
388388

389-
About 55 min later, the output of the build script is a compressed
389+
About 1h07 later, the output of the build script is a compressed
390390
archive and its SHA signature, created in the `deploy` folder:
391391

392392
```console
393393
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/linux-arm64/deploy
394-
total 18660
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
394+
total 18440
395+
-rw-r--r-- 1 ilg ilg 18874437 Sep 2 21:01 xpack-qemu-riscv-7.2.5-1-linux-arm64.tar.gz
396+
-rw-r--r-- 1 ilg ilg 110 Sep 2 21:01 xpack-qemu-riscv-7.2.5-1-linux-arm64.tar.gz.sha
397397
```
398398

399399
#### Arm GNU/Linux 32-bit
@@ -420,14 +420,14 @@ xpm run docker-link-deps --config linux-arm -C ~/Work/xpack-dev-tools/qemu-riscv
420420
xpm run docker-build-develop --config linux-arm -C ~/Work/xpack-dev-tools/qemu-riscv-xpack.git
421421
```
422422

423-
About 50 minutes later, the output of the build script is a compressed
423+
About 58 minutes later, the output of the build script is a compressed
424424
archive and its SHA signature, created in the `deploy` folder:
425425

426426
```console
427427
$ ls -l ~/Work/xpack-dev-tools/qemu-riscv-xpack.git/build/linux-arm/deploy
428-
total 17636
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
428+
total 17456
429+
-rw-r--r-- 1 ilg ilg 17869389 Sep 2 20:52 xpack-qemu-riscv-7.2.5-1-linux-arm.tar.gz
430+
-rw-r--r-- 1 ilg ilg 108 Sep 2 20:52 xpack-qemu-riscv-7.2.5-1-linux-arm.tar.gz.sha
431431
```
432432

433433
### Update README-MAINTAINER listing output
@@ -659,7 +659,7 @@ To test graphical mode, use Thomas Huth's presentation:
659659
curl -L https://www.qemu-advent-calendar.org/2018/download/day24.tar.xz \
660660
-o ${HOME}/Downloads/day24.tar.xz
661661
(cd ${HOME}/Downloads; tar xvf day24.tar.xz)
662-
export PATH=${HOME}/Downloads/xpack-qemu-riscv-8.1.0-1/bin:$PATH
662+
export PATH=${HOME}/Downloads/xpack-qemu-riscv-7.2.5-1/bin:$PATH
663663
bash ${HOME}/Downloads/day24/run.sh
664664
```
665665

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

675675
The following two regions overlap (in the memory address space):
676-
/home/ilg/Downloads/xpack-qemu-riscv-8.1.0-1/bin/../share/qemu/opensbi-riscv64-generic-fw_dynamic.bin (addresses 0x0000000080000000 - 0x0000000080019b50)
676+
/home/ilg/Downloads/xpack-qemu-riscv-7.2.5-1/bin/../share/qemu/opensbi-riscv64-generic-fw_dynamic.bin (addresses 0x0000000080000000 - 0x0000000080019b50)
677677
/home/ilg/Downloads/day24/risk-v.elf ELF program header segment 0 (addresses 0x0000000080000000 - 0x000000008005d348)
678678
aplay: read_header:2861: read error
679679
```
680680

681681
## Create a new GitHub pre-release draft
682682

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

692692
The result is a
693693
[draft pre-release](https://github.com/xpack-dev-tools/qemu-riscv-xpack/releases/)
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),
694+
tagged like **v7.2.5-1** (mind the dash in the middle!) and
695+
named like **xPack QEMU RISC-V v7.2.5-1** (mind the dash),
696696
with all binaries attached.
697697

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

717717
- commit the `develop` branch of `xpack/web-jekyll` GitHub repo;
718-
use a message like _xPack QEMU RISC-V v8.1.0-1 released_
718+
use a message like _xPack QEMU RISC-V v7.2.5-1 released_
719719
- push to GitHub
720720
- wait for the GitHub Pages build to complete
721721
- the preview web is <https://xpack.github.io/web-preview/news/>
@@ -756,18 +756,18 @@ watching this project.
756756
- compare the SHA sums with those shown by `cat *.sha`
757757
- check the executable names
758758
- commit all changes, use a message like
759-
_package.json: update urls for 8.1.0-1.1 release_ (without _v_)
759+
_package.json: update urls for 7.2.5-1.1 release_ (without _v_)
760760

761761
## Publish on the npmjs.com server
762762

763763
- select the `xpack-develop` branch
764764
- check the latest commits `npm run git-log`
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_
765+
- update `CHANGELOG.md`, add a line like _* v7.2.5-1.1 published on npmjs.com_
766+
- commit with a message like _CHANGELOG: publish npm v7.2.5-1.1_
767767
- `npm pack` and check the content of the archive, which should list
768768
only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`;
769769
possibly adjust `.npmignore`
770-
- `npm version 8.1.0-1.1`; the first 4 numbers are the same as the
770+
- `npm version 7.2.5-1.1`; the first 4 numbers are the same as the
771771
GitHub release; the fifth number is the npm specific version
772772
- the commits and the tag should have been pushed by the `postversion` script;
773773
if not, push them with `git push origin --tags`
@@ -796,12 +796,12 @@ The tests results are available from the
796796
When the release is considered stable, promote it as `latest`:
797797

798798
- `npm dist-tag ls @xpack-dev-tools/qemu-riscv`
799-
- `npm dist-tag add @xpack-dev-tools/qemu-riscv@8.1.0-1.1 latest`
799+
- `npm dist-tag add @xpack-dev-tools/qemu-riscv@7.2.5-1.1 latest`
800800
- `npm dist-tag ls @xpack-dev-tools/qemu-riscv`
801801

802802
In case the previous version is not functional and needs to be unpublished:
803803

804-
- `npm unpublish @xpack-dev-tools/qemu-riscv@8.1.0-1.1`
804+
- `npm unpublish @xpack-dev-tools/qemu-riscv@7.2.5-1.1`
805805

806806
## Update the Web
807807

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

824824
- in a separate browser windows, open [TweetDeck](https://tweetdeck.twitter.com/)
825825
- using the `@xpack_project` account
826-
- paste the release name like **xPack QEMU RISC-V v8.1.0-1 released**
826+
- paste the release name like **xPack QEMU RISC-V v7.2.5-1 released**
827827
- paste the link to the Web page
828828
[release](https://xpack.github.io/qemu-riscv/releases/)
829829
- 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/8.1.0-1.1/.content/
109-
/Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/8.1.0-1.1/.content/
108+
$ tree -L 2 /Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/7.2.5-1.1/.content/
109+
/Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/7.2.5-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 `8.1.0`; to this string the xPack distribution adds a four number,
195+
like `7.2.5`; 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 `8.1.0-1`. When published as a npm package, the version gets
199-
a fifth number, like `8.1.0-1.1`.
198+
like `7.2.5-1`. When published as a npm package, the version gets
199+
a fifth number, like `7.2.5-1.1`.
200200

201201
Since adherence of third party packages to semver is not guaranteed,
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`.
202+
it is recommended to use semver expressions like `^7.2.5` and `~7.2.5`
203+
with caution, and prefer exact matches, like `7.2.5-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": "8.1.0-1.1.pre",
3+
"version": "7.2.5-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.7"
68+
"@xpack-dev-tools/xbb-helper": "^1.10.8"
6969
},
7070
"properties": {
7171
"appName": "QEMU RISC-V",

0 commit comments

Comments
 (0)