From patchwork Wed Oct 18 13:06:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 827589 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g8yRGOp6"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yHC5X1kk5z9t5Q for ; Thu, 19 Oct 2017 00:07:28 +1100 (AEDT) Received: from localhost ([::1]:44576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4o4E-00075N-Br for incoming@patchwork.ozlabs.org; Wed, 18 Oct 2017 09:07:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4o3w-00073w-Fq for qemu-devel@nongnu.org; Wed, 18 Oct 2017 09:07:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4o3s-0002Fo-Hd for qemu-devel@nongnu.org; Wed, 18 Oct 2017 09:07:08 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:47935) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4o3s-0002FZ-B0 for qemu-devel@nongnu.org; Wed, 18 Oct 2017 09:07:04 -0400 Received: by mail-wr0-x244.google.com with SMTP id y39so4963524wrd.4 for ; Wed, 18 Oct 2017 06:07:04 -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; bh=wZxRT3xUtyi63f4f69/fcrtE420p0SVoiP2cZeuH25Y=; b=g8yRGOp698z5k1dSA6P4OZ1RTviVwZCbvtGFAYCOP9Z5yl19IMn3z6ubjKwAavy8yw xtj3Yz/a2C0pA7jM116AdbPTXxU71nNn7x3SmVkz63YwFaGgTvxi5Ya6yxwqaqKaMB/4 +SEcUeNJ2Q8/4Z6lSsONCCwGRWz85nejvFyophWd/J3YXJgiZMfdgwGHpImxa4wXn46W q3d6o7pl/gw7ajHgXOYPkvmeWH2ftLdMY1Ebh/HIMunIyp08cCf1E4HmY7HvW+z3aUHo 6p1wU1FUPrvTJMDA/mDvX6zEAqxz7OnYaNr6jK9Eu8dz89wBSJM68MCuVrz+L47Oyklz vbkA== 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; bh=wZxRT3xUtyi63f4f69/fcrtE420p0SVoiP2cZeuH25Y=; b=q9Dkfyx6mBrmPc+A8/QkjL6h10GdM/8MNNdYoPSqVNjw6OoWyy7IwkeJ0TtLM9ifPD nws/DEK5Sf/ef2PBukfOq994y5JicO3tnJMJCVc+WAKX0u068VJsJrMbjJ7N6bPSjmlN o4VlFogIYxHpNOYR5V5XHM3t4Sp1XnDxBIt0f80j+jG+UfZi3dFT7vaNjEOjAfxgZU8m D6xvnwlkWt/CFza/gzVCuICRlbuqQMp4O/xzbdQU0/BpUWK4SMFLvmVF/RdCbhtV7MEt 5KHiB3pfnly1Y98UD5PZj607PgYSkdNqkYt/AsmeiwNNaThx5flQ+JcQKPP8qMFaSgs3 r47Q== X-Gm-Message-State: AMCzsaWhQPe7iILh0Iy798kj7/x8DFEErbrsEM6002AvNzrJYfuTwAD3 xwu+z/BkqaxnLgV76WRNYlANKWb2 X-Google-Smtp-Source: ABhQp+RanuMCxxYpt5OQ398rw1whxKnqLgKDnyYkjliODuJJcHfR4Yo/+/JdJ8MGlPO+O4T93jOneQ== X-Received: by 10.223.129.198 with SMTP id 64mr6370272wra.59.1508332022858; Wed, 18 Oct 2017 06:07:02 -0700 (PDT) Received: from 640k.lan (94-39-155-245.adsl-ull.clienti.tiscali.it. [94.39.155.245]) by smtp.gmail.com with ESMTPSA id p78sm15504019wma.11.2017.10.18.06.07.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Oct 2017 06:07:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 18 Oct 2017 15:06:29 +0200 Message-Id: <1508331989-142364-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH] docker: allow running from srcdir != builddir build 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: Fam Zheng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The new script uses "git submodule", which is picky about being invoked from the top of the git checkout. Invoke the script from $(SRC_PATH) to avoid git's wrath. Fixes: b7f404201e45e99da23b9764dec27ce5f965cdcd Cc: Fam Zheng Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrange --- tests/docker/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 6f9ea19..b6d9fa3 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -18,11 +18,11 @@ TESTS ?= % IMAGES ?= % CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) -DOCKER_SRC_COPY := docker-src.$(CUR_TIME) +DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) $(DOCKER_SRC_COPY): @mkdir $@ - $(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \ + $(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh $@/qemu.tar, \ "GEN", "$@/qemu.tar") $(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \ "COPY","RUNNER")