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

login
register
mail settings
Submitter Radek Dostal
Date May 2, 2014, 9 a.m.
Message ID <1399021218-27441-1-git-send-email-radek.dostal@streamunlimited.com>
Download mbox | patch
Permalink /patch/71407/
State New
Headers show

Comments

Radek Dostal - May 2, 2014, 9 a.m.
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(-)
Chris Larson - May 3, 2014, 1:36 a.m.
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.

Patch

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