diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /scripts/lib/recipetool | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool')
-rw-r--r-- | scripts/lib/recipetool/append.py | 4 | ||||
-rw-r--r-- | scripts/lib/recipetool/create.py | 4 | ||||
-rw-r--r-- | scripts/lib/recipetool/create_buildsys_python.py | 10 | ||||
-rw-r--r-- | scripts/lib/recipetool/create_kmod.py | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index e9d52bb67b..5f629c07d8 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py | |||
@@ -49,7 +49,7 @@ def find_target_file(targetpath, d, pkglist=None): | |||
49 | '/etc/group': '/etc/group should be managed through the useradd and extrausers classes', | 49 | '/etc/group': '/etc/group should be managed through the useradd and extrausers classes', |
50 | '/etc/shadow': '/etc/shadow should be managed through the useradd and extrausers classes', | 50 | '/etc/shadow': '/etc/shadow should be managed through the useradd and extrausers classes', |
51 | '/etc/gshadow': '/etc/gshadow should be managed through the useradd and extrausers classes', | 51 | '/etc/gshadow': '/etc/gshadow should be managed through the useradd and extrausers classes', |
52 | '${sysconfdir}/hostname': '${sysconfdir}/hostname contents should be set by setting hostname_pn-base-files = "value" in configuration',} | 52 | '${sysconfdir}/hostname': '${sysconfdir}/hostname contents should be set by setting hostname:pn-base-files = "value" in configuration',} |
53 | 53 | ||
54 | for pthspec, message in invalidtargets.items(): | 54 | for pthspec, message in invalidtargets.items(): |
55 | if fnmatch.fnmatchcase(targetpath, d.expand(pthspec)): | 55 | if fnmatch.fnmatchcase(targetpath, d.expand(pthspec)): |
@@ -79,7 +79,7 @@ def find_target_file(targetpath, d, pkglist=None): | |||
79 | for fullpth in dictval.keys(): | 79 | for fullpth in dictval.keys(): |
80 | if fnmatch.fnmatchcase(fullpth, targetpath): | 80 | if fnmatch.fnmatchcase(fullpth, targetpath): |
81 | recipes[targetpath].append(pn) | 81 | recipes[targetpath].append(pn) |
82 | elif line.startswith('pkg_preinst_') or line.startswith('pkg_postinst_'): | 82 | elif line.startswith('pkg_preinst:') or line.startswith('pkg_postinst:'): |
83 | scriptval = line.split(':', 1)[1].strip().encode('utf-8').decode('unicode_escape') | 83 | scriptval = line.split(':', 1)[1].strip().encode('utf-8').decode('unicode_escape') |
84 | if 'update-alternatives --install %s ' % targetpath in scriptval: | 84 | if 'update-alternatives --install %s ' % targetpath in scriptval: |
85 | recipes[targetpath].append('?%s' % pn) | 85 | recipes[targetpath].append('?%s' % pn) |
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 566c75369a..0ac97e02e9 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
@@ -710,7 +710,7 @@ def create_recipe(args): | |||
710 | lines_after.append('') | 710 | lines_after.append('') |
711 | 711 | ||
712 | if args.binary: | 712 | if args.binary: |
713 | lines_after.append('INSANE_SKIP_${PN} += "already-stripped"') | 713 | lines_after.append('INSANE_SKIP:${PN} += "already-stripped"') |
714 | lines_after.append('') | 714 | lines_after.append('') |
715 | 715 | ||
716 | if args.npm_dev: | 716 | if args.npm_dev: |
@@ -1177,7 +1177,7 @@ def split_pkg_licenses(licvalues, packages, outlines, fallback_licenses=None, pn | |||
1177 | license = ' '.join(list(set(pkglicenses.get(pkgname, ['Unknown'])))) or 'Unknown' | 1177 | license = ' '.join(list(set(pkglicenses.get(pkgname, ['Unknown'])))) or 'Unknown' |
1178 | if license == 'Unknown' and pkgname in fallback_licenses: | 1178 | if license == 'Unknown' and pkgname in fallback_licenses: |
1179 | license = fallback_licenses[pkgname] | 1179 | license = fallback_licenses[pkgname] |
1180 | outlines.append('LICENSE_%s = "%s"' % (pkgname, license)) | 1180 | outlines.append('LICENSE:%s = "%s"' % (pkgname, license)) |
1181 | outlicenses[pkgname] = license.split() | 1181 | outlicenses[pkgname] = license.split() |
1182 | return outlicenses | 1182 | return outlicenses |
1183 | 1183 | ||
diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py index adfa377956..fdd3366038 100644 --- a/scripts/lib/recipetool/create_buildsys_python.py +++ b/scripts/lib/recipetool/create_buildsys_python.py | |||
@@ -45,9 +45,9 @@ class PythonRecipeHandler(RecipeHandler): | |||
45 | 'Summary': 'SUMMARY', | 45 | 'Summary': 'SUMMARY', |
46 | 'Description': 'DESCRIPTION', | 46 | 'Description': 'DESCRIPTION', |
47 | 'License': 'LICENSE', | 47 | 'License': 'LICENSE', |
48 | 'Requires': 'RDEPENDS_${PN}', | 48 | 'Requires': 'RDEPENDS:${PN}', |
49 | 'Provides': 'RPROVIDES_${PN}', | 49 | 'Provides': 'RPROVIDES:${PN}', |
50 | 'Obsoletes': 'RREPLACES_${PN}', | 50 | 'Obsoletes': 'RREPLACES:${PN}', |
51 | } | 51 | } |
52 | # PN/PV are already set by recipetool core & desc can be extremely long | 52 | # PN/PV are already set by recipetool core & desc can be extremely long |
53 | excluded_fields = [ | 53 | excluded_fields = [ |
@@ -301,7 +301,7 @@ class PythonRecipeHandler(RecipeHandler): | |||
301 | inst_req_deps = ('python3-' + r.replace('.', '-').lower() for r in sorted(inst_reqs)) | 301 | inst_req_deps = ('python3-' + r.replace('.', '-').lower() for r in sorted(inst_reqs)) |
302 | lines_after.append('# WARNING: the following rdepends are from setuptools install_requires. These') | 302 | lines_after.append('# WARNING: the following rdepends are from setuptools install_requires. These') |
303 | lines_after.append('# upstream names may not correspond exactly to bitbake package names.') | 303 | lines_after.append('# upstream names may not correspond exactly to bitbake package names.') |
304 | lines_after.append('RDEPENDS_${{PN}} += "{}"'.format(' '.join(inst_req_deps))) | 304 | lines_after.append('RDEPENDS:${{PN}} += "{}"'.format(' '.join(inst_req_deps))) |
305 | 305 | ||
306 | if mapped_deps: | 306 | if mapped_deps: |
307 | name = info.get('Name') | 307 | name = info.get('Name') |
@@ -313,7 +313,7 @@ class PythonRecipeHandler(RecipeHandler): | |||
313 | lines_after.append('') | 313 | lines_after.append('') |
314 | lines_after.append('# WARNING: the following rdepends are determined through basic analysis of the') | 314 | lines_after.append('# WARNING: the following rdepends are determined through basic analysis of the') |
315 | lines_after.append('# python sources, and might not be 100% accurate.') | 315 | lines_after.append('# python sources, and might not be 100% accurate.') |
316 | lines_after.append('RDEPENDS_${{PN}} += "{}"'.format(' '.join(sorted(mapped_deps)))) | 316 | lines_after.append('RDEPENDS:${{PN}} += "{}"'.format(' '.join(sorted(mapped_deps)))) |
317 | 317 | ||
318 | unmapped_deps -= set(extensions) | 318 | unmapped_deps -= set(extensions) |
319 | unmapped_deps -= set(self.assume_provided) | 319 | unmapped_deps -= set(self.assume_provided) |
diff --git a/scripts/lib/recipetool/create_kmod.py b/scripts/lib/recipetool/create_kmod.py index 85b5c48e53..cc00106961 100644 --- a/scripts/lib/recipetool/create_kmod.py +++ b/scripts/lib/recipetool/create_kmod.py | |||
@@ -113,7 +113,7 @@ class KernelModuleRecipeHandler(RecipeHandler): | |||
113 | kdirpath, _ = check_target(compile_lines, install=False) | 113 | kdirpath, _ = check_target(compile_lines, install=False) |
114 | 114 | ||
115 | if manual_install or not install_lines: | 115 | if manual_install or not install_lines: |
116 | lines_after.append('EXTRA_OEMAKE_append_task-install = " -C ${STAGING_KERNEL_DIR} M=${S}"') | 116 | lines_after.append('EXTRA_OEMAKE:append:task-install = " -C ${STAGING_KERNEL_DIR} M=${S}"') |
117 | elif install_target and install_target != 'modules_install': | 117 | elif install_target and install_target != 'modules_install': |
118 | lines_after.append('MODULES_INSTALL_TARGET = "install"') | 118 | lines_after.append('MODULES_INSTALL_TARGET = "install"') |
119 | 119 | ||