Re: [Qemu-devel] [PATCH for-2.12] make-release: add skiboot .version file
On 10 April 2018 at 15:23, Michael Rothwrote: > Quoting Peter Maydell (2018-04-10 02:31:04) >> On 10 April 2018 at 01:57, Michael Roth wrote: >> > # 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 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
Re: [Qemu-devel] [PATCH for-2.12] make-release: add skiboot .version file
Quoting Peter Maydell (2018-04-10 02:31:04) > On 10 April 2018 at 01:57, Michael Rothwrote: > > 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. > > > > Cc: qemu-sta...@nongnu.org > > Reported-by: Michael Tokarev > > Signed-off-by: Michael Roth > > --- > > scripts/make-release | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/scripts/make-release b/scripts/make-release > > index 04fa9defdc..c14f75b12c 100755 > > --- a/scripts/make-release > > +++ b/scripts/make-release > > @@ -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 > > thanks > -- PMM >
Re: [Qemu-devel] [PATCH for-2.12] make-release: add skiboot .version file
On 10 April 2018 at 01:57, Michael Rothwrote: > 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. > > Cc: qemu-sta...@nongnu.org > Reported-by: Michael Tokarev > Signed-off-by: Michael Roth > --- > scripts/make-release | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/scripts/make-release b/scripts/make-release > index 04fa9defdc..c14f75b12c 100755 > --- a/scripts/make-release > +++ b/scripts/make-release > @@ -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
[Qemu-devel] [PATCH for-2.12] 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. Cc: qemu-sta...@nongnu.org Reported-by: Michael TokarevSigned-off-by: Michael Roth --- scripts/make-release | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/make-release b/scripts/make-release index 04fa9defdc..c14f75b12c 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -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. -- 2.11.0