Re: [PATCH 2/3] scripts/make-release: Do not include the skiboot sources in the tarball anymore

[Cédric Le Goater]

On 7/4/22 08:42, Thomas Huth wrote:
> The skiboot sources are licensed under the Apache license, so we don't
> have to include them in our tarball as long as we continue to distribute
> the skiboot license information in our release tarball.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.

> ---
>   scripts/make-release | 15 ++++++++++++++-
>   1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/make-release b/scripts/make-release
> index f79ed7a2ae..176304f30b 100755
> --- a/scripts/make-release
> +++ b/scripts/make-release
> @@ -19,7 +19,6 @@ 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)
>   
>   # Fetch edk2 submodule's submodules to get their license information.
>   # Edk2 is distributed under permissive licenses, so we don't have to
> @@ -48,6 +47,20 @@ https://github.com/tianocore/edk2/archive/${edk2rev}.tar.gz
>   EOF
>   cd ../..
>   
> +# Same for skiboot - it has a permissive Apache license, so we don't
> +# need to ship the sources for this.
> +cd roms/skiboot
> +skibootrev=$(git rev-parse --short=12 HEAD)
> +head -n 38 libstb/tss2/ibmtpm20tss/utils/tss.c > LICENSE-tss.txt
> +head -n 50 libfdt/fdt.c > LICENSE-libfdt.txt
> +rm -r $(ls | grep -v LICEN) .[a-z]*
> +cat > sources.txt <<EOF
> +The skiboot sources can be downloaded from:
> +
> +https://github.com/open-power/skiboot/archive/${skibootrev}.tar.gz
> +EOF
> +cd ../..
> +
>   popd
>   tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
>   rm -rf ${destination}