From 6411230fa6865d147430475c288526cd5dd56a6b Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 10 Feb 2020 20:19:51 +0500 Subject: [PATCH] glibc-external: fix do_install_append processing Signed-off-by: Christopher Larson --- recipes-external/glibc/glibc-external.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index 1e07997..8c8c81b 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -57,6 +57,7 @@ python do_install () { bb.build.exec_func('external_toolchain_do_install', d) bb.build.exec_func('glibc_external_do_install_extra', d) bb.build.exec_func('adjust_locale_names', d) + # sentinel } python adjust_locale_names () { @@ -152,8 +153,8 @@ do_install_locale_append() { python () { # Undo the do_install_append which joined shell to python install = d.getVar('do_install', False) - python, shell = install.split('rm -f ', 1) - d.setVar('do_install_glibc', 'rm -f ' + shell) + python, shell = install.split('# sentinel', 1) + d.setVar('do_install_glibc', shell) d.setVarFlag('do_install_glibc', 'func', '1') new_install = python + '\n bb.build.exec_func("do_install_glibc", d)\n' d.setVar('do_install', new_install.replace('\t', ' '))