From nobody Tue Feb 10 03:38:38 2026 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; dkim=fail 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 1494220213473392.4856931599078; Sun, 7 May 2017 22:10:13 -0700 (PDT) Received: from localhost ([::1]:57689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7aw0-0005Oi-6f for importer@patchew.org; Mon, 08 May 2017 01:10:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7akt-0003xh-3z for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7ako-0007wS-9h for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:43 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:35383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7ako-0007w2-4z for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:38 -0400 Received: by mail-qk0-x244.google.com with SMTP id k74so8663341qke.2 for ; Sun, 07 May 2017 21:58:37 -0700 (PDT) Received: from localhost.localdomain ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id m188sm4358549qkc.5.2017.05.07.21.58.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 May 2017 21:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qoCq0u1pUaX7Cgu6wsoI70i+Njie5KE9FKeMXB0BEoQ=; b=gW1LcPbuCUrR4EsjXrni+pZl0NPQW8Ueo4RJ6LGkaFWkzL8ucvjU8k/Z2naYqxvsuW n7eMl8kOO+c/m3u1vog64V6mHhnZ0ddzOebk50Q8vNgiaIOl4mtGCGyFzFF5G4wrfjho KqBjQ5p1unEdXZNsWmGw3KQk2PZujVlNhdYyC2PvtWPKrKh2JEJ+1Ds0m2sJYd7ZhQSJ tN6jFfr4tHJqNtGb7TsvQ8ScnLztuNg/FQfzohzwXwoxbqCGKgZQCwLJyZYJiTQDIbSE hOElA3Jw8zkPnyGytfqxcXn9WJ81IhfzPxEyAdnvr6YuXXlgPprPDUVm17S/YGNjX0Yx SRIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qoCq0u1pUaX7Cgu6wsoI70i+Njie5KE9FKeMXB0BEoQ=; b=I9/Etx5pKb5V6uvFo3+Iazic8DlPDWqxkgoPt0f3qonK4+CYDCZY557rnawO26cN4u NfqntQqqlRGGoO3h70NUmTh/VIklYC2vUW1oHoQ6UjFNXIneI8E0qSEAMlD23CTnqIiW 7rQFtcmlL5/QF5G396p0MUY8Et3dkzOlwtDfDYsw7qFvIZf62RpQCqGPl0lsF2VqBkWV KUCm7T5EzHk6BLSk9muxp/YqOX/BeVm2lPvkSxeo57KzGrq/89DrdRfheAgEgiT9ZONX zp8aoF+t9Lnaxf1WdPGY59lZgtauiiSHsT2RyKRwYeEsGUc07CuuAPeQ/r8S2Wbe+6m2 nR3Q== X-Gm-Message-State: AODbwcCWAi/W3PmrWh8HJTHEeSjPkdQ+akmpsisJaso19auaajX9ff/i fNa2xR7iZFHzXQ== X-Received: by 10.55.128.198 with SMTP id b189mr22289557qkd.301.1494219517534; Sun, 07 May 2017 21:58:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Mon, 8 May 2017 01:57:05 -0300 Message-Id: <20170508045715.21770-14-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170508045715.21770-1-f4bug@amsat.org> References: <20170508045715.21770-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [RFC PATCH 13/23] docker: add --include-file argument to 'build' command 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 3 ++- tests/docker/docker.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ceff2c1654..47978fb56c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -51,7 +51,8 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ - $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)),\ + $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE))\ + $(if $(EXTRA_FILE),--include-file=3D$(EXTRA_FILE)),\ "BUILD","$*") =20 # Enforce dependancies for composite images diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 6ddc6e4c2a..4c096a8178 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -237,6 +237,9 @@ class BuildCommand(SubCommand): help=3D"""Specify a binary that will be copied= to the container together with all its dependent libraries""") + parser.add_argument("--include-file", "-f", + help=3D"""Specify a binary that will be copied= to the + container""") parser.add_argument("--add-current-user", "-u", dest=3D"user", action=3D"store_true", help=3D"Add the current user to image's passwd= ") @@ -274,6 +277,8 @@ class BuildCommand(SubCommand): if args.include_executable: _copy_binary_with_libs(args.include_executable, docker_dir) + if args.include_file: + _copy_with_mkdir(args.include_file, docker_dir) =20 argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v for k, v in os.environ.iteritems() --=20 2.11.0