[PATCH] distutils.bbclass: only modify *.py file if it contains path to be removed

[PATCH] distutils.bbclass: only modify *.py file if it contains path to be removed

[Radek Dostal]

Currently sed command touches every single *.py file. This modifies the
timestamp of the file. All *.pyo files will be recompiled during the first
boot, because timestamp will not match. This should be only necessary if
sed command changes the file.

Signed-off-by: Radek Dostal <radek.dostal@streamunlimited.com>
---
 meta/classes/distutils.bbclass |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index f3da023..cd1d148 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -43,7 +43,11 @@ distutils_do_install() {
 
         # support filenames with *spaces*
         find ${D} -name "*.py" -print0 | while read -d $'\0' i ; do \
-            sed -i -e s:${D}::g "$i"
+            # only modify file if it contains path to avoid recompilation on the target
+            if (cat "$i" | grep "${D}") >/dev/null 2>&1
+            then
+                sed -i -e s:${D}::g "$i"
+            fi
         done
 
         if test -e ${D}${bindir} ; then	
-- 
1.7.9.5

Re: [PATCH] distutils.bbclass: only modify *.py file if it contains path to be removed

[Richard Purdie]

On Wed, 2014-04-30 at 15:01 +0200, Radek Dostal wrote:
> Currently sed command touches every single *.py file. This modifies the
> timestamp of the file. All *.pyo files will be recompiled during the first
> boot, because timestamp will not match. This should be only necessary if
> sed command changes the file.
> 
> Signed-off-by: Radek Dostal <radek.dostal@streamunlimited.com>
> ---
>  meta/classes/distutils.bbclass |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
> index f3da023..cd1d148 100644
> --- a/meta/classes/distutils.bbclass
> +++ b/meta/classes/distutils.bbclass
> @@ -43,7 +43,11 @@ distutils_do_install() {
>  
>          # support filenames with *spaces*
>          find ${D} -name "*.py" -print0 | while read -d $'\0' i ; do \
> -            sed -i -e s:${D}::g "$i"
> +            # only modify file if it contains path to avoid recompilation on the target
> +            if (cat "$i" | grep "${D}") >/dev/null 2>&1

Can we do something here which doesn't involve three different shell
calls please?

Cheers,

Richard


> +            then
> +                sed -i -e s:${D}::g "$i"
> +            fi
>          done
>  
>          if test -e ${D}${bindir} ; then	
> -- 
> 1.7.9.5
> 

[PATCH] distutils.bbclass: only modify *.py file if it contains path to be removed

[Radek Dostal]

Currently sed command touches every single *.py file. This modifies the
timestamp of the file. All *.pyo files will be recompiled during the first
boot, because timestamp will not match. This should be only necessary if
sed command changes the file.

Signed-off-by: Radek Dostal <radek.dostal@streamunlimited.com>
---
 meta/classes/distutils.bbclass |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index f3da023..18e1a34 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -43,7 +43,11 @@ distutils_do_install() {
 
         # support filenames with *spaces*
         find ${D} -name "*.py" -print0 | while read -d $'\0' i ; do \
-            sed -i -e s:${D}::g "$i"
+            # only modify file if it contains path to avoid recompilation on the target
+            if (grep "${D}" "$i") >/dev/null 2>&1
+            then
+                sed -i -e s:${D}::g "$i"
+            fi
         done
 
         if test -e ${D}${bindir} ; then	
-- 
1.7.9.5

Re: [PATCH] distutils.bbclass: only modify *.py file if it contains path to be removed

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

On Fri, May 2, 2014 at 2:00 AM, Radek Dostal <
radek.dostal@streamunlimited.com> wrote:

> -            sed -i -e s:${D}::g "$i"
> +            # only modify file if it contains path to avoid recompilation
> on the target
> +            if (grep "${D}" "$i") >/dev/null 2>&1


If you're to go this route, I'd suggest:

    if grep -q "${D}" "$i"; then

Avoids the unnecessary re-directions, and unnecessary sub-shell.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 1076 bytes --]

[PATCH v3] distutils.bbclass: only modify *.py file if it contains path to be removed

[Radek Dostal]

Currently sed command touches every single *.py file. This modifies the
timestamp of the file. All *.pyo files will be recompiled during the first
boot, because timestamp will not match. This should be only necessary if
sed command changes the file.

Signed-off-by: Radek Dostal <radek.dostal@streamunlimited.com>
---
 meta/classes/distutils.bbclass |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index f3da023..12f2603 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -43,7 +43,10 @@ distutils_do_install() {
 
         # support filenames with *spaces*
         find ${D} -name "*.py" -print0 | while read -d $'\0' i ; do \
-            sed -i -e s:${D}::g "$i"
+            # only modify file if it contains path to avoid recompilation on the target
+            if grep -q "${D}" "$i"; then
+                sed -i -e s:${D}::g "$i"
+            fi
         done
 
         if test -e ${D}${bindir} ; then	
-- 
1.7.9.5