From patchwork Thu May 31 17:15:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 137437 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp6883478lji; Thu, 31 May 2018 10:51:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ6kLQkLgxatFV2qwMecYthqNWY/vpmIcXYkQY+zb8qIG0DwUW4LeO3NIheQoG4i0vCvYSN X-Received: by 2002:a37:be44:: with SMTP id o65-v6mr6886738qkf.111.1527789101586; Thu, 31 May 2018 10:51:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527789101; cv=none; d=google.com; s=arc-20160816; b=DlijoUonVuNdZJhGNebgQw441KKyB+kd7Yf8ezHHOlRmGnJq74Q+IoLp/BWYbmZ/KV u81tK4NpgeeHYUcagnhP1l1bIJ9sTA9u5C//vThukMInVe69oEeK9Hb3tkLyCeOayq7L z3tIKyShiorvdLdZKd26st47Jtc0T701fpNdO59KldMQIr+kImBKRDB7BEz631WqklxL oUnVkmwxrEgOp8TLzyMphYVYIkOtfh+sMxPt4TicWJsbiyAsHkHWaX15wt1KpNcxXF1x OdqcGvcaElt1BNZHWSYqna3SE+wLIGN1HcaMBh10GCzp/tayZNkd6XL2nAjBeKaa6pve 7L1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=3WKuRu8uEsX7M8gUbrZEQYxETU+RyADRfFIP/0PUVys=; b=V6KhKNT3LdqXm+GaF40GegVeBqrSy4ZcotxpqYEB6mdYJkBzP+HM1m/Ao9lna7MWHI P3zy8Geu1CDvMLDp4Gv5r/47ybzBmu6cYm8RgkKxrabhhvlVVbW6A0A32XbpeYXeGUY4 OESEbFXaahAou6Z8QF8RsgBQptaW7eT9FPihcYmswuuGF5lKrM2XMmfvASZCGBf6Ltss ljYxNFGCZJswABHp98aN7vNZu0hu3xt+wvbGkD+Nr5OM1v+DmQA2SUKzEMHxPIyr9mcp ZKhz8xFdmA/nobhv1lpL24xCvg0cg+27VjPNYodhWumichc/xSe4xY+hq+JNRfPUyY6Q /R7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 12-v6si11246049qtc.338.2018.05.31.10.51.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 31 May 2018 10:51:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:45465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fORjh-0007tq-1p for patch@linaro.org; Thu, 31 May 2018 13:51:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fORBR-0006IZ-Jp for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fORBQ-0003zi-Dl for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:17 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41808 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fORBQ-0003zT-8N for qemu-devel@nongnu.org; Thu, 31 May 2018 13:16:16 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E14E4401EF10 for ; Thu, 31 May 2018 17:16:15 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-47.ams2.redhat.com [10.36.117.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71B4F63F50 for ; Thu, 31 May 2018 17:16:15 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 31 May 2018 19:15:57 +0200 Message-Id: <20180531171606.21604-6-pbonzini@redhat.com> In-Reply-To: <20180531171606.21604-1-pbonzini@redhat.com> References: <20180531171253.21012-1-pbonzini@redhat.com> <20180531171606.21604-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 31 May 2018 17:16:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 31 May 2018 17:16:15 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 44/53] scripts/update-linux-headers: Handle kernel license no longer being one file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The kernel has changed its license documentation, so instead of COPYING being a stand-alone file that defines the license, it refers to various other files under LICENSES/. This means we need to copy not just COPYING but also these other files to our copy of the kernel headers. Signed-off-by: Peter Maydell Message-Id: <20180525132755.21839-4-peter.maydell@linaro.org> Reviewed-by: Michael S. Tsirkin Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- scripts/update-linux-headers.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.17.0 diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 1fe54f8ab1..feb75390aa 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -142,6 +142,20 @@ else cp "$linux/COPYING" "$output/linux-headers" fi +# Recent kernel sources split the copyright/license info into multiple +# files, which we need to copy. This set of licenses is the set that +# are referred to by SPDX lines in the headers we currently copy. +# We don't copy the Documentation/process/license-rules.rst which +# is also referred to by COPYING, since it's explanatory rather than license. +if [ -d "$linux/LICENSES" ]; then + mkdir -p "$output/linux-headers/LICENSES/preferred" \ + "$output/linux-headers/LICENSES/exceptions" + for l in preferred/GPL-2.0 preferred/BSD-2-Clause preferred/BSD-3-Clause \ + exceptions/Linux-syscall-note; do + cp "$linux/LICENSES/$l" "$output/linux-headers/LICENSES/$l" + done +fi + cat <$output/linux-headers/linux/virtio_config.h #include "standard-headers/linux/virtio_config.h" EOF