Patch review
cover Patch review
Please review this set of changes for styhead and have comments back by end of day Friday, January 31
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/905
The following changes since commit 06439dff5437782f7b6627e0374eaa24ca5aee4a:
boost: fix do_fetch error (2025-01-23 08:26:01 -0800)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/styhead-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/styhead-nut
Adrian Freihofer (5):
devtool: modify support debug-builds
devtool: ide-sdk sort cmake preset
devtool: ide-sdk recommend DEBUG_BUILD
oe-selftest: devtool ide-sdk use modify debug-build
devtool: ide-sdk remove the plugin from eSDK installer
Peter Marko (3):
go: upgrade 1.22.8 -> 1.22.9
go: upgrade 1.22.9 -> 1.22.10
go: upgrade 1.22.10 -> 1.22.11
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
.../go/{go-1.22.8.inc => go-1.22.11.inc} | 2 +-
..._1.22.8.bb => go-binary-native_1.22.11.bb} | 6 +-
...1.22.8.bb => go-cross-canadian_1.22.11.bb} | 0
...go-cross_1.22.8.bb => go-cross_1.22.11.bb} | 0
...sssdk_1.22.8.bb => go-crosssdk_1.22.11.bb} | 0
...untime_1.22.8.bb => go-runtime_1.22.11.bb} | 0
.../go/{go_1.22.8.bb => go_1.22.11.bb} | 0
scripts/lib/devtool/ide_sdk.py | 63 ++++++-------------
scripts/lib/devtool/standard.py | 3 +
10 files changed, 28 insertions(+), 48 deletions(-)
rename meta/recipes-devtools/go/{go-1.22.8.inc => go-1.22.11.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.22.8.bb => go-binary-native_1.22.11.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.22.8.bb => go-cross-canadian_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.22.8.bb => go-cross_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.22.8.bb => go-crosssdk_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.22.8.bb => go-runtime_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go_1.22.8.bb => go_1.22.11.bb} (100%)Signature · 1 line
2.43.0
PATCH 1/8 go: upgrade 1.22.8 -> 1.22.9
From: Peter Marko <[email protected]>
Upgrade to latest 1.22.x release [1]:
$ git --no-pager log --oneline go1.22.8..go1.22.9 8af39d30a4 (tag: go1.22.9) [release-branch.go1.22] go1.22.9 c19e5887f4 [release-branch.go1.22] cmd/cgo/internal/testcarchive: remove 1-minute timeout e3fd4ba7f9 [release-branch.go1.22] cmd/link: generate Mach-O UUID when -B flag is specified 29252e4c5a [release-branch.go1.22] runtime: fix TestGdbAutotmpTypes on gdb version 15
[1] https://github.com/golang/go/compare/go1.22.8...go1.22.9
(From OE-Core rev: 4f2f202506bcefb4d6c46a11738e159e261a4a4b)
---
meta/recipes-devtools/go/{go-1.22.8.inc => go-1.22.9.inc} | 2 +-
...o-binary-native_1.22.8.bb => go-binary-native_1.22.9.bb} | 6 +++---
...cross-canadian_1.22.8.bb => go-cross-canadian_1.22.9.bb} | 0
.../go/{go-cross_1.22.8.bb => go-cross_1.22.9.bb} | 0
.../go/{go-crosssdk_1.22.8.bb => go-crosssdk_1.22.9.bb} | 0
.../go/{go-runtime_1.22.8.bb => go-runtime_1.22.9.bb} | 0
meta/recipes-devtools/go/{go_1.22.8.bb => go_1.22.9.bb} | 0
7 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.22.8.inc => go-1.22.9.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.22.8.bb => go-binary-native_1.22.9.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.22.8.bb => go-cross-canadian_1.22.9.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.22.8.bb => go-cross_1.22.9.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.22.8.bb => go-crosssdk_1.22.9.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.22.8.bb => go-runtime_1.22.9.bb} (100%)
rename meta/recipes-devtools/go/{go_1.22.8.bb => go_1.22.9.bb} (100%)meta/recipes-devtools/go/go-1.22.9.inc renamed from meta/recipes-devtools/go/go-1.22.8.inc +1 -1
@@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "df12c23ebf19dea0f4bf46a22cbeda4a3eca6f474f318390ce774974278440b8" +SRC_URI[main.sha256sum] = "e81a362f51aee2125722b018e46714e6a055a1954283414c0f937e737013db22"
meta/recipes-devtools/go/go-binary-native_1.22.9.bb renamed from meta/recipes-devtools/go/go-binary-native_1.22.8.bb +3 -3
@@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "5f467d29fc67c7ae6468cb6ad5b047a274bae8180cac5e0b7ddbfeba3e47e18f" -SRC_URI[go_linux_arm64.sha256sum] = "5c616b32dab04bb8c4c8700478381daea0174dc70083e4026321163879278a4a" -SRC_URI[go_linux_ppc64le.sha256sum] = "c546f27866510bf8e54e86fe6f58c705af0e894341e5572c91f197a734152c27" +SRC_URI[go_linux_amd64.sha256sum] = "84a8f05b7b969d8acfcaf194ce9298ad5d3ddbfc7034930c280006b5c85a574c" +SRC_URI[go_linux_arm64.sha256sum] = "5beec5ef9f019e1779727ef0d9643fa8bf2495e7222014d2fc4fbfce5999bf01" +SRC_URI[go_linux_ppc64le.sha256sum] = "dcee55b402eaf46e7ffb2018b9e30b27ae5e821367697d8f8ff1ed1cecfd7948" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.22.9.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.22.8.bb +0 -0
meta/recipes-devtools/go/go-cross_1.22.9.bb renamed from meta/recipes-devtools/go/go-cross_1.22.8.bb +0 -0
meta/recipes-devtools/go/go-crosssdk_1.22.9.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.22.8.bb +0 -0
meta/recipes-devtools/go/go-runtime_1.22.9.bb renamed from meta/recipes-devtools/go/go-runtime_1.22.8.bb +0 -0
meta/recipes-devtools/go/go_1.22.9.bb renamed from meta/recipes-devtools/go/go_1.22.8.bb +0 -0
Signature · 1 line
2.43.0
PATCH 2/8 go: upgrade 1.22.9 -> 1.22.10
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
Upgrade to latest 1.22.x release [1]:
$ git --no-pager log --oneline go1.22.9..go1.22.10 8f3f22eef8 (tag: go1.22.10) [release-branch.go1.22] go1.22.10 6d7a95abca [release-branch.go1.22] runtime: reserve 4kB for system stack on windows-386 6f05fa7a4f [release-branch.go1.22] syscall: mark SyscallN as noescape 3355db9690 [release-branch.go1.22] time: accept "+01" in TestLoadFixed on OpenBSD
[1] https://github.com/golang/go/compare/go1.22.9...go1.22.10
(From OE-Core rev: e357c93b39df938dc36195dbd779a58b2951b8e6)
---
meta/recipes-devtools/go/{go-1.22.9.inc => go-1.22.10.inc} | 2 +-
...-binary-native_1.22.9.bb => go-binary-native_1.22.10.bb} | 6 +++---
...ross-canadian_1.22.9.bb => go-cross-canadian_1.22.10.bb} | 0
.../go/{go-cross_1.22.9.bb => go-cross_1.22.10.bb} | 0
.../go/{go-crosssdk_1.22.9.bb => go-crosssdk_1.22.10.bb} | 0
.../go/{go-runtime_1.22.9.bb => go-runtime_1.22.10.bb} | 0
meta/recipes-devtools/go/{go_1.22.9.bb => go_1.22.10.bb} | 0
7 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.22.9.inc => go-1.22.10.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.22.9.bb => go-binary-native_1.22.10.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.22.9.bb => go-cross-canadian_1.22.10.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.22.9.bb => go-cross_1.22.10.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.22.9.bb => go-crosssdk_1.22.10.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.22.9.bb => go-runtime_1.22.10.bb} (100%)
rename meta/recipes-devtools/go/{go_1.22.9.bb => go_1.22.10.bb} (100%)meta/recipes-devtools/go/go-1.22.10.inc renamed from meta/recipes-devtools/go/go-1.22.9.inc +1 -1
@@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "e81a362f51aee2125722b018e46714e6a055a1954283414c0f937e737013db22" +SRC_URI[main.sha256sum] = "1e94fd48be750d1fafb4d9b3b6dd31a6e9d2735d339bf2462bc97b64ca4c1037"
meta/recipes-devtools/go/go-binary-native_1.22.10.bb renamed from meta/recipes-devtools/go/go-binary-native_1.22.9.bb +3 -3
@@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "84a8f05b7b969d8acfcaf194ce9298ad5d3ddbfc7034930c280006b5c85a574c" -SRC_URI[go_linux_arm64.sha256sum] = "5beec5ef9f019e1779727ef0d9643fa8bf2495e7222014d2fc4fbfce5999bf01" -SRC_URI[go_linux_ppc64le.sha256sum] = "dcee55b402eaf46e7ffb2018b9e30b27ae5e821367697d8f8ff1ed1cecfd7948" +SRC_URI[go_linux_amd64.sha256sum] = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092" +SRC_URI[go_linux_arm64.sha256sum] = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec" +SRC_URI[go_linux_ppc64le.sha256sum] = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.22.10.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.22.9.bb +0 -0
meta/recipes-devtools/go/go-cross_1.22.10.bb renamed from meta/recipes-devtools/go/go-cross_1.22.9.bb +0 -0
meta/recipes-devtools/go/go-crosssdk_1.22.10.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.22.9.bb +0 -0
meta/recipes-devtools/go/go-runtime_1.22.10.bb renamed from meta/recipes-devtools/go/go-runtime_1.22.9.bb +0 -0
meta/recipes-devtools/go/go_1.22.10.bb renamed from meta/recipes-devtools/go/go_1.22.9.bb +0 -0
Signature · 1 line
2.43.0
PATCH 4/8 devtool: modify support debug-builds
In reply to Steve SakomanFrom: Adrian Freihofer <[email protected]>
Add a new option --debug-builds to automatically add DEBUG_BUILD = “1” to the bbappend file of this recipe. This is especially useful when invoking devtool modify before invoking devtool ide-sdk to perform a remote debugging session.
--- scripts/lib/devtool/standard.py | 3 +++ 1 file changed, 3 insertions(+)
scripts/lib/devtool/standard.py +3 -0
@@ -975,6 +975,8 @@ def modify(args, config, basepath, workspace): if branch == args.branch: continue f.write('# patches_%s: %s\n' % (branch, ','.join(branch_patches[branch]))) + if args.debug_build: + f.write('\nDEBUG_BUILD = "1"\n') update_unlockedsigs(basepath, workspace, args.fixed_setup, [pn])
@@ -2313,6 +2315,7 @@ def register_commands(subparsers, context): parser_modify.add_argument('--branch', '-b', default="devtool", help='Name for development branch to checkout (when not using -n/--no-extract) (default "%(default)s")') parser_modify.add_argument('--no-overrides', '-O', action="store_true", help='Do not create branches for other override configurations') parser_modify.add_argument('--keep-temp', help='Keep temporary directory (for debugging)', action="store_true") + parser_modify.add_argument('--debug-build', action="store_true", help='Add DEBUG_BUILD = "1" to the modified recipe') parser_modify.set_defaults(func=modify, fixed_setup=context.fixed_setup) parser_extract = subparsers.add_parser('extract', help='Extract the source for an existing recipe',
Signature · 1 line
2.43.0
PATCH 5/8 devtool: ide-sdk sort cmake preset
In reply to Steve SakomanFrom: Adrian Freihofer <[email protected]>
Sort the keys of the generated CMakeUserPreset.json file to make it easier to search and compare.
--- scripts/lib/devtool/ide_sdk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/lib/devtool/ide_sdk.py +2 -2
@@ -493,7 +493,7 @@ class RecipeModified: vars = (key for key in d.keys() if not key.startswith( "__") and not d.getVarFlag(key, "func", False)) - for var in vars: + for var in sorted(vars): func = d.getVarFlag(var, "func", False) if d.getVarFlag(var, 'python', False) and func: continue
@@ -545,7 +545,7 @@ class RecipeModified: cache_vars = {} oecmake_args = d.getVar('OECMAKE_ARGS').split() extra_oecmake = d.getVar('EXTRA_OECMAKE').split() - for param in oecmake_args + extra_oecmake: + for param in sorted(oecmake_args + extra_oecmake): d_pref = "-D" if param.startswith(d_pref): param = param[len(d_pref):]
Signature · 1 line
2.43.0
PATCH 3/8 go: upgrade 1.22.10 -> 1.22.11
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
Upgrade to latest 1.22.x release [1]:
$ git --no-pager log --oneline go1.22.10..go1.22.11 f072884354 (tag: go1.22.11) [release-branch.go1.22] go1.22.11 b72d56f98d [release-branch.go1.22] net/http: persist header stripping across repeated redirects 19d2103415 [release-branch.go1.22] crypto/x509: properly check for IPv6 hosts in URIs ae9996f965 [release-branch.go1.22] runtime: hold traceAcquire across casgstatus in injectglist 223260bc63 [release-branch.go1.22] crypto/tls: fix Config.Time in tests using expired certificates
Fixes CVE-2024-45336 and CVE-2024-45341
[1] https://github.com/golang/go/compare/go1.22.10...go1.22.11
(From OE-Core rev: 4589986602319f9ed61e381b333bb53b731eb8d8)
---
meta/recipes-devtools/go/{go-1.22.10.inc => go-1.22.11.inc} | 2 +-
...binary-native_1.22.10.bb => go-binary-native_1.22.11.bb} | 6 +++---
...oss-canadian_1.22.10.bb => go-cross-canadian_1.22.11.bb} | 0
.../go/{go-cross_1.22.10.bb => go-cross_1.22.11.bb} | 0
.../go/{go-crosssdk_1.22.10.bb => go-crosssdk_1.22.11.bb} | 0
.../go/{go-runtime_1.22.10.bb => go-runtime_1.22.11.bb} | 0
meta/recipes-devtools/go/{go_1.22.10.bb => go_1.22.11.bb} | 0
7 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.22.10.inc => go-1.22.11.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.22.10.bb => go-binary-native_1.22.11.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.22.10.bb => go-cross-canadian_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.22.10.bb => go-cross_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.22.10.bb => go-crosssdk_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.22.10.bb => go-runtime_1.22.11.bb} (100%)
rename meta/recipes-devtools/go/{go_1.22.10.bb => go_1.22.11.bb} (100%)meta/recipes-devtools/go/go-1.22.11.inc renamed from meta/recipes-devtools/go/go-1.22.10.inc +1 -1
@@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "1e94fd48be750d1fafb4d9b3b6dd31a6e9d2735d339bf2462bc97b64ca4c1037" +SRC_URI[main.sha256sum] = "a60c23dec95d10a2576265ce580f57869d5ac2471c4f4aca805addc9ea0fc9fe"
meta/recipes-devtools/go/go-binary-native_1.22.11.bb renamed from meta/recipes-devtools/go/go-binary-native_1.22.10.bb +3 -3
@@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "736ce492a19d756a92719a6121226087ccd91b652ed5caec40ad6dbfb2252092" -SRC_URI[go_linux_arm64.sha256sum] = "5213c5e32fde3bd7da65516467b7ffbfe40d2bb5a5f58105e387eef450583eec" -SRC_URI[go_linux_ppc64le.sha256sum] = "db05b9838f69d741fb9a5301220b1a62014aee025b0baf341aba3d280087b981" +SRC_URI[go_linux_amd64.sha256sum] = "0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991" +SRC_URI[go_linux_arm64.sha256sum] = "9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031" +SRC_URI[go_linux_ppc64le.sha256sum] = "963a0ec973640b23ee8bb7a462cc415276fd8436111a03df8c34eb3b1ae29f12" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.22.11.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.22.10.bb +0 -0
meta/recipes-devtools/go/go-cross_1.22.11.bb renamed from meta/recipes-devtools/go/go-cross_1.22.10.bb +0 -0
meta/recipes-devtools/go/go-crosssdk_1.22.11.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.22.10.bb +0 -0
meta/recipes-devtools/go/go-runtime_1.22.11.bb renamed from meta/recipes-devtools/go/go-runtime_1.22.10.bb +0 -0
meta/recipes-devtools/go/go_1.22.11.bb renamed from meta/recipes-devtools/go/go_1.22.10.bb +0 -0
Signature · 1 line
2.43.0
PATCH 6/8 devtool: ide-sdk recommend DEBUG_BUILD
In reply to Steve SakomanFrom: Adrian Freihofer <[email protected]>
The debug_build_config function was never called. Compiling with debug optimized compiler flags was not working. Even with the --debug-build-config flag set, the build configuration from the recipe was used.
The devtool ide-sdk --debug-build-config approach didn't work very well anyway. The problem is that changing the bbappend file doesn't work while bitbake uses the bbappend file. As a workaround, it would be possible to parse the recipe, get DEBUG_BUILD and the path to the append file, exit tinfoil, change the bbappend file, reopen tinfoil and do what ide-sdk is supposed to do. Such an implementation would be complicated and slow.
Therefore, the code that was originally supposed to implement this is removed from ide-sdk and the new --debug-build function of devtool modify is used instead. Additionally, a hint should be given on how to manually add DEBUG_BUILD = '1' to bbappend.
This is compatible with the VSCode Bitbake plug-in, which does not support this parameter anyway.
--- scripts/lib/devtool/ide_sdk.py | 50 ++++++---------------------------- 1 file changed, 9 insertions(+), 41 deletions(-)
scripts/lib/devtool/ide_sdk.py +9 -41
@@ -288,6 +288,7 @@ class RecipeModified: self.bblayers = None self.bpn = None self.d = None + self.debug_build = None self.fakerootcmd = None self.fakerootenv = None self.libdir = None
@@ -348,6 +349,7 @@ class RecipeModified: self.bpn = recipe_d.getVar('BPN') self.cxx = recipe_d.getVar('CXX') self.d = recipe_d.getVar('D') + self.debug_build = recipe_d.getVar('DEBUG_BUILD') self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD') self.fakerootenv = recipe_d.getVar('FAKEROOTENV') self.libdir = recipe_d.getVar('libdir')
@@ -389,17 +391,6 @@ class RecipeModified: self.recipe_id = self.bpn + "-" + self.package_arch self.recipe_id_pretty = self.bpn + ": " + self.package_arch - def append_to_bbappend(self, append_text): - with open(self.bbappend, 'a') as bbap: - bbap.write(append_text) - - def remove_from_bbappend(self, append_text): - with open(self.bbappend, 'r') as bbap: - text = bbap.read() - new_text = text.replace(append_text, '') - with open(self.bbappend, 'w') as bbap: - bbap.write(new_text) - @staticmethod def is_valid_shell_variable(var): """Skip strange shell variables like systemd
@@ -412,34 +403,6 @@ class RecipeModified: return True return False - def debug_build_config(self, args): - """Explicitely set for example CMAKE_BUILD_TYPE to Debug if not defined otherwise""" - if self.build_tool is BuildTool.CMAKE: - append_text = os.linesep + \ - 'OECMAKE_ARGS:append = " -DCMAKE_BUILD_TYPE:STRING=Debug"' + os.linesep - if args.debug_build_config and not 'CMAKE_BUILD_TYPE' in self.cmake_cache_vars: - self.cmake_cache_vars['CMAKE_BUILD_TYPE'] = { - "type": "STRING", - "value": "Debug", - } - self.append_to_bbappend(append_text) - elif 'CMAKE_BUILD_TYPE' in self.cmake_cache_vars: - del self.cmake_cache_vars['CMAKE_BUILD_TYPE'] - self.remove_from_bbappend(append_text) - elif self.build_tool is BuildTool.MESON: - append_text = os.linesep + 'MESON_BUILDTYPE = "debug"' + os.linesep - if args.debug_build_config and self.meson_buildtype != "debug": - self.mesonopts.replace( - '--buildtype ' + self.meson_buildtype, '--buildtype debug') - self.append_to_bbappend(append_text) - elif self.meson_buildtype == "debug": - self.mesonopts.replace( - '--buildtype debug', '--buildtype plain') - self.remove_from_bbappend(append_text) - elif args.debug_build_config: - logger.warn( - "--debug-build-config is not implemented for this build tool yet.") - def solib_search_path(self, image): """Search for debug symbols in the rootfs and rootfs-dbg
@@ -988,6 +951,13 @@ def ide_setup(args, config, basepath, workspace): recipe_modified.gen_meson_wrapper() ide.setup_modified_recipe( args, recipe_image, recipe_modified) + + if recipe_modified.debug_build != '1': + logger.warn( + 'Recipe %s is compiled with release build configuration. ' + 'You might want to add DEBUG_BUILD = "1" to %s. ' + 'Note that devtool modify --debug-build can do this automatically.', + recipe_modified.name, recipe_modified.bbappend) else: raise DevtoolError("Must not end up here.")
@@ -1065,6 +1035,4 @@ def register_commands(subparsers, context): '-p', '--no-preserve', help='Do not preserve existing files', action='store_true') parser_ide_sdk.add_argument( '--no-check-space', help='Do not check for available space before deploying', action='store_true') - parser_ide_sdk.add_argument( - '--debug-build-config', help='Use debug build flags, for example set CMAKE_BUILD_TYPE=Debug', action='store_true') parser_ide_sdk.set_defaults(func=ide_setup)
Signature · 1 line
2.43.0
PATCH 7/8 oe-selftest: devtool ide-sdk use modify debug-build
In reply to Steve SakomanFrom: Adrian Freihofer <[email protected]>
--- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
@@ -2533,7 +2533,7 @@ class DevtoolIdeSdkTests(DevtoolBase): self.track_for_cleanup(tempdir) self.add_command_to_tearDown('bitbake -c clean %s' % recipe_name) - result = runCmd('devtool modify %s -x %s' % (recipe_name, tempdir)) + result = runCmd('devtool modify %s -x %s --debug-build' % (recipe_name, tempdir)) self.assertExists(os.path.join(tempdir, build_file), 'Extracted source could not be found') self.assertExists(os.path.join(self.workspacedir, 'conf',
Signature · 1 line
2.43.0
PATCH 8/8 devtool: ide-sdk remove the plugin from eSDK installer
In reply to Steve SakomanFrom: Adrian Freihofer <[email protected]>
The ide-sdk command bootstraps the SDK from the bitbake environment before the IDE configuration is generated. In the case of the eSDK installer, the bootstrapping is performed during the installation of the eSDK installer. Running the ide-sdk plugin from an eSDK installer based setup would require skipping the bootstrapping and probably taking some other differences into account when generating the IDE configurations.
This would be possible. But it will probably never be implemented, as running devtool ide-sdk directly from the bitbake environment is much more flexible.
Also, some of the recent improvements that have made it into the core have the potential to make the eSDK installer obsolete at some point in the future:
- bitbake-layers create-layers-setup replicates the layers
- bitbake-config-build replicates the build configuration
- The new sstate mirror features replicate the sstate
- bblock locks the sstate more flexible than the eSDK installer
- devtool ide-sdk bootstraps the SDK directly from the bitbake environment. The same environment-setup... file is provided with --mode=shared.
The devtool modify based workflow is supported since always by devtool and also the default --mode of devtool ide-sdk.
These functions essentially cover what the eSDK installer does without a need for the current implementation of the eSDK installer and the populate_sdk_ext, which is hard to maintain and takes a lot of time to build.
This means that instead of making the ide-sdk plugin compatible with the eSDK installer, we should rather replace the current implementation of the eSDK installer and populate_sdk_ext with an implementation that can replicate a normal bitbake environment in a convenient way where the ide-sdk plugin also just works without additional complexity.
--- scripts/lib/devtool/ide_sdk.py | 9 +++++++++ 1 file changed, 9 insertions(+)
scripts/lib/devtool/ide_sdk.py +9 -0
@@ -965,6 +965,15 @@ def ide_setup(args, config, basepath, workspace): def register_commands(subparsers, context): """Register devtool subcommands from this plugin""" + # The ide-sdk command bootstraps the SDK from the bitbake environment before the IDE + # configuration is generated. In the case of the eSDK, the bootstrapping is performed + # during the installation of the eSDK installer. Running the ide-sdk plugin from an + # eSDK installer-based setup would require skipping the bootstrapping and probably + # taking some other differences into account when generating the IDE configurations. + # This would be possible. But it is not implemented. + if context.fixed_setup: + return + global ide_plugins # Search for IDE plugins in all sub-folders named ide_plugins where devtool seraches for plugins.
Signature · 1 line
2.43.0