diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r-- | scripts/lib/devtool/standard.py | 8 |
1 files changed, 4 insertions, 4 deletions
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' |