Re: [RFC][dizzy][fido][master][PATCH 1/3] rootfs.py: Allow to override postinst-intercepts location

[akuster808 <akuster808@gmail.com>]

All 3 in master so backporting to Dizzy.

- armin

On 09/04/2015 05:27 AM, Martin Jansa wrote:
> On Fri, Sep 04, 2015 at 02:22:26PM +0200, Martin Jansa wrote:
>> * useful when we need to overlay/extend intercept scripts from oe-core
> 
> 2/3 and 3/3 could be a bit dangerous or controversial (main reason why
> this was sent as RFC), but this one is really useful for us to apply
> these fixes in advance (and without backporting them all to fido and
> dizzy) - so if you agree please merge 1/3 to master, fido and dizzy.
> 
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>>  meta/lib/oe/rootfs.py | 6 ++++--
>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
>> index c29843b..76950ec 100644
>> --- a/meta/lib/oe/rootfs.py
>> +++ b/meta/lib/oe/rootfs.py
>> @@ -164,6 +164,9 @@ class Rootfs(object):
>>          pre_process_cmds = self.d.getVar("ROOTFS_PREPROCESS_COMMAND", True)
>>          post_process_cmds = self.d.getVar("ROOTFS_POSTPROCESS_COMMAND", True)
>>  
>> +        postinst_intercepts_dir = self.d.getVar("POSTINST_INTERCEPTS_DIR", True)
>> +        if not postinst_intercepts_dir:
>> +            postinst_intercepts_dir = self.d.expand("${COREBASE}/scripts/postinst-intercepts")
>>          intercepts_dir = os.path.join(self.d.getVar('WORKDIR', True),
>>                                        "intercept_scripts")
>>  
>> @@ -173,8 +176,7 @@ class Rootfs(object):
>>  
>>          bb.utils.mkdirhier(self.deploy_dir_image)
>>  
>> -        shutil.copytree(self.d.expand("${COREBASE}/scripts/postinst-intercepts"),
>> -                        intercepts_dir)
>> +        shutil.copytree(postinst_intercepts_dir, intercepts_dir)
>>  
>>          shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"),
>>                      self.deploy_dir_image +
>> -- 
>> 2.5.0
>>
> 
> 
>