Re: [PATCH 4/8] devtool: extract: remove patches when S=WORKDIR

[Markus Lehtonen <markus.lehtonen@linux.intel.com>]

Hi,

On 23/04/15 19:18, "Paul Eggleton" <paul.eggleton@linux.intel.com> wrote:

>From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
>
>All local files from the layer, including patches, are added to to
>srctree repository when S==WORKDIR. The patch files are useless as they
>are automatically applied on top of the srctree by devtool.
>
>This change causes devtool extract to not commit these unnecessary (and
>possibly confusing) patch file(s) into srctree repository.
>
>[YOCTO #7602]
>
>Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
>---
> scripts/lib/devtool/standard.py | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
>diff --git a/scripts/lib/devtool/standard.py
>b/scripts/lib/devtool/standard.py
>index aa30a98..926ec6c 100644
>--- a/scripts/lib/devtool/standard.py
>+++ b/scripts/lib/devtool/standard.py
>@@ -153,6 +153,7 @@ def extract(args, config, basepath, workspace):
> 
> def _extract_source(srctree, keep_temp, devbranch, d):
>     import bb.event
>+    import oe.recipeutils
> 
>     def eventfilter(name, handler, event, d):
>         if name == 'base_eventhandler':
>@@ -240,6 +241,13 @@ def _extract_source(srctree, keep_temp, devbranch,
>d):
>             else:
>                 os.rmdir(patchdir)
> 
>+        # Find local patches that were "unpacked" to srctree directory
>+        recipe_patches = [os.path.basename(patch) for patch in
>+                oe.recipeutils.get_recipe_patches(crd)]
>+        patches = [fname for fname in os.listdir(workdir) if fname in
>+                   recipe_patches]
>+
>+        # Set-up srctree repo
>         if bb.data.inherits_class('kernel-yocto', d):
>             (stdout, _) = bb.process.run('git --git-dir="%s" rev-parse
>HEAD' % crd.expand('${WORKDIR}/git'), cwd=srcsubdir)
>             initial_rev = stdout.rstrip()
>@@ -251,6 +259,10 @@ def _extract_source(srctree, keep_temp, devbranch,
>d):
>             if not os.path.exists(os.path.join(srcsubdir, '.git')):
>                 bb.process.run('git init', cwd=srcsubdir)
>                 bb.process.run('git add .', cwd=srcsubdir)
>+                # Do not commit patches (would happend if S=WORKDIR)
>+                if patches and srcsubdir == workdir:
>+                    bb.process.run('git reset -- %s' % " ".join(patches),
>+                                    cwd=srcsubdir)
>                 bb.process.run('git commit -q -m "Initial commit from
>upstream at version %s"' % crd.getVar('PV', True), cwd=srcsubdir)
> 
>             (stdout, _) = bb.process.run('git rev-parse HEAD',
>cwd=srcsubdir)
>@@ -266,6 +278,14 @@ def _extract_source(srctree, keep_temp, devbranch,
>d):
> 
>         bb.process.run('git tag -f devtool-patched', cwd=srcsubdir)
> 
>+        # Remove patches if S=WORKDIR so that stale patch files are not
>present
>+        # in the srtree
>+        if patches and srcsubdir == workdir:
>+            logger.info('Removing patch files...')
>+            for patch in patches:
>+                os.unlink(os.path.join(workdir, patch))
>+
>+
>         if os.path.exists(patchdir):
>             shutil.rmtree(patchdir)
>             if haspatches:


NACK! Please skip this patch for now. I just found out it doesn't work as
expected. I'll submit a new version when I've worked around the problems.

Thanks,
  Markus