From patchwork Wed May 12 10:20:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 435478 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp4687932jao; Wed, 12 May 2021 03:24:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLSGaCuDwuThdsmws1AXODoFR8MFz42/tGR9Sr0t0H0QJoI2W+f9N+JAmwa38hqgcDPxjU X-Received: by 2002:a37:9ac1:: with SMTP id c184mr33150328qke.201.1620815081008; Wed, 12 May 2021 03:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620815081; cv=none; d=google.com; s=arc-20160816; b=vrlYvCGe2Nzev+B78+JtfYmGD6PhdmbnL136rZJn6FNVB1Cor2d82ujpipq7/Pk0eW zQIea4p6J/m8NcsPVGexx6STE7wsfO9mdg2ooo5f2Wrkwa1iH92W1triVtuvszkqGo6n QX3ALldVeck/TguyHWleQGgPzzusuuCn3mzgmZPpZ+WFJL7NZDAl9YG6G7iuhiXkw440 34V40+PlDeHvPp2EAU85OvdddTJjrSlHa+AjucUHkF5yj6APBRNeCEtX92UmmH3QAJ5M nfsdGU/534e1dRBQrikr/xTb1ANrUGlrmDimEMHduHnVi/dzWfsLmsind99is0OJznP7 E3cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=+W6vzYOHSyrjetzgB57V0E/SW7N0nADhYjK0hwWdl18=; b=sk5CBIjoYtHYnm8dsslzsNz39bdLGmKbCiloDexMk24nwDaeSeUXqx4wk7Kgv30BVW 8KraR4TonvRVy48jphvnhrCHrSfpxvO/8KT8RF+ktnsmbt1bt8lZMJ/VfeMAV1gKJ2E2 hhuB75A5cxwkNzrnBA8G5VaC55hWlmWgAK1ct8XJLjPgX88qpj56HCiKp4yhzyd1jSRQ oxpxzp1DDEg1RVGpnTT89e5zc4T0d+WqjhFuLRcV/VVjZ7YvfLBhXua9QzY3+KQMPeyd J5lOlvW+poGCNn3RJn+fkgSiR+i0WHM3l8eck3UgZAUcYjjRWxf938PCfIcUwjVxmPwM LLKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aQ+5Uk+R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f9si2423673qtf.44.2021.05.12.03.24.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 May 2021 03:24:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aQ+5Uk+R; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgm2i-0000Eo-B0 for patch@linaro.org; Wed, 12 May 2021 06:24:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lglzB-0003DT-6l for qemu-devel@nongnu.org; Wed, 12 May 2021 06:21:01 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:40888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lglz8-0003VM-77 for qemu-devel@nongnu.org; Wed, 12 May 2021 06:21:00 -0400 Received: by mail-wm1-x333.google.com with SMTP id y124-20020a1c32820000b029010c93864955so1111891wmy.5 for ; Wed, 12 May 2021 03:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+W6vzYOHSyrjetzgB57V0E/SW7N0nADhYjK0hwWdl18=; b=aQ+5Uk+RP9Lsj/h5jiNwXSsaLhsnSJuM0jsevcqTAmRf0VC6t2O95R7pvR8fchp45P p9flr9ZMDgQjp4v+3w8BnJLcaUopapdPq4/gUwR44eOG7ptmPWIctinj9ntTIHTKtik1 l0LgC2cUOraYEedxpy9bk29K4J72KleWm4RLW+fBkddJC6eyEkxAgxdxd5gRJSBzG2EK yLN9aPdYauPoEIfkT21aTdUJGmx0eBScNRXNcz8Ko3EtnFRX45pVOHsal4xABm5n3cx2 UvVe4o8Wtfop6hwXc6l8YuX7d6S5At5ddiZZd2UQOFJvggZW9w+G4R8cIWiv2DHePrBD 9tgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+W6vzYOHSyrjetzgB57V0E/SW7N0nADhYjK0hwWdl18=; b=sylhHKZ/i/qGNapf+a4henhJCudDdasuHzysV4A1rlycRqFHOOdvwbggtfYkcmC7IW bKAE+awNzDxm7W3YGZfEiSWR5Ljpe7OqVmy7DGKwA2I9z/6K7DqTlMdZgUFY2kYcQT39 4qL3XFzwS4JhMnOTuDYFsA2LikWvCUq0sx/svpMzX5JWGaFeo8uGMDVEKGLMnrL0BtZX EtLC2+a/KmnVdjGoNCTH+I3zC7Dx45TgWNWFbONsr7O8ZBAUKC0vrh7MDnv9rCG93LI1 capj1Zk9Z2kvnF4o1vJQbjiI1utQVmbYIdKRtjOHogsCo5Fj6M1d9lNxoz9SIFf4kcIa MYWg== X-Gm-Message-State: AOAM532ECrLeaF2+2XO0bYTlA08NuvJu9aLmutUf4QwW6+QHxT+vG40X 75IHHmJR9fRfpAAzmdQXCpfvEfRSKcHdtw== X-Received: by 2002:a7b:c217:: with SMTP id x23mr10552406wmi.26.1620814856821; Wed, 12 May 2021 03:20:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z5sm953072wrn.69.2021.05.12.03.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 03:20:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6849C1FF8F; Wed, 12 May 2021 11:20:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 03/31] tests/docker: make executable an optional argument to "update" Date: Wed, 12 May 2021 11:20:23 +0100 Message-Id: <20210512102051.12134-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210512102051.12134-1-alex.bennee@linaro.org> References: <20210512102051.12134-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We're going to extend the abilities of the command shortly. Reviewed-by: Willian Rampazzo Signed-off-by: Alex Bennée --- v2 - fix indention issue --- tests/docker/Makefile.include | 2 +- tests/docker/docker.py | 56 ++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 28 deletions(-) -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9f464cb92c..820423d718 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -248,7 +248,7 @@ docker-run: docker-qemu-src $(if $(EXECUTABLE), \ $(call quiet-command, \ $(DOCKER_SCRIPT) update \ - $(IMAGE) $(EXECUTABLE), \ + $(IMAGE) --executable $(EXECUTABLE), \ " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ $(DOCKER_SCRIPT) run \ diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 0435a55d10..9b3425fec2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -523,7 +523,7 @@ class UpdateCommand(SubCommand): def args(self, parser): parser.add_argument("tag", help="Image Tag") - parser.add_argument("executable", + parser.add_argument("--executable", help="Executable to copy") def run(self, args, argv): @@ -532,35 +532,37 @@ def run(self, args, argv): tmp = tempfile.NamedTemporaryFile(suffix="dckr.tar.gz") tmp_tar = TarFile(fileobj=tmp, mode='w') - # Add the executable to the tarball, using the current - # configured binfmt_misc path. If we don't get a path then we - # only need the support libraries copied - ff, enabled = _check_binfmt_misc(args.executable) - - if not enabled: - print("binfmt_misc not enabled, update disabled") - return 1 - - if ff: - tmp_tar.add(args.executable, arcname=ff) - - # Add any associated libraries - libs = _get_so_libs(args.executable) - if libs: - for l in libs: - so_path = os.path.dirname(l) - name = os.path.basename(l) - real_l = os.path.realpath(l) - try: - tmp_tar.add(real_l, arcname="%s/%s" % (so_path, name)) - except FileNotFoundError: - print("Couldn't add %s/%s to archive" % (so_path, name)) - pass - # Create a Docker buildfile df = StringIO() df.write(u"FROM %s\n" % args.tag) - df.write(u"ADD . /\n") + + if args.executable: + # Add the executable to the tarball, using the current + # configured binfmt_misc path. If we don't get a path then we + # only need the support libraries copied + ff, enabled = _check_binfmt_misc(args.executable) + + if not enabled: + print("binfmt_misc not enabled, update disabled") + return 1 + + if ff: + tmp_tar.add(args.executable, arcname=ff) + + # Add any associated libraries + libs = _get_so_libs(args.executable) + if libs: + for l in libs: + so_path = os.path.dirname(l) + name = os.path.basename(l) + real_l = os.path.realpath(l) + try: + tmp_tar.add(real_l, arcname="%s/%s" % (so_path, name)) + except FileNotFoundError: + print("Couldn't add %s/%s to archive" % (so_path, name)) + pass + + df.write(u"ADD . /\n") df_bytes = BytesIO(bytes(df.getvalue(), "UTF-8"))