From nobody Wed May 8 05:35:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489462344157537.0878922782468; Mon, 13 Mar 2017 20:32:24 -0700 (PDT) Received: from localhost ([::1]:56205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cndCA-0005ZL-GJ for importer@patchew.org; Mon, 13 Mar 2017 23:32:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cndBL-0005Y3-In for qemu-devel@nongnu.org; Mon, 13 Mar 2017 23:31:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cndBH-0005TW-R2 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 23:31:31 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cndBH-0005SV-IL for qemu-devel@nongnu.org; Mon, 13 Mar 2017 23:31:27 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2E3SpP6032068 for ; Mon, 13 Mar 2017 23:31:25 -0400 Received: from e23smtp05.au.ibm.com (e23smtp05.au.ibm.com [202.81.31.147]) by mx0a-001b2d01.pphosted.com with ESMTP id 2960gybj6x-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 13 Mar 2017 23:31:25 -0400 Received: from localhost by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Mar 2017 13:31:23 +1000 Received: from d23relay06.au.ibm.com (202.81.31.225) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 14 Mar 2017 13:31:20 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v2E3VC4M36700376; Tue, 14 Mar 2017 14:31:20 +1100 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v2E3UlJq032736; Tue, 14 Mar 2017 14:30:48 +1100 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v2E3Ulgm031693; Tue, 14 Mar 2017 14:30:47 +1100 Received: from tungsten.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 08BA4A01C7; Tue, 14 Mar 2017 14:30:23 +1100 (AEDT) From: Sam Bobroff To: david@gibson.dropbear.id.au Date: Tue, 14 Mar 2017 14:30:22 +1100 X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-TM-AS-MML: disable x-cbid: 17031403-0016-0000-0000-00000224F71A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17031403-0017-0000-0000-000006998E13 Message-Id: <0dee8b2e5316bf53099a530f8e9ea83a4c21507e.1489462214.git.sam.bobroff@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-14_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703140027 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH for-2.10 1/1] scripts/update-linux-headers.sh: refactor extra files 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: , Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, paulus@ozlabs.org, qemu-ppc@nongnu.org, sjitindarsingh@gmail.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" update-linux-headers.sh now has enough code in it to suggest some refactoring. Parameterize some of it to make adding new files a bit easier. Signed-off-by: Sam Bobroff --- scripts/update-linux-headers.sh | 44 ++++++++++++++++++++++---------------= ---- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers= .sh index 6a370a8669..49366103e1 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -82,33 +82,37 @@ for arch in $ARCHLIST; do fi =20 make -C "$linux" INSTALL_HDR_PATH=3D"$tmpdir" $arch_var=3D$arch header= s_install + ARCH_EXTRA=3D + ARCH_STD_EXTRA=3D + case "$arch" in + arm) + ARCH_EXTRA=3D"unistd-eabi.h unistd-oabi.h unistd-common.h" + ;; + powerpc) + ARCH_EXTRA=3Depapr_hcalls.h + ;; + s390) + ARCH_STD_EXTRA=3D"kvm_virtio.h virtio-ccw.h" + ;; + x86) + ARCH_EXTRA=3D"unistd_32.h unistd_x32.h unistd_64.h" + ARCH_STD_EXTRA=3D"hyperv.h" + ;; + esac =20 rm -rf "$output/linux-headers/asm-$arch" mkdir -p "$output/linux-headers/asm-$arch" - for header in kvm.h kvm_para.h unistd.h; do - cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" + for header in kvm.h kvm_para.h unistd.h $ARCH_EXTRA; do + cp "$tmpdir/include/asm/$header" \ + "$output/linux-headers/asm-$arch/" done - if [ $arch =3D powerpc ]; then - cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm= -powerpc/" - fi =20 rm -rf "$output/include/standard-headers/asm-$arch" mkdir -p "$output/include/standard-headers/asm-$arch" - if [ $arch =3D s390 ]; then - cp_portable "$tmpdir/include/asm/kvm_virtio.h" "$output/include/st= andard-headers/asm-s390/" - cp_portable "$tmpdir/include/asm/virtio-ccw.h" "$output/include/st= andard-headers/asm-s390/" - fi - if [ $arch =3D arm ]; then - cp "$tmpdir/include/asm/unistd-eabi.h" "$output/linux-headers/asm-= arm/" - cp "$tmpdir/include/asm/unistd-oabi.h" "$output/linux-headers/asm-= arm/" - cp "$tmpdir/include/asm/unistd-common.h" "$output/linux-headers/as= m-arm/" - fi - if [ $arch =3D x86 ]; then - cp_portable "$tmpdir/include/asm/hyperv.h" "$output/include/standa= rd-headers/asm-x86/" - cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x8= 6/" - cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x= 86/" - cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x8= 6/" - fi + for header in $ARCH_STD_EXTRA; do + cp_portable "$tmpdir/include/asm/$header" \ + "$output/include/standard-headers/asm-$arch/" + done done =20 rm -rf "$output/linux-headers/linux" --=20 2.11.0