[{"id":1763556,"web_url":"http://patchwork.ozlabs.org/comment/1763556/","msgid":"","list_archive_url":null,"date":"2017-09-05T18:30:02","subject":"Re: [U-Boot] [PATCH] env: Fix out of tree building of tools-all","submitter":{"id":13206,"url":"http://patchwork.ozlabs.org/api/people/13206/","name":"Peter Robinson","email":"pbrobinson@gmail.com"},"content":"On Tue, Sep 5, 2017 at 7:20 PM, Tom Rini wrote:\n> With the move of environment code from common/ to env/ a number of\n> changes needed to be made to various make targets. We missed updating\n> some of the files required for out of tree builds of the tools. Correct\n> the 'environ' target to know that we need to work under tools/env/ still\n> (not tools/environ/) and then update the wrappers in env_attr.c and\n> env_flags.c to point to the new correct file.\n>\n> Reported-by: Peter Robinson \n> Signed-off-by: Tom Rini \nTested-by: Peter Robinson \n\nWorks for my use case, thanks for the quick fix.\n\nRegards,\nPeter\n\n> ---\n> Makefile | 2 +-\n> tools/env/env_attr.c | 2 +-\n> tools/env/env_flags.c | 2 +-\n> tools/env/fw_env.c | 2 +-\n> 4 files changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/Makefile b/Makefile\n> index 792162521155..020ebd50ad22 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -1466,7 +1466,7 @@ checkarmreloc: u-boot\n> fi\n>\n> environ: scripts_basic\n> - $(Q)$(MAKE) $(build)=tools/$@\n> + $(Q)$(MAKE) $(build)=tools/env\n>\n> tools-only: scripts_basic $(version_h) $(timestamp_h)\n> $(Q)$(MAKE) $(build)=tools\n> diff --git a/tools/env/env_attr.c b/tools/env/env_attr.c\n> index 502d4c900bf2..4d8536335c30 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\"\n> diff --git a/tools/env/env_flags.c b/tools/env/env_flags.c\n> index b261cb8e3907..71e13e2021f6 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> diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c\n> index 965e1662d702..ab06415898c2 100644\n> --- a/tools/env/fw_env.c\n> +++ b/tools/env/fw_env.c\n> @@ -755,7 +755,7 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count,\n>\n> /*\n> * If a block is bad, we retry in the next block at the same\n> - * offset - see common/env_nand.c::writeenv()\n> + * offset - see env/nand.c::writeenv()\n> */\n> lseek (fd, blockstart + block_seek, SEEK_SET);\n>\n> --\n> 1.9.1\n>","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=gmail.com header.i=@gmail.com\n\theader.b=\"I5nJbUS7\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmwHn0LXDz9sCZ\n\tfor ;\n\tWed, 6 Sep 2017 04:30:12 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 8CFD5C21D92; Tue, 5 Sep 2017 18:30:08 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id D0963C21C54;\n\tTue, 5 Sep 2017 18:30:05 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 4358FC21C54; Tue, 5 Sep 2017 18:30:05 +0000 (UTC)","from mail-wm0-f65.google.com (mail-wm0-f65.google.com\n\t[74.125.82.65])\n\tby lists.denx.de (Postfix) with ESMTPS id 7ED24C21C45\n\tfor ; Tue, 5 Sep 2017 18:30:04 +0000 (UTC)","by mail-wm0-f65.google.com with SMTP id p17so3598578wmd.3\n\tfor ; Tue, 05 Sep 2017 11:30:04 -0700 (PDT)","by 10.223.148.161 with HTTP; Tue, 5 Sep 2017 11:30:02 -0700 (PDT)"],"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=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=mime-version:in-reply-to:references:from:date:message-id:subject:to\n\t:cc; bh=7mpGnq1trKkT2ZFIUQHVhez2D4H0kkbIcv0vDiTOVrY=;\n\tb=I5nJbUS7tsH4cXAkDpqVijTV4uvfZ5w9jnDvRjHoxICPry4Nc7BJ2w9+AHU1zDVWqI\n\t2QpiVXUMF0vUVvC/wJQBQ9J13thM4OVwHHxWAd/HJIzdVvokh+e1fUS/QuF9JGI8nVIS\n\tRZLFqYlxDC33NVaPwF4AO3ayVTi3X7VbvpsBksSxs1exBD4vhz9e60iI3YMAU7FC+SEA\n\tGTudw5ROw3cjUkufCWL2IqXRV5rQQGlvjgKGheoWiM/YHeMMy4tqRqauM2w3xD+TOnPk\n\tVMdvpZl839TIZLrgv43INrPsNkct2u54PkapbO6pra8n0zil34+qHVYMd5Nn+YpdPf9F\n\tHBLA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:in-reply-to:references:from:date\n\t:message-id:subject:to:cc;\n\tbh=7mpGnq1trKkT2ZFIUQHVhez2D4H0kkbIcv0vDiTOVrY=;\n\tb=S+AtS736tkf+d8Uc7wcAKibNrOE++qBqMNE3Z81KWVk7taaZNFpQfN26J6/UI6dGv+\n\tVTFT4eVQHSqCvaLh2XPNkLJGVClcUCW19Wz4XnehAN1l5sisY+RcVrnhkzQ720Rve7va\n\tanWcv7uq0zMGAnKcVcDjj8SKr0JM6WQem1rHy5RCwjkBk0xbeL521BdrN9e5cancN6Om\n\t7eBW44HtrFTwTuOD404EHg14obFEdX8RJ8HswGeRZBhVmctXw2pgZcAg11juQwcZgPPh\n\tYvIyuqGoMtg4TQh+KXH301QzQbjYWEQJ13TaeJVc/cd5/6O2a111bumISWIHen5WB9vD\n\tGIiA==","X-Gm-Message-State":"AHPjjUg+elRM/syPKQ/NuJgTa1b07E8hpIvtTCLUlUCFwAX1oC4u7QRN\n\thQAHhnYvnGaPEELnnng2ViP2M6GVC9eCknk=","X-Google-Smtp-Source":"ADKCNb4SIJ0z+STwm+7svyblr9RTw9oKAQA5dJcWE3VxbMBe68Nm5mNDvzrZhTwr4UqKor4efg/QBj17O/sp6vvNj5s=","X-Received":"by 10.28.131.211 with SMTP id f202mr2899435wmd.187.1504636203492;\n\tTue, 05 Sep 2017 11:30:03 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<1504635609-23585-1-git-send-email-trini@konsulko.com>","References":"<1504635609-23585-1-git-send-email-trini@konsulko.com>","From":"Peter Robinson ","Date":"Tue, 5 Sep 2017 19:30:02 +0100","Message-ID":"","To":"Tom Rini ","Cc":"u-boot@lists.denx.de","Subject":"Re: [U-Boot] [PATCH] env: Fix out of tree building of tools-all","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\" "}},{"id":1763746,"web_url":"http://patchwork.ozlabs.org/comment/1763746/","msgid":"<20170906003604.GK17058@bill-the-cat>","list_archive_url":null,"date":"2017-09-06T00:36:04","subject":"Re: [U-Boot] [PATCH] env: Fix out of tree building of tools-all","submitter":{"id":65875,"url":"http://patchwork.ozlabs.org/api/people/65875/","name":"Tom Rini","email":"trini@konsulko.com"},"content":"On Tue, Sep 05, 2017 at 02:20:09PM -0400, Tom Rini wrote:\n\n> With the move of environment code from common/ to env/ a number of\n> changes needed to be made to various make targets. We missed updating\n> some of the files required for out of tree builds of the tools. Correct\n> the 'environ' target to know that we need to work under tools/env/ still\n> (not tools/environ/) and then update the wrappers in env_attr.c and\n> env_flags.c to point to the new correct file.\n> \n> Reported-by: Peter Robinson \n> Tested-by: Peter Robinson \n> Signed-off-by: Tom Rini \n\nApplied to u-boot/master, thanks!","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\" (1024-bit key;\n\tunprotected) header.d=konsulko.com header.i=@konsulko.com\n\theader.b=\"tSaZOHyc\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xn4SX2klqz9t2y\n\tfor ;\n\tWed, 6 Sep 2017 10:38:20 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid DD544C21DB1; Wed, 6 Sep 2017 00:36:46 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 34F9DC21E4C;\n\tWed, 6 Sep 2017 00:36:21 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 00838C21E13; Wed, 6 Sep 2017 00:35:37 +0000 (UTC)","from mail-yw0-f174.google.com (mail-yw0-f174.google.com\n\t[209.85.161.174])\n\tby lists.denx.de (Postfix) with ESMTPS id 6A631C21DA9\n\tfor ; Wed, 6 Sep 2017 00:35:36 +0000 (UTC)","by mail-yw0-f174.google.com with SMTP id r85so2517807ywg.1\n\tfor ; Tue, 05 Sep 2017 17:35:36 -0700 (PDT)","from bill-the-cat ([2606:a000:140b:dc:e812:f686:84fa:3ab0])\n\tby smtp.gmail.com with ESMTPSA id\n\tf184sm474285ywc.19.2017.09.05.17.35.34\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tTue, 05 Sep 2017 17:35:34 -0700 (PDT)"],"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=konsulko.com;\n\ts=google; \n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:in-reply-to:user-agent;\n\tbh=PzAKBJpCxSuO6NHj6xO1KaA0Nlfparobt1keE+JVfLE=;\n\tb=tSaZOHycZsLchupQ7vamVXiZBSPrSeCVVw7v0ta/9H7lN0Fw3/mQATWZ9S8HDgmyJx\n\tadocngpgtHf52j7E7omDQ/QrRQSqSNkNuXl9j79BQBlqitQL9im3Cl0IG7+wQRK8y8OU\n\toa2up4jMcZyVR3HFTsnUaMg+kwDocEiV46zQU=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:in-reply-to:user-agent;\n\tbh=PzAKBJpCxSuO6NHj6xO1KaA0Nlfparobt1keE+JVfLE=;\n\tb=T2srre2Xsb8KzH/NueB9Pd+myKtQHvpNZqgkO1mq81iF6W0mJaRlKI7GLgwMvj3rKo\n\t5hbSPqVgqiIPvxZPDHA+28aZFGXkAWPTNMUzooOeEMNCSGSGnc7rvR71nkNLdmB9sP3g\n\t4Fh0t9TeA2lJZd3RRKF6qrB0/hQWKqmSU+eXT3ibr+DiWAlwkoDCGHajRdRCTaJUFfIp\n\tK6MNSiVgfMJwLV7+XI1SR7YML556v11guBe0q+7dAY0hZ7b73JALjx8GOx6dfpLC6Y0/\n\tKdaDJuvve3+zLhdjQAp6e4NNXW9OesSgQcnPMTx9+nid+wg6h5gR9AI+gzNUm0cqquvK\n\t5YPg==","X-Gm-Message-State":"AHPjjUjFtKzUMXMvSqMkojyYNo+qKrN6dGduMtkQyPqqMwuz4BFD13Ek\n\tAZI7RF9LK4AhgAEe4je43A==","X-Google-Smtp-Source":"ADKCNb73kLUv783GhOAhNzEfdz8edbAI+uEBslfJ8BXho/MMEvW4IwuZuLKCrf1wvDcyZQKSoG2tsQ==","X-Received":"by 10.37.20.132 with SMTP id 126mr736621ybu.131.1504658135130;\n\tTue, 05 Sep 2017 17:35:35 -0700 (PDT)","Date":"Tue, 5 Sep 2017 20:36:04 -0400","From":"Tom Rini ","To":"u-boot@lists.denx.de","Message-ID":"<20170906003604.GK17058@bill-the-cat>","References":"<1504635609-23585-1-git-send-email-trini@konsulko.com>","MIME-Version":"1.0","In-Reply-To":"<1504635609-23585-1-git-send-email-trini@konsulko.com>","User-Agent":"Mutt/1.5.21 (2010-09-15)","Subject":"Re: [U-Boot] [PATCH] env: Fix out of tree building of tools-all","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":"multipart/mixed;\n\tboundary=\"===============2519404902308094353==\"","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "}}]