From patchwork Mon Jul 4 06:42:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1651782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NBR3gs2K; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LbxDN1qkLz9s5V for ; Mon, 4 Jul 2022 16:46:42 +1000 (AEST) Received: from localhost ([::1]:56036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8Fqx-0002Rr-K2 for incoming@patchwork.ozlabs.org; Mon, 04 Jul 2022 02:46:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fne-00012f-69 for qemu-devel@nongnu.org; Mon, 04 Jul 2022 02:43:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22644) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fna-0005Yi-Ns for qemu-devel@nongnu.org; Mon, 04 Jul 2022 02:43:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656916990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UxlQh1idZfTCUmtRfa0H3hKdPeUurQhB6klVVfQKBag=; b=NBR3gs2K8LNg31lYsL1QsZYEx6+UG9B6z0nkbTSGTlsnxkHcKbCiTv+DHBbLO65aymGtg6 NpDZlWcutwjXsoKxtsdyY4IqJkubfI7qw8IjRRW41lWqO/GsGbG9B3vwmlHBv5bgc5L3uO nNup3RAulDaVFiuiRybqbc//IwrGvi8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-AEze4FZuNAC-YlkRMUJRpQ-1; Mon, 04 Jul 2022 02:43:06 -0400 X-MC-Unique: AEze4FZuNAC-YlkRMUJRpQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EA15185A582; Mon, 4 Jul 2022 06:43:05 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5776CC27D8F; Mon, 4 Jul 2022 06:43:00 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi , Michael Roth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?utf-8?q?C=C3=A9dric_Le_Goater?= Cc: Richard Henderson , Peter Maydell , Paolo Bonzini , "Daniel P . Berrange" , Michael Tokarev , qemu-ppc@nongnu.org, qemu-arm@nongnu.org, Brad Smith , Kamil Rytarowski , Reinoud Zandijk , Ryo ONODERA Subject: [PATCH 1/3] scripts/make-release: Do not include the edk2 sources in the tarball anymore Date: Mon, 4 Jul 2022 08:42:52 +0200 Message-Id: <20220704064254.18187-2-thuth@redhat.com> In-Reply-To: <20220704064254.18187-1-thuth@redhat.com> References: <20220704064254.18187-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The edk2 sources are bigger than the sources of QEMU - so they double the size of our release tarballs if we include them. Fortunately, edk2 has a permissive license, so there is no need for us to do this as long as we continue to distribute the edk2 license information in our release tarball. Signed-off-by: Thomas Huth --- scripts/make-release | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/scripts/make-release b/scripts/make-release index 05b14ecc95..f79ed7a2ae 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -20,19 +20,34 @@ 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, since it won't have access to them via -# the tarball later. + +# Fetch edk2 submodule's submodules to get their license information. +# Edk2 is distributed under permissive licenses, so we don't have to +# include the full source tree here (which is bigger than QEMU's sources) +# as long as we provide the license information in the tarball. # # A more uniform way to handle this sort of situation would be nice, but we # don't necessarily have much control over how a submodule handles its # submodule dependencies, so we continue to handle these on a case-by-case # basis for now. -(cd roms/edk2 && \ - git submodule update --init -- \ +cd roms/edk2 +git submodule update --init --depth 1 -- \ ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \ BaseTools/Source/C/BrotliCompress/brotli \ - CryptoPkg/Library/OpensslLib/openssl \ - MdeModulePkg/Library/BrotliCustomDecompressLib/brotli) + CryptoPkg/Library/OpensslLib/openssl +mv ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/COPYING.txt \ + License-softfloat.txt +mv BaseTools/Source/C/BrotliCompress/brotli/LICENSE License-brotli.txt +mv CryptoPkg/Library/OpensslLib/openssl/LICENSE License-openssl.txt +edk2rev=$(git rev-parse --short=12 HEAD) +rm -r $(ls | grep -v License) .[a-z]* +cat > sources.txt < X-Patchwork-Id: 1651785 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FzF/od+Q; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LbxKj0DcMz9s0w for ; Mon, 4 Jul 2022 16:51:21 +1000 (AEST) Received: from localhost ([::1]:34458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8FvS-00073I-S0 for incoming@patchwork.ozlabs.org; Mon, 04 Jul 2022 02:51:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fnm-00019A-2S for qemu-devel@nongnu.org; Mon, 04 Jul 2022 02:43:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fnj-0005Zn-Pq for qemu-devel@nongnu.org; Mon, 04 Jul 2022 02:43:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656916998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EFLRx6j5GMOx+5HQUeUBBvYGl1SF4iluq4MHmmsNN30=; b=FzF/od+Q3utuDYriQyjqGyEHDFN3lK1YkSk/dIO7coQZtKhFYO0w2+2VkYmpEInxeAH4Ca QACtgc3vi/1ai75yfOsDULnCF8laGspuMTmJIu1NmtTkyg5ykzOgg+ASv2ctKKBcenmsG/ NSG+c0qBp/c7a0Ogq/MvtaQiFx8cfOM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-378-YX6g0XyUOoS1CgR2EYrdpw-1; Mon, 04 Jul 2022 02:43:10 -0400 X-MC-Unique: YX6g0XyUOoS1CgR2EYrdpw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3159918A6522; Mon, 4 Jul 2022 06:43:10 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48DD8C15D42; Mon, 4 Jul 2022 06:43:06 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi , Michael Roth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?utf-8?q?C=C3=A9dric_Le_Goater?= Cc: Richard Henderson , Peter Maydell , Paolo Bonzini , "Daniel P . Berrange" , Michael Tokarev , qemu-ppc@nongnu.org, qemu-arm@nongnu.org, Brad Smith , Kamil Rytarowski , Reinoud Zandijk , Ryo ONODERA Subject: [PATCH 2/3] scripts/make-release: Do not include the skiboot sources in the tarball anymore Date: Mon, 4 Jul 2022 08:42:53 +0200 Message-Id: <20220704064254.18187-3-thuth@redhat.com> In-Reply-To: <20220704064254.18187-1-thuth@redhat.com> References: <20220704064254.18187-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Cédric Le Goater --- 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 < X-Patchwork-Id: 1651784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JHmjediu; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LbxKT1rCkz9s0w for ; Mon, 4 Jul 2022 16:51:09 +1000 (AEST) Received: from localhost ([::1]:33994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8FvH-0006kr-4e for incoming@patchwork.ozlabs.org; Mon, 04 Jul 2022 02:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fnz-0001Lh-KZ for qemu-devel@nongnu.org; Mon, 04 Jul 2022 02:43:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fnk-0005a2-GF for qemu-devel@nongnu.org; Mon, 04 Jul 2022 02:43:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656917000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Zxsb/fXTfzPzD85shT5J+1m+4C8tjjmG7Du/pZgqU8=; b=JHmjediuYWw9slRBgbGKppHHCUbYUSghSUWRDzdYVwjDrCGWR968B4GVJeXigeojx5p+Qs qCVHE3514o2bb6DYivsLb1sy/+85JxWhnlyvYJlsOOKXgCzVbKL6716sB6kt0tI7HB8ump XNy1FCqGHI8lo3YkNecAhoMbzFMkJXg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-16-klja1yQvOzWojATi3PFRVA-1; Mon, 04 Jul 2022 02:43:15 -0400 X-MC-Unique: klja1yQvOzWojATi3PFRVA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 630D9101A588; Mon, 4 Jul 2022 06:43:14 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 837B3C15D58; Mon, 4 Jul 2022 06:43:10 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi , Michael Roth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?utf-8?q?C=C3=A9dric_Le_Goater?= Cc: Richard Henderson , Peter Maydell , Paolo Bonzini , "Daniel P . Berrange" , Michael Tokarev , qemu-ppc@nongnu.org, qemu-arm@nongnu.org, Brad Smith , Kamil Rytarowski , Reinoud Zandijk , Ryo ONODERA Subject: [PATCH 3/3] scripts/make-release: Remove CI yaml and more git files from the tarball Date: Mon, 4 Jul 2022 08:42:54 +0200 Message-Id: <20220704064254.18187-4-thuth@redhat.com> In-Reply-To: <20220704064254.18187-1-thuth@redhat.com> References: <20220704064254.18187-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" These files are of no use in a normal tarball and thus should not be included here. Signed-off-by: Thomas Huth Reviewed-by: Stefan Hajnoczi --- scripts/make-release | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/make-release b/scripts/make-release index 176304f30b..61c0fd0bfb 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -61,6 +61,8 @@ https://github.com/open-power/skiboot/archive/${skibootrev}.tar.gz EOF cd ../.. +rm .*.yml popd -tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination} + +tar --exclude=".git*" -cjf ${destination}.tar.bz2 ${destination} rm -rf ${destination}