recipetool: create: don't create extra files directory unconditionally
The extra directory next to the recipe should only be created if there are files to put into it; currently only the npm plugin does this. I didn't notice the issue earlier because the test was actually able to succeed under these circumstances if the recipe file came first in the directory listing, which was a fault in my original oe-selftest test; apparently on some YP autobuilder machines the order came out reversed. With this change we can put the oe-selftest test that highlighted the issue back to the way it was, with an extra check to reinforce that only a single file should be created. (From OE-Core rev: b8b778345eb0997c2cd952a1f61fdd2050b6b894) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
8debfea81e
commit
600b7007f6
|
@ -410,9 +410,11 @@ class RecipetoolTests(RecipetoolBase):
|
||||||
srcuri = 'http://www.dest-unreach.org/socat/download/socat-%s.tar.bz2' % pv
|
srcuri = 'http://www.dest-unreach.org/socat/download/socat-%s.tar.bz2' % pv
|
||||||
result = runCmd('recipetool create %s -o %s' % (srcuri, temprecipe))
|
result = runCmd('recipetool create %s -o %s' % (srcuri, temprecipe))
|
||||||
dirlist = os.listdir(temprecipe)
|
dirlist = os.listdir(temprecipe)
|
||||||
if len(dirlist) < 1 or not os.path.isfile(os.path.join(temprecipe, 'socat_%s.bb' % pv)):
|
if len(dirlist) > 1:
|
||||||
|
self.fail('recipetool created more than just one file; output:\n%s\ndirlist:\n%s' % (result.output, str(dirlist)))
|
||||||
|
if len(dirlist) < 1 or not os.path.isfile(os.path.join(temprecipe, dirlist[0])):
|
||||||
self.fail('recipetool did not create recipe file; output:\n%s\ndirlist:\n%s' % (result.output, str(dirlist)))
|
self.fail('recipetool did not create recipe file; output:\n%s\ndirlist:\n%s' % (result.output, str(dirlist)))
|
||||||
self.assertIn('socat_%s.bb' % pv, dirlist, 'Recipe file incorrectly named')
|
self.assertEqual(dirlist[0], 'socat_%s.bb' % pv, 'Recipe file incorrectly named')
|
||||||
checkvars = {}
|
checkvars = {}
|
||||||
checkvars['LICENSE'] = set(['Unknown', 'GPLv2'])
|
checkvars['LICENSE'] = set(['Unknown', 'GPLv2'])
|
||||||
checkvars['LIC_FILES_CHKSUM'] = set(['file://COPYING.OpenSSL;md5=5c9bccc77f67a8328ef4ebaf468116f4', 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'])
|
checkvars['LIC_FILES_CHKSUM'] = set(['file://COPYING.OpenSSL;md5=5c9bccc77f67a8328ef4ebaf468116f4', 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'])
|
||||||
|
|
|
@ -604,13 +604,14 @@ def create_recipe(args):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
# Move any extra files the plugins created to a directory next to the recipe
|
# Move any extra files the plugins created to a directory next to the recipe
|
||||||
if outfile == '-':
|
if extrafiles:
|
||||||
extraoutdir = pn
|
if outfile == '-':
|
||||||
else:
|
extraoutdir = pn
|
||||||
extraoutdir = os.path.join(os.path.dirname(outfile), pn)
|
else:
|
||||||
bb.utils.mkdirhier(extraoutdir)
|
extraoutdir = os.path.join(os.path.dirname(outfile), pn)
|
||||||
for destfn, extrafile in extrafiles.iteritems():
|
bb.utils.mkdirhier(extraoutdir)
|
||||||
shutil.move(extrafile, os.path.join(extraoutdir, destfn))
|
for destfn, extrafile in extrafiles.iteritems():
|
||||||
|
shutil.move(extrafile, os.path.join(extraoutdir, destfn))
|
||||||
|
|
||||||
lines = lines_before
|
lines = lines_before
|
||||||
lines_before = []
|
lines_before = []
|
||||||
|
|
Loading…
Reference in New Issue