From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 55A5477016 for ; Wed, 30 Sep 2015 10:05:54 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 30 Sep 2015 03:05:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,611,1437462000"; d="scan'208";a="800402121" Received: from marquiz.fi.intel.com ([10.237.72.155]) by fmsmga001.fm.intel.com with ESMTP; 30 Sep 2015 03:05:53 -0700 Message-ID: <1443607552.11206.37.camel@linux.intel.com> From: Markus Lehtonen To: Paul Eggleton Date: Wed, 30 Sep 2015 13:05:52 +0300 In-Reply-To: <2536397.TWMWxq2M1Y@peggleto-mobl.ger.corp.intel.com> References: <1443095587-13852-1-git-send-email-markus.lehtonen@linux.intel.com> <2936022.hqFWI3dATu@peggleto-mobl.ger.corp.intel.com> <1443603673.11206.35.camel@linux.intel.com> <2536397.TWMWxq2M1Y@peggleto-mobl.ger.corp.intel.com> X-Mailer: Evolution 3.12.11 Mime-Version: 1.0 Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH v3 10/10] devtool: modify: make bitbake use local files from srctree X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2015 10:05:57 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Hi, On Wed, 2015-09-30 at 10:21 +0100, Paul Eggleton wrote: > On Wednesday 30 September 2015 12:01:13 Markus Lehtonen wrote: > > Hi, > > > > On Mon, 2015-09-28 at 14:48 +0100, Paul Eggleton wrote: > > > Hi Markus, > > > > > > On Thursday 24 September 2015 14:53:07 Markus Lehtonen wrote: > > > > This change makes it possible to have local files (non-remote SRC_URI > > > > files, i.e. files that are located in the "recipe space") under the > > > > srctree even if S!=WORKDIR. The files must be placed under the > > > > 'local-files' subdirectory. > > > > > > > > Complements the previous patch that imports local files into srctree. > > > > > > > > [YOCTO #7602] > > > > > > > > Signed-off-by: Markus Lehtonen > > > > --- > > > > > > > > scripts/lib/devtool/standard.py | 9 +++++++-- > > > > 1 file changed, 7 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/scripts/lib/devtool/standard.py > > > > b/scripts/lib/devtool/standard.py index 6b85c8c..78b0d27 100644 > > > > --- a/scripts/lib/devtool/standard.py > > > > +++ b/scripts/lib/devtool/standard.py > > > > > > > > @@ -558,8 +558,13 @@ def modify(args, config, basepath, workspace): > > > > if not os.path.exists(appendpath): > > > > os.makedirs(appendpath) > > > > > > > > with open(appendfile, 'w') as f: > > > > - f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n\n') > > > > - f.write('inherit externalsrc\n') > > > > + f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n') > > > > + # Local files can be modified/tracked in separate subdir under > > > > srctree + # Mostly useful for packages with S != WORKDIR > > > > + f.write('FILESPATH_prepend := "%s:"\n' % > > > > + os.path.join(srctree, 'local-files')) > > > > > > Shouldn't this directory be named "oe-local-files"? > > > > Argh, sorry, I had missed this email earlier. Yes, it should be > > 'oe-local-files'. An updated patch with a fix is available at: > > > > http://cgit.openembedded.org/openembedded-core-contrib/log/?h=marquiz/devtoo > > l/localfiles > > OK, great, but the commit message still has "local-files". Oh my, you're right. Yet another version of the patch in the same location: http://cgit.openembedded.org/openembedded-core-contrib/log/?h=marquiz/devtool/localfiles Thank you for your patience, Markus