From: Robert Yang Date: Tue, 8 Oct 2024 15:47:27 +0000 (-0700) Subject: cml1.bbclass: do_diffconfig: Don't override .config with .config.orig X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3647eb69038917971a9d8ca9553875adddcc893f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cml1.bbclass: do_diffconfig: Don't override .config with .config.orig Fixed: 1) $ bitbake virtual/kernel -cmenuconfig Do some changes and save the new config to default .config. 2) $ bitbake virtual/kernel -cdiffconfig The config fragment is dumped into ${WORKDIR}/fragment.cfg. But the .config which was saved by step #1 is overridden by .config.orig, so the changes will be lost if run 'bitbake virtual/kernel' And the following comment is for subprocess.call(), not for shutil.copy(), so move subprocess.call() to the correct location. # No need to check the exit code as we know it's going to be # non-zero, but that's what we expect. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie (cherry picked from commit 6cccf6b02f92dad514e65fd779ff659b19eb6be7) Signed-off-by: Steve Sakoman --- diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index 8c207daec41..0bf171a6681 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass @@ -93,10 +93,9 @@ python do_diffconfig() { if isdiff: statement = 'diff --unchanged-line-format= --old-line-format= --new-line-format="%L" ' + configorig + ' ' + config + '>' + fragment - subprocess.call(statement, shell=True) # No need to check the exit code as we know it's going to be # non-zero, but that's what we expect. - shutil.copy(configorig, config) + subprocess.call(statement, shell=True) bb.plain("Config fragment has been dumped into:\n %s" % fragment) else: