mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 09:49:32 +02:00
devtool: update-recipe: add option to write changes to bbappend
Quite often what you want to do having made customisations to a piece of software is to apply those customisations in your own layer rather than in the original recipe. Thus, add a -a/--append option to the update-recipe subcommand which allows you to specify the layer to write a bbappend into. The bbappend will be created at the appropriate path within the specified layer directory (which may or may not be in your bblayers.conf) or if one already exists it will be updated appropriately. (This re-uses code written for recipetool appendfile.) Implements [YOCTO #7587]. (From OE-Core rev: 87d487ea4fdfb6cd30e3b3fad47732db12e86f23) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
committed by
Richard Purdie
Richard Purdie
parent
fbfc06a969
commit
7539c1f889
@@ -524,6 +524,177 @@ class DevtoolTests(DevtoolBase):
|
||||
break
|
||||
self.assertTrue(matched, 'Unexpected diff remove line: %s' % line)
|
||||
|
||||
def test_devtool_update_recipe_append(self):
|
||||
# Check preconditions
|
||||
workspacedir = os.path.join(self.builddir, 'workspace')
|
||||
self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory')
|
||||
testrecipe = 'mdadm'
|
||||
recipefile = get_bb_var('FILE', testrecipe)
|
||||
src_uri = get_bb_var('SRC_URI', testrecipe)
|
||||
self.assertNotIn('git://', src_uri, 'This test expects the %s recipe to NOT be a git recipe' % testrecipe)
|
||||
result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile))
|
||||
self.assertEqual(result.output.strip(), "", '%s recipe is not clean' % testrecipe)
|
||||
# First, modify a recipe
|
||||
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
|
||||
tempsrcdir = os.path.join(tempdir, 'source')
|
||||
templayerdir = os.path.join(tempdir, 'layer')
|
||||
self.track_for_cleanup(tempdir)
|
||||
self.track_for_cleanup(workspacedir)
|
||||
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
|
||||
# (don't bother with cleaning the recipe on teardown, we won't be building it)
|
||||
result = runCmd('devtool modify %s -x %s' % (testrecipe, tempsrcdir))
|
||||
# Check git repo
|
||||
self.assertTrue(os.path.isdir(os.path.join(tempsrcdir, '.git')), 'git repository for external source tree not found')
|
||||
result = runCmd('git status --porcelain', cwd=tempsrcdir)
|
||||
self.assertEqual(result.output.strip(), "", 'Created git repo is not clean')
|
||||
result = runCmd('git symbolic-ref HEAD', cwd=tempsrcdir)
|
||||
self.assertEqual(result.output.strip(), "refs/heads/devtool", 'Wrong branch in git repo')
|
||||
# Add a commit
|
||||
result = runCmd("sed 's!\\(#define VERSION\\W*\"[^\"]*\\)\"!\\1-custom\"!' -i ReadMe.c", cwd=tempsrcdir)
|
||||
result = runCmd('git commit -a -m "Add our custom version"', cwd=tempsrcdir)
|
||||
self.add_command_to_tearDown('cd %s; rm -f %s/*.patch; git checkout .' % (os.path.dirname(recipefile), testrecipe))
|
||||
# Create a temporary layer and add it to bblayers.conf
|
||||
self._create_temp_layer(templayerdir, True, 'selftestupdaterecipe')
|
||||
# Create the bbappend
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
self.assertNotIn('WARNING:', result.output)
|
||||
# Check recipe is still clean
|
||||
result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile))
|
||||
self.assertEqual(result.output.strip(), "", '%s recipe is not clean' % testrecipe)
|
||||
# Check bbappend was created
|
||||
splitpath = os.path.dirname(recipefile).split(os.sep)
|
||||
appenddir = os.path.join(templayerdir, splitpath[-2], splitpath[-1])
|
||||
bbappendfile = self._check_bbappend(testrecipe, recipefile, appenddir)
|
||||
patchfile = os.path.join(appenddir, testrecipe, '0001-Add-our-custom-version.patch')
|
||||
self.assertTrue(os.path.exists(patchfile), 'Patch file not created')
|
||||
|
||||
# Check bbappend contents
|
||||
expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
|
||||
'\n',
|
||||
'SRC_URI += "file://0001-Add-our-custom-version.patch"\n',
|
||||
'\n']
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines, f.readlines())
|
||||
|
||||
# Check we can run it again and bbappend isn't modified
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines, f.readlines())
|
||||
# Drop new commit and check patch gets deleted
|
||||
result = runCmd('git reset HEAD^', cwd=tempsrcdir)
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
self.assertFalse(os.path.exists(patchfile), 'Patch file not deleted')
|
||||
expectedlines2 = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n',
|
||||
'\n']
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines2, f.readlines())
|
||||
# Put commit back and check we can run it if layer isn't in bblayers.conf
|
||||
os.remove(bbappendfile)
|
||||
result = runCmd('git commit -a -m "Add our custom version"', cwd=tempsrcdir)
|
||||
result = runCmd('bitbake-layers remove-layer %s' % templayerdir, cwd=self.builddir)
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
self.assertIn('WARNING: Specified layer is not currently enabled in bblayers.conf', result.output)
|
||||
self.assertTrue(os.path.exists(patchfile), 'Patch file not created (with disabled layer)')
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines, f.readlines())
|
||||
# Deleting isn't expected to work under these circumstances
|
||||
|
||||
def test_devtool_update_recipe_append_git(self):
|
||||
# Check preconditions
|
||||
workspacedir = os.path.join(self.builddir, 'workspace')
|
||||
self.assertTrue(not os.path.exists(workspacedir), 'This test cannot be run with a workspace directory under the build directory')
|
||||
testrecipe = 'mtd-utils'
|
||||
recipefile = get_bb_var('FILE', testrecipe)
|
||||
src_uri = get_bb_var('SRC_URI', testrecipe)
|
||||
self.assertIn('git://', src_uri, 'This test expects the %s recipe to be a git recipe' % testrecipe)
|
||||
for entry in src_uri.split():
|
||||
if entry.startswith('git://'):
|
||||
git_uri = entry
|
||||
break
|
||||
result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile))
|
||||
self.assertEqual(result.output.strip(), "", '%s recipe is not clean' % testrecipe)
|
||||
# First, modify a recipe
|
||||
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
|
||||
tempsrcdir = os.path.join(tempdir, 'source')
|
||||
templayerdir = os.path.join(tempdir, 'layer')
|
||||
self.track_for_cleanup(tempdir)
|
||||
self.track_for_cleanup(workspacedir)
|
||||
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
|
||||
# (don't bother with cleaning the recipe on teardown, we won't be building it)
|
||||
result = runCmd('devtool modify %s -x %s' % (testrecipe, tempsrcdir))
|
||||
# Check git repo
|
||||
self.assertTrue(os.path.isdir(os.path.join(tempsrcdir, '.git')), 'git repository for external source tree not found')
|
||||
result = runCmd('git status --porcelain', cwd=tempsrcdir)
|
||||
self.assertEqual(result.output.strip(), "", 'Created git repo is not clean')
|
||||
result = runCmd('git symbolic-ref HEAD', cwd=tempsrcdir)
|
||||
self.assertEqual(result.output.strip(), "refs/heads/devtool", 'Wrong branch in git repo')
|
||||
# Add a commit
|
||||
result = runCmd('echo "# Additional line" >> Makefile', cwd=tempsrcdir)
|
||||
result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempsrcdir)
|
||||
self.add_command_to_tearDown('cd %s; rm -f %s/*.patch; git checkout .' % (os.path.dirname(recipefile), testrecipe))
|
||||
# Create a temporary layer
|
||||
os.makedirs(os.path.join(templayerdir, 'conf'))
|
||||
with open(os.path.join(templayerdir, 'conf', 'layer.conf'), 'w') as f:
|
||||
f.write('BBPATH .= ":${LAYERDIR}"\n')
|
||||
f.write('BBFILES += "${LAYERDIR}/recipes-*/*/*.bbappend"\n')
|
||||
f.write('BBFILE_COLLECTIONS += "oeselftesttemplayer"\n')
|
||||
f.write('BBFILE_PATTERN_oeselftesttemplayer = "^${LAYERDIR}/"\n')
|
||||
f.write('BBFILE_PRIORITY_oeselftesttemplayer = "999"\n')
|
||||
f.write('BBFILE_PATTERN_IGNORE_EMPTY_oeselftesttemplayer = "1"\n')
|
||||
self.add_command_to_tearDown('bitbake-layers remove-layer %s || true' % templayerdir)
|
||||
result = runCmd('bitbake-layers add-layer %s' % templayerdir, cwd=self.builddir)
|
||||
# Create the bbappend
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
self.assertNotIn('WARNING:', result.output)
|
||||
# Check recipe is still clean
|
||||
result = runCmd('git status . --porcelain', cwd=os.path.dirname(recipefile))
|
||||
self.assertEqual(result.output.strip(), "", '%s recipe is not clean' % testrecipe)
|
||||
# Check bbappend was created
|
||||
splitpath = os.path.dirname(recipefile).split(os.sep)
|
||||
appenddir = os.path.join(templayerdir, splitpath[-2], splitpath[-1])
|
||||
bbappendfile = self._check_bbappend(testrecipe, recipefile, appenddir)
|
||||
self.assertFalse(os.path.exists(os.path.join(appenddir, testrecipe)), 'Patch directory should not be created')
|
||||
|
||||
# Check bbappend contents
|
||||
result = runCmd('git rev-parse HEAD', cwd=tempsrcdir)
|
||||
expectedlines = ['SRCREV = "%s"\n' % result.output,
|
||||
'\n',
|
||||
'SRC_URI = "%s"\n' % git_uri,
|
||||
'\n']
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines, f.readlines())
|
||||
|
||||
# Check we can run it again and bbappend isn't modified
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines, f.readlines())
|
||||
# Drop new commit and check SRCREV changes
|
||||
result = runCmd('git reset HEAD^', cwd=tempsrcdir)
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
self.assertFalse(os.path.exists(os.path.join(appenddir, testrecipe)), 'Patch directory should not be created')
|
||||
result = runCmd('git rev-parse HEAD', cwd=tempsrcdir)
|
||||
expectedlines = ['SRCREV = "%s"\n' % result.output,
|
||||
'\n',
|
||||
'SRC_URI = "%s"\n' % git_uri,
|
||||
'\n']
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines, f.readlines())
|
||||
# Put commit back and check we can run it if layer isn't in bblayers.conf
|
||||
os.remove(bbappendfile)
|
||||
result = runCmd('git commit -a -m "Change the Makefile"', cwd=tempsrcdir)
|
||||
result = runCmd('bitbake-layers remove-layer %s' % templayerdir, cwd=self.builddir)
|
||||
result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
|
||||
self.assertIn('WARNING: Specified layer is not currently enabled in bblayers.conf', result.output)
|
||||
self.assertFalse(os.path.exists(os.path.join(appenddir, testrecipe)), 'Patch directory should not be created')
|
||||
result = runCmd('git rev-parse HEAD', cwd=tempsrcdir)
|
||||
expectedlines = ['SRCREV = "%s"\n' % result.output,
|
||||
'\n',
|
||||
'SRC_URI = "%s"\n' % git_uri,
|
||||
'\n']
|
||||
with open(bbappendfile, 'r') as f:
|
||||
self.assertEqual(expectedlines, f.readlines())
|
||||
# Deleting isn't expected to work under these circumstances
|
||||
|
||||
def test_devtool_extract(self):
|
||||
# Check preconditions
|
||||
workspacedir = os.path.join(self.builddir, 'workspace')
|
||||
|
||||
Reference in New Issue
Block a user