summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-02-01 16:50:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-15 21:46:56 +0000
commit54d0147307e0fb581db20603cfec58d74343a0de (patch)
tree0924d0197faf85851987995fe249615d0ee28e16 /meta/recipes-devtools
parentf8183e4c6f63ac34ab17262f60ea4b64d6712e6f (diff)
downloadpoky-54d0147307e0fb581db20603cfec58d74343a0de.tar.gz
meta: remove True option to getVar and getVarFlag calls (again)
* True is default since 2016 and most layers were already updated not to pass this parameter where not necessary, e.g. oe-core was updated couple times, first in: https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f Updated with the same regexp as later oe-core update: https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba with small modification to replace not only d.getVar, but also data.getVar as in e.g.: e.data.getVar('ERR_REPORT_USERNAME', True) and for getVarFlag: sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \ -i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \ | cut -d':' -f1 \ | sort -u) (From OE-Core rev: de7bf6689a19dc614ce4b39c84ffd825bee1b962) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 26c74fd10614582e177437608908eb43688ab510) Signed-off-by: Steve Sakoman <steve@sakoman.com> (cherry picked from commit 24a86d0c55ee89ae0dc77975e1d0ee02898d2289) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/go/go_1.17.13.bb4
-rw-r--r--meta/recipes-devtools/rust/rust-common.inc2
-rw-r--r--meta/recipes-devtools/rust/rust.inc20
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/go/go_1.17.13.bb b/meta/recipes-devtools/go/go_1.17.13.bb
index 34dc89bb0c..bb57c1c48a 100644
--- a/meta/recipes-devtools/go/go_1.17.13.bb
+++ b/meta/recipes-devtools/go/go_1.17.13.bb
@@ -11,7 +11,7 @@ export CXX_FOR_TARGET = "g++"
11# mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its 11# mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its
12# variants. 12# variants.
13python() { 13python() {
14 if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): 14 if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'):
15 d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel") 15 d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel")
16} 16}
17 17
diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc
index ef70c48d0f..db0bd8fc1b 100644
--- a/meta/recipes-devtools/rust/rust-common.inc
+++ b/meta/recipes-devtools/rust/rust-common.inc
@@ -109,7 +109,7 @@ def llvm_features_from_target_fpu(d):
109 # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float 109 # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float
110 # ABI. There is no option for hard. 110 # ABI. There is no option for hard.
111 111
112 fpu = d.getVar('TARGET_FPU', True) 112 fpu = d.getVar('TARGET_FPU')
113 return ["+soft-float"] if fpu == "soft" else [] 113 return ["+soft-float"] if fpu == "soft" else []
114 114
115def llvm_features(d): 115def llvm_features(d):
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc
index f39228e3c0..008b2ce4a4 100644
--- a/meta/recipes-devtools/rust/rust.inc
+++ b/meta/recipes-devtools/rust/rust.inc
@@ -79,7 +79,7 @@ python do_configure() {
79 config = configparser.RawConfigParser() 79 config = configparser.RawConfigParser()
80 80
81 # [target.ARCH-poky-linux] 81 # [target.ARCH-poky-linux]
82 target_section = "target.{}".format(d.getVar('TARGET_SYS', True)) 82 target_section = "target.{}".format(d.getVar('TARGET_SYS'))
83 config.add_section(target_section) 83 config.add_section(target_section)
84 84
85 llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}") 85 llvm_config = d.expand("${YOCTO_ALTERNATE_EXE_PATH}")
@@ -90,7 +90,7 @@ python do_configure() {
90 90
91 # If we don't do this rust-native will compile it's own llvm for BUILD. 91 # If we don't do this rust-native will compile it's own llvm for BUILD.
92 # [target.${BUILD_ARCH}-unknown-linux-gnu] 92 # [target.${BUILD_ARCH}-unknown-linux-gnu]
93 target_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS', True)) 93 target_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS'))
94 config.add_section(target_section) 94 config.add_section(target_section)
95 95
96 config.set(target_section, "llvm-config", e(llvm_config)) 96 config.set(target_section, "llvm-config", e(llvm_config))
@@ -124,26 +124,26 @@ python do_configure() {
124 config.set("build", "vendor", e(True)) 124 config.set("build", "vendor", e(True))
125 125
126 if not "targets" in locals(): 126 if not "targets" in locals():
127 targets = [d.getVar("TARGET_SYS", True)] 127 targets = [d.getVar("TARGET_SYS")]
128 config.set("build", "target", e(targets)) 128 config.set("build", "target", e(targets))
129 129
130 if not "hosts" in locals(): 130 if not "hosts" in locals():
131 hosts = [d.getVar("HOST_SYS", True)] 131 hosts = [d.getVar("HOST_SYS")]
132 config.set("build", "host", e(hosts)) 132 config.set("build", "host", e(hosts))
133 133
134 # We can't use BUILD_SYS since that is something the rust snapshot knows 134 # We can't use BUILD_SYS since that is something the rust snapshot knows
135 # nothing about when trying to build some stage0 tools (like fabricate) 135 # nothing about when trying to build some stage0 tools (like fabricate)
136 config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS", True))) 136 config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS")))
137 137
138 # [install] 138 # [install]
139 config.add_section("install") 139 config.add_section("install")
140 # ./x.py install doesn't have any notion of "destdir" 140 # ./x.py install doesn't have any notion of "destdir"
141 # but we can prepend ${D} to all the directories instead 141 # but we can prepend ${D} to all the directories instead
142 config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True))) 142 config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix")))
143 config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True))) 143 config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir")))
144 config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True))) 144 config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir")))
145 config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True))) 145 config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir")))
146 config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True))) 146 config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir")))
147 147
148 with open("config.toml", "w") as f: 148 with open("config.toml", "w") as f:
149 f.write('changelog-seen = 2\n\n') 149 f.write('changelog-seen = 2\n\n')