diff options
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/recipetool/append.py | 4 | ||||
-rw-r--r-- | scripts/lib/recipetool/create.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index 10945d6008..c18926e56c 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py | |||
@@ -336,9 +336,9 @@ def appendsrc(args, files, rd, extralines=None): | |||
336 | src_destdir = os.path.dirname(srcfile) | 336 | src_destdir = os.path.dirname(srcfile) |
337 | if not args.use_workdir: | 337 | if not args.use_workdir: |
338 | if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'): | 338 | if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'): |
339 | srcdir = os.path.join(workdir, 'git') | 339 | srcdir = os.path.join(workdir, rd.getVar('BB_GIT_DEFAULT_DESTSUFFIX')) |
340 | if not bb.data.inherits_class('kernel-yocto', rd): | 340 | if not bb.data.inherits_class('kernel-yocto', rd): |
341 | logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git') | 341 | logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}') |
342 | src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir) | 342 | src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir) |
343 | src_destdir = os.path.normpath(src_destdir) | 343 | src_destdir = os.path.normpath(src_destdir) |
344 | 344 | ||
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 3c6ef6719f..7080558beb 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -638,7 +638,6 @@ def create_recipe(args): | |||
638 | if len(splitline) > 1: | 638 | if len(splitline) > 1: |
639 | if splitline[0] == 'origin' and scriptutils.is_src_url(splitline[1]): | 639 | if splitline[0] == 'origin' and scriptutils.is_src_url(splitline[1]): |
640 | srcuri = reformat_git_uri(splitline[1]) + ';branch=master' | 640 | srcuri = reformat_git_uri(splitline[1]) + ';branch=master' |
641 | srcsubdir = 'git' | ||
642 | break | 641 | break |
643 | 642 | ||
644 | if args.src_subdir: | 643 | if args.src_subdir: |
@@ -840,7 +839,7 @@ def create_recipe(args): | |||
840 | line = line.replace(realpv, '${PV}') | 839 | line = line.replace(realpv, '${PV}') |
841 | if pn: | 840 | if pn: |
842 | line = line.replace(pn, '${BPN}') | 841 | line = line.replace(pn, '${BPN}') |
843 | if line == 'S = "${WORKDIR}/${BPN}-${PV}"': | 842 | if line == 'S = "${WORKDIR}/${BPN}-${PV}"' or 'tmp-recipetool-' in line: |
844 | skipblank = True | 843 | skipblank = True |
845 | continue | 844 | continue |
846 | elif line.startswith('SRC_URI = '): | 845 | elif line.startswith('SRC_URI = '): |