Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753917AbcLKVUl (ORCPT ); Sun, 11 Dec 2016 16:20:41 -0500 Received: from mx2.suse.de ([195.135.220.15]:38026 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751752AbcLKVUk (ORCPT ); Sun, 11 Dec 2016 16:20:40 -0500 Subject: Re: [PATCH] tags: honor COMPILED_SOURCE with apart output directory To: Robert Jarzmik References: <1476736079-11963-1-git-send-email-robert.jarzmik@free.fr> <8737i12rxt.fsf@belgarion.home> Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org From: Michal Marek Message-ID: <7aea4608-2a38-ab02-6c24-beba5a737935@suse.com> Date: Sun, 11 Dec 2016 22:20:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.0 MIME-Version: 1.0 In-Reply-To: <8737i12rxt.fsf@belgarion.home> Content-Type: text/plain; charset=iso-8859-2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1187 Lines: 36 Dne 6.12.2016 v 12:54 Robert Jarzmik napsal(a): > Robert Jarzmik writes: > >> When the kernel is compiled with an "O=" argument, the object files are >> not necessarily in the source tree, and more probably in another tree. >> >> In this situation, the current used check doesn't work, and >> COMPILED_SOURCE tags is broken with O= builds. >> >> This patch fixes it by looking for object files both in source tree and >> potential destination tree. >> >> Signed-off-by: Robert Jarzmik > > Hi Marek, ping about this patch ? Sorry, I missed the patch. >> --- a/scripts/tags.sh >> +++ b/scripts/tags.sh >> @@ -106,7 +106,9 @@ all_compiled_sources() >> case "$i" in >> *.[cS]) >> j=${i/\.[cS]/\.o} >> - if [ -e $j ]; then >> + k=${i/"$tree"/"$O"\/} >> + k=${k/\.[cS]/\.o} >> + if [ -e $j -o -e "$k" ]; then Please use the KBUILD_OUTPUT variable and not O. Also, the $tree prefix should only match at the beginning of the filename (so use something like ${i#$tree}). Last, but not least, the .[cS] -> .o substitution only needs to be done once. The k variable can use the value of j instead of i. Thanks, Michal