Skip to contentSkip to conversation

make-release: add skiboot .version file

PATCH Superseded Michael Roth 2 participants 4 messages Apr 10, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 make-release: add skiboot .version file

This is needed to build skiboot from tarball-distributed sources since the git data the make_release.sh script relies on to generate it is not available.

---
 scripts/make-release | 1 +
 1 file changed, 1 insertion(+)
scripts/make-release +1 -0
index 04fa9defdc..c14f75b12c 100755
@@ -19,6 +19,7 @@ pushd ${destination}
 git checkout "v${version}"
 git submodule update --init
 (cd roms/seabios && git describe --tags --long --dirty > .version)
+(cd roms/skiboot && ./make_version.sh > .version)
 # FIXME: The following line is a workaround for avoiding filename collisions
 # when unpacking u-boot sources on case-insensitive filesystems. Once we
 # update to something with u-boot commit 610eec7f0 we can drop this line.
Signature · 1 line
2.11.0
#1 lore raw
Quoted 16 lines · Michael Roth

This is needed to build skiboot from tarball-distributed sources since the git data the make_release.sh script relies on to generate it is not available.

---
 scripts/make-release | 1 +
 1 file changed, 1 insertion(+)
scripts/make-release +0 -0
index 04fa9defdc..c14f75b12c 100755

scripts/make-release pushd ${destination} · line 25

Quoted 7 lines
scripts/make-release +1 -0
@@ -19,6 +19,7 @@ pushd ${destination}
 git checkout "v${version}"
 git submodule update --init
 (cd roms/seabios && git describe --tags --long --dirty > .version)
+(cd roms/skiboot && ./make_version.sh > .version)
 # FIXME: The following line is a workaround for avoiding filename collisions
 # when unpacking u-boot sources on case-insensitive filesystems. Once we
 # update to something with u-boot commit 610eec7f0 we can drop this line.

Seeing this comment in the context part of this patch reminds me:
have we updated to a u-boot that lets us drop the workaround yet?

thanks
-- PMM

#2 lore raw

Quoting Peter Maydell (2018-04-10 02:31:04)

Quoted 12 lines · Michael Roth
Quoted 11 lines

This is needed to build skiboot from tarball-distributed sources since the git data the make_release.sh script relies on to generate it is not available.

---
 scripts/make-release | 1 +
 1 file changed, 1 insertion(+)
Quoted 15 lines

scripts/make-release pushd ${destination} · line 25

Quoted 12 lines
scripts/make-release +1 -0
index 04fa9defdc..c14f75b12c 100755
@@ -19,6 +19,7 @@ pushd ${destination}
 git checkout "v${version}"
 git submodule update --init
 (cd roms/seabios && git describe --tags --long --dirty > .version)
+(cd roms/skiboot && ./make_version.sh > .version)
 # FIXME: The following line is a workaround for avoiding filename collisions
 # when unpacking u-boot sources on case-insensitive filesystems. Once we
 # update to something with u-boot commit 610eec7f0 we can drop this line.

Seeing this comment in the context part of this patch reminds me:
have we updated to a u-boot that lets us drop the workaround yet?

Not yet, we need:

https://github.com/u-boot/u-boot/commit/610eec7f0

which was committed Oct 2017, but QEMU master is still using the v2017.07 July release, via:

https://github.com/qemu/qemu/commit/73663d71

Quoted 4 lines

thanks
-- PMM

#3 lore raw
Quoted 9 lines · Michael Roth

Quoting Peter Maydell (2018-04-10 02:31:04)

Quoted 7 lines · Michael Roth
Quoted 3 lines

# FIXME: The following line is a workaround for avoiding filename collisions

 # when unpacking u-boot sources on case-insensitive filesystems. Once we
 # update to something with u-boot commit 610eec7f0 we can drop this line.

Seeing this comment in the context part of this patch reminds me:
have we updated to a u-boot that lets us drop the workaround yet?

Quoted 8 lines

Not yet, we need:

https://github.com/u-boot/u-boot/commit/610eec7f0

which was committed Oct 2017, but QEMU master is still using the v2017.07 July release, via:

https://github.com/qemu/qemu/commit/73663d71

I guess it's too late in the 2.12 release cycle to update our u-boot binary, but we should remember to do it at the start of 2.13...

thanks
-- PMM