{"id":809979,"url":"http://patchwork.ozlabs.org/api/patches/809979/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20170905075359.53509-1-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170905075359.53509-1-sjg@chromium.org>","list_archive_url":null,"date":"2017-09-05T07:53:58","name":"[U-Boot,v2,1/2] env: Fix operation of 'make environ'","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"9b62664759c8aad099369d3b01e840504727cfe4","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20170905075359.53509-1-sjg@chromium.org/mbox/","series":[{"id":1502,"url":"http://patchwork.ozlabs.org/api/series/1502/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=1502","date":"2017-09-05T07:53:59","name":"[U-Boot,v2,1/2] env: Fix operation of 'make environ'","version":2,"mbox":"http://patchwork.ozlabs.org/series/1502/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809979/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809979/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"BG4OjTQu\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmfCl30J8z9s3w\n\tfor ;\n\tTue, 5 Sep 2017 17:55:47 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 2E2DAC21EE6; Tue, 5 Sep 2017 07:55:02 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 1AD8FC21DA3;\n\tTue, 5 Sep 2017 07:54:44 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 8A324C21C26; Tue, 5 Sep 2017 07:54:41 +0000 (UTC)","from mail-oi0-f46.google.com (mail-oi0-f46.google.com\n\t[209.85.218.46])\n\tby lists.denx.de (Postfix) with ESMTPS id C73BAC21C2B\n\tfor ; Tue, 5 Sep 2017 07:54:40 +0000 (UTC)","by mail-oi0-f46.google.com with SMTP id x184so19491764oia.0\n\tfor ; Tue, 05 Sep 2017 00:54:40 -0700 (PDT)","from kiwi.bld.corp.google.com ([100.101.164.89])\n\tby smtp.gmail.com with ESMTPSA id\n\to204sm109492oib.5.2017.09.05.00.54.38\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 05 Sep 2017 00:54:38 -0700 (PDT)","by kiwi.bld.corp.google.com (Postfix, from userid 121222)\n\tid EB05F140719; Tue, 5 Sep 2017 01:54:36 -0600 (MDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n\ts=20161025; \n\th=sender:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=sYpy2ENrwbg5VVbJdQv1FE/6VPe5dZ6CjltNGzDbpDA=;\n\tb=BG4OjTQuCYa3/rsg5rCS7lUcb3AK1BnYXQN29dw842U128g04P5Pkg5rVnkuhdtOiu\n\tCdVJ1/rHid7UKkdjfCGOhgrSQ8NmJQJe5Ykfh+/RG+3+zTYgHiGIVr0pkuF2JJRXfdlM\n\tAgDt4aMnVjrY1W51ToabVVTiAyrCSnG1dfOAT7uwRLFDe7axDC1+La9bbNGd7w2O+HYg\n\tae71poq3Y8oH9XnV/+rTCBe7onxD1NUoEMFzUeyTB6oFwe6sFyxspZHAfcrEz7wiK64M\n\tHcSOe++N0xTSNLPBuXwh4FuGHgcaYtw+M9y3i8usXkb/sfr1+MQJfVirhbDB7PDMAwbl\n\tpoYA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:mime-version:content-transfer-encoding;\n\tbh=sYpy2ENrwbg5VVbJdQv1FE/6VPe5dZ6CjltNGzDbpDA=;\n\tb=dQuck+ii20kaJfSb4Zbklab3pavM4UPBiNSyTN0/nUy8Do79NCFPX2Rp7qMZ4axbnB\n\tmZsvciuX7/VRmghXvt7DoZTcStPQTjRNq3b9O8s6noaBteVZatrGMM1gctNndCJ7MgiW\n\tZe0gPlPcloYvoYr27FrceojR95DT9stqfHayly0h3/MMaBYFBdVkv+weTZdbroF+NLGU\n\tVWs8nzbiKRlARu+1NbaLK42FH8yUHmGVGM4J75pZZ2SoWxilafm/MXbvG3upKuMoTqfm\n\tANopD+DjxpnNyKea+0JOVgrDAGr66VF3Fhq9mnIOiiyLYzPYrqOOHbqbHckKC4W24X1Q\n\thkzw==","X-Gm-Message-State":"AHPjjUhwmU/9+Hytv5KiOh1yCmLf/VgOOlQV1ITT8uYax23t6l49v8vY\n\tTSEWRFlPUDYOoxs4tIMV9w==","X-Google-Smtp-Source":"ADKCNb7X5K7Ru822UEez5QhqEVGvgiroEqj8Ps4CN3NrNslSDn4fk76CeopgP8LE7DTOG24c5fKvzA==","X-Received":"by 10.202.71.5 with SMTP id u5mr2669919oia.100.1504598079359;\n\tTue, 05 Sep 2017 00:54:39 -0700 (PDT)","From":"Simon Glass ","To":"U-Boot Mailing List ","Date":"Tue, 5 Sep 2017 01:53:58 -0600","Message-Id":"<20170905075359.53509-1-sjg@chromium.org>","X-Mailer":"git-send-email 2.14.1.581.gf28d330327-goog","MIME-Version":"1.0","Cc":"Tom Rini , =?utf-8?b?TcOlbnMgUnVsbGfDpXJk?=\n\t, Joe Hershberger ","Subject":"[U-Boot] [PATCH v2 1/2] env: Fix operation of 'make environ'","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"This was broken by the recent environment refactoring. Specifically:\n\n$ make environ\nscripts/Makefile.build:59: tools/environ/Makefile: No such file or directory\nmake[1]: *** No rule to make target 'tools/environ/Makefile'. Stop.\nmake: *** [Makefile:1469: environ] Error 2\n\nFix this by updating the Makefile and adjusting the #include filesnames in\ntwo C files.\n\nFixes: ec74f5f (Makefile: Rename 'env' target to 'environ')\nReported-by: Måns Rullgård \nSigned-off-by: Simon Glass \n---\n\nChanges in v2:\n- Use 'envtools' target\n- Update tools/env/Makefile to mention the new target\n\n Makefile | 4 ++--\n tools/env/README | 4 ++--\n tools/env/env_attr.c | 2 +-\n tools/env/env_flags.c | 2 +-\n 4 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/Makefile b/Makefile\nindex 7921625211..b19e3bd388 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1465,8 +1465,8 @@ checkarmreloc: u-boot\n \t\tfalse; \\\n \tfi\n \n-environ: scripts_basic\n-\t$(Q)$(MAKE) $(build)=tools/$@\n+envtools: scripts_basic\n+\t$(Q)$(MAKE) $(build)=tools/env\n \n tools-only: scripts_basic $(version_h) $(timestamp_h)\n \t$(Q)$(MAKE) $(build)=tools\ndiff --git a/tools/env/README b/tools/env/README\nindex 24e31bc9f8..bc6e2c11ef 100644\n--- a/tools/env/README\n+++ b/tools/env/README\n@@ -3,9 +3,9 @@ This is a demo implementation of a Linux command line tool to access\n the U-Boot's environment variables.\n \n In order to cross-compile fw_printenv, run\n- make CROSS_COMPILE= env\n+ make CROSS_COMPILE= envtools\n in the root directory of the U-Boot distribution. For example,\n- make CROSS_COMPILE=arm-linux- env\n+ make CROSS_COMPILE=arm-linux- envtools\n \n For the run-time utility configuration uncomment the line\n #define CONFIG_FILE \"/etc/fw_env.config\"\ndiff --git a/tools/env/env_attr.c b/tools/env/env_attr.c\nindex 502d4c900b..4d8536335c 100644\n--- a/tools/env/env_attr.c\n+++ b/tools/env/env_attr.c\n@@ -1 +1 @@\n-#include \"../../common/env_attr.c\"\n+#include \"../../env/attr.c\"\ndiff --git a/tools/env/env_flags.c b/tools/env/env_flags.c\nindex b261cb8e39..71e13e2021 100644\n--- a/tools/env/env_flags.c\n+++ b/tools/env/env_flags.c\n@@ -1 +1 @@\n-#include \"../../common/env_flags.c\"\n+#include \"../../env/flags.c\"\n","prefixes":["U-Boot","v2","1/2"]}