diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 5eba2191d9..61f40da90f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -254,13 +254,13 @@ def add(args, config, basepath, workspace): | |||
254 | f.write('\n# initial_rev: %s\n' % initial_rev) | 254 | f.write('\n# initial_rev: %s\n' % initial_rev) |
255 | 255 | ||
256 | if args.binary: | 256 | if args.binary: |
257 | f.write('do_install_append() {\n') | 257 | f.write('do_install:append() {\n') |
258 | f.write(' rm -rf ${D}/.git\n') | 258 | f.write(' rm -rf ${D}/.git\n') |
259 | f.write(' rm -f ${D}/singletask.lock\n') | 259 | f.write(' rm -f ${D}/singletask.lock\n') |
260 | f.write('}\n') | 260 | f.write('}\n') |
261 | 261 | ||
262 | if bb.data.inherits_class('npm', rd): | 262 | if bb.data.inherits_class('npm', rd): |
263 | f.write('python do_configure_append() {\n') | 263 | f.write('python do_configure:append() {\n') |
264 | f.write(' pkgdir = d.getVar("NPM_PACKAGE")\n') | 264 | f.write(' pkgdir = d.getVar("NPM_PACKAGE")\n') |
265 | f.write(' lockfile = os.path.join(pkgdir, "singletask.lock")\n') | 265 | f.write(' lockfile = os.path.join(pkgdir, "singletask.lock")\n') |
266 | f.write(' bb.utils.remove(lockfile)\n') | 266 | f.write(' bb.utils.remove(lockfile)\n') |
@@ -936,20 +936,20 @@ def modify(args, config, basepath, workspace): | |||
936 | 936 | ||
937 | bb.utils.mkdirhier(os.path.dirname(appendfile)) | 937 | bb.utils.mkdirhier(os.path.dirname(appendfile)) |
938 | with open(appendfile, 'w') as f: | 938 | with open(appendfile, 'w') as f: |
939 | f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n') | 939 | f.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n') |
940 | # Local files can be modified/tracked in separate subdir under srctree | 940 | # Local files can be modified/tracked in separate subdir under srctree |
941 | # Mostly useful for packages with S != WORKDIR | 941 | # Mostly useful for packages with S != WORKDIR |
942 | f.write('FILESPATH_prepend := "%s:"\n' % | 942 | f.write('FILESPATH:prepend := "%s:"\n' % |
943 | os.path.join(srctreebase, 'oe-local-files')) | 943 | os.path.join(srctreebase, 'oe-local-files')) |
944 | f.write('# srctreebase: %s\n' % srctreebase) | 944 | f.write('# srctreebase: %s\n' % srctreebase) |
945 | 945 | ||
946 | f.write('\ninherit externalsrc\n') | 946 | f.write('\ninherit externalsrc\n') |
947 | f.write('# NOTE: We use pn- overrides here to avoid affecting multiple variants in the case where the recipe uses BBCLASSEXTEND\n') | 947 | f.write('# NOTE: We use pn- overrides here to avoid affecting multiple variants in the case where the recipe uses BBCLASSEXTEND\n') |
948 | f.write('EXTERNALSRC_pn-%s = "%s"\n' % (pn, srctree)) | 948 | f.write('EXTERNALSRC:pn-%s = "%s"\n' % (pn, srctree)) |
949 | 949 | ||
950 | b_is_s = use_external_build(args.same_dir, args.no_same_dir, rd) | 950 | b_is_s = use_external_build(args.same_dir, args.no_same_dir, rd) |
951 | if b_is_s: | 951 | if b_is_s: |
952 | f.write('EXTERNALSRC_BUILD_pn-%s = "%s"\n' % (pn, srctree)) | 952 | f.write('EXTERNALSRC_BUILD:pn-%s = "%s"\n' % (pn, srctree)) |
953 | 953 | ||
954 | if bb.data.inherits_class('kernel', rd): | 954 | if bb.data.inherits_class('kernel', rd): |
955 | f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' | 955 | f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' |