summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-10 14:45:17 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-23 11:10:13 +0000
commit55a157f4e687de98d78f74e0ec7b4e9883599319 (patch)
tree8702aaff3d6782ccfce84ab1f17d5acf4c82433f /meta
parentd316363b7ba57cbf5300c6cd3b4cc68fb3258d6f (diff)
downloadpoky-55a157f4e687de98d78f74e0ec7b4e9883599319.tar.gz
devtool: update-recipe: fix handling of compressed local patches
It is possible to use gzip or bzip2 to compress patches and still refer to them in compressed form in the SRC_URI value within a recipe. If you run "devtool modify" on such a recipe, make changes to the commit for the patch and then run devtool update-recipe, we need to correctly associate the commit back to the compressed patch file and re-compress the patch, neither of which we were doing previously. Additionally, add an oe-selftest test to ensure this doesn't regress in future. Fixes [YOCTO #8278]. (From OE-Core rev: e47d21624dfec6f71742b837e91da553f18a28c5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/patch.bbclass9
-rw-r--r--meta/lib/oe/recipeutils.py6
-rw-r--r--meta/lib/oeqa/selftest/devtool.py24
3 files changed, 32 insertions, 7 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 1f6927be04..2c1f58cbdc 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -10,13 +10,13 @@ PATCH_GIT_USER_EMAIL ?= "oe.patch@oe"
10 10
11inherit terminal 11inherit terminal
12 12
13def src_patches(d, all = False ): 13def src_patches(d, all=False, expand=True):
14 workdir = d.getVar('WORKDIR', True) 14 workdir = d.getVar('WORKDIR', True)
15 fetch = bb.fetch2.Fetch([], d) 15 fetch = bb.fetch2.Fetch([], d)
16 patches = [] 16 patches = []
17 sources = [] 17 sources = []
18 for url in fetch.urls: 18 for url in fetch.urls:
19 local = patch_path(url, fetch, workdir) 19 local = patch_path(url, fetch, workdir, expand)
20 if not local: 20 if not local:
21 if all: 21 if all:
22 local = fetch.localpath(url) 22 local = fetch.localpath(url)
@@ -55,13 +55,14 @@ def src_patches(d, all = False ):
55 55
56 return patches 56 return patches
57 57
58def patch_path(url, fetch, workdir): 58def patch_path(url, fetch, workdir, expand=True):
59 """Return the local path of a patch, or None if this isn't a patch""" 59 """Return the local path of a patch, or None if this isn't a patch"""
60 60
61 local = fetch.localpath(url) 61 local = fetch.localpath(url)
62 base, ext = os.path.splitext(os.path.basename(local)) 62 base, ext = os.path.splitext(os.path.basename(local))
63 if ext in ('.gz', '.bz2', '.Z'): 63 if ext in ('.gz', '.bz2', '.Z'):
64 local = os.path.join(workdir, base) 64 if expand:
65 local = os.path.join(workdir, base)
65 ext = os.path.splitext(base)[1] 66 ext = os.path.splitext(base)[1]
66 67
67 urldata = fetch.ud[url] 68 urldata = fetch.ud[url]
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 6caae5f7d4..ab4177aa81 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -397,7 +397,7 @@ def get_recipe_local_files(d, patches=False):
397 for uri in uris: 397 for uri in uris:
398 if fetch.ud[uri].type == 'file': 398 if fetch.ud[uri].type == 'file':
399 if (not patches and 399 if (not patches and
400 bb.utils.exec_flat_python_func('patch_path', uri, fetch, '')): 400 bb.utils.exec_flat_python_func('patch_path', uri, fetch, '', expand=False)):
401 continue 401 continue
402 # Skip files that are referenced by absolute path 402 # Skip files that are referenced by absolute path
403 fname = fetch.ud[uri].basepath 403 fname = fetch.ud[uri].basepath
@@ -418,7 +418,7 @@ def get_recipe_patches(d):
418 patchfiles = [] 418 patchfiles = []
419 # Execute src_patches() defined in patch.bbclass - this works since that class 419 # Execute src_patches() defined in patch.bbclass - this works since that class
420 # is inherited globally 420 # is inherited globally
421 patches = bb.utils.exec_flat_python_func('src_patches', d) 421 patches = bb.utils.exec_flat_python_func('src_patches', d, expand=False)
422 for patch in patches: 422 for patch in patches:
423 _, _, local, _, _, parm = bb.fetch.decodeurl(patch) 423 _, _, local, _, _, parm = bb.fetch.decodeurl(patch)
424 patchfiles.append(local) 424 patchfiles.append(local)
@@ -437,7 +437,7 @@ def get_recipe_patched_files(d):
437 import oe.patch 437 import oe.patch
438 # Execute src_patches() defined in patch.bbclass - this works since that class 438 # Execute src_patches() defined in patch.bbclass - this works since that class
439 # is inherited globally 439 # is inherited globally
440 patches = bb.utils.exec_flat_python_func('src_patches', d) 440 patches = bb.utils.exec_flat_python_func('src_patches', d, expand=False)
441 patchedfiles = {} 441 patchedfiles = {}
442 for patch in patches: 442 for patch in patches:
443 _, _, patchfile, _, _, parm = bb.fetch.decodeurl(patch) 443 _, _, patchfile, _, _, parm = bb.fetch.decodeurl(patch)
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index f6226c1ad9..92dc5e5869 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -948,6 +948,30 @@ class DevtoolTests(DevtoolBase):
948 expected_status = [(' M', '.*/%s/file2$' % testrecipe)] 948 expected_status = [(' M', '.*/%s/file2$' % testrecipe)]
949 self._check_repo_status(os.path.dirname(recipefile), expected_status) 949 self._check_repo_status(os.path.dirname(recipefile), expected_status)
950 950
951 def test_devtool_update_recipe_local_patch_gz(self):
952 # First, modify the recipe
953 testrecipe = 'devtool-test-patch-gz'
954 recipefile = get_bb_var('FILE', testrecipe)
955 src_uri = get_bb_var('SRC_URI', testrecipe)
956 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
957 self.track_for_cleanup(tempdir)
958 self.track_for_cleanup(self.workspacedir)
959 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
960 # (don't bother with cleaning the recipe on teardown, we won't be building it)
961 result = runCmd('devtool modify %s' % testrecipe)
962 # Modify one file
963 srctree = os.path.join(self.workspacedir, 'sources', testrecipe)
964 runCmd('echo "Another line" >> README', cwd=srctree)
965 runCmd('git commit -a --amend --no-edit', cwd=srctree)
966 self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile)))
967 result = runCmd('devtool update-recipe %s' % testrecipe)
968 expected_status = [(' M', '.*/%s/readme.patch.gz$' % testrecipe)]
969 self._check_repo_status(os.path.dirname(recipefile), expected_status)
970 patch_gz = os.path.join(os.path.dirname(recipefile), testrecipe, 'readme.patch.gz')
971 result = runCmd('file %s' % patch_gz)
972 if 'gzip compressed data' not in result.output:
973 self.fail('New patch file is not gzipped - file reports:\n%s' % result.output)
974
951 @testcase(1163) 975 @testcase(1163)
952 def test_devtool_extract(self): 976 def test_devtool_extract(self):
953 tempdir = tempfile.mkdtemp(prefix='devtoolqa') 977 tempdir = tempfile.mkdtemp(prefix='devtoolqa')