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/append.py | |
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/append.py')
-rw-r--r-- | scripts/lib/recipetool/append.py | 4 |
1 files changed, 2 insertions, 2 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) |