summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 14:27:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commit65133015b1cf545a0c86177ce471a0b2b9340d5c (patch)
tree2d24b99d759e7b7e611217dcc686ae0fe85a671e /scripts
parentbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (diff)
downloadpoky-65133015b1cf545a0c86177ce471a0b2b9340d5c.tar.gz
meta: Manual override fixes
The automated conversion of OE-Core to use the new override sytax isn't perfect. This patches some mis-converted lines and some lines which were missed by the automation. (From OE-Core rev: 4e9a06b64b43131b731fb59a0305f78a98e27fbd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/devtool2
-rw-r--r--scripts/lib/devtool/standard.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/devtool b/scripts/devtool
index 8a4f41bc37..af4811b922 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -100,7 +100,7 @@ def read_workspace():
100 _enable_workspace_layer(config.workspace_path, config, basepath) 100 _enable_workspace_layer(config.workspace_path, config, basepath)
101 101
102 logger.debug('Reading workspace in %s' % config.workspace_path) 102 logger.debug('Reading workspace in %s' % config.workspace_path)
103 externalsrc_re = re.compile(r'^EXTERNALSRC(_pn-([^ =]+))? *= *"([^"]*)"$') 103 externalsrc_re = re.compile(r'^EXTERNALSRC(:pn-([^ =]+))? *= *"([^"]*)"$')
104 for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')): 104 for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')):
105 with open(fn, 'r') as f: 105 with open(fn, 'r') as f:
106 pnvalues = {} 106 pnvalues = {}
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 61f40da90f..b74a60d001 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -523,7 +523,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works
523 history = d.varhistory.variable('SRC_URI') 523 history = d.varhistory.variable('SRC_URI')
524 for event in history: 524 for event in history:
525 if not 'flag' in event: 525 if not 'flag' in event:
526 if event['op'].startswith(('_append[', '_prepend[')): 526 if event['op'].startswith((':append[', ':prepend[')):
527 extra_overrides.append(event['op'].split('[')[1].split(']')[0]) 527 extra_overrides.append(event['op'].split('[')[1].split(']')[0])
528 # We want to remove duplicate overrides. If a recipe had multiple 528 # We want to remove duplicate overrides. If a recipe had multiple
529 # SRC_URI_override += values it would cause mulitple instances of 529 # SRC_URI_override += values it would cause mulitple instances of
@@ -955,17 +955,17 @@ def modify(args, config, basepath, workspace):
955 f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' 955 f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout '
956 'do_fetch do_unpack do_kernel_configcheck"\n') 956 'do_fetch do_unpack do_kernel_configcheck"\n')
957 f.write('\ndo_patch[noexec] = "1"\n') 957 f.write('\ndo_patch[noexec] = "1"\n')
958 f.write('\ndo_configure_append() {\n' 958 f.write('\ndo_configure:append() {\n'
959 ' cp ${B}/.config ${S}/.config.baseline\n' 959 ' cp ${B}/.config ${S}/.config.baseline\n'
960 ' ln -sfT ${B}/.config ${S}/.config.new\n' 960 ' ln -sfT ${B}/.config ${S}/.config.new\n'
961 '}\n') 961 '}\n')
962 f.write('\ndo_kernel_configme_prepend() {\n' 962 f.write('\ndo_kernel_configme:prepend() {\n'
963 ' if [ -e ${S}/.config ]; then\n' 963 ' if [ -e ${S}/.config ]; then\n'
964 ' mv ${S}/.config ${S}/.config.old\n' 964 ' mv ${S}/.config ${S}/.config.old\n'
965 ' fi\n' 965 ' fi\n'
966 '}\n') 966 '}\n')
967 if rd.getVarFlag('do_menuconfig','task'): 967 if rd.getVarFlag('do_menuconfig','task'):
968 f.write('\ndo_configure_append() {\n' 968 f.write('\ndo_configure:append() {\n'
969 ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' 969 ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n'
970 ' cp ${B}/.config ${S}/.config.baseline\n' 970 ' cp ${B}/.config ${S}/.config.baseline\n'
971 ' ln -sfT ${B}/.config ${S}/.config.new\n' 971 ' ln -sfT ${B}/.config ${S}/.config.new\n'