* [PATCH] Drop redundant expand=True parameter from getVar
@ 2024-05-24 6:52 srinuvasan.a
2024-05-24 7:27 ` MOESSBAUER, Felix
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: srinuvasan.a @ 2024-05-24 6:52 UTC (permalink / raw)
To: isar-users; +Cc: jan.kiszka, Srinuvasan A
From: Srinuvasan A <srinuvasan.a@siemens.com>
It is long True by default, but people keep adding new cases of this
redundancy, hence fix this one.
Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
meta/recipes-kernel/linux/linux-custom.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index 0d222332..433ed057 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -97,7 +97,7 @@ KERNEL_NAME_PROVIDED ?= "${@ d.getVar('BPN').partition('linux-')[2]}"
# Determine cross-profile override
python() {
- if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and d.getVar("ISAR_CROSS_COMPILE", True) == "1" and "class-native" not in d.getVar("OVERRIDES", True).split(":"):
+ if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and d.getVar("ISAR_CROSS_COMPILE") == "1" and "class-native" not in d.getVar("OVERRIDES").split(":"):
d.appendVar("OVERRIDES", ":cross-profile")
}
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Drop redundant expand=True parameter from getVar
2024-05-24 6:52 [PATCH] Drop redundant expand=True parameter from getVar srinuvasan.a
@ 2024-05-24 7:27 ` MOESSBAUER, Felix
2024-05-24 8:38 ` Anton Mikanovich
2024-06-03 6:37 ` [PATCH] " Uladzimir Bely
2 siblings, 0 replies; 8+ messages in thread
From: MOESSBAUER, Felix @ 2024-05-24 7:27 UTC (permalink / raw)
To: isar-users, Arjunan, Srinu; +Cc: Kiszka, Jan
On Fri, 2024-05-24 at 12:22 +0530, srinuvasan.a via isar-users wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
>
> It is long True by default, but people keep adding new cases of this
> redundancy, hence fix this one.
Thanks!
Acked-by: Felix Moessbauer <felix.moessbauer@siemens.com>
>
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
> meta/recipes-kernel/linux/linux-custom.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> b/meta/recipes-kernel/linux/linux-custom.inc
> index 0d222332..433ed057 100644
> --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -97,7 +97,7 @@ KERNEL_NAME_PROVIDED ?= "${@
> d.getVar('BPN').partition('linux-')[2]}"
>
> # Determine cross-profile override
> python() {
> - if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and
> d.getVar("ISAR_CROSS_COMPILE", True) == "1" and "class-native" not in
> d.getVar("OVERRIDES", True).split(":"):
> + if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and
> d.getVar("ISAR_CROSS_COMPILE") == "1" and "class-native" not in
> d.getVar("OVERRIDES").split(":"):
> d.appendVar("OVERRIDES", ":cross-profile")
> }
>
> --
> 2.34.1
>
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Drop redundant expand=True parameter from getVar
2024-05-24 6:52 [PATCH] Drop redundant expand=True parameter from getVar srinuvasan.a
2024-05-24 7:27 ` MOESSBAUER, Felix
@ 2024-05-24 8:38 ` Anton Mikanovich
2024-05-27 5:38 ` Srinuvasan Arjunan
2024-05-28 6:20 ` [PATCH v1] " srinuvasan.a
2024-06-03 6:37 ` [PATCH] " Uladzimir Bely
2 siblings, 2 replies; 8+ messages in thread
From: Anton Mikanovich @ 2024-05-24 8:38 UTC (permalink / raw)
To: srinuvasan.a, isar-users; +Cc: jan.kiszka, Felix Moessbauer
24/05/2024 09:52, srinuvasan.a via isar-users wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
>
> It is long True by default, but people keep adding new cases of this
> redundancy, hence fix this one.
>
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
> meta/recipes-kernel/linux/linux-custom.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
> index 0d222332..433ed057 100644
> --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -97,7 +97,7 @@ KERNEL_NAME_PROVIDED ?= "${@ d.getVar('BPN').partition('linux-')[2]}"
>
> # Determine cross-profile override
> python() {
> - if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and d.getVar("ISAR_CROSS_COMPILE", True) == "1" and "class-native" not in d.getVar("OVERRIDES", True).split(":"):
> + if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and d.getVar("ISAR_CROSS_COMPILE") == "1" and "class-native" not in d.getVar("OVERRIDES").split(":"):
> d.appendVar("OVERRIDES", ":cross-profile")
> }
>
Hello Srinuvasan,
This was already fixed in next by:
7505bd07 ("linux-custom: use to_boolean when checking ISAR_CROSS_COMPILE")
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Drop redundant expand=True parameter from getVar
2024-05-24 8:38 ` Anton Mikanovich
@ 2024-05-27 5:38 ` Srinuvasan Arjunan
2024-05-28 6:20 ` [PATCH v1] " srinuvasan.a
1 sibling, 0 replies; 8+ messages in thread
From: Srinuvasan Arjunan @ 2024-05-27 5:38 UTC (permalink / raw)
To: isar-users
[-- Attachment #1.1: Type: text/plain, Size: 1622 bytes --]
On Friday, May 24, 2024 at 2:08:44 PM UTC+5:30 Anton Mikanovich wrote:
24/05/2024 09:52, srinuvasan.a via isar-users wrote:
> From: Srinuvasan A <srinuv...@siemens.com>
>
> It is long True by default, but people keep adding new cases of this
> redundancy, hence fix this one.
>
> Signed-off-by: Srinuvasan A <srinuv...@siemens.com>
> ---
> meta/recipes-kernel/linux/linux-custom.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
b/meta/recipes-kernel/linux/linux-custom.inc
> index 0d222332..433ed057 100644
> --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -97,7 +97,7 @@ KERNEL_NAME_PROVIDED ?= "${@
d.getVar('BPN').partition('linux-')[2]}"
>
> # Determine cross-profile override
> python() {
> - if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and
d.getVar("ISAR_CROSS_COMPILE", True) == "1" and "class-native" not in
d.getVar("OVERRIDES", True).split(":"):
> + if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and
d.getVar("ISAR_CROSS_COMPILE") == "1" and "class-native" not in
d.getVar("OVERRIDES").split(":"):
> d.appendVar("OVERRIDES", ":cross-profile")
> }
>
Hello Srinuvasan,
This was already fixed in next by:
7505bd07 ("linux-custom: use to_boolean when checking ISAR_CROSS_COMPILE")
Hi Anton,
Yes, accidently created patch on master instead of next, sorry
for the inconvenience, but still it's partially fixed in next, i will send
v1 of this patch again.
Thanks,
Srinu
[-- Attachment #1.2: Type: text/html, Size: 2186 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v1] Drop redundant expand=True parameter from getVar
2024-05-24 8:38 ` Anton Mikanovich
2024-05-27 5:38 ` Srinuvasan Arjunan
@ 2024-05-28 6:20 ` srinuvasan.a
1 sibling, 0 replies; 8+ messages in thread
From: srinuvasan.a @ 2024-05-28 6:20 UTC (permalink / raw)
To: isar-users; +Cc: Srinuvasan A
From: Srinuvasan A <srinuvasan.a@siemens.com>
It is long True by default, but people keep adding new cases of this
redundancy, hence fix this one.
Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
meta/recipes-kernel/linux/linux-custom.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index b53d136c..aef80fbb 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -97,7 +97,7 @@ KERNEL_NAME_PROVIDED ?= "${@ d.getVar('BPN').partition('linux-')[2]}"
# Determine cross-profile override
python() {
- if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and bb.utils.to_boolean(d.getVar("ISAR_CROSS_COMPILE")) and "class-native" not in d.getVar("OVERRIDES", True).split(":"):
+ if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and bb.utils.to_boolean(d.getVar("ISAR_CROSS_COMPILE")) and "class-native" not in d.getVar("OVERRIDES").split(":"):
d.appendVar("OVERRIDES", ":cross-profile")
}
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Drop redundant expand=True parameter from getVar
2024-05-24 6:52 [PATCH] Drop redundant expand=True parameter from getVar srinuvasan.a
2024-05-24 7:27 ` MOESSBAUER, Felix
2024-05-24 8:38 ` Anton Mikanovich
@ 2024-06-03 6:37 ` Uladzimir Bely
2 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2024-06-03 6:37 UTC (permalink / raw)
To: srinuvasan.a, isar-users
On Fri, 2024-05-24 at 12:22 +0530, srinuvasan.a via isar-users wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
>
> It is long True by default, but people keep adding new cases of this
> redundancy, hence fix this one.
>
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
> meta/recipes-kernel/linux/linux-custom.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> b/meta/recipes-kernel/linux/linux-custom.inc
> index 0d222332..433ed057 100644
> --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -97,7 +97,7 @@ KERNEL_NAME_PROVIDED ?= "${@
> d.getVar('BPN').partition('linux-')[2]}"
>
> # Determine cross-profile override
> python() {
> - if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and
> d.getVar("ISAR_CROSS_COMPILE", True) == "1" and "class-native" not in
> d.getVar("OVERRIDES", True).split(":"):
> + if d.getVar("DISTRO_ARCH") != d.getVar("HOST_ARCH") and
> d.getVar("ISAR_CROSS_COMPILE") == "1" and "class-native" not in
> d.getVar("OVERRIDES").split(":"):
> d.appendVar("OVERRIDES", ":cross-profile")
> }
>
> --
> 2.34.1
>
Applied to next, thanks.
--
Best regards,
Uladzimir.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Drop redundant expand=True parameter from getVar
2023-02-28 7:24 Jan Kiszka
@ 2023-03-06 6:03 ` Uladzimir Bely
0 siblings, 0 replies; 8+ messages in thread
From: Uladzimir Bely @ 2023-03-06 6:03 UTC (permalink / raw)
To: isar-users
In the email from Tuesday, 28 February 2023 10:24:07 +03 user Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> It is long True by default, but people keep adding new cases of this
> redundancy. Fix at least the existing ones via
>
> for f in $(git ls-tree --name-only -r HEAD meta*); do
> sed -i "s/\(getVar([^,]*\), True)/\1)/g" $f;
> done
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> Please double-check that I all conversions are correct and that I didn't
> touch any file that is supposed to stay in sync with OE (I don't think
> so).
>
> meta-isar/recipes-app/hello/hello.bb | 2 +-
> meta/classes/base.bbclass | 20 ++++++-------
> meta/classes/buildchroot.bbclass | 2 +-
> meta/classes/dpkg-base.bbclass | 20 ++++++-------
> meta/classes/dpkg.bbclass | 4 +--
> meta/classes/image-account-extension.bbclass | 6 ++--
> meta/classes/image-locales-extension.bbclass | 4 +--
> meta/classes/image-tools-extension.bbclass | 2 +-
> meta/classes/image.bbclass | 10 +++----
> meta/classes/imagetypes_wic.bbclass | 18 ++++++------
> meta/classes/initramfs.bbclass | 2 +-
> meta/classes/isar-events.bbclass | 2 +-
> meta/classes/rootfs.bbclass | 4 +--
> meta/classes/sbuild.bbclass | 2 +-
> meta/classes/sdk.bbclass | 6 ++--
> meta/classes/template.bbclass | 8 +++---
> .../isar-bootstrap/isar-bootstrap.inc | 28 +++++++++----------
> meta/recipes-kernel/kselftest/kselftest.inc | 6 ++--
> meta/recipes-kernel/linux/linux-custom.inc | 14 +++++-----
> meta/recipes-kernel/linux/linux-distro.bb | 10 +++----
> 20 files changed, 85 insertions(+), 85 deletions(-)
>
Applied to next, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Drop redundant expand=True parameter from getVar
@ 2023-02-28 7:24 Jan Kiszka
2023-03-06 6:03 ` Uladzimir Bely
0 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2023-02-28 7:24 UTC (permalink / raw)
To: isar-users; +Cc: Cedric Hombourger
From: Jan Kiszka <jan.kiszka@siemens.com>
It is long True by default, but people keep adding new cases of this
redundancy. Fix at least the existing ones via
for f in $(git ls-tree --name-only -r HEAD meta*); do
sed -i "s/\(getVar([^,]*\), True)/\1)/g" $f;
done
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Please double-check that I all conversions are correct and that I didn't
touch any file that is supposed to stay in sync with OE (I don't think
so).
meta-isar/recipes-app/hello/hello.bb | 2 +-
meta/classes/base.bbclass | 20 ++++++-------
meta/classes/buildchroot.bbclass | 2 +-
meta/classes/dpkg-base.bbclass | 20 ++++++-------
meta/classes/dpkg.bbclass | 4 +--
meta/classes/image-account-extension.bbclass | 6 ++--
meta/classes/image-locales-extension.bbclass | 4 +--
meta/classes/image-tools-extension.bbclass | 2 +-
meta/classes/image.bbclass | 10 +++----
meta/classes/imagetypes_wic.bbclass | 18 ++++++------
meta/classes/initramfs.bbclass | 2 +-
meta/classes/isar-events.bbclass | 2 +-
meta/classes/rootfs.bbclass | 4 +--
meta/classes/sbuild.bbclass | 2 +-
meta/classes/sdk.bbclass | 6 ++--
meta/classes/template.bbclass | 8 +++---
.../isar-bootstrap/isar-bootstrap.inc | 28 +++++++++----------
meta/recipes-kernel/kselftest/kselftest.inc | 6 ++--
meta/recipes-kernel/linux/linux-custom.inc | 14 +++++-----
meta/recipes-kernel/linux/linux-distro.bb | 10 +++----
20 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-isar/recipes-app/hello/hello.bb
index 53d28e8f..acf8ed73 100644
--- a/meta-isar/recipes-app/hello/hello.bb
+++ b/meta-isar/recipes-app/hello/hello.bb
@@ -15,7 +15,7 @@ SRC_URI = "apt://${PN}"
MAINTAINER = "isar-users <isar-users@googlegroups.com>"
CHANGELOG_V = "<orig-version>+isar"
-DEB_BUILD_OPTIONS += "${@ 'nocheck' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' else '' }"
+DEB_BUILD_OPTIONS += "${@ 'nocheck' if d.getVar('ISAR_CROSS_COMPILE') == '1' else '' }"
do_prepare_build() {
deb_add_changelog
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 88e173d8..53550ae2 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -18,7 +18,7 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
-THISDIR = "${@os.path.dirname(d.getVar('FILE', True))}"
+THISDIR = "${@os.path.dirname(d.getVar('FILE'))}"
FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}"], d)}"
OE_IMPORTS += "os sys time oe.path oe.patch oe.sstatesig oe.utils"
@@ -71,7 +71,7 @@ do_showdata[nostamp] = "1"
python do_showdata() {
for e in d.keys():
if d.getVarFlag(e, 'python'):
- code = d.getVar(e, True)
+ code = d.getVar(e)
if code.startswith("def"):
bb.plain("\n" + code + "\n")
else:
@@ -103,9 +103,9 @@ python do_listtasks() {
}
root_cleandirs() {
- ROOT_CLEANDIRS_DIRS_PY="${@d.getVar("ROOT_CLEANDIRS_DIRS", True) or ""}"
+ ROOT_CLEANDIRS_DIRS_PY="${@d.getVar("ROOT_CLEANDIRS_DIRS") or ""}"
ROOT_CLEANDIRS_DIRS="${ROOT_CLEANDIRS_DIRS-${ROOT_CLEANDIRS_DIRS_PY}}"
- TMPDIR_PY="${@d.getVar("TMPDIR", True) or ""}"
+ TMPDIR_PY="${@d.getVar("TMPDIR") or ""}"
TMPDIR="${TMPDIR-${TMPDIR_PY}}"
for i in $ROOT_CLEANDIRS_DIRS; do
awk '{ print $2 }' /proc/mounts | grep -q "^${i}\(/\|\$\)" && \
@@ -125,7 +125,7 @@ python() {
if flags and flags.get('task'):
rcleandirs = flags.get('root_cleandirs')
if rcleandirs:
- tmpdir = os.path.normpath(d.getVar("TMPDIR", True))
+ tmpdir = os.path.normpath(d.getVar("TMPDIR"))
rcleandirs = list(
os.path.normpath(d.expand(i)) for i in rcleandirs.split()
)
@@ -187,7 +187,7 @@ do_fetch[network] = "${TASK_USE_NETWORK}"
# Fetch package from the source link
python do_fetch() {
- src_uri = (d.getVar('SRC_URI', True) or "").split()
+ src_uri = (d.getVar('SRC_URI') or "").split()
if len(src_uri) == 0:
return
@@ -204,11 +204,11 @@ do_unpack[dirs] = "${WORKDIR}"
# Unpack package and put it into working directory
python do_unpack() {
- src_uri = (d.getVar('SRC_URI', True) or "").split()
+ src_uri = (d.getVar('SRC_URI') or "").split()
if len(src_uri) == 0:
return
- rootdir = d.getVar('WORKDIR', True)
+ rootdir = d.getVar('WORKDIR')
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
@@ -236,7 +236,7 @@ python do_clean() {
import subprocess
import glob
- for f in (d.getVar('CLEANFUNCS', True) or '').split():
+ for f in (d.getVar('CLEANFUNCS') or '').split():
bb.build.exec_func(f, d)
workdir = d.expand("${WORKDIR}")
@@ -257,7 +257,7 @@ python do_cleansstate() {
addtask cleanall after do_cleansstate
do_cleanall[nostamp] = "1"
python do_cleanall() {
- src_uri = (d.getVar('SRC_URI', True) or "").split()
+ src_uri = (d.getVar('SRC_URI') or "").split()
if len(src_uri) == 0:
return
diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass
index 5abd533b..048d3249 100644
--- a/meta/classes/buildchroot.bbclass
+++ b/meta/classes/buildchroot.bbclass
@@ -7,7 +7,7 @@ ISAR_CROSS_COMPILE ??= "0"
# Choose the correct buildchroot: host or target
python __anonymous() {
- mode = d.getVar('ISAR_CROSS_COMPILE', True)
+ mode = d.getVar('ISAR_CROSS_COMPILE')
distro_arch = d.getVar('DISTRO_ARCH')
if mode == "0" or d.getVar('HOST_ARCH') == distro_arch:
dep = "buildchroot-target:do_build"
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index ad28f7b3..44e2e694 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -13,7 +13,7 @@ inherit deb-dl-dir
DEPENDS ?= ""
RPROVIDES ?= "${PROVIDES}"
-DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}"
+DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE') == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}"
DEB_BUILD_PROFILES ?= ""
DEB_BUILD_OPTIONS ?= ""
@@ -22,7 +22,7 @@ ISAR_APT_REPO ?= "deb [trusted=yes] file:///home/builder/${PN}/isar-apt/${DISTRO
python do_adjust_git() {
import subprocess
- rootdir = d.getVar('WORKDIR', True)
+ rootdir = d.getVar('WORKDIR')
git_link = os.path.join(d.getVar('GIT_DL_LINK_DIR'), '.git-downloads')
dl_dir = d.getVar("DL_DIR")
@@ -34,7 +34,7 @@ python do_adjust_git() {
if not os.path.exists(git_link):
os.symlink(git_dl, git_link)
- for src_uri in (d.getVar("SRC_URI", True) or "").split():
+ for src_uri in (d.getVar("SRC_URI") or "").split():
try:
fetcher = bb.fetch2.Fetch([src_uri], d)
ud = fetcher.ud[src_uri]
@@ -161,8 +161,8 @@ do_cleanall_apt() {
}
def get_package_srcdir(d):
- s = os.path.abspath(d.getVar("S", True))
- workdir = os.path.abspath(d.getVar("WORKDIR", True))
+ s = os.path.abspath(d.getVar("S"))
+ workdir = os.path.abspath(d.getVar("WORKDIR"))
if os.path.commonpath([s, workdir]) == workdir:
if s == workdir:
bb.warn('S is not a subdir of WORKDIR debian package operations' +
@@ -202,13 +202,13 @@ dpkg_runbuild() {
}
def isar_deb_build_profiles(d):
- deb_build_profiles = d.getVar('DEB_BUILD_PROFILES', True)
- if d.getVar('ISAR_CROSS_COMPILE', True) == "1":
+ deb_build_profiles = d.getVar('DEB_BUILD_PROFILES')
+ if d.getVar('ISAR_CROSS_COMPILE') == "1":
deb_build_profiles += ' cross'
return deb_build_profiles.strip()
def isar_deb_build_options(d):
- deb_build_options = d.getVar('DEB_BUILD_OPTIONS', True)
+ deb_build_options = d.getVar('DEB_BUILD_OPTIONS')
return deb_build_options.strip()
# use with caution: might contaminate multiple tasks
@@ -294,8 +294,8 @@ python do_devshell() {
schroot = d.getVar('SBUILD_CHROOT')
isar_apt = d.getVar('ISAR_APT_REPO')
- pkg_arch = d.getVar('PACKAGE_ARCH', True)
- build_arch = d.getVar('SBUILD_HOST_ARCH', True)
+ pkg_arch = d.getVar('PACKAGE_ARCH')
+ build_arch = d.getVar('SBUILD_HOST_ARCH')
pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS'))
debdistroname = d.getVar('DEBDISTRONAME')
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index d5285032..4d17cb4d 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -13,8 +13,8 @@ SBUILD_PASSTHROUGH_ADDITIONS ?= ""
def expand_sbuild_pt_additions(d):
cmds = ''
- for var in d.getVar('SBUILD_PASSTHROUGH_ADDITIONS', True).split():
- varval = d.getVar(var, True)
+ for var in d.getVar('SBUILD_PASSTHROUGH_ADDITIONS').split():
+ varval = d.getVar(var)
if varval != None:
cmds += 'sbuild_export ' + var + ' "' + varval + '"\n'
return cmds
diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass
index cbc20a25..1a1f704d 100644
--- a/meta/classes/image-account-extension.bbclass
+++ b/meta/classes/image-account-extension.bbclass
@@ -28,7 +28,7 @@ GROUPS ??= ""
def gen_accounts_array(d, listname, entryname, flags, verb_flags=None):
from itertools import chain
- entries = (d.getVar(listname, True) or "").split()
+ entries = (d.getVar(listname) or "").split()
return " ".join(
":".join(
chain(
@@ -62,7 +62,7 @@ ROOTFS_POSTPROCESS_COMMAND += "image_postprocess_accounts"
image_postprocess_accounts() {
# Create groups
# Add space to the end of the list:
- list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_GROUPS', True).split())} '
+ list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_GROUPS').split())} '
while true; do
# Pop first group entry:
list_rest="${list#*:*:* }"
@@ -125,7 +125,7 @@ image_postprocess_accounts() {
done
# Create users
- list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_USERS', True).split())} '
+ list='${@" ".join(d.getVar('IMAGE_ACCOUNTS_USERS').split())} '
while true; do
# Pop first user entry:
list_rest="${list#*:*:*:*:*:*:*:*:*:*:* }"
diff --git a/meta/classes/image-locales-extension.bbclass b/meta/classes/image-locales-extension.bbclass
index 65b9ac80..b48bcec8 100644
--- a/meta/classes/image-locales-extension.bbclass
+++ b/meta/classes/image-locales-extension.bbclass
@@ -11,13 +11,13 @@ LOCALE_GEN ?= "en_US.UTF-8 UTF-8\n\
LOCALE_DEFAULT ?= "en_US.UTF-8"
def get_locale_gen(d, sep='\n'):
- locale_gen = d.getVar("LOCALE_GEN", True) or ""
+ locale_gen = d.getVar("LOCALE_GEN") or ""
return sep.join(sorted(set(i.strip()
for i in locale_gen.split('\\n')
if i.strip())))
def get_nopurge(d):
- locale_gen = d.getVar("LOCALE_GEN", True) or ""
+ locale_gen = d.getVar("LOCALE_GEN") or ""
return '\n'.join(sorted(set(i.strip()
for j in locale_gen.split('\\n')
if j.strip()
diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass
index 2d3dda4f..7c84505f 100644
--- a/meta/classes/image-tools-extension.bbclass
+++ b/meta/classes/image-tools-extension.bbclass
@@ -16,7 +16,7 @@ do_install_imager_deps[deptask] = "do_deploy_deb"
do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock"
do_install_imager_deps[network] = "${TASK_USE_NETWORK_AND_SUDO}"
do_install_imager_deps() {
- if [ -z "${@d.getVar("IMAGER_INSTALL", True).strip()}" ]; then
+ if [ -z "${@d.getVar("IMAGER_INSTALL").strip()}" ]; then
exit
fi
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ef7d5a2a..8390cad0 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -10,10 +10,10 @@ STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*"
SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}"
IMAGE_INSTALL ?= ""
-IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}"
+IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE") if d.getVar("IMAGE_TYPE") else "ext4"}"
IMAGE_ROOTFS ?= "${WORKDIR}/rootfs"
-KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}"
+KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}"
IMAGE_INSTALL += "${KERNEL_IMAGE_PKG}"
# Name of the image including distro&machine names
@@ -56,7 +56,7 @@ python(){
}
def cfg_script(d):
- cf = d.getVar('DISTRO_CONFIG_SCRIPT', True) or ''
+ cf = d.getVar('DISTRO_CONFIG_SCRIPT') or ''
if cf:
return 'file://' + cf
return ''
@@ -100,10 +100,10 @@ ROOTFS_EXTRA ?= "64"
def get_rootfs_size(d):
import subprocess
- rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True))
+ rootfs_extra = int(d.getVar("ROOTFS_EXTRA"))
output = subprocess.check_output(
- ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)]
+ ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS")]
)
base_size = int(output.split()[0])
diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
index b0b27a9b..5be53f60 100644
--- a/meta/classes/imagetypes_wic.bbclass
+++ b/meta/classes/imagetypes_wic.bbclass
@@ -24,7 +24,7 @@ python () {
wks_full_path = None
- wks_file = d.getVar('WKS_FILE', True)
+ wks_file = d.getVar('WKS_FILE')
if not wks_file:
bb.fatal("WKS_FILE must be set")
if not wks_file.endswith('.wks') and not wks_file.endswith('.wks.in'):
@@ -34,10 +34,10 @@ python () {
if os.path.exists(wks_file):
wks_full_path = wks_file
else:
- bbpaths = d.getVar('BBPATH', True).split(':')
+ bbpaths = d.getVar('BBPATH').split(':')
corebase_paths = bbpaths
- corebase = d.getVar('COREBASE', True)
+ corebase = d.getVar('COREBASE')
if corebase is not None:
corebase_paths.append(corebase)
@@ -110,24 +110,24 @@ WICVARS += "\
WICVARS += "DISTRO DISTRO_ARCH"
python do_rootfs_wicenv () {
- wicvars = d.getVar('WICVARS', True)
+ wicvars = d.getVar('WICVARS')
if not wicvars:
return
- stdir = d.getVar('STAGING_DIR', True)
- outdir = os.path.join(stdir, d.getVar('MACHINE', True), 'imgdata')
+ stdir = d.getVar('STAGING_DIR')
+ outdir = os.path.join(stdir, d.getVar('MACHINE'), 'imgdata')
bb.utils.mkdirhier(outdir)
- basename = d.getVar('IMAGE_BASENAME', True)
+ basename = d.getVar('IMAGE_BASENAME')
with open(os.path.join(outdir, basename) + '.env', 'w') as envf:
for var in wicvars.split():
- value = d.getVar(var, True)
+ value = d.getVar(var)
if value:
envf.write('{}="{}"\n'.format(var, value.strip()))
# this part is stolen from OE ./meta/recipes-core/meta/wic-tools.bb
with open(os.path.join(outdir, "wic-tools.env"), 'w') as envf:
for var in ('RECIPE_SYSROOT_NATIVE', 'STAGING_DATADIR', 'STAGING_LIBDIR'):
- envf.write('{}="{}"\n'.format(var, d.getVar(var, True).strip()))
+ envf.write('{}="{}"\n'.format(var, d.getVar(var).strip()))
}
diff --git a/meta/classes/initramfs.bbclass b/meta/classes/initramfs.bbclass
index a5141a53..460ae652 100644
--- a/meta/classes/initramfs.bbclass
+++ b/meta/classes/initramfs.bbclass
@@ -14,7 +14,7 @@ INITRAMFS_ROOTFS ?= "${WORKDIR}/rootfs"
INITRAMFS_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${INITRAMFS_FULLNAME}.initrd.img"
# Install proper kernel
-INITRAMFS_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}"
+INITRAMFS_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME")) if d.getVar("KERNEL_NAME") else ""}"
# Name of the initramfs including distro&machine names
INITRAMFS_FULLNAME = "${PN}-${DISTRO}-${MACHINE}"
diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass
index f52b2349..4f3c87dd 100644
--- a/meta/classes/isar-events.bbclass
+++ b/meta/classes/isar-events.bbclass
@@ -45,7 +45,7 @@ addhandler build_completed
python build_completed() {
import subprocess
- tmpdir = d.getVar('TMPDIR', True)
+ tmpdir = d.getVar('TMPDIR')
if not tmpdir:
return
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 0eed3d02..784793b5 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -182,8 +182,8 @@ do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARC
do_rootfs_install[recrdeptask] = "do_deploy_deb"
do_rootfs_install[network] = "${TASK_USE_SUDO}"
python do_rootfs_install() {
- configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND", True) or "").split()
- install_cmds = (d.getVar("ROOTFS_INSTALL_COMMAND", True) or "").split()
+ configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND") or "").split()
+ install_cmds = (d.getVar("ROOTFS_INSTALL_COMMAND") or "").split()
# Mount after configure commands, so that they have time to copy
# 'isar-apt' (sdkchroot):
diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass
index 6e3c790c..5ea58775 100644
--- a/meta/classes/sbuild.bbclass
+++ b/meta/classes/sbuild.bbclass
@@ -9,7 +9,7 @@ python __anonymous() {
import pwd
d.setVar('SCHROOT_USER', pwd.getpwuid(os.geteuid()).pw_name)
- mode = d.getVar('ISAR_CROSS_COMPILE', True)
+ mode = d.getVar('ISAR_CROSS_COMPILE')
distro_arch = d.getVar('DISTRO_ARCH')
if mode == "0" or d.getVar('HOST_ARCH') == distro_arch:
d.setVar('SBUILD_HOST_ARCH', distro_arch)
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 01eb3a67..faf1efbd 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -44,13 +44,13 @@ SDK_PREINSTALL += " \
# Choose the correct toolchain: cross or native
python __anonymous() {
- mode = d.getVar('ISAR_CROSS_COMPILE', True)
+ mode = d.getVar('ISAR_CROSS_COMPILE')
distro_arch = d.getVar('DISTRO_ARCH')
if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or distro_arch == None:
toolchain = "build-essential"
else:
toolchain = "crossbuild-essential-" + distro_arch
- if d.getVar('ISAR_ENABLE_COMPAT_ARCH', True) == "1":
+ if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == "1":
toolchain += " crossbuild-essential-" + d.getVar('COMPAT_DISTRO_ARCH')
d.setVar('TOOLCHAIN', toolchain)
}
@@ -67,7 +67,7 @@ IMAGE_FSTYPES:class-sdk = "${SDK_FORMATS}"
# bitbake dependencies
SDKDEPENDS += "sdk-files ${SDK_INSTALL}"
-SDKDEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}"
+SDKDEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE') == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}"
DEPENDS:class-sdk = "${SDKDEPENDS}"
SDKROOTFSDEPENDS = ""
diff --git a/meta/classes/template.bbclass b/meta/classes/template.bbclass
index e6bcc362..1f4cedbd 100644
--- a/meta/classes/template.bbclass
+++ b/meta/classes/template.bbclass
@@ -10,13 +10,13 @@ do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}"
python do_transform_template() {
import subprocess, contextlib, shutil
- workdir = os.path.normpath(d.getVar('WORKDIR', True))
+ workdir = os.path.normpath(d.getVar('WORKDIR'))
- template_vars = (d.getVar('TEMPLATE_VARS', True) or "").split()
+ template_vars = (d.getVar('TEMPLATE_VARS') or "").split()
if len(template_vars) == 0:
return
- template_files = (d.getVar('TEMPLATE_FILES', True) or "").split()
+ template_files = (d.getVar('TEMPLATE_FILES') or "").split()
if len(template_files) == 0:
return
@@ -27,7 +27,7 @@ python do_transform_template() {
# from bitbake data store:
env = os.environ.copy()
for varname in template_vars:
- value = d.getVar(varname, True)
+ value = d.getVar(varname)
if value:
env.update({varname: value})
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 99d75e21..f4c088e8 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -36,7 +36,7 @@ inherit deb-dl-dir
python () {
distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split()
third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS") or "").split()
- topdir = d.getVar("TOPDIR", True)
+ topdir = d.getVar("TOPDIR")
# The cached repo key can be both for bootstrapping and apt package
# installation afterwards. However, debootstrap will include the key into
@@ -59,11 +59,11 @@ python () {
filename = os.path.relpath(fetcher.localpath(key), topdir)
d.appendVar("THIRD_PARTY_APT_KEYFILES", " ${TOPDIR}/%s" % filename)
- distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or ""
+ distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES") or ""
for file in distro_apt_sources.split():
d.appendVar("SRC_URI", " file://%s" % file)
- distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) or ""
+ distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES") or ""
for file in distro_apt_preferences.split():
d.appendVar("SRC_URI", " file://%s" % file)
}
@@ -113,7 +113,7 @@ def get_apt_source_mirror(d, aptsources_entry_list):
if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')):
premirrors = "\S* file://${REPO_BASE_DIR}/${BOOTSTRAP_BASE_DISTRO}\n"
else:
- premirrors = d.getVar('DISTRO_APT_PREMIRRORS', True) or ""
+ premirrors = d.getVar('DISTRO_APT_PREMIRRORS') or ""
mirror_list = [entry.split()
for entry in premirrors.split('\\n')
if any(entry)]
@@ -150,7 +150,7 @@ def aggregate_aptsources_list(d, file_list, file_out):
def get_aptsources_list(d):
import errno
apt_sources_var = d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES"
- list = (d.getVar(apt_sources_var, True) or "").split()
+ list = (d.getVar(apt_sources_var) or "").split()
ret = []
for p in list:
try:
@@ -218,14 +218,14 @@ do_generate_keyrings[dirs] = "${DL_DIR}"
do_generate_keyrings[vardeps] += "DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS"
do_generate_keyrings[network] = "${TASK_USE_SUDO}"
do_generate_keyrings() {
- if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES", True) or ""}" ]; then
+ if [ -n "${@d.getVar("THIRD_PARTY_APT_KEYFILES") or ""}" ]; then
chmod 777 "${APT_KEYS_DIR}"
- for keyfile in ${@d.getVar("THIRD_PARTY_APT_KEYFILES", True)}; do
+ for keyfile in ${@d.getVar("THIRD_PARTY_APT_KEYFILES")}; do
cp "$keyfile" "${APT_KEYS_DIR}"/"$(basename "$keyfile")"
done
fi
- if [ -n "${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES", True) or ""}" ]; then
- for keyfile in ${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES", True)}; do
+ if [ -n "${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES") or ""}" ]; then
+ for keyfile in ${@d.getVar("DISTRO_BOOTSTRAP_KEYFILES")}; do
sudo apt-key --keyring "${DISTRO_BOOTSTRAP_KEYRING}" add $keyfile
cp "$keyfile" "${APT_KEYS_DIR}"/"$(basename "$keyfile")"
done
@@ -243,16 +243,16 @@ do_apt_config_prepare[vardeps] += " \
DEPLOY_ISAR_BOOTSTRAP \
"
python do_apt_config_prepare() {
- apt_preferences_out = d.getVar("APTPREFS", True)
+ apt_preferences_out = d.getVar("APTPREFS")
apt_preferences_list = (
- d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) or ""
+ d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES") or ""
).split()
aggregate_files(d, apt_preferences_list, apt_preferences_out)
- apt_sources_out = d.getVar("APTSRCS", True)
- apt_sources_init_out = d.getVar("APTSRCS_INIT", True)
+ apt_sources_out = d.getVar("APTSRCS")
+ apt_sources_init_out = d.getVar("APTSRCS_INIT")
apt_sources_list = (
- d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or ""
+ d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES") or ""
).split()
aggregate_files(d, apt_sources_list, apt_sources_init_out)
diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc
index 03f37f12..eb61582e 100644
--- a/meta/recipes-kernel/kselftest/kselftest.inc
+++ b/meta/recipes-kernel/kselftest/kselftest.inc
@@ -43,9 +43,9 @@ KSELFTEST_TARGETS ?= ""
KSELFTEST_SKIP_TARGETS ?= ""
KSELFTEST_FORCE_TARGETS ?= "0"
-KSELFTEST_ARGS = "${@ "TARGETS=\"${KSELFTEST_TARGETS}\"" if d.getVar('KSELFTEST_TARGETS', True) else ''}"
-KSELFTEST_ARGS .= "${@ " FORCE_TARGETS=1" if d.getVar('KSELFTEST_FORCE_TARGETS', True) == '1' else ''}"
-KSELFTEST_ARGS .= "${@ " SKIP_TARGETS=\"${KSELFTEST_SKIP_TARGETS}\"" if d.getVar('KSELFTEST_SKIP_TARGETS', True) else ''}"
+KSELFTEST_ARGS = "${@ "TARGETS=\"${KSELFTEST_TARGETS}\"" if d.getVar('KSELFTEST_TARGETS') else ''}"
+KSELFTEST_ARGS .= "${@ " FORCE_TARGETS=1" if d.getVar('KSELFTEST_FORCE_TARGETS') == '1' else ''}"
+KSELFTEST_ARGS .= "${@ " SKIP_TARGETS=\"${KSELFTEST_SKIP_TARGETS}\"" if d.getVar('KSELFTEST_SKIP_TARGETS') else ''}"
do_prepare_build[cleandirs] += "${S}/debian"
do_prepare_build() {
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index 2b71dd8c..42501342 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -90,11 +90,11 @@ inherit template
KCFLAGS ?= "-fdebug-prefix-map=${CURDIR}=."
# Derive name of the kernel packages from the name of this recipe
-KERNEL_NAME_PROVIDED ?= "${@ d.getVar('PN', True).partition('linux-')[2]}"
+KERNEL_NAME_PROVIDED ?= "${@ d.getVar('PN').partition('linux-')[2]}"
# Make bitbake know we will be producing linux-image and linux-headers packages
python() {
- kernel_name = d.getVar("KERNEL_NAME_PROVIDED", True)
+ kernel_name = d.getVar("KERNEL_NAME_PROVIDED")
d.setVar('PROVIDES', 'linux-image-' + kernel_name + ' ' + \
'linux-headers-' + kernel_name)
}
@@ -131,8 +131,8 @@ def config_fragments(d):
return fragments
def get_additional_build_profiles(d):
- profiles = d.getVar('BASE_DISTRO', True)
- if d.getVar('KERNEL_LIBC_DEV_DEPLOY', True) != '1':
+ profiles = d.getVar('BASE_DISTRO')
+ if d.getVar('KERNEL_LIBC_DEV_DEPLOY') != '1':
profiles += ' nolibcdev'
return profiles
@@ -160,12 +160,12 @@ do_prepare_build:prepend() {
KERNEL_BUILD_DIR = "build-full"
def get_kernel_config_target(d):
- kernel_defconfig = d.getVar('KERNEL_DEFCONFIG', True)
+ kernel_defconfig = d.getVar('KERNEL_DEFCONFIG')
config_target = kernel_defconfig
if kernel_defconfig:
- workdir=d.getVar('WORKDIR', True)
+ workdir=d.getVar('WORKDIR')
if os.path.isfile(workdir + "/" + kernel_defconfig):
config_target = "olddefconfig"
else:
@@ -179,7 +179,7 @@ def get_kernel_config_fragments(d):
src_frags = " ".join(config_fragments(d))
out_frags = " ".join(map(lambda frag: 'debian/fragments/' + frag, config_fragments(d)))
- linux_version_extension = d.getVar('LINUX_VERSION_EXTENSION', True)
+ linux_version_extension = d.getVar('LINUX_VERSION_EXTENSION')
if linux_version_extension:
out_frags += " debian/isar/version.cfg"
diff --git a/meta/recipes-kernel/linux/linux-distro.bb b/meta/recipes-kernel/linux/linux-distro.bb
index bfc8be9f..bc43528c 100644
--- a/meta/recipes-kernel/linux/linux-distro.bb
+++ b/meta/recipes-kernel/linux/linux-distro.bb
@@ -6,12 +6,12 @@
# SPDX-License-Identifier: MIT
python() {
- distro_kernels = d.getVar('DISTRO_KERNELS', True) or ""
+ distro_kernels = d.getVar('DISTRO_KERNELS') or ""
for kernel in distro_kernels.split():
d.appendVar('PROVIDES', ' linux-image-' + kernel)
d.appendVar('PROVIDES', ' linux-headers-' + kernel)
- if d.getVar('KERNEL_IMAGE_PKG', True):
- d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_IMAGE_PKG', True))
- if d.getVar('KERNEL_HEADERS_PKG', True):
- d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_HEADERS_PKG', True))
+ if d.getVar('KERNEL_IMAGE_PKG'):
+ d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_IMAGE_PKG'))
+ if d.getVar('KERNEL_HEADERS_PKG'):
+ d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_HEADERS_PKG'))
}
--
2.35.3
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-06-03 6:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-24 6:52 [PATCH] Drop redundant expand=True parameter from getVar srinuvasan.a
2024-05-24 7:27 ` MOESSBAUER, Felix
2024-05-24 8:38 ` Anton Mikanovich
2024-05-27 5:38 ` Srinuvasan Arjunan
2024-05-28 6:20 ` [PATCH v1] " srinuvasan.a
2024-06-03 6:37 ` [PATCH] " Uladzimir Bely
-- strict thread matches above, loose matches on Subject: below --
2023-02-28 7:24 Jan Kiszka
2023-03-06 6:03 ` Uladzimir Bely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox