Skip to content

Commit a96a2b2

Browse files
committed
prepare v7.0.0-1
1 parent 86ce03a commit a96a2b2

File tree

7 files changed

+56
-197
lines changed

7 files changed

+56
-197
lines changed

CHANGELOG.md

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

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

5+
## 2022-05-02
6+
7+
- v7.0.0-1 prepared
8+
59
## 2021-12-17
610

711
- v6.2.0-1 prepared

README-BUILD.md

Lines changed: 16 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,16 @@ not be accepted by bash.
117117

118118
## Versioning
119119

120-
The version string is an extension to semver, the format looks like `6.2.0-1`.
120+
The version string is an extension to semver, the format looks like `7.0.0-1`.
121121
It includes the three digits with the original QEMU version and a fourth
122122
digit with the xPack release number.
123123

124124
When publishing on the **npmjs.com** server, a fifth digit is appended.
125125

126126
## Changes
127127

128-
Compared to the original QEMU distribution, there are major
129-
changes in the Cortex-M emulation.
130-
131-
The actual changes for each version are documented in the
132-
release web pages.
128+
Compared to the original QEMU distribution, there are
129+
no functional changes in the RISC-V emulation.
133130

134131
## How to run a local/native build
135132

@@ -220,10 +217,10 @@ archives and their SHA signatures, created in the `deploy` folder:
220217
```console
221218
$ ls -l ~/Work/qemu-riscv-*/deploy
222219
total 37100
223-
-rw-rw-r-- 1 ilg ilg 8796275 Oct 14 21:38 xpack-qemu-riscv-6.2.0-1-linux-x64.tar.gz
224-
-rw-rw-r-- 1 ilg ilg 107 Oct 14 21:38 xpack-qemu-riscv-6.2.0-1-linux-x64.tar.gz.sha
225-
-rw-rw-r-- 1 ilg ilg 10393964 Oct 14 21:44 xpack-qemu-riscv-6.2.0-1-win32-x64.zip
226-
-rw-rw-r-- 1 ilg ilg 104 Oct 14 21:44 xpack-qemu-riscv-6.2.0-1-win32-x64.zip.sha
220+
-rw-rw-r-- 1 ilg ilg 8796275 Oct 14 21:38 xpack-qemu-riscv-7.0.0-1-linux-x64.tar.gz
221+
-rw-rw-r-- 1 ilg ilg 107 Oct 14 21:38 xpack-qemu-riscv-7.0.0-1-linux-x64.tar.gz.sha
222+
-rw-rw-r-- 1 ilg ilg 10393964 Oct 14 21:44 xpack-qemu-riscv-7.0.0-1-win32-x64.zip
223+
-rw-rw-r-- 1 ilg ilg 104 Oct 14 21:44 xpack-qemu-riscv-7.0.0-1-win32-x64.zip.sha
227224
```
228225

229226
### Build the Arm GNU/Linux binaries
@@ -292,10 +289,10 @@ archives and their SHA signatures, created in the `deploy` folder:
292289
```console
293290
$ ls -l ~/Work/qemu-riscv-*/deploy
294291
total 16856
295-
-rw-rw-r-- 1 ilg ilg 8777442 Oct 14 18:58 xpack-qemu-riscv-6.2.0-1-linux-arm64.tar.gz
296-
-rw-rw-r-- 1 ilg ilg 109 Oct 14 18:58 xpack-qemu-riscv-6.2.0-1-linux-arm64.tar.gz.sha
297-
-rw-rw-r-- 1 ilg ilg 8472838 Oct 14 19:22 xpack-qemu-riscv-6.2.0-1-linux-arm.tar.gz
298-
-rw-rw-r-- 1 ilg ilg 107 Oct 14 19:22 xpack-qemu-riscv-6.2.0-1-linux-arm.tar.gz.sha
292+
-rw-rw-r-- 1 ilg ilg 8777442 Oct 14 18:58 xpack-qemu-riscv-7.0.0-1-linux-arm64.tar.gz
293+
-rw-rw-r-- 1 ilg ilg 109 Oct 14 18:58 xpack-qemu-riscv-7.0.0-1-linux-arm64.tar.gz.sha
294+
-rw-rw-r-- 1 ilg ilg 8472838 Oct 14 19:22 xpack-qemu-riscv-7.0.0-1-linux-arm.tar.gz
295+
-rw-rw-r-- 1 ilg ilg 107 Oct 14 19:22 xpack-qemu-riscv-7.0.0-1-linux-arm.tar.gz.sha
299296
```
300297

301298
### Build the macOS binaries
@@ -339,8 +336,8 @@ archive and its SHA signature, created in the `deploy` folder:
339336
```console
340337
$ ls -l ~/Work/qemu-riscv-*/deploy
341338
total 15120
342-
-rw-r--r-- 1 ilg staff 7735782 Oct 14 20:24 xpack-qemu-riscv-6.2.0-1-darwin-x64.tar.gz
343-
-rw-r--r-- 1 ilg staff 108 Oct 14 20:24 xpack-qemu-riscv-6.2.0-1-darwin-x64.tar.gz.sha
339+
-rw-r--r-- 1 ilg staff 7735782 Oct 14 20:24 xpack-qemu-riscv-7.0.0-1-darwin-x64.tar.gz
340+
-rw-r--r-- 1 ilg staff 108 Oct 14 20:24 xpack-qemu-riscv-7.0.0-1-darwin-x64.tar.gz.sha
344341
```
345342

346343
## Subsequent runs
@@ -422,108 +419,7 @@ The result of the `configure` step on CentOS 6, with most of the
422419
options disabled, is:
423420

424421
```console
425-
Source path /Host/Work/qemu-riscv-2.8.0-13/qemu.git
426-
C compiler gcc
427-
Host C compiler cc
428-
C++ compiler g++
429-
Objective-C compiler gcc
430-
ARFLAGS rv
431-
CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g -ffunction-sections -fdata-sections -m64 -pipe -O2 -Wno-format-truncation -Wno-incompatible-pointer-types -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-result
432-
QEMU_CFLAGS -I/Host/Work/qemu-riscv-2.8.0-13/install/centos64/include/pixman-1 -I$(SRC_PATH)/dtc/libfdt -pthread -I/Host/Work/qemu-riscv-2.8.0-13/install/centos64/include/glib-2.0 -I/Host/Work/qemu-riscv-2.8.0-13/install/centos64/lib/glib-2.0/include -fPIE -DPIE -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -ffunction-sections -fdata-sections -m64 -pipe -O2 -Wno-format-truncation -Wno-incompatible-pointer-types -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-result -I/Host/Work/qemu-riscv-2.8.0-13/install/centos64/include -Wendif-labels -Wno-shift-negative-value -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition -Wtype-limits -fstack-protector-strong
433-
LDFLAGS -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g -L/Host/Work/qemu-riscv-2.8.0-13/install/centos64/lib -L/Host/Work/qemu-riscv-2.8.0-13/install/centos64/lib
434-
make make
435-
install install
436-
python python -B
437-
module support no
438-
host CPU x86_64
439-
host big endian no
440-
target list gnuarmeclipse-softmmu
441-
tcg debug enabled yes
442-
gprof enabled no
443-
sparse enabled no
444-
strip binaries no
445-
profiler no
446-
static build no
447-
pixman system
448-
SDL support yes (2.0.5)
449-
GTK support no
450-
GTK GL support no
451-
VTE support no
452-
TLS priority NORMAL
453-
GNUTLS support no
454-
GNUTLS rnd no
455-
libgcrypt no
456-
libgcrypt kdf no
457-
nettle no
458-
nettle kdf no
459-
libtasn1 no
460-
curses support no
461-
virgl support no
462-
curl support no
463-
mingw32 support no
464-
Audio drivers
465-
Block whitelist (rw)
466-
Block whitelist (ro)
467-
VirtFS support no
468-
VNC support no
469-
xen support no
470-
brlapi support no
471-
bluez support no
472-
Documentation yes
473-
PIE yes
474-
vde support no
475-
netmap support no
476-
Linux AIO support no
477-
ATTR/XATTR support yes
478-
Install blobs no
479-
KVM support no
480-
COLO support yes
481-
RDMA support no
482-
TCG interpreter no
483-
fdt support yes
484-
preadv support yes
485-
fdatasync yes
486-
madvise yes
487-
posix_madvise yes
488-
libcap-ng support no
489-
vhost-net support yes
490-
vhost-scsi support yes
491-
vhost-vsock support yes
492-
Trace backends log
493-
spice support no
494-
rbd support no
495-
xfsctl support no
496-
smartcard support no
497-
libusb no
498-
usb net redir no
499-
OpenGL support no
500-
OpenGL dmabufs no
501-
libiscsi support no
502-
libnfs support no
503-
build guest agent no
504-
QGA VSS support no
505-
QGA w32 disk info no
506-
QGA MSI support no
507-
seccomp support no
508-
coroutine backend ucontext
509-
coroutine pool yes
510-
debug stack usage no
511-
GlusterFS support no
512-
Archipelago support no
513-
gcov gcov
514-
gcov enabled no
515-
TPM support no
516-
libssh2 support no
517-
TPM passthrough no
518-
QOM debugging yes
519-
lzo support no
520-
snappy support no
521-
bzip2 support no
522-
NUMA host support no
523-
tcmalloc support no
524-
jemalloc support no
525-
avx2 optimization yes
526-
replication support yes
422+
...
527423
```
528424

529425
## Testing
@@ -537,9 +433,7 @@ program from there. For example on macOS the output should
537433
look like:
538434

539435
```console
540-
$ .../xpack-qemu-riscv-2.8.0-13/bin/qemu-system-gnuarmeclipse --version
541-
xPack 64-bit QEMU emulator version 2.8.0-13 (v2.8.0-12-dirty)
542-
Copyright (c) 2003-2016 Fabrice Bellard and the QEMU Project developers
436+
$ ...
543437
```
544438

545439
## Installed folders
@@ -548,34 +442,7 @@ After install, the package should create a structure like this (macOS files;
548442
only the first two depth levels are shown):
549443

550444
```console
551-
$ tree -L 2 /Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/2.8.0-13.1/.content
552-
/Users/ilg/Library/xPacks/@xpack-dev-tools/qemu-riscv/2.8.0-13.1/.content
553-
├── README.md
554-
├── bin
555-
│   └── qemu-system-gnuarmeclipse
556-
├── distro-info
557-
│   ├── CHANGELOG.md
558-
│   ├── licenses
559-
│   ├── patches
560-
│   └── scripts
561-
├── libexec
562-
│   ├── libSDL2-2.0.0.dylib
563-
│   ├── libSDL2_image-2.0.0.dylib
564-
│   ├── libgcc_s.1.dylib
565-
│   ├── libglib-2.0.0.dylib
566-
│   ├── libgthread-2.0.0.dylib
567-
│   ├── libiconv.2.dylib
568-
│   ├── libintl.8.dylib
569-
│   ├── libpixman-1.0.dylib
570-
│   ├── libssp.0.dylib
571-
│   ├── libstdc++.6.dylib
572-
│   ├── libz.1.2.11.dylib
573-
│   └── libz.1.dylib -> libz.1.2.11.dylib
574-
└── share
575-
├── doc
576-
└── qemu
577-
578-
9 directories, 15 files
445+
$ tree -L 2 ...
579446
```
580447

581448
## Uninstall

README-DEVELOP.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -276,28 +276,16 @@ selection window that appears on top, select the desired configuration.
276276

277277
### The emulated images
278278

279-
There are multiple Cortex-M test projects in the separate GitHub project
280-
[`xpack-dev-tools/qemu-eclipse-test-projects`](https://github.com/xpack-dev-tools/qemu-eclipse-test-projects.git)
281-
282-
The default one is `f407-disc-blink-tutorial`, the STM32F4-DISCOVERY Blinky,
283-
as described in the
284-
[blinky tutorial](https://xpack-dev-tools.github.io/tutorials/blinky-arm/).
285-
286-
Clone the repository in the same `Work` folder:
287-
288-
```sh
289-
cd ~/Work
290-
git clone https://github.com/xpack-dev-tools/qemu-eclipse-test-projects.git qemu-eclipse-test-projects.git
291-
```
279+
TBD
292280

293281
### Debug
294282

295283
VSC also provides decent debugging features. The launchers are
296284
defined in `.vscode/launch.json`.
297285

298286
The executable is started from
299-
`${env:HOME}/Work/qemu-riscv-dev/${platform}-${arch}/install/qemu/bin/qemu-system-gnuarmeclipse`, or
300-
`${env:USERPROFILE}/Work/qemu-riscv-dev/win32-x64/install/qemu/bin/qemu-system-gnuarmeclipse.exe` on Windows.
287+
`${env:HOME}/Work/qemu-riscv-dev/${platform}-${arch}/install/qemu/bin/qemu-system-riscv`, or
288+
`${env:USERPROFILE}/Work/qemu-riscv-dev/win32-x64/install/qemu/bin/qemu-system-riscv.exe` on Windows.
301289

302290
In addition to a test showing the help message, two more launchers
303291
are defined for each platform, to start the classical STM32F4DISCOVERY

README-RELEASE.md

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ No need to add a tag here, it'll be added when the release is created.
2020

2121
### Check the latest upstream release
2222

23-
- currently does not apply
23+
Get the version from the upstream
24+
[VERSION](https://github.com/qemu/qemu/blob/master/VERSION) file.
2425

2526
### Increase the version
2627

27-
Determine the version (like `6.2.0`) and update the `scripts/VERSION`
28-
file; the format is `6.2.0-1`. The fourth number is the xPack release number
28+
Determine the version (like `7.0.0`) and update the `scripts/VERSION`
29+
file; the format is `7.0.0-1`. The fourth number is the xPack release number
2930
of this version. A fifth number will be added when publishing
3031
the package on the `npm` server.
3132

@@ -36,7 +37,7 @@ Check GitHub issues and pull requests:
3637
- <https://github.com/xpack-dev-tools/qemu-riscv-xpack/issues/>
3738
- <https://github.com/xpack-dev-tools/qemu/issues/>
3839

39-
and fix them; assign them to a milestone (like `6.2.0-1`).
40+
and fix them; assign them to a milestone (like `7.0.0-1`).
4041

4142
### Check `README.md`
4243

@@ -54,8 +55,8 @@ but in the version specific release page.
5455

5556
- open the `CHANGELOG.md` file
5657
- check if all previous fixed issues are in
57-
- add a new entry like _- v6.2.0-1 prepared_
58-
- commit with a message like _prepare v6.2.0-1_
58+
- add a new entry like _- v7.0.0-1 prepared_
59+
- commit with a message like _prepare v7.0.0-1_
5960

6061
Note: if you missed to update the `CHANGELOG.md` before starting the build,
6162
edit the file and rerun the build, it should take only a few minutes to
@@ -67,7 +68,7 @@ In the qemu.git fork:
6768

6869
- TODO
6970
- update the `xpack-riscv-develop` branch
70-
- add a `v6.2.0-1-xpack-riscv` tag
71+
- add a `v7.0.0-1-xpack-riscv` tag
7172

7273
### Update the version specific code
7374

@@ -235,20 +236,20 @@ To test graphical mode, use Thomas Huth's presentation:
235236
curl -L https://www.qemu-advent-calendar.org/2018/download/day24.tar.xz \
236237
-o ${HOME}/Downloads/day24.tar.xz
237238
(cd ${HOME}/Downloads; tar xvf day24.tar.xz)
238-
export PATH=${HOME}/Downloads/xpack-qemu-riscv-6.2.0-1/bin:$PATH
239+
export PATH=${HOME}/Downloads/xpack-qemu-riscv-7.0.0-1/bin:$PATH
239240
bash ${HOME}/Downloads/day24/run.sh
240241
```
241242

242243
## Create a new GitHub pre-release draft
243244

244-
- in `CHANGELOG.md`, add the release date and a message like _- v6.2.0-1 released_
245+
- in `CHANGELOG.md`, add the release date and a message like _- v7.0.0-1 released_
245246
- commit and push the `xpack-develop` branch
246247
- run the xPack action `trigger-workflow-publish-release`
247248

248249
The result is a
249250
[draft pre-release](https://github.com/xpack-dev-tools/qemu-riscv-xpack/releases/)
250-
tagged like **v6.2.0-1** (mind the dash in the middle!) and
251-
named like **xPack QEMU RISC-V v6.2.0-1** (mind the dash),
251+
tagged like **v7.0.0-1** (mind the dash in the middle!) and
252+
named like **xPack QEMU RISC-V v7.0.0-1** (mind the dash),
252253
with all binaries attached.
253254

254255
- edit the draft and attach it to the `xpack-develop` branch (important!)
@@ -270,7 +271,7 @@ If any, refer to closed
270271
## Update the preview Web
271272

272273
- commit the `develop` branch of `xpack/web-jekyll` GitHub repo;
273-
use a message like **xPack QEMU RISC-V v6.2.0-1 released**
274+
use a message like **xPack QEMU RISC-V v7.0.0-1 released**
274275
- push to GitHub
275276
- wait for the GitHub Pages build to complete
276277
- the preview web is <https://xpack.github.io/web-preview/news/>
@@ -299,18 +300,18 @@ watching this project.
299300
- compare the SHA sums with those shown by `cat *.sha`
300301
- check the executable names
301302
- commit all changes, use a message like
302-
`package.json: update urls for 6.2.0-1.1 release` (without `v`)
303+
`package.json: update urls for 7.0.0-1.1 release` (without `v`)
303304

304305
## Publish on the npmjs.com server
305306

306307
- select the `xpack-develop` branch
307308
- check the latest commits `npm run git-log`
308-
- update `CHANGELOG.md`, add a line like _- v6.2.0-1.1 published on npmjs.com_
309-
- commit with a message like _CHANGELOG: publish npm v6.2.0-1.1_
309+
- update `CHANGELOG.md`, add a line like _- v7.0.0-1.1 published on npmjs.com_
310+
- commit with a message like _CHANGELOG: publish npm v7.0.0-1.1_
310311
- `npm pack` and check the content of the archive, which should list
311312
only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`;
312313
possibly adjust `.npmignore`
313-
- `npm version 6.2.0-1.1`; the first 5 numbers are the same as the
314+
- `npm version 7.0.0-1.1`; the first 5 numbers are the same as the
314315
GitHub release; the sixth number is the npm specific version
315316
- the commits and the tag should have been pushed by the `postversion` script;
316317
if not, push them with `git push origin --tags`
@@ -339,12 +340,12 @@ The tests results are available from the
339340
When the release is considered stable, promote it as `latest`:
340341

341342
- `npm dist-tag ls @xpack-dev-tools/qemu-riscv`
342-
- `npm dist-tag add @xpack-dev-tools/qemu-riscv@6.2.0-1.1 latest`
343+
- `npm dist-tag add @xpack-dev-tools/qemu-riscv@7.0.0-1.1 latest`
343344
- `npm dist-tag ls @xpack-dev-tools/qemu-riscv`
344345

345346
In case the previous version is not functional and needs to be unpublished:
346347

347-
- `npm unpublish @xpack-dev-tools/qemu-riscv@6.2.0-1.X`
348+
- `npm unpublish @xpack-dev-tools/qemu-riscv@7.0.0-1.X`
348349

349350
## Update the Web
350351

@@ -366,7 +367,7 @@ In case the previous version is not functional and needs to be unpublished:
366367

367368
- in a separate browser windows, open [TweetDeck](https://tweetdeck.twitter.com/)
368369
- using the `@xpack_project` account
369-
- paste the release name like **xPack QEMU RISC-V v6.2.0-1 released**
370+
- paste the release name like **xPack QEMU RISC-V v7.0.0-1 released**
370371
- paste the link to the Web page
371372
[release](https://xpack.github.io/qemu-riscv/releases/)
372373
- click the **Tweet** button

0 commit comments

Comments
 (0)