From patchwork Mon May 8 22:17:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 9716777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2F7596035D for ; Mon, 8 May 2017 22:19:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23D572684F for ; Mon, 8 May 2017 22:19:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18BC82624A; Mon, 8 May 2017 22:19:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9009E2624A for ; Mon, 8 May 2017 22:19:46 +0000 (UTC) Received: from localhost ([::1]:33917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7r0L-0008G3-NP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 May 2017 18:19:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7qyw-0008Ey-8O for qemu-devel@nongnu.org; Mon, 08 May 2017 18:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7qyv-0006kr-EC for qemu-devel@nongnu.org; Mon, 08 May 2017 18:18:18 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34462) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7qyv-0006ke-9s for qemu-devel@nongnu.org; Mon, 08 May 2017 18:18:17 -0400 Received: by mail-qt0-x243.google.com with SMTP id l39so11476280qtb.1 for ; Mon, 08 May 2017 15:18:17 -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=HeMUuF5y/IKunsBpYWtLNj0XNfretjHBo857usgIaYs=; b=EG9Npd148NDzhFLvigfhiCBD311smJhss0vYY0pLMokR+LodTWSMmY+6Sl6qYzQ5oR nVHHqZzQ40aEmbpEvBEPu2E0NPUhjKK5m6XoSY7+wovuf6tUQOgLyRaU0mNrTikW24lf uYNmQORQdr8wCuV1qh+Zxft1m968uWTCx6Y0pHnR1gwe/fT4Qivq3g+N/tKvDWfK6avs OfmeJkfsH5tic96aklO5jRo8VjiP79ynHHrtvtD5fKbebBGK/K8pPbDFgf5U5ZlbCktX /t0RAwgY4bv5M6BjmPPghA+9nkflwgVUyF9FRvkql37zAlIXpzrtfKQxk3dh+KNxGgLH Q0QA== 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=HeMUuF5y/IKunsBpYWtLNj0XNfretjHBo857usgIaYs=; b=XTUZtLMfAhI2awLjWPAaeF8k/FcRBxM00okyh/U5PbJ+3jV8TFKsJCYX9BEeEblH4q gvHUb0lB2wq+aUhPNDfwdKZBiCTvjiU3zXNAA1r+59ZKH7mnXx952cAt0MHcUu4joJFo diwJ5yuy51WghFymQ9ZkspCz2B6QAa8AUV3Fq/+jMDu/b8OY5MeUJQ0G78KO6e3mLYVn knV/WLgEP3qloUDcj5Kms3IdvFQhPeY7BmQykxHOKqv3hv+pYntayrcq1fDQRVQXtz/c UX5W4axqwIzX+JRqu9DCGm+WjI+J4t1ybE3GiBD8PsPYLJbKBwemKDNcO6VC7+fPsP0f nKNw== X-Gm-Message-State: AN3rC/5oV0nBKIce+dSfv0PnfddiAUUkctTYgkbRF35zRb40ge0drNaI 6KE4+rpW3ymWCg== X-Received: by 10.200.38.21 with SMTP id u21mr53948330qtu.96.1494281896863; Mon, 08 May 2017 15:18:16 -0700 (PDT) Received: from localhost.localdomain ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id k65sm10157286qkf.18.2017.05.08.15.18.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 May 2017 15:18:16 -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 19:17:40 -0300 Message-Id: <20170508221759.15616-3-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170508221759.15616-1-f4bug@amsat.org> References: <20170508221759.15616-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 02/21] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé --- 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 03eda37bf4..c99ce702ea 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=$(EXECUTABLE)),\ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE))\ + $(if $(EXTRA_FILE),--include-file=$(EXTRA_FILE)),\ "BUILD","$*") # Enforce dependancies for composite images diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 6ddc6e4c2a..90520e4bca 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -237,6 +237,9 @@ class BuildCommand(SubCommand): help="""Specify a binary that will be copied to the container together with all its dependent libraries""") + parser.add_argument("--include-file", "-f", + help="""Specify a file that will be copied to the + container""") parser.add_argument("--add-current-user", "-u", dest="user", action="store_true", help="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) argv += ["--build-arg=" + k.lower() + "=" + v for k, v in os.environ.iteritems()