[{"id":1770013,"web_url":"http://patchwork.ozlabs.org/comment/1770013/","msgid":"<87fubkjqws.fsf@linaro.org>","list_archive_url":null,"date":"2017-09-18T09:29:39","subject":"Re: [Qemu-devel] [PATCH v8 13/13] docker: Use archive-source.py","submitter":{"id":39532,"url":"http://patchwork.ozlabs.org/api/people/39532/","name":"Alex Bennée","email":"alex.bennee@linaro.org"},"content":"Fam Zheng writes:\n\n> Signed-off-by: Fam Zheng \n\nReviewed-by: Alex Bennée \n\n> ---\n> tests/docker/Makefile.include | 15 ++-------------\n> tests/docker/run | 8 +-------\n> 2 files changed, 3 insertions(+), 20 deletions(-)\n>\n> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include\n> index aaab1a4208..7a027d5bd6 100644\n> --- a/tests/docker/Makefile.include\n> +++ b/tests/docker/Makefile.include\n> @@ -17,24 +17,13 @@ DOCKER_TOOLS := travis\n> TESTS ?= %\n> IMAGES ?= %\n>\n> -# Make archive from git repo $1 to tar.gz $2\n> -make-archive-maybe = $(if $(wildcard $1/*), \\\n> -\t$(call quiet-command, \\\n> -\t\t(cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \\\n> -\t\t\tgit archive -1 HEAD --format=tar.gz; \\\n> -\t\telse \\\n> -\t\t\tgit archive -1 $$(git stash create) --format=tar.gz; \\\n> -\t\tfi) > $2, \\\n> -\t\t\"ARCHIVE\",\"$(notdir $2)\"))\n> -\n> CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)\n> DOCKER_SRC_COPY := docker-src.$(CUR_TIME)\n>\n> $(DOCKER_SRC_COPY):\n> \t@mkdir $@\n> -\t$(call make-archive-maybe, $(SRC_PATH), $@/qemu.tgz)\n> -\t$(call make-archive-maybe, $(SRC_PATH)/dtc, $@/dtc.tgz)\n> -\t$(call make-archive-maybe, $(SRC_PATH)/pixman, $@/pixman.tgz)\n> +\t$(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \\\n> +\t\t\"GEN\", \"$@/qemu.tar\")\n> \t$(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \\\n> \t\t\"COPY\",\"RUNNER\")\n>\n> diff --git a/tests/docker/run b/tests/docker/run\n> index c1e4513bce..9eb9165f76 100755\n> --- a/tests/docker/run\n> +++ b/tests/docker/run\n> @@ -32,13 +32,7 @@ export TEST_DIR=/tmp/qemu-test\n> mkdir -p $TEST_DIR/{src,build,install}\n>\n> # Extract the source tarballs\n> -tar -C $TEST_DIR/src -xzf $BASE/qemu.tgz\n> -for p in dtc pixman; do\n> - if test -f $BASE/$p.tgz; then\n> - tar -C $TEST_DIR/src/$p -xzf $BASE/$p.tgz\n> - export FEATURES=\"$FEATURES $p\"\n> - fi\n> -done\n> +tar -C $TEST_DIR/src -xf $BASE/qemu.tar\n>\n> if test -n \"$SHOW_ENV\"; then\n> if test -f /packages.txt; then\n\n\n--\nAlex Bennée","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"VaWe0kYJ\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwgjT095Kz9s7M\n\tfor ;\n\tMon, 18 Sep 2017 19:30:49 +1000 (AEST)","from localhost ([::1]:35415 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtsO6-0000IB-9p\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 05:30:46 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55512)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtsN8-0008FJ-Et\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:29:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtsN4-00081C-Gh\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:29:46 -0400","from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:44904)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtsN4-00080x-9p\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 05:29:42 -0400","by mail-wm0-x236.google.com with SMTP id 189so12272608wmh.1\n\tfor ; Mon, 18 Sep 2017 02:29:42 -0700 (PDT)","from zen.linaro.local ([81.128.185.34])\n\tby smtp.gmail.com with ESMTPSA id\n\tk141sm6975187wmg.15.2017.09.18.02.29.40\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 02:29:40 -0700 (PDT)","from zen (localhost [127.0.0.1])\n\tby zen.linaro.local (Postfix) with ESMTPS id BE60D3E00DB;\n\tMon, 18 Sep 2017 10:29:39 +0100 (BST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=references:user-agent:from:to:cc:subject:in-reply-to:date\n\t:message-id:mime-version:content-transfer-encoding;\n\tbh=erWFHxMHt5ZQ2qD0j2kaXHx+TYUNrXHtmg56Jg1pr1g=;\n\tb=VaWe0kYJ0dLtxQdB6pw+Al8HCyZ9JClG1JxOQ23bUvu9GifOW7YdIg7j/sam/kn0z5\n\thxvAEzpuj42ggyrrt3EJ+unqb/63/3ZRauIVNTKwQaQTRYXCCBWlki9KEZVPsExHUCTr\n\tzVIRfhsCoMQixRDBinLccGesZ5p+USmByZ6Mw=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:references:user-agent:from:to:cc:subject\n\t:in-reply-to:date:message-id:mime-version:content-transfer-encoding; \n\tbh=erWFHxMHt5ZQ2qD0j2kaXHx+TYUNrXHtmg56Jg1pr1g=;\n\tb=jtDFuJJeuZo6jXYoK3DW04EZA0auhY2vP52Fz+HvYWZq73ty1OWMf6PDbCsY+NnZ3q\n\tyyI0caEGxRJA64L/s5lUGtPHIoKE/rn4f1wEJJIvNN+YsmLGGtzcrf8nlMSHmiLvPQtX\n\tdAsTGSlkp//sBeBEwAGGwQTxrh2MQogdMd86DqRvkGYszvKglRkNBLQzhjtZ+Gdra1Lo\n\t4byY28zVTRmY5oSQIwnwzK8D9brbNKFBhpPUXTAfspnvmzxh3FlZWVdoKRdxHzyowkle\n\tjz9ZOH3/HtuT9u9MDBAPS9jG0NZ8WneU1VeiO4kYa4sctYycAa8x+tiRYHpAfgRya2U2\n\tpEoQ==","X-Gm-Message-State":"AHPjjUgSOs6oxAzg1QA7IZEf0UPOHyG/Ab9iOE/bXXfY/EY1oigfCmwD\n\traGkyjHv6ixPbcUL","X-Google-Smtp-Source":"AOwi7QAjrwwkgAs7Gr2mhz8bLEnu6SfqJl4reiYOT+xTGX1Acuxegaw1Z+40j+W1gzVUWSc8LLx/pw==","X-Received":"by 10.28.143.138 with SMTP id r132mr4273356wmd.18.1505726981114; \n\tMon, 18 Sep 2017 02:29:41 -0700 (PDT)","References":"<20170918024402.3265-1-famz@redhat.com>\n\t<20170918024402.3265-14-famz@redhat.com>","User-agent":"mu4e 0.9.19; emacs 25.3.50.1","From":"Alex =?utf-8?q?Benn=C3=A9e?= ","To":"Fam Zheng ","In-reply-to":"<20170918024402.3265-14-famz@redhat.com>","Date":"Mon, 18 Sep 2017 10:29:39 +0100","Message-ID":"<87fubkjqws.fsf@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2a00:1450:400c:c09::236","Subject":"Re: [Qemu-devel] [PATCH v8 13/13] docker: Use archive-source.py","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell , qemu-devel@nongnu.org, Philippe\n\t=?utf-8?q?Mathieu-Daud=C3=A9?= ,\n\tKamil Rytarowski , stefanha@redhat.com, \n\tCleber Rosa , pbonzini@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]