[Qemu-devel] [PATCH] scripts/make-release: Stop shipping u-boot source as a tarball

Peter Maydell posted 1 patch 4 days ago
Test asan passed
Test docker-clang@ubuntu passed
Test docker-mingw@fedora passed
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190314155628.8822-1-peter.maydell@linaro.org
scripts/make-release | 4 ----
1 file changed, 4 deletions(-)

[Qemu-devel] [PATCH] scripts/make-release: Stop shipping u-boot source as a tarball

Posted by Peter Maydell 4 days ago
In commit d0dead3b6df7f6cd970e we changed to shipping the u-boot
sources as a tarball, to work around a problem where they
contained a file and directory that had the same name except
for case, which was preventing QEMU's source tarball being
unpacked on case-insensitive filesystems.

In commit f2a3b549e357041f86d7e we updated our u-boot blob
and sources to v2019.01, which no longer has this problem,
so we can finally remove our workaround (effectively
reverting d0dead3b6df7f6cd970e).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Tested (with a slightly hand-hacked script) by creating a tarball
with master as of dbbc277510aa39ea and unpacking it on OSX.
---
 scripts/make-release | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/make-release b/scripts/make-release
index c14f75b12c8..b4af9c9e520 100755
--- a/scripts/make-release
+++ b/scripts/make-release
@@ -20,10 +20,6 @@ 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.
-tar --exclude=.git -cjf roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot
 popd
 tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
 rm -rf ${destination}
-- 
2.20.1


Re: [Qemu-devel] [PATCH] scripts/make-release: Stop shipping u-boot source as a tarball

Posted by Michael Roth 3 days ago
Quoting Peter Maydell (2019-03-14 10:56:28)
> In commit d0dead3b6df7f6cd970e we changed to shipping the u-boot
> sources as a tarball, to work around a problem where they
> contained a file and directory that had the same name except
> for case, which was preventing QEMU's source tarball being
> unpacked on case-insensitive filesystems.
> 
> In commit f2a3b549e357041f86d7e we updated our u-boot blob
> and sources to v2019.01, which no longer has this problem,
> so we can finally remove our workaround (effectively
> reverting d0dead3b6df7f6cd970e).
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
> Tested (with a slightly hand-hacked script) by creating a tarball
> with master as of dbbc277510aa39ea and unpacking it on OSX.
> ---
>  scripts/make-release | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/scripts/make-release b/scripts/make-release
> index c14f75b12c8..b4af9c9e520 100755
> --- a/scripts/make-release
> +++ b/scripts/make-release
> @@ -20,10 +20,6 @@ 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.
> -tar --exclude=.git -cjf roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot
>  popd
>  tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
>  rm -rf ${destination}
> -- 
> 2.20.1
> 

Re: [Qemu-devel] [PATCH] scripts/make-release: Stop shipping u-boot source as a tarball

Posted by Peter Maydell 14 hours ago
On Sat, 16 Mar 2019 at 03:25, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
>
> Quoting Peter Maydell (2019-03-14 10:56:28)
> > In commit d0dead3b6df7f6cd970e we changed to shipping the u-boot
> > sources as a tarball, to work around a problem where they
> > contained a file and directory that had the same name except
> > for case, which was preventing QEMU's source tarball being
> > unpacked on case-insensitive filesystems.
> >
> > In commit f2a3b549e357041f86d7e we updated our u-boot blob
> > and sources to v2019.01, which no longer has this problem,
> > so we can finally remove our workaround (effectively
> > reverting d0dead3b6df7f6cd970e).
> >
> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>
> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

Thanks; applied to master so it is in place ready for when
you roll the rc0 tarballs tomorrow.

-- PMM

Re: [Qemu-devel] [PATCH] scripts/make-release: Stop shipping u-boot source as a tarball

Posted by Philippe Mathieu-Daudé 4 days ago
Hi Peter,

On 3/14/19 4:56 PM, Peter Maydell wrote:
> In commit d0dead3b6df7f6cd970e we changed to shipping the u-boot
> sources as a tarball, to work around a problem where they
> contained a file and directory that had the same name except
> for case, which was preventing QEMU's source tarball being
> unpacked on case-insensitive filesystems.
> 
> In commit f2a3b549e357041f86d7e we updated our u-boot blob
> and sources to v2019.01, which no longer has this problem,

Is this u-boot commit 610eec7f0593574c03?

> so we can finally remove our workaround (effectively
> reverting d0dead3b6df7f6cd970e).
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Tested (with a slightly hand-hacked script) by creating a tarball
> with master as of dbbc277510aa39ea and unpacking it on OSX.
> ---
>  scripts/make-release | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/scripts/make-release b/scripts/make-release
> index c14f75b12c8..b4af9c9e520 100755
> --- a/scripts/make-release
> +++ b/scripts/make-release
> @@ -20,10 +20,6 @@ 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.
> -tar --exclude=.git -cjf roms/u-boot.tar.bz2 -C roms u-boot && rm -rf roms/u-boot
>  popd
>  tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
>  rm -rf ${destination}
> 

Re: [Qemu-devel] [PATCH] scripts/make-release: Stop shipping u-boot source as a tarball

Posted by Peter Maydell 3 days ago
On Thu, 14 Mar 2019 at 21:31, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Hi Peter,
>
> On 3/14/19 4:56 PM, Peter Maydell wrote:
> > In commit d0dead3b6df7f6cd970e we changed to shipping the u-boot
> > sources as a tarball, to work around a problem where they
> > contained a file and directory that had the same name except
> > for case, which was preventing QEMU's source tarball being
> > unpacked on case-insensitive filesystems.
> >
> > In commit f2a3b549e357041f86d7e we updated our u-boot blob
> > and sources to v2019.01, which no longer has this problem,
>
> Is this u-boot commit 610eec7f0593574c03?

Yes.

thanks
-- PMM

Re: [Qemu-devel] [PATCH] scripts/make-release: Stop shipping u-boot source as a tarball

Posted by Philippe Mathieu-Daudé 3 days ago
On 3/15/19 10:46 AM, Peter Maydell wrote:
> On Thu, 14 Mar 2019 at 21:31, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>
>> Hi Peter,
>>
>> On 3/14/19 4:56 PM, Peter Maydell wrote:
>>> In commit d0dead3b6df7f6cd970e we changed to shipping the u-boot
>>> sources as a tarball, to work around a problem where they
>>> contained a file and directory that had the same name except
>>> for case, which was preventing QEMU's source tarball being
>>> unpacked on case-insensitive filesystems.
>>>
>>> In commit f2a3b549e357041f86d7e we updated our u-boot blob
>>> and sources to v2019.01, which no longer has this problem,
>>
>> Is this u-boot commit 610eec7f0593574c03?
> 
> Yes.

Good.
I checked u-boot range v2017.07..v2019.01 and did not notice other fixes.
I'd appreciate if you add a comment about this u-boot commit :)

Regardless:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks,

Phil.