mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

meta: remove True option to getVar and getVarFlag calls (again)

Browse Source 
* 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: 26c74fd10614582e177437608908eb43688ab510)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2023-02-01 16:50:38 +01:00
committed by Richard Purdie
parent 8c36e1557f
commit 94149c4f37
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes-recipe/image.bbclass
View File

@@ -446,7 +446,7 @@ python () {
localdata.delVar('DATE') localdata.delVar('DATE')
localdata.delVar('TMPDIR') localdata.delVar('TMPDIR')
localdata.delVar('IMAGE_VERSION_SUFFIX') localdata.delVar('IMAGE_VERSION_SUFFIX')
vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude') or '').split()
for dep in vardepsexclude: for dep in vardepsexclude:
localdata.delVar(dep) localdata.delVar(dep)

2
meta/classes-recipe/license_image.bbclass
View File

@@ -235,7 +235,7 @@ def get_deployed_dependencies(d):
deploy = {} deploy = {}
# Get all the dependencies for the current task (rootfs). # Get all the dependencies for the current task (rootfs).
taskdata = d.getVar("BB_TASKDEPDATA", False) taskdata = d.getVar("BB_TASKDEPDATA", False)
pn = d.getVar("PN", True) pn = d.getVar("PN")
depends = list(set([dep[0] for dep depends = list(set([dep[0] for dep
in list(taskdata.values()) in list(taskdata.values())
if not dep[0].endswith("-native") and not dep[0] == pn])) if not dep[0].endswith("-native") and not dep[0] == pn]))

2
meta/classes-recipe/rust-target-config.bbclass
View File

@@ -114,7 +114,7 @@ def llvm_features_from_target_fpu(d):
# TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float
# ABI. There is no option for hard. # ABI. There is no option for hard.
fpu = d.getVar('TARGET_FPU', True) fpu = d.getVar('TARGET_FPU')
return ["+soft-float"] if fpu == "soft" else [] return ["+soft-float"] if fpu == "soft" else []
def llvm_features(d): def llvm_features(d):

8
meta/lib/oe/package_manager/deb/__init__.py
View File

@@ -82,15 +82,15 @@ class DpkgIndexer(Indexer):
return return
oe.utils.multiprocess_launch(create_index, index_cmds, self.d) oe.utils.multiprocess_launch(create_index, index_cmds, self.d)
if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': if self.d.getVar('PACKAGE_FEED_SIGN') == '1':
signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND'))
else: else:
signer = None signer = None
if signer: if signer:
for f in index_sign_files: for f in index_sign_files:
signer.detach_sign(f, signer.detach_sign(f,
self.d.getVar('PACKAGE_FEED_GPG_NAME', True), self.d.getVar('PACKAGE_FEED_GPG_NAME'),
self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE'),
output_suffix="gpg", output_suffix="gpg",
use_sha256=True) use_sha256=True)

4
meta/recipes-devtools/go/go_1.19.4.bb
View File

@@ -12,7 +12,7 @@ export CXX_FOR_TARGET = "g++"
# mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its
# variants. # variants.
python() { python() {
if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'):
d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel") d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel")
} }

22
meta/recipes-devtools/rust/rust_1.67.0.bb
View File

@@ -83,7 +83,7 @@ python do_configure() {
config = configparser.RawConfigParser() config = configparser.RawConfigParser()
# [target.ARCH-poky-linux] # [target.ARCH-poky-linux]
host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True)) host_section = "target.{}".format(d.getVar('RUST_HOST_SYS'))
config.add_section(host_section) config.add_section(host_section)
llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}") llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}")
@@ -98,7 +98,7 @@ python do_configure() {
# If we don't do this rust-native will compile it's own llvm for BUILD. # If we don't do this rust-native will compile it's own llvm for BUILD.
# [target.${BUILD_ARCH}-unknown-linux-gnu] # [target.${BUILD_ARCH}-unknown-linux-gnu]
build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS', True)) build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS'))
if build_section != host_section: if build_section != host_section:
config.add_section(build_section) config.add_section(build_section)
@@ -108,7 +108,7 @@ python do_configure() {
config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}"))) config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}")))
config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}"))) config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}")))
target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS', True)) target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS'))
if target_section != host_section and target_section != build_section: if target_section != host_section and target_section != build_section:
config.add_section(target_section) config.add_section(target_section)
@@ -154,26 +154,26 @@ python do_configure() {
config.set("build", "vendor", e(True)) config.set("build", "vendor", e(True))
if not "targets" in locals(): if not "targets" in locals():
targets = [d.getVar("RUST_TARGET_SYS", True)] targets = [d.getVar("RUST_TARGET_SYS")]
config.set("build", "target", e(targets)) config.set("build", "target", e(targets))
if not "hosts" in locals(): if not "hosts" in locals():
hosts = [d.getVar("RUST_HOST_SYS", True)] hosts = [d.getVar("RUST_HOST_SYS")]
config.set("build", "host", e(hosts)) config.set("build", "host", e(hosts))
# We can't use BUILD_SYS since that is something the rust snapshot knows # We can't use BUILD_SYS since that is something the rust snapshot knows
# nothing about when trying to build some stage0 tools (like fabricate) # nothing about when trying to build some stage0 tools (like fabricate)
config.set("build", "build", e(d.getVar("RUST_BUILD_SYS", True))) config.set("build", "build", e(d.getVar("RUST_BUILD_SYS")))
# [install] # [install]
config.add_section("install") config.add_section("install")
# ./x.py install doesn't have any notion of "destdir" # ./x.py install doesn't have any notion of "destdir"
# but we can prepend ${D} to all the directories instead # but we can prepend ${D} to all the directories instead
config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True))) config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix")))
config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True))) config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir")))
config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True))) config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir")))
config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True))) config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir")))
config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True))) config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir")))
with open("config.toml", "w") as f: with open("config.toml", "w") as f:
f.write('changelog-seen = 2\n\n') f.write('changelog-seen = 2\n\n')

2
scripts/contrib/image-manifest
View File

@@ -392,7 +392,7 @@ def export_manifest_info(args):
for key in rd.getVarFlags('PACKAGECONFIG').keys(): for key in rd.getVarFlags('PACKAGECONFIG').keys():
if key == 'doc': if key == 'doc':
continue continue
rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key, True) rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key)
if config['patches'] == 'yes': if config['patches'] == 'yes':
patches = oe.recipeutils.get_recipe_patches(rd) patches = oe.recipeutils.get_recipe_patches(rd)

2
scripts/lib/devtool/menuconfig.py
View File

@@ -45,7 +45,7 @@ def menuconfig(args, config, basepath, workspace):
return 1 return 1
check_workspace_recipe(workspace, args.component) check_workspace_recipe(workspace, args.component)
pn = rd.getVar('PN', True) pn = rd.getVar('PN')
if not rd.getVarFlag('do_menuconfig','task'): if not rd.getVarFlag('do_menuconfig','task'):
raise DevtoolError("This recipe does not support menuconfig option") raise DevtoolError("This recipe does not support menuconfig option")