| Message ID | 20181109161352.29873-1-mdroth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [resend,for-3.1] make-release: add skiboot .version file | expand |
On Fri, Nov 9, 2018 at 5:16 PM Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > > 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-stable@nongnu.org > Reported-by: Michael Tokarev <mjt@tls.msk.ru> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > 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.17.1 > >
Quoting Michael Roth (2018-11-09 10:13:52) > 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-stable@nongnu.org > Reported-by: Michael Tokarev <mjt@tls.msk.ru> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Hi Peter, Should I go ahead and send this as a standalone pull or should it go in through someone else? > --- > 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.17.1 >
On 14 November 2018 at 16:55, Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > Quoting Michael Roth (2018-11-09 10:13:52) >> 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-stable@nongnu.org >> Reported-by: Michael Tokarev <mjt@tls.msk.ru> >> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > > Hi Peter, > > Should I go ahead and send this as a standalone pull or should it go in > through someone else? Applied to master, thanks. -- PMM
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.
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-stable@nongnu.org Reported-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- scripts/make-release | 1 + 1 file changed, 1 insertion(+)