From nobody Mon Nov 25 11:34:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1715804655; cv=none; d=zohomail.com; s=zohoarc; b=hxR1+Dp5wF464J/YY5GooqoNvtdPZoOdKo/UlJBVg+8bC7VsG+b3Ngpj2fPqdMZl6qQMUh4M3UGtrvdsqq+xi9gbmleydWqgPsW9rBTimlkHrv/wYDubzhub1i3vrP6Yp4/ZxaUqYDrY8Uw4rgNxRpjB/LBLVtVIQ3CWzZnZp5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715804655; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=R1E2ktoxkcgN3p1HKHsTBPKrhmDDFh6CEjoDvoJe/mc=; b=EbKp2gx/1RhhItzJVOzVTKrNxhPxIelphz7L4NI+dxIoUTrxjK1z5LO2r0mUJaxcXjGqyG5JswL5HPnPQD3VOOz2En6Syz92Ao6h6GMF/AqAH8LoosU868xtPtBBDgkMVIz9hqiAl0+9l6CFTzVovRZWzyeVebbDkkBcc4kq+70= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715804655746463.7145559724214; Wed, 15 May 2024 13:24:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7LAD-00016Z-86; Wed, 15 May 2024 16:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s7LA6-00012Q-G7 for qemu-devel@nongnu.org; Wed, 15 May 2024 16:23:42 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s7LA2-0004Ee-Ty for qemu-devel@nongnu.org; Wed, 15 May 2024 16:23:42 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-5238b7d0494so1990056e87.3 for ; Wed, 15 May 2024 13:23:37 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a1787c686sm896601566b.47.2024.05.15.13.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 13:23:35 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C81EF5FA19; Wed, 15 May 2024 21:23:34 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715804616; x=1716409416; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R1E2ktoxkcgN3p1HKHsTBPKrhmDDFh6CEjoDvoJe/mc=; b=PFPXZve0lvX872WD/RZOv0Y7R81ttMFjrrHrYcvHxs0c621oWFPrSS28NsOnJH/uDj Kg9dZiBm8pmmoZhu4DVUUgjP6pdnEIRVjveGBvkVARXtQGsLXJrQl3NGNKZvv0dUIQD4 Sl/WAL/S3gBhpicDxfpnRy1rLVqb1cmwLdisI+3ZT9KGitMvtZliC7obz3Zo1aLzFD+2 hORkUbiyNN7U52KygtZqxVtQO/9NkcgWRQbaLFXwTW9UajX8qOmmpYquRUojMH+UqYiI feUYs5I8inPR0jUElq17OjKu+IheKz6G62p7lJaTA6HGQbEVLqpIs3H3KwZrofw+wVro xhXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715804616; x=1716409416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R1E2ktoxkcgN3p1HKHsTBPKrhmDDFh6CEjoDvoJe/mc=; b=fuLsHxmeRXVWm+LJ2vxr+xSWL09hCE5D587yi5Lhe0eqJXkfVoTXvKHnpTyPwne04m ufWPlSjorgxBgM8klujDnrBAowiGf9SIieH40N6P63+7JsjPX8Ornx9kA/21Al1dAc2T wcHBVsxbcE19hSusOJX86/mb8kkMnY6hJNahOCOJbLmmE4tqXhaSEBpfhAy0qcsCRtD/ 7q4C5O4PL7/jIMiVXXbjBY6euib7CAcl/L3WRh+yVqNwh597tjoHqG0buaXdDVEIcpFc eZHs5QFjIRfbZUFDSCW74Tw3X61Bfc+kFkK1157KHT5iF+2IOV6oBd0mTXwhNe5AcqJ0 Yiwg== X-Gm-Message-State: AOJu0YxjClr5JnfIFksg/a0Yin9hnOUffgg1b5j4JDchhG4w2HTodQQb kC/RHckiH3vbTxkAQYLZZZw4nXqeLxylHRLiNg+p+IFsplN6aadneLBFs7YFF1w= X-Google-Smtp-Source: AGHT+IEcmWBf2wqnTaaV49X5C6mV8ozLG7fp4T/FNb0sBiMXZZ1jKiTWZO1LT42KUfZtBxegacyhQQ== X-Received: by 2002:ac2:550a:0:b0:519:611f:df49 with SMTP id 2adb3069b0e04-52210277efbmr13077529e87.69.1715804615798; Wed, 15 May 2024 13:23:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , "Michael S . Tsirkin" , Cornelia Huck , Paolo Bonzini Subject: [PULL 02/11] scripts/update-linux-header.sh: be more src tree friendly Date: Wed, 15 May 2024 21:23:25 +0100 Message-Id: <20240515202334.710324-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240515202334.710324-1-alex.bennee@linaro.org> References: <20240515202334.710324-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1715804656818100015 Running "install_headers" in the Linux source tree is fairly unfriendly as out-of-tree builds will start complaining about the kernel source being non-pristine. As we have a temporary directory for the install we should also do the build step here. So now we have: $tmpdir/ $blddir/ $hdrdir/ Reviewed-by: Pierrick Bouvier Reviewed-by: Michael S. Tsirkin Signed-off-by: Alex Benn=C3=A9e Message-Id: <20240514174253.694591-3-alex.bennee@linaro.org> diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers= .sh index 36f3e91fe4..8963c39189 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -27,6 +27,8 @@ # types like "__u64". This work is done in the cp_portable function. =20 tmpdir=3D$(mktemp -d) +hdrdir=3D"$tmpdir/headers" +blddir=3D"$tmpdir/build" linux=3D"$1" output=3D"$2" =20 @@ -110,56 +112,56 @@ for arch in $ARCHLIST; do arch_var=3DARCH fi =20 - make -C "$linux" INSTALL_HDR_PATH=3D"$tmpdir" $arch_var=3D$arch header= s_install + make -C "$linux" O=3D"$blddir" INSTALL_HDR_PATH=3D"$hdrdir" $arch_var= =3D$arch headers_install =20 rm -rf "$output/linux-headers/asm-$arch" mkdir -p "$output/linux-headers/asm-$arch" for header in kvm.h unistd.h bitsperlong.h mman.h; do - cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch" + cp "$hdrdir/include/asm/$header" "$output/linux-headers/asm-$arch" done =20 if [ $arch =3D mips ]; then - cp "$tmpdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips= /" - cp "$tmpdir/include/asm/unistd_o32.h" "$output/linux-headers/asm-m= ips/" - cp "$tmpdir/include/asm/unistd_n32.h" "$output/linux-headers/asm-m= ips/" - cp "$tmpdir/include/asm/unistd_n64.h" "$output/linux-headers/asm-m= ips/" + cp "$hdrdir/include/asm/sgidefs.h" "$output/linux-headers/asm-mips= /" + cp "$hdrdir/include/asm/unistd_o32.h" "$output/linux-headers/asm-m= ips/" + cp "$hdrdir/include/asm/unistd_n32.h" "$output/linux-headers/asm-m= ips/" + cp "$hdrdir/include/asm/unistd_n64.h" "$output/linux-headers/asm-m= ips/" fi if [ $arch =3D powerpc ]; then - cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-po= werpc/" - cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-po= werpc/" + cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-po= werpc/" + cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-po= werpc/" 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/virtio-ccw.h" "$output/include/st= andard-headers/asm-s390/" - cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s3= 90/" - cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s3= 90/" + cp_portable "$hdrdir/include/asm/virtio-ccw.h" "$output/include/st= andard-headers/asm-s390/" + cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-s3= 90/" + cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-s3= 90/" 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/" + cp "$hdrdir/include/asm/unistd-eabi.h" "$output/linux-headers/asm-= arm/" + cp "$hdrdir/include/asm/unistd-oabi.h" "$output/linux-headers/asm-= arm/" + cp "$hdrdir/include/asm/unistd-common.h" "$output/linux-headers/as= m-arm/" fi if [ $arch =3D arm64 ]; then - cp "$tmpdir/include/asm/sve_context.h" "$output/linux-headers/asm-= arm64/" + cp "$hdrdir/include/asm/sve_context.h" "$output/linux-headers/asm-= arm64/" fi if [ $arch =3D x86 ]; then - 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/" - cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/stan= dard-headers/asm-$arch" + cp "$hdrdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x8= 6/" + cp "$hdrdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x= 86/" + cp "$hdrdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x8= 6/" + cp_portable "$hdrdir/include/asm/kvm_para.h" "$output/include/stan= dard-headers/asm-$arch" # Remove everything except the macros from bootparam.h avoiding the # unnecessary import of several video/ist/etc headers sed -e '/__ASSEMBLY__/,/__ASSEMBLY__/d' \ - "$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h" - cp_portable "$tmpdir/bootparam.h" \ + "$hdrdir/include/asm/bootparam.h" > "$hdrdir/bootparam.h" + cp_portable "$hdrdir/bootparam.h" \ "$output/include/standard-headers/asm-$arch" - cp_portable "$tmpdir/include/asm/setup_data.h" \ + cp_portable "$hdrdir/include/asm/setup_data.h" \ "$output/standard-headers/asm-x86" fi if [ $arch =3D riscv ]; then - cp "$tmpdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv= /" + cp "$hdrdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv= /" fi done arch=3D @@ -169,13 +171,13 @@ mkdir -p "$output/linux-headers/linux" for header in const.h stddef.h kvm.h vfio.h vfio_ccw.h vfio_zdev.h vhost.h= \ psci.h psp-sev.h userfaultfd.h memfd.h mman.h nvme_ioctl.h \ vduse.h iommufd.h bits.h; do - cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" + cp "$hdrdir/include/linux/$header" "$output/linux-headers/linux" done =20 rm -rf "$output/linux-headers/asm-generic" mkdir -p "$output/linux-headers/asm-generic" for header in unistd.h bitsperlong.h mman-common.h mman.h hugetlb_encode.h= ; do - cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-ge= neric" + cp "$hdrdir/include/asm-generic/$header" "$output/linux-headers/asm-ge= neric" done =20 if [ -L "$linux/source" ]; then @@ -210,23 +212,23 @@ EOF =20 rm -rf "$output/include/standard-headers/linux" mkdir -p "$output/include/standard-headers/linux" -for i in "$tmpdir"/include/linux/*virtio*.h \ - "$tmpdir/include/linux/qemu_fw_cfg.h" \ - "$tmpdir/include/linux/fuse.h" \ - "$tmpdir/include/linux/input.h" \ - "$tmpdir/include/linux/input-event-codes.h" \ - "$tmpdir/include/linux/udmabuf.h" \ - "$tmpdir/include/linux/pci_regs.h" \ - "$tmpdir/include/linux/ethtool.h" \ - "$tmpdir/include/linux/const.h" \ - "$tmpdir/include/linux/kernel.h" \ - "$tmpdir/include/linux/vhost_types.h" \ - "$tmpdir/include/linux/sysinfo.h" \ - "$tmpdir/include/misc/pvpanic.h"; do +for i in "$hdrdir"/include/linux/*virtio*.h \ + "$hdrdir/include/linux/qemu_fw_cfg.h" \ + "$hdrdir/include/linux/fuse.h" \ + "$hdrdir/include/linux/input.h" \ + "$hdrdir/include/linux/input-event-codes.h" \ + "$hdrdir/include/linux/udmabuf.h" \ + "$hdrdir/include/linux/pci_regs.h" \ + "$hdrdir/include/linux/ethtool.h" \ + "$hdrdir/include/linux/const.h" \ + "$hdrdir/include/linux/kernel.h" \ + "$hdrdir/include/linux/vhost_types.h" \ + "$hdrdir/include/linux/sysinfo.h" \ + "$hdrdir/include/misc/pvpanic.h"; do cp_portable "$i" "$output/include/standard-headers/linux" done mkdir -p "$output/include/standard-headers/drm" -cp_portable "$tmpdir/include/drm/drm_fourcc.h" \ +cp_portable "$hdrdir/include/drm/drm_fourcc.h" \ "$output/include/standard-headers/drm" =20 cat <$output/include/standard-headers/linux/types.h --=20 2.39.2