diff options
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r-- | scripts/lib/devtool/build_image.py | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/sdk.py | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/search.py | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/standard.py | 12 | ||||
-rw-r--r-- | scripts/lib/devtool/upgrade.py | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/scripts/lib/devtool/build_image.py b/scripts/lib/devtool/build_image.py index 9388abbacf..980f90ddd6 100644 --- a/scripts/lib/devtool/build_image.py +++ b/scripts/lib/devtool/build_image.py | |||
@@ -113,7 +113,7 @@ def build_image_task(config, basepath, workspace, image, add_packages=None, task | |||
113 | with open(appendfile, 'w') as afile: | 113 | with open(appendfile, 'w') as afile: |
114 | if packages: | 114 | if packages: |
115 | # include packages from workspace recipes into the image | 115 | # include packages from workspace recipes into the image |
116 | afile.write('IMAGE_INSTALL_append = " %s"\n' % ' '.join(packages)) | 116 | afile.write('IMAGE_INSTALL:append = " %s"\n' % ' '.join(packages)) |
117 | if not task: | 117 | if not task: |
118 | logger.info('Building image %s with the following ' | 118 | logger.info('Building image %s with the following ' |
119 | 'additional packages: %s', image, ' '.join(packages)) | 119 | 'additional packages: %s', image, ' '.join(packages)) |
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index 3aa42a1466..ae3fc4caf9 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py | |||
@@ -207,7 +207,7 @@ def sdk_update(args, config, basepath, workspace): | |||
207 | if not sstate_mirrors: | 207 | if not sstate_mirrors: |
208 | with open(os.path.join(conf_dir, 'site.conf'), 'a') as f: | 208 | with open(os.path.join(conf_dir, 'site.conf'), 'a') as f: |
209 | f.write('SCONF_VERSION = "%s"\n' % site_conf_version) | 209 | f.write('SCONF_VERSION = "%s"\n' % site_conf_version) |
210 | f.write('SSTATE_MIRRORS_append = " file://.* %s/sstate-cache/PATH \\n "\n' % updateserver) | 210 | f.write('SSTATE_MIRRORS:append = " file://.* %s/sstate-cache/PATH \\n "\n' % updateserver) |
211 | finally: | 211 | finally: |
212 | shutil.rmtree(tmpsdk_dir) | 212 | shutil.rmtree(tmpsdk_dir) |
213 | 213 | ||
diff --git a/scripts/lib/devtool/search.py b/scripts/lib/devtool/search.py index d24040df37..d81cdd876f 100644 --- a/scripts/lib/devtool/search.py +++ b/scripts/lib/devtool/search.py | |||
@@ -65,7 +65,7 @@ def search(args, config, basepath, workspace): | |||
65 | splitline = line.split(':', 1) | 65 | splitline = line.split(':', 1) |
66 | key = splitline[0] | 66 | key = splitline[0] |
67 | value = splitline[1].strip() | 67 | value = splitline[1].strip() |
68 | if key in ['PKG_%s' % pkg, 'DESCRIPTION', 'FILES_INFO'] or key.startswith('FILERPROVIDES_'): | 68 | if key in ['PKG:%s' % pkg, 'DESCRIPTION', 'FILES_INFO'] or key.startswith('FILERPROVIDES_'): |
69 | if keyword_rc.search(value): | 69 | if keyword_rc.search(value): |
70 | match = True | 70 | match = True |
71 | break | 71 | break |
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 ' |
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index da1456a01a..63362b4900 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py | |||
@@ -103,14 +103,14 @@ def _write_append(rc, srctree, same_dir, no_same_dir, rev, copied, workspace, d) | |||
103 | pn = d.getVar('PN') | 103 | pn = d.getVar('PN') |
104 | af = os.path.join(appendpath, '%s.bbappend' % brf) | 104 | af = os.path.join(appendpath, '%s.bbappend' % brf) |
105 | with open(af, 'w') as f: | 105 | with open(af, 'w') as f: |
106 | f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n\n') | 106 | f.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n\n') |
107 | f.write('inherit externalsrc\n') | 107 | f.write('inherit externalsrc\n') |
108 | f.write(('# NOTE: We use pn- overrides here to avoid affecting' | 108 | f.write(('# NOTE: We use pn- overrides here to avoid affecting' |
109 | 'multiple variants in the case where the recipe uses BBCLASSEXTEND\n')) | 109 | 'multiple variants in the case where the recipe uses BBCLASSEXTEND\n')) |
110 | f.write('EXTERNALSRC_pn-%s = "%s"\n' % (pn, srctree)) | 110 | f.write('EXTERNALSRC:pn-%s = "%s"\n' % (pn, srctree)) |
111 | b_is_s = use_external_build(same_dir, no_same_dir, d) | 111 | b_is_s = use_external_build(same_dir, no_same_dir, d) |
112 | if b_is_s: | 112 | if b_is_s: |
113 | f.write('EXTERNALSRC_BUILD_pn-%s = "%s"\n' % (pn, srctree)) | 113 | f.write('EXTERNALSRC_BUILD:pn-%s = "%s"\n' % (pn, srctree)) |
114 | f.write('\n') | 114 | f.write('\n') |
115 | if rev: | 115 | if rev: |
116 | f.write('# initial_rev: %s\n' % rev) | 116 | f.write('# initial_rev: %s\n' % rev) |