From patchwork Mon Jul 4 06:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1651780 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-ppc-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 4Lbx9k2hsVz9s0w for ; Mon, 4 Jul 2022 16:44:26 +1000 (AEST) Received: from localhost ([::1]:55480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8Fom-00024L-3N for incoming@patchwork.ozlabs.org; Mon, 04 Jul 2022 02:44:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fnn-0001Ai-Ph for qemu-ppc@nongnu.org; Mon, 04 Jul 2022 02:43:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8Fnj-0005Zm-Py for qemu-ppc@nongnu.org; Mon, 04 Jul 2022 02:43:22 -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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-ppc" 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 <