From nobody Sun Nov 16 02:44:13 2025 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=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1744143369; cv=none; d=zohomail.com; s=zohoarc; b=S+Xwl5hyVustv2qt3t/pXUW7/Hh04uGjdyD6M0wd1nsGxQhA9FF7aNje1LwvveqDfd7JA50QdoNYIptf3svfEeN33gttxPR/XeZJwhbxEz7yZlatlHkEuWaFE8uOtC+f7Ij2lzW81vZ7kglFiNx0L1dEbhEy5EW1wEyS/+qHeO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744143369; 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=M1idkm7r5Jb6Xv7RXg4rhinfRXY28w0xmTG5JKg+HK4=; b=S74mIe8xpwuzvA02XrYfblLc6eOwwSmYJrIdUVkIL9+MaT37PwK4FbmFESSO3RKUI5S7S59azRV5Qt+vc0bOlpcRokKsVYwSDY2SA3l+NlVefWOA2gtqwUsv5rGaU27N9J+0TKOBwVRBxErtSriItsr6fXHVRRzt1KyQsbOrM/o= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1744143369062625.5595597057636; Tue, 8 Apr 2025 13:16:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2FM1-0002TL-Br; Tue, 08 Apr 2025 16:15:29 -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 1u2FLg-0002GG-M0 for qemu-devel@nongnu.org; Tue, 08 Apr 2025 16:15:15 -0400 Received: from sea.source.kernel.org ([172.234.252.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2FLX-0004yD-Pf for qemu-devel@nongnu.org; Tue, 08 Apr 2025 16:15:06 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 70807446A5; Tue, 8 Apr 2025 20:14:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id F0C9DC4CEEA; Tue, 8 Apr 2025 20:14:53 +0000 (UTC) Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB8B3C369A6; Tue, 8 Apr 2025 20:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744143294; bh=nhhtsinaOBQHNfYgiTQPRXdYH8S92/y0v4vPFKB9/BA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=n4FHa5nKGLwiNjZWyknh8Ys0s7GHb6D7QIT/TGjENqMT8Kv1sdg/wkFZq83LlRm43 pMaikmFkJZsGPh25Uf37VxFhPGAZ/n8p4gsDA+rFJHFge8GMf5BLGDJn8tilzTZtv/ DdLSA6+PP24V/Uww7BC6eIygHsXBnGUu5ELCRizBsrwCAVwArC7HtoPHZMNizx3VSN by8+F5E34bBYqNMoWdONyOa/XBFDgbOwXHon3OAv8Wcov6EcvWKyDMkhwhjx/RhZk/ G3VOTca60/Tb0hmc+uPLgNNoDD9LQumiFNS4WKYUbGGq147qfstoCPRnR5w6+3oYfR Ufhsa+m4Ndqyw== From: Joel Granados Date: Tue, 08 Apr 2025 22:14:47 +0200 Subject: [PATCH 2/3] scripts: Add root dir to arguments MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250408-jag-sysctl-v1-2-3f4f38b751be@kernel.org> References: <20250408-jag-sysctl-v1-0-3f4f38b751be@kernel.org> In-Reply-To: <20250408-jag-sysctl-v1-0-3f4f38b751be@kernel.org> To: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta Cc: qemu-devel@nongnu.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3596; i=joel.granados@kernel.org; h=from:subject:message-id; bh=nhhtsinaOBQHNfYgiTQPRXdYH8S92/y0v4vPFKB9/BA=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGf1g7v/y9Ezk1NvJXRjuojbd77VkNpWMHK8I 9p1k0WWuCKa24kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJn9YO7AAoJELqXzVK3 lkFPXjML/23NQ8FqFqNI86LpKGfSCW6r9yPdBw0TMaXu/pPYyUVr0TIv2SAq/7+7KYrk825rIvj rv7zSvKgg8DAHGqc2cakgTraHjmHxhw2QECqZG7+CF4ZNczefUucxtYFXE52YFupGCXc42ZC3n/ 99J7SxyhIVict88P5hnj0M8GM/TFcD+q59u+jF9aEueXggYFS4QZ64Hy3n4XNTKdGhOLWEbOe+v rdjBnVRMp8sgOJL/P0Tyr2gcMBKpaKIICj8c3nHr8ZOqNK8YARRN9uExb6EwHGaTiC+/oJJyyJw 5HbWEL01XRGF4nxan2vvuzXDbUvc3kl7huVtOlqbVlkWBK5tRnAwS9JT/cEL7jNWxbBvPe4XIkm MeU77gVhgwNtthGJGfFS1bPOpLf38mnrdjw/JwhAPT0hosfdHxymSdtrvAHC6BOJVyWwEQL5dtU 6sqv9BovTZ57dYyQuh7MHl1RWqXWIdFCpp1gPAyWyMFYeUzYgHYd2zl2CWJvbOvp9WNhcsGw628 WQ= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 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=172.234.252.31; envelope-from=joel.granados@kernel.org; helo=sea.source.kernel.org 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.845, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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 @kernel.org) X-ZM-MESSAGEID: 1744143370586019000 The archive-source script appended everything directly on the tar root making it unusable for creating nix overlays; nix expects all files to be under a directory in the tarbal. Add a "-d|--dir" argument that places all files under a custom root. Behaviour is unchanged when the argument is not given. Signed-off-by: Joel Granados --- scripts/archive-source.sh | 78 ++++++++++++++++++++++++++++++++++++++-----= ---- 1 file changed, 63 insertions(+), 15 deletions(-) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index a469a5e2dec4b05e51474f0a1af190c1ccf23c7e..7143aaefc1133fe991b329df3c7= 8e6ed7726322f 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -9,19 +9,6 @@ # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. =20 -error() { - printf %s\\n "$*" >&2 - exit 1 -} - -if test $# -lt 1; then - error "Usage: $0 " -fi - -tar_file=3D$(realpath "$1") -sub_tdir=3D$(mktemp -d "${tar_file%.tar}.sub.XXXXXXXX") -sub_file=3D"${sub_tdir}/submodule.tar" - # We want a predictable list of submodules for builds, that is # independent of what the developer currently has initialized # in their checkout, because the build environment is completely @@ -32,6 +19,61 @@ subprojects=3D"keycodemapdb libvfio-user berkeley-softfl= oat-3 proc-macro-error-1-rs proc-macro-error-attr-1-rs quote-1-rs syn-2-rs unicode-ident-1-rs" sub_deinit=3D"" +git_archive_prefix=3D"" +tar_transform=3D"" + +BASENAME=3D"$(basename "${BASH_SOURCE[0]}")" +USAGE=3D"Usage: ${BASENAME} [OPTIONS] + Resulting tarball name + + OPTIONS: + -d, --dir Files will be placed into DIR inside the tarball +" + +error() { + printf %s\\n "$*" >&2 + exit 1 +} + +get_opts() { + local short=3D"d:" + local long=3D"dir:" + + if ! tmp=3D$(getopt -o "$short" --long "$long" -n "$BASENAME" -- "$@")= ; then + exit 1 + fi + eval set -- "$tmp" + unset tmp + + while true; do + case "$1" in + '-d' | '--dir' ) + local tar_dir_name=3D$"$2/"; shift 2 + git_archive_prefix=3D"--prefix ${tar_dir_name}" + tar_transform=3D"--transform=3Ds|^|${tar_dir_name}|" + ;; + + '--' ) + shift 1 + ;; + + * ) + tar_file_name=3D"$1"; shift + break + ;; + + esac + done + + if [ $# -gt 0 ]; then + echo "Superfluous args: $@" + error "${USAGE}" + fi + + tar_file=3D$(realpath "$tar_file_name") + sub_tdir=3D$(mktemp -d "${tar_file%.tar}.sub.XXXXXXXX") + sub_file=3D"${sub_tdir}/submodule.tar" +} =20 function cleanup() { local status=3D$? @@ -73,13 +115,19 @@ function subproject_dir() { echo "${dir:-$1}" } =20 -git archive --format tar "$(tree_ish)" > "$tar_file" +get_opts "$@" + +git archive --format tar ${git_archive_prefix} "$(tree_ish)" > "$tar_file" test $? -ne 0 && error "failed to archive qemu" =20 for sp in $subprojects; do meson subprojects download $sp test $? -ne 0 && error "failed to download subproject $sp" - tar --append --file "$tar_file" --exclude=3D.git subprojects/"$(subpro= ject_dir $sp)" + tar --append \ + --file "$tar_file" \ + --exclude=3D.git \ + ${tar_transform} \ + subprojects/"$(subproject_dir $sp)" test $? -ne 0 && error "failed to append subproject $sp to $tar_file" done exit 0 --=20 2.44.1