diff options
-rw-r--r-- | meta/classes-recipe/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes-recipe/license_image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes-recipe/rust-target-config.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oe/package_manager/deb/__init__.py | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go_1.19.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust_1.67.0.bb | 22 | ||||
-rwxr-xr-x | scripts/contrib/image-manifest | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/menuconfig.py | 2 |
8 files changed, 22 insertions, 22 deletions
diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index d9472a795a..ce7d718156 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass | |||
@@ -446,7 +446,7 @@ python () { | |||
446 | localdata.delVar('DATE') | 446 | localdata.delVar('DATE') |
447 | localdata.delVar('TMPDIR') | 447 | localdata.delVar('TMPDIR') |
448 | localdata.delVar('IMAGE_VERSION_SUFFIX') | 448 | localdata.delVar('IMAGE_VERSION_SUFFIX') |
449 | vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() | 449 | vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude') or '').split() |
450 | for dep in vardepsexclude: | 450 | for dep in vardepsexclude: |
451 | localdata.delVar(dep) | 451 | localdata.delVar(dep) |
452 | 452 | ||
diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass index b60d6e44f4..8560c27e93 100644 --- a/meta/classes-recipe/license_image.bbclass +++ b/meta/classes-recipe/license_image.bbclass | |||
@@ -235,7 +235,7 @@ def get_deployed_dependencies(d): | |||
235 | deploy = {} | 235 | deploy = {} |
236 | # Get all the dependencies for the current task (rootfs). | 236 | # Get all the dependencies for the current task (rootfs). |
237 | taskdata = d.getVar("BB_TASKDEPDATA", False) | 237 | taskdata = d.getVar("BB_TASKDEPDATA", False) |
238 | pn = d.getVar("PN", True) | 238 | pn = d.getVar("PN") |
239 | depends = list(set([dep[0] for dep | 239 | depends = list(set([dep[0] for dep |
240 | in list(taskdata.values()) | 240 | in list(taskdata.values()) |
241 | if not dep[0].endswith("-native") and not dep[0] == pn])) | 241 | if not dep[0].endswith("-native") and not dep[0] == pn])) |
diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 939dd13d2f..5e71546fee 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass | |||
@@ -114,7 +114,7 @@ def llvm_features_from_target_fpu(d): | |||
114 | # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float | 114 | # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float |
115 | # ABI. There is no option for hard. | 115 | # ABI. There is no option for hard. |
116 | 116 | ||
117 | fpu = d.getVar('TARGET_FPU', True) | 117 | fpu = d.getVar('TARGET_FPU') |
118 | return ["+soft-float"] if fpu == "soft" else [] | 118 | return ["+soft-float"] if fpu == "soft" else [] |
119 | 119 | ||
120 | def llvm_features(d): | 120 | def llvm_features(d): |
diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py index c672454072..0c23c884c1 100644 --- a/meta/lib/oe/package_manager/deb/__init__.py +++ b/meta/lib/oe/package_manager/deb/__init__.py | |||
@@ -82,15 +82,15 @@ class DpkgIndexer(Indexer): | |||
82 | return | 82 | return |
83 | 83 | ||
84 | oe.utils.multiprocess_launch(create_index, index_cmds, self.d) | 84 | oe.utils.multiprocess_launch(create_index, index_cmds, self.d) |
85 | if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': | 85 | if self.d.getVar('PACKAGE_FEED_SIGN') == '1': |
86 | signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) | 86 | signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND')) |
87 | else: | 87 | else: |
88 | signer = None | 88 | signer = None |
89 | if signer: | 89 | if signer: |
90 | for f in index_sign_files: | 90 | for f in index_sign_files: |
91 | signer.detach_sign(f, | 91 | signer.detach_sign(f, |
92 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), | 92 | self.d.getVar('PACKAGE_FEED_GPG_NAME'), |
93 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), | 93 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE'), |
94 | output_suffix="gpg", | 94 | output_suffix="gpg", |
95 | use_sha256=True) | 95 | use_sha256=True) |
96 | 96 | ||
diff --git a/meta/recipes-devtools/go/go_1.19.4.bb b/meta/recipes-devtools/go/go_1.19.4.bb index 98977673ee..587ee55944 100644 --- a/meta/recipes-devtools/go/go_1.19.4.bb +++ b/meta/recipes-devtools/go/go_1.19.4.bb | |||
@@ -12,7 +12,7 @@ export CXX_FOR_TARGET = "g++" | |||
12 | # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its | 12 | # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its |
13 | # variants. | 13 | # variants. |
14 | python() { | 14 | python() { |
15 | if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): | 15 | if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'): |
16 | d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel") | 16 | d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel") |
17 | } | 17 | } |
18 | 18 | ||
diff --git a/meta/recipes-devtools/rust/rust_1.67.0.bb b/meta/recipes-devtools/rust/rust_1.67.0.bb index f4ac8bc635..60f3daf464 100644 --- a/meta/recipes-devtools/rust/rust_1.67.0.bb +++ b/meta/recipes-devtools/rust/rust_1.67.0.bb | |||
@@ -83,7 +83,7 @@ python do_configure() { | |||
83 | config = configparser.RawConfigParser() | 83 | config = configparser.RawConfigParser() |
84 | 84 | ||
85 | # [target.ARCH-poky-linux] | 85 | # [target.ARCH-poky-linux] |
86 | host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True)) | 86 | host_section = "target.{}".format(d.getVar('RUST_HOST_SYS')) |
87 | config.add_section(host_section) | 87 | config.add_section(host_section) |
88 | 88 | ||
89 | llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}") | 89 | llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}") |
@@ -98,7 +98,7 @@ python do_configure() { | |||
98 | 98 | ||
99 | # If we don't do this rust-native will compile it's own llvm for BUILD. | 99 | # If we don't do this rust-native will compile it's own llvm for BUILD. |
100 | # [target.${BUILD_ARCH}-unknown-linux-gnu] | 100 | # [target.${BUILD_ARCH}-unknown-linux-gnu] |
101 | build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS', True)) | 101 | build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS')) |
102 | if build_section != host_section: | 102 | if build_section != host_section: |
103 | config.add_section(build_section) | 103 | config.add_section(build_section) |
104 | 104 | ||
@@ -108,7 +108,7 @@ python do_configure() { | |||
108 | config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}"))) | 108 | config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}"))) |
109 | config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}"))) | 109 | config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}"))) |
110 | 110 | ||
111 | target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS', True)) | 111 | target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS')) |
112 | if target_section != host_section and target_section != build_section: | 112 | if target_section != host_section and target_section != build_section: |
113 | config.add_section(target_section) | 113 | config.add_section(target_section) |
114 | 114 | ||
@@ -154,26 +154,26 @@ python do_configure() { | |||
154 | config.set("build", "vendor", e(True)) | 154 | config.set("build", "vendor", e(True)) |
155 | 155 | ||
156 | if not "targets" in locals(): | 156 | if not "targets" in locals(): |
157 | targets = [d.getVar("RUST_TARGET_SYS", True)] | 157 | targets = [d.getVar("RUST_TARGET_SYS")] |
158 | config.set("build", "target", e(targets)) | 158 | config.set("build", "target", e(targets)) |
159 | 159 | ||
160 | if not "hosts" in locals(): | 160 | if not "hosts" in locals(): |
161 | hosts = [d.getVar("RUST_HOST_SYS", True)] | 161 | hosts = [d.getVar("RUST_HOST_SYS")] |
162 | config.set("build", "host", e(hosts)) | 162 | config.set("build", "host", e(hosts)) |
163 | 163 | ||
164 | # We can't use BUILD_SYS since that is something the rust snapshot knows | 164 | # We can't use BUILD_SYS since that is something the rust snapshot knows |
165 | # nothing about when trying to build some stage0 tools (like fabricate) | 165 | # nothing about when trying to build some stage0 tools (like fabricate) |
166 | config.set("build", "build", e(d.getVar("RUST_BUILD_SYS", True))) | 166 | config.set("build", "build", e(d.getVar("RUST_BUILD_SYS"))) |
167 | 167 | ||
168 | # [install] | 168 | # [install] |
169 | config.add_section("install") | 169 | config.add_section("install") |
170 | # ./x.py install doesn't have any notion of "destdir" | 170 | # ./x.py install doesn't have any notion of "destdir" |
171 | # but we can prepend ${D} to all the directories instead | 171 | # but we can prepend ${D} to all the directories instead |
172 | config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True))) | 172 | config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix"))) |
173 | config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True))) | 173 | config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir"))) |
174 | config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True))) | 174 | config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir"))) |
175 | config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True))) | 175 | config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir"))) |
176 | config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True))) | 176 | config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir"))) |
177 | 177 | ||
178 | with open("config.toml", "w") as f: | 178 | with open("config.toml", "w") as f: |
179 | f.write('changelog-seen = 2\n\n') | 179 | f.write('changelog-seen = 2\n\n') |
diff --git a/scripts/contrib/image-manifest b/scripts/contrib/image-manifest index 3c07a73a4e..4d65a99258 100755 --- a/scripts/contrib/image-manifest +++ b/scripts/contrib/image-manifest | |||
@@ -392,7 +392,7 @@ def export_manifest_info(args): | |||
392 | for key in rd.getVarFlags('PACKAGECONFIG').keys(): | 392 | for key in rd.getVarFlags('PACKAGECONFIG').keys(): |
393 | if key == 'doc': | 393 | if key == 'doc': |
394 | continue | 394 | continue |
395 | rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key, True) | 395 | rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key) |
396 | 396 | ||
397 | if config['patches'] == 'yes': | 397 | if config['patches'] == 'yes': |
398 | patches = oe.recipeutils.get_recipe_patches(rd) | 398 | patches = oe.recipeutils.get_recipe_patches(rd) |
diff --git a/scripts/lib/devtool/menuconfig.py b/scripts/lib/devtool/menuconfig.py index d87a01e7a9..18daef30c3 100644 --- a/scripts/lib/devtool/menuconfig.py +++ b/scripts/lib/devtool/menuconfig.py | |||
@@ -45,7 +45,7 @@ def menuconfig(args, config, basepath, workspace): | |||
45 | return 1 | 45 | return 1 |
46 | 46 | ||
47 | check_workspace_recipe(workspace, args.component) | 47 | check_workspace_recipe(workspace, args.component) |
48 | pn = rd.getVar('PN', True) | 48 | pn = rd.getVar('PN') |
49 | 49 | ||
50 | if not rd.getVarFlag('do_menuconfig','task'): | 50 | if not rd.getVarFlag('do_menuconfig','task'): |
51 | raise DevtoolError("This recipe does not support menuconfig option") | 51 | raise DevtoolError("This recipe does not support menuconfig option") |