Remove True option to getVar[Flag] calls
cover Remove True option to getVar[Flag] calls
getVar() and getVarFlag() now default to expanding by default, thus remove the True option from calls to both with a regex search and replace.
(Note: this series is relative to ross/mut3)
The following changes since commit d17879fdbc46e2cf10f724d3fbcf1b09d4e1bc7b:
uninative: rebuild uninative for gcc 4.8 and 4.9 (2016-12-14 09:44:15 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib joshuagl/deprecations
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=joshuagl/deprecations
Joshua Lock (4):
meta: remove True option to getVar calls
scripts: remove True option to getVar calls
meta: remove True option to getVarFlag calls
scripts: remove True option to getVarFlag calls
meta/classes/allarch.bbclass | 4 +- meta/classes/archiver.bbclass | 102 ++++---- meta/classes/autotools.bbclass | 12 +- meta/classes/base.bbclass | 126 ++++----- meta/classes/binconfig.bbclass | 2 +- meta/classes/blacklist.bbclass | 6 +- meta/classes/bugzilla.bbclass | 24 +- meta/classes/buildhistory.bbclass | 62 ++--- meta/classes/buildstats-summary.bbclass | 2 +- meta/classes/buildstats.bbclass | 14 +- meta/classes/ccache.bbclass | 2 +- meta/classes/chrpath.bbclass | 4 +- meta/classes/cmake.bbclass | 16 +- meta/classes/cml1.bbclass | 4 +- meta/classes/compress_doc.bbclass | 40 +-- meta/classes/copyleft_compliance.bbclass | 10 +- meta/classes/copyleft_filter.bbclass | 10 +- meta/classes/cross-canadian.bbclass | 34 +-- meta/classes/crosssdk.bbclass | 2 +- meta/classes/cve-check.bbclass | 46 ++-- meta/classes/debian.bbclass | 24 +- meta/classes/devshell.bbclass | 10 +- meta/classes/distro_features_check.bbclass | 8 +- meta/classes/distrodata.bbclass | 132 +++++----- meta/classes/distutils-base.bbclass | 2 +- meta/classes/distutils3-base.bbclass | 2 +- meta/classes/externalsrc.bbclass | 40 +-- meta/classes/extrausers.bbclass | 2 +- meta/classes/fontcache.bbclass | 14 +- meta/classes/fs-uuid.bbclass | 2 +- meta/classes/gconf.bbclass | 12 +- meta/classes/gettext.bbclass | 8 +- meta/classes/gio-module-cache.bbclass | 10 +- meta/classes/grub-efi.bbclass | 22 +- meta/classes/gsettings.bbclass | 10 +- meta/classes/gtk-icon-cache.bbclass | 14 +- meta/classes/gtk-immodules-cache.bbclass | 10 +- meta/classes/icecc.bbclass | 4 +- meta/classes/image-buildinfo.bbclass | 12 +- meta/classes/image-live.bbclass | 8 +- meta/classes/image-vm.bbclass | 12 +- meta/classes/image.bbclass | 100 +++---- meta/classes/image_types.bbclass | 24 +- meta/classes/insane.bbclass | 194 +++++++------- meta/classes/kernel-arch.bbclass | 6 +- meta/classes/kernel-fitimage.bbclass | 14 +- meta/classes/kernel-grub.bbclass | 2 +- meta/classes/kernel-module-split.bbclass | 38 +-- meta/classes/kernel-uimage.bbclass | 8 +- meta/classes/kernel-yocto.bbclass | 2 +- meta/classes/kernel.bbclass | 40 +-- meta/classes/libc-common.bbclass | 10 +- meta/classes/libc-package.bbclass | 60 ++--- meta/classes/license.bbclass | 112 ++++---- meta/classes/live-vm-common.bbclass | 8 +- meta/classes/metadata_scm.bbclass | 2 +- meta/classes/migrate_localcount.bbclass | 12 +- meta/classes/mime.bbclass | 12 +- meta/classes/module.bbclass | 2 +- meta/classes/multilib.bbclass | 32 +-- meta/classes/multilib_global.bbclass | 22 +- meta/classes/native.bbclass | 10 +- meta/classes/nativesdk.bbclass | 8 +- meta/classes/npm.bbclass | 4 +- meta/classes/oelint.bbclass | 4 +- meta/classes/package.bbclass | 286 ++++++++++----------- meta/classes/package_deb.bbclass | 54 ++-- meta/classes/package_ipk.bbclass | 60 ++--- meta/classes/package_rpm.bbclass | 142 +++++----- meta/classes/package_tar.bbclass | 16 +- meta/classes/packagedata.bbclass | 10 +- meta/classes/packagefeed-stability.bbclass | 16 +- meta/classes/packagegroup.bbclass | 8 +- meta/classes/patch.bbclass | 22 +- meta/classes/pixbufcache.bbclass | 10 +- meta/classes/populate_sdk_base.bbclass | 36 +-- meta/classes/populate_sdk_ext.bbclass | 112 ++++---- meta/classes/prexport.bbclass | 4 +- meta/classes/ptest.bbclass | 2 +- meta/classes/qemu.bbclass | 10 +- meta/classes/qemuboot.bbclass | 8 +- meta/classes/recipe_sanity.bbclass | 26 +- meta/classes/report-error.bbclass | 22 +- meta/classes/rm_work.bbclass | 6 +- meta/classes/rootfs-postcommands.bbclass | 6 +- meta/classes/rootfs_deb.bbclass | 4 +- meta/classes/rootfs_ipk.bbclass | 4 +- meta/classes/rootfs_rpm.bbclass | 4 +- meta/classes/sanity.bbclass | 108 ++++---- meta/classes/sign_ipk.bbclass | 12 +- meta/classes/sign_package_feed.bbclass | 4 +- meta/classes/sign_rpm.bbclass | 12 +- meta/classes/siteconfig.bbclass | 2 +- meta/classes/siteinfo.bbclass | 14 +- meta/classes/spdx.bbclass | 26 +- meta/classes/sstate.bbclass | 128 ++++----- meta/classes/staging.bbclass | 22 +- meta/classes/syslinux.bbclass | 34 +-- meta/classes/systemd-boot.bbclass | 14 +- meta/classes/systemd.bbclass | 38 +-- meta/classes/terminal.bbclass | 8 +- meta/classes/testexport.bbclass | 42 +-- meta/classes/testimage.bbclass | 12 +- meta/classes/testsdk.bbclass | 12 +- meta/classes/tinderclient.bbclass | 54 ++-- meta/classes/toaster.bbclass | 14 +- meta/classes/toolchain-scripts.bbclass | 4 +- meta/classes/typecheck.bbclass | 2 +- meta/classes/uboot-config.bbclass | 14 +- meta/classes/uboot-extlinux-config.bbclass | 24 +- meta/classes/uboot-sign.bbclass | 6 +- meta/classes/uninative.bbclass | 18 +- meta/classes/update-alternatives.bbclass | 66 ++--- meta/classes/update-rc.d.bbclass | 28 +- meta/classes/useradd-staticids.bbclass | 48 ++-- meta/classes/useradd.bbclass | 22 +- meta/classes/utility-tasks.bbclass | 10 +- meta/classes/utils.bbclass | 30 +-- meta/classes/waf.bbclass | 2 +- meta/conf/bitbake.conf | 30 +-- meta/conf/distro/defaultsetup.conf | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 6 +- meta/conf/machine/include/arm/arch-arm.inc | 2 +- meta/conf/machine/include/arm/arch-arm64.inc | 2 +- .../conf/machine/include/arm/feature-arm-thumb.inc | 10 +- meta/conf/machine/include/arm/feature-arm-vfp.inc | 10 +- .../machine/include/mips/feature-mips-mips16e.inc | 6 +- meta/conf/multilib.conf | 2 +- meta/lib/buildstats.py | 4 +- meta/lib/oe/classextend.py | 12 +- meta/lib/oe/copy_buildsystem.py | 12 +- meta/lib/oe/data.py | 4 +- meta/lib/oe/distro_check.py | 20 +- meta/lib/oe/gpg_sign.py | 4 +- meta/lib/oe/manifest.py | 26 +- meta/lib/oe/package.py | 2 +- meta/lib/oe/package_manager.py | 174 ++++++------- meta/lib/oe/packagedata.py | 2 +- meta/lib/oe/packagegroup.py | 10 +- meta/lib/oe/patch.py | 30 +-- meta/lib/oe/path.py | 2 +- meta/lib/oe/prservice.py | 26 +- meta/lib/oe/qa.py | 4 +- meta/lib/oe/recipeutils.py | 38 +-- meta/lib/oe/rootfs.py | 114 ++++---- meta/lib/oe/sdk.py | 76 +++--- meta/lib/oe/sstatesig.py | 32 +-- meta/lib/oe/terminal.py | 2 +- meta/lib/oe/utils.py | 30 +-- meta/lib/oeqa/controllers/masterimage.py | 16 +- meta/lib/oeqa/oetest.py | 60 ++--- meta/lib/oeqa/runexported.py | 8 +- meta/lib/oeqa/runtime/_ptest.py | 16 +- meta/lib/oeqa/runtime/date.py | 4 +- meta/lib/oeqa/runtime/multilib.py | 2 +- meta/lib/oeqa/runtime/parselogs.py | 4 +- meta/lib/oeqa/runtime/rpm.py | 6 +- meta/lib/oeqa/runtime/scp.py | 2 +- meta/lib/oeqa/runtime/smart.py | 18 +- meta/lib/oeqa/runtime/systemd.py | 2 +- meta/lib/oeqa/runtime/x32lib.py | 2 +- meta/lib/oeqa/sdk/gcc.py | 2 +- meta/lib/oeqa/selftest/tinfoil.py | 16 +- meta/lib/oeqa/targetcontrol.py | 52 ++-- meta/lib/oeqa/utils/commands.py | 2 +- meta/lib/oeqa/utils/dump.py | 4 +- meta/lib/oeqa/utils/package_manager.py | 12 +- meta/lib/oeqa/utils/targetbuild.py | 8 +- meta/lib/oeqa/utils/testexport.py | 14 +- meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb | 2 +- meta/recipes-bsp/grub/grub-efi_2.00.bb | 2 +- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- meta/recipes-connectivity/bluez5/bluez5.inc | 4 +- meta/recipes-connectivity/connman/connman.inc | 4 +- meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +- meta/recipes-core/busybox/busybox.inc | 14 +- meta/recipes-core/busybox/busybox_1.24.1.bb | 4 +- meta/recipes-core/busybox/busybox_git.bb | 4 +- meta/recipes-core/coreutils/coreutils_6.9.bb | 8 +- meta/recipes-core/coreutils/coreutils_8.25.bb | 8 +- meta/recipes-core/glibc/glibc-ld.inc | 6 +- meta/recipes-core/glibc/glibc-locale.inc | 8 +- meta/recipes-core/glibc/glibc-package.inc | 4 +- meta/recipes-core/glibc/glibc.inc | 6 +- meta/recipes-core/libxml/libxml2_2.9.4.bb | 2 +- meta/recipes-core/meta/meta-environment-extsdk.bb | 4 +- meta/recipes-core/meta/meta-environment.bb | 6 +- meta/recipes-core/meta/meta-extsdk-toolchain.bb | 2 +- meta/recipes-core/meta/meta-world-pkgdata.bb | 2 +- meta/recipes-core/meta/signing-keys.bb | 18 +- meta/recipes-core/os-release/os-release.bb | 4 +- .../packagegroups/packagegroup-base.bb | 4 +- .../packagegroups/packagegroup-core-sdk.bb | 2 +- meta/recipes-core/psplash/psplash_git.bb | 20 +- meta/recipes-core/systemd/systemd_232.bb | 4 +- meta/recipes-core/util-linux/util-linux.inc | 2 +- meta/recipes-core/volatile-binds/volatile-binds.bb | 2 +- meta/recipes-devtools/apt/apt-native.inc | 4 +- meta/recipes-devtools/apt/apt-package.inc | 4 +- meta/recipes-devtools/automake/automake.inc | 2 +- meta/recipes-devtools/binutils/binutils-2.27.inc | 2 +- meta/recipes-devtools/binutils/binutils.inc | 6 +- meta/recipes-devtools/cmake/cmake.inc | 2 +- meta/recipes-devtools/cmake/cmake_3.7.0.bb | 4 +- meta/recipes-devtools/dpkg/dpkg.inc | 2 +- meta/recipes-devtools/gcc/gcc-common.inc | 32 +-- meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- meta/recipes-devtools/gcc/gcc-multilib-config.inc | 20 +- meta/recipes-devtools/gcc/libgcc-common.inc | 38 +-- meta/recipes-devtools/gcc/libgfortran.inc | 2 +- meta/recipes-devtools/git/git.inc | 2 +- .../kconfig-frontends_3.12.0.0.bb | 2 +- meta/recipes-devtools/perl/perl_5.24.0.bb | 2 +- meta/recipes-devtools/prelink/prelink_git.bb | 2 +- meta/recipes-devtools/python/python-smartpm_git.bb | 6 +- meta/recipes-devtools/qemu/qemu-targets.inc | 4 +- meta/recipes-devtools/rpm/rpm_5.4.16.bb | 60 ++--- meta/recipes-devtools/swig/swig.inc | 4 +- meta/recipes-devtools/vala/vala.inc | 2 +- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 +- meta/recipes-extended/cups/cups.inc | 2 +- meta/recipes-extended/man/man_1.6g.bb | 4 +- .../net-tools/net-tools_1.60-26.bb | 8 +- .../packagegroup-core-full-cmdline.bb | 2 +- .../packagegroups/packagegroup-core-lsb.bb | 4 +- meta/recipes-extended/pam/libpam_1.3.0.bb | 14 +- meta/recipes-extended/procps/procps_3.3.12.bb | 8 +- meta/recipes-extended/texinfo/texinfo_6.3.bb | 2 +- meta/recipes-extended/tzdata/tzdata_2016i.bb | 2 +- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb | 2 +- .../gobject-introspection_1.50.0.bb | 2 +- meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- meta/recipes-gnome/gtk+/gtk+_2.24.31.bb | 2 +- meta/recipes-graphics/cairo/cairo-fpu.inc | 2 +- meta/recipes-graphics/mesa/mesa.inc | 6 +- .../xorg-driver/xorg-driver-common.inc | 4 +- meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb | 2 +- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 +- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto.inc | 4 +- meta/recipes-kernel/lttng/lttng-modules_git.bb | 4 +- meta/recipes-kernel/perf/perf-features.inc | 2 +- meta/recipes-kernel/perf/perf.bb | 2 +- meta/recipes-multimedia/alsa/alsa-fpu.inc | 2 +- .../gstreamer/gst-plugins-package.inc | 10 +- .../gstreamer/gstreamer1.0-omx.inc | 4 +- meta/recipes-rt/images/core-image-rt-sdk.bb | 2 +- meta/recipes-rt/images/core-image-rt.bb | 2 +- meta/recipes-support/attr/ea-acl.inc | 8 +- meta/recipes-support/boost/boost-1.62.0.inc | 4 +- meta/recipes-support/boost/boost.inc | 8 +- meta/recipes-support/gnutls/gnutls.inc | 2 +- meta/recipes-support/icu/icu_58.1.bb | 2 +- meta/recipes-support/libiconv/libiconv_1.11.1.bb | 2 +- meta/recipes-support/libiconv/libiconv_1.14.bb | 4 +- meta/recipes-support/libnl/libnl_3.2.28.bb | 2 +- meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb | 2 +- meta/recipes-support/sqlite/sqlite3.inc | 2 +- meta/recipes-support/taglib/taglib_1.11.1.bb | 2 +- scripts/contrib/list-packageconfig-flags.py | 6 +- scripts/contrib/verify-homepage.py | 2 +- scripts/devtool | 2 +- scripts/lib/devtool/__init__.py | 8 +- scripts/lib/devtool/build_image.py | 10 +- scripts/lib/devtool/deploy.py | 2 +- scripts/lib/devtool/package.py | 2 +- scripts/lib/devtool/runqemu.py | 4 +- scripts/lib/devtool/sdk.py | 8 +- scripts/lib/devtool/search.py | 4 +- scripts/lib/devtool/standard.py | 58 ++--- scripts/lib/devtool/upgrade.py | 20 +- scripts/lib/devtool/utilcmds.py | 18 +- scripts/lib/recipetool/append.py | 28 +- scripts/lib/recipetool/create.py | 24 +- scripts/lib/recipetool/create_buildsys_python.py | 4 +- scripts/lib/recipetool/create_kernel.py | 4 +- scripts/lib/recipetool/create_npm.py | 6 +- scripts/lib/recipetool/newappend.py | 2 +- scripts/lib/scriptutils.py | 2 +- scripts/oe-pkgdata-util | 2 +- scripts/recipetool | 2 +- scripts/verify-bashisms | 2 +- 285 files changed, 2487 insertions(+), 2487 deletions(-)
Signature · 1 line
2.9.3
PATCH 1/4 meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
--- meta/classes/allarch.bbclass | 4 +- meta/classes/archiver.bbclass | 74 +++--- meta/classes/autotools.bbclass | 12 +- meta/classes/base.bbclass | 126 ++++----- meta/classes/binconfig.bbclass | 2 +- meta/classes/blacklist.bbclass | 4 +- meta/classes/bugzilla.bbclass | 24 +- meta/classes/buildhistory.bbclass | 62 ++--- meta/classes/buildstats-summary.bbclass | 2 +- meta/classes/buildstats.bbclass | 14 +- meta/classes/ccache.bbclass | 2 +- meta/classes/chrpath.bbclass | 4 +- meta/classes/cmake.bbclass | 16 +- meta/classes/cml1.bbclass | 4 +- meta/classes/compress_doc.bbclass | 26 +- meta/classes/copyleft_compliance.bbclass | 10 +- meta/classes/copyleft_filter.bbclass | 10 +- meta/classes/cross-canadian.bbclass | 34 +-- meta/classes/crosssdk.bbclass | 2 +- meta/classes/cve-check.bbclass | 46 ++-- meta/classes/debian.bbclass | 24 +- meta/classes/devshell.bbclass | 6 +- meta/classes/distro_features_check.bbclass | 8 +- meta/classes/distrodata.bbclass | 132 +++++----- meta/classes/distutils-base.bbclass | 2 +- meta/classes/distutils3-base.bbclass | 2 +- meta/classes/externalsrc.bbclass | 38 +-- meta/classes/extrausers.bbclass | 2 +- meta/classes/fontcache.bbclass | 14 +- meta/classes/fs-uuid.bbclass | 2 +- meta/classes/gconf.bbclass | 12 +- meta/classes/gettext.bbclass | 8 +- meta/classes/gio-module-cache.bbclass | 10 +- meta/classes/grub-efi.bbclass | 22 +- meta/classes/gsettings.bbclass | 10 +- meta/classes/gtk-icon-cache.bbclass | 14 +- meta/classes/gtk-immodules-cache.bbclass | 10 +- meta/classes/icecc.bbclass | 4 +- meta/classes/image-buildinfo.bbclass | 10 +- meta/classes/image-live.bbclass | 8 +- meta/classes/image-vm.bbclass | 12 +- meta/classes/image.bbclass | 96 +++---- meta/classes/image_types.bbclass | 24 +- meta/classes/insane.bbclass | 194 +++++++------- meta/classes/kernel-arch.bbclass | 6 +- meta/classes/kernel-fitimage.bbclass | 14 +- meta/classes/kernel-grub.bbclass | 2 +- meta/classes/kernel-module-split.bbclass | 38 +-- meta/classes/kernel-uimage.bbclass | 8 +- meta/classes/kernel-yocto.bbclass | 2 +- meta/classes/kernel.bbclass | 40 +-- meta/classes/libc-common.bbclass | 10 +- meta/classes/libc-package.bbclass | 60 ++--- meta/classes/license.bbclass | 96 +++---- meta/classes/live-vm-common.bbclass | 8 +- meta/classes/metadata_scm.bbclass | 2 +- meta/classes/migrate_localcount.bbclass | 12 +- meta/classes/mime.bbclass | 12 +- meta/classes/module.bbclass | 2 +- meta/classes/multilib.bbclass | 32 +-- meta/classes/multilib_global.bbclass | 22 +- meta/classes/native.bbclass | 10 +- meta/classes/nativesdk.bbclass | 8 +- meta/classes/npm.bbclass | 4 +- meta/classes/oelint.bbclass | 4 +- meta/classes/package.bbclass | 282 ++++++++++----------- meta/classes/package_deb.bbclass | 54 ++-- meta/classes/package_ipk.bbclass | 60 ++--- meta/classes/package_rpm.bbclass | 136 +++++----- meta/classes/package_tar.bbclass | 14 +- meta/classes/packagedata.bbclass | 10 +- meta/classes/packagefeed-stability.bbclass | 14 +- meta/classes/packagegroup.bbclass | 8 +- meta/classes/patch.bbclass | 20 +- meta/classes/pixbufcache.bbclass | 10 +- meta/classes/populate_sdk_base.bbclass | 36 +-- meta/classes/populate_sdk_ext.bbclass | 108 ++++---- meta/classes/prexport.bbclass | 4 +- meta/classes/ptest.bbclass | 2 +- meta/classes/qemu.bbclass | 10 +- meta/classes/qemuboot.bbclass | 8 +- meta/classes/recipe_sanity.bbclass | 26 +- meta/classes/report-error.bbclass | 22 +- meta/classes/rm_work.bbclass | 6 +- meta/classes/rootfs-postcommands.bbclass | 6 +- meta/classes/rootfs_deb.bbclass | 4 +- meta/classes/rootfs_ipk.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 2 +- meta/classes/sanity.bbclass | 108 ++++---- meta/classes/sign_ipk.bbclass | 12 +- meta/classes/sign_package_feed.bbclass | 4 +- meta/classes/sign_rpm.bbclass | 12 +- meta/classes/siteconfig.bbclass | 2 +- meta/classes/siteinfo.bbclass | 14 +- meta/classes/spdx.bbclass | 26 +- meta/classes/sstate.bbclass | 114 ++++----- meta/classes/staging.bbclass | 22 +- meta/classes/syslinux.bbclass | 34 +-- meta/classes/systemd-boot.bbclass | 14 +- meta/classes/systemd.bbclass | 38 +-- meta/classes/terminal.bbclass | 8 +- meta/classes/testexport.bbclass | 40 +-- meta/classes/testimage.bbclass | 12 +- meta/classes/testsdk.bbclass | 12 +- meta/classes/tinderclient.bbclass | 54 ++-- meta/classes/toaster.bbclass | 14 +- meta/classes/toolchain-scripts.bbclass | 4 +- meta/classes/uboot-config.bbclass | 14 +- meta/classes/uboot-extlinux-config.bbclass | 24 +- meta/classes/uboot-sign.bbclass | 6 +- meta/classes/uninative.bbclass | 18 +- meta/classes/update-alternatives.bbclass | 52 ++-- meta/classes/update-rc.d.bbclass | 28 +- meta/classes/useradd-staticids.bbclass | 48 ++-- meta/classes/useradd.bbclass | 22 +- meta/classes/utility-tasks.bbclass | 4 +- meta/classes/utils.bbclass | 30 +-- meta/classes/waf.bbclass | 2 +- meta/conf/bitbake.conf | 30 +-- meta/conf/distro/defaultsetup.conf | 2 +- meta/conf/distro/include/tclibc-glibc.inc | 6 +- meta/conf/machine/include/arm/arch-arm.inc | 2 +- meta/conf/machine/include/arm/arch-arm64.inc | 2 +- .../conf/machine/include/arm/feature-arm-thumb.inc | 10 +- meta/conf/machine/include/arm/feature-arm-vfp.inc | 10 +- .../machine/include/mips/feature-mips-mips16e.inc | 6 +- meta/conf/multilib.conf | 2 +- meta/lib/buildstats.py | 4 +- meta/lib/oe/classextend.py | 12 +- meta/lib/oe/copy_buildsystem.py | 12 +- meta/lib/oe/data.py | 2 +- meta/lib/oe/distro_check.py | 20 +- meta/lib/oe/gpg_sign.py | 4 +- meta/lib/oe/manifest.py | 26 +- meta/lib/oe/package.py | 2 +- meta/lib/oe/package_manager.py | 174 ++++++------- meta/lib/oe/packagedata.py | 2 +- meta/lib/oe/packagegroup.py | 6 +- meta/lib/oe/patch.py | 30 +-- meta/lib/oe/path.py | 2 +- meta/lib/oe/prservice.py | 26 +- meta/lib/oe/qa.py | 4 +- meta/lib/oe/recipeutils.py | 38 +-- meta/lib/oe/rootfs.py | 114 ++++----- meta/lib/oe/sdk.py | 76 +++--- meta/lib/oe/sstatesig.py | 30 +-- meta/lib/oe/terminal.py | 2 +- meta/lib/oe/utils.py | 30 +-- meta/lib/oeqa/controllers/masterimage.py | 16 +- meta/lib/oeqa/oetest.py | 60 ++--- meta/lib/oeqa/runexported.py | 8 +- meta/lib/oeqa/runtime/_ptest.py | 16 +- meta/lib/oeqa/runtime/date.py | 4 +- meta/lib/oeqa/runtime/multilib.py | 2 +- meta/lib/oeqa/runtime/parselogs.py | 4 +- meta/lib/oeqa/runtime/rpm.py | 6 +- meta/lib/oeqa/runtime/scp.py | 2 +- meta/lib/oeqa/runtime/smart.py | 18 +- meta/lib/oeqa/runtime/systemd.py | 2 +- meta/lib/oeqa/runtime/x32lib.py | 2 +- meta/lib/oeqa/sdk/gcc.py | 2 +- meta/lib/oeqa/selftest/tinfoil.py | 16 +- meta/lib/oeqa/targetcontrol.py | 52 ++-- meta/lib/oeqa/utils/commands.py | 2 +- meta/lib/oeqa/utils/dump.py | 4 +- meta/lib/oeqa/utils/package_manager.py | 12 +- meta/lib/oeqa/utils/targetbuild.py | 8 +- meta/lib/oeqa/utils/testexport.py | 14 +- meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb | 2 +- meta/recipes-bsp/grub/grub-efi_2.00.bb | 2 +- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- meta/recipes-connectivity/bluez5/bluez5.inc | 4 +- meta/recipes-connectivity/connman/connman.inc | 4 +- meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +- meta/recipes-core/busybox/busybox.inc | 14 +- meta/recipes-core/busybox/busybox_1.24.1.bb | 4 +- meta/recipes-core/busybox/busybox_git.bb | 4 +- meta/recipes-core/coreutils/coreutils_6.9.bb | 8 +- meta/recipes-core/coreutils/coreutils_8.25.bb | 8 +- meta/recipes-core/glibc/glibc-ld.inc | 6 +- meta/recipes-core/glibc/glibc-locale.inc | 8 +- meta/recipes-core/glibc/glibc-package.inc | 4 +- meta/recipes-core/glibc/glibc.inc | 6 +- meta/recipes-core/libxml/libxml2_2.9.4.bb | 2 +- meta/recipes-core/meta/meta-environment-extsdk.bb | 4 +- meta/recipes-core/meta/meta-environment.bb | 6 +- meta/recipes-core/meta/meta-extsdk-toolchain.bb | 2 +- meta/recipes-core/meta/meta-world-pkgdata.bb | 2 +- meta/recipes-core/meta/signing-keys.bb | 18 +- meta/recipes-core/os-release/os-release.bb | 4 +- .../packagegroups/packagegroup-base.bb | 4 +- .../packagegroups/packagegroup-core-sdk.bb | 2 +- meta/recipes-core/psplash/psplash_git.bb | 20 +- meta/recipes-core/systemd/systemd_232.bb | 4 +- meta/recipes-core/util-linux/util-linux.inc | 2 +- meta/recipes-core/volatile-binds/volatile-binds.bb | 2 +- meta/recipes-devtools/apt/apt-native.inc | 4 +- meta/recipes-devtools/apt/apt-package.inc | 4 +- meta/recipes-devtools/automake/automake.inc | 2 +- meta/recipes-devtools/binutils/binutils-2.27.inc | 2 +- meta/recipes-devtools/binutils/binutils.inc | 6 +- meta/recipes-devtools/cmake/cmake.inc | 2 +- meta/recipes-devtools/cmake/cmake_3.7.0.bb | 4 +- meta/recipes-devtools/dpkg/dpkg.inc | 2 +- meta/recipes-devtools/gcc/gcc-common.inc | 32 +-- meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- meta/recipes-devtools/gcc/gcc-multilib-config.inc | 20 +- meta/recipes-devtools/gcc/libgcc-common.inc | 38 +-- meta/recipes-devtools/gcc/libgfortran.inc | 2 +- meta/recipes-devtools/git/git.inc | 2 +- .../kconfig-frontends_3.12.0.0.bb | 2 +- meta/recipes-devtools/perl/perl_5.24.0.bb | 2 +- meta/recipes-devtools/prelink/prelink_git.bb | 2 +- meta/recipes-devtools/python/python-smartpm_git.bb | 6 +- meta/recipes-devtools/qemu/qemu-targets.inc | 4 +- meta/recipes-devtools/rpm/rpm_5.4.16.bb | 60 ++--- meta/recipes-devtools/swig/swig.inc | 4 +- meta/recipes-devtools/vala/vala.inc | 2 +- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 +- meta/recipes-extended/cups/cups.inc | 2 +- meta/recipes-extended/man/man_1.6g.bb | 4 +- .../net-tools/net-tools_1.60-26.bb | 8 +- .../packagegroup-core-full-cmdline.bb | 2 +- .../packagegroups/packagegroup-core-lsb.bb | 4 +- meta/recipes-extended/pam/libpam_1.3.0.bb | 14 +- meta/recipes-extended/procps/procps_3.3.12.bb | 8 +- meta/recipes-extended/texinfo/texinfo_6.3.bb | 2 +- meta/recipes-extended/tzdata/tzdata_2016i.bb | 2 +- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb | 2 +- .../gobject-introspection_1.50.0.bb | 2 +- meta/recipes-gnome/gtk+/gtk+3.inc | 2 +- meta/recipes-gnome/gtk+/gtk+_2.24.31.bb | 2 +- meta/recipes-graphics/cairo/cairo-fpu.inc | 2 +- meta/recipes-graphics/mesa/mesa.inc | 6 +- .../xorg-driver/xorg-driver-common.inc | 4 +- meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb | 2 +- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 +- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto.inc | 4 +- meta/recipes-kernel/lttng/lttng-modules_git.bb | 4 +- meta/recipes-kernel/perf/perf-features.inc | 2 +- meta/recipes-kernel/perf/perf.bb | 2 +- meta/recipes-multimedia/alsa/alsa-fpu.inc | 2 +- .../gstreamer/gst-plugins-package.inc | 10 +- .../gstreamer/gstreamer1.0-omx.inc | 4 +- meta/recipes-rt/images/core-image-rt-sdk.bb | 2 +- meta/recipes-rt/images/core-image-rt.bb | 2 +- meta/recipes-support/attr/ea-acl.inc | 8 +- meta/recipes-support/boost/boost-1.62.0.inc | 4 +- meta/recipes-support/boost/boost.inc | 8 +- meta/recipes-support/gnutls/gnutls.inc | 2 +- meta/recipes-support/icu/icu_58.1.bb | 2 +- meta/recipes-support/libiconv/libiconv_1.11.1.bb | 2 +- meta/recipes-support/libiconv/libiconv_1.14.bb | 4 +- meta/recipes-support/libnl/libnl_3.2.28.bb | 2 +- meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb | 2 +- meta/recipes-support/sqlite/sqlite3.inc | 2 +- meta/recipes-support/taglib/taglib_1.11.1.bb | 2 +- 261 files changed, 2306 insertions(+), 2306 deletions(-)
meta/classes/allarch.bbclass +2 -2
@@ -11,7 +11,7 @@ PACKAGE_ARCH = "all" python () { # Allow this class to be included but overridden - only set # the values if we're still "all" package arch. - if d.getVar("PACKAGE_ARCH", True) == "all": + if d.getVar("PACKAGE_ARCH") == "all": # No need for virtual/libc or a cross compiler d.setVar("INHIBIT_DEFAULT_DEPS","1")
@@ -47,6 +47,6 @@ python () { d.setVarFlag("emit_pkgdata", "vardepsexclude", "MULTILIB_VARIANTS") d.setVarFlag("write_specfile", "vardepsexclude", "MULTILIBS") elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d): - bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE", True)) + bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE")) }
meta/classes/archiver.bbclass +37 -37
204 lines not on this page · raw message
meta/classes/autotools.bbclass +6 -6
@@ -1,8 +1,8 @@ def autotools_dep_prepend(d): - if d.getVar('INHIBIT_AUTOTOOLS_DEPS', True): + if d.getVar('INHIBIT_AUTOTOOLS_DEPS'): return '' - pn = d.getVar('PN', True) + pn = d.getVar('PN') deps = '' if pn in ['autoconf-native', 'automake-native', 'help2man-native']:
@@ -14,7 +14,7 @@ def autotools_dep_prepend(d): if not bb.data.inherits_class('native', d) \ and not bb.data.inherits_class('nativesdk', d) \ and not bb.data.inherits_class('cross', d) \ - and not d.getVar('INHIBIT_DEFAULT_DEPS', True): + and not d.getVar('INHIBIT_DEFAULT_DEPS'): deps += 'libtool-cross ' return deps + 'gnu-config-native '
@@ -139,15 +139,15 @@ ACLOCALDIR = "${WORKDIR}/aclocal-copy" python autotools_copy_aclocals () { import copy - s = d.getVar("AUTOTOOLS_SCRIPT_PATH", True) + s = d.getVar("AUTOTOOLS_SCRIPT_PATH") if not os.path.exists(s + "/configure.in") and not os.path.exists(s + "/configure.ac"): if not d.getVar("AUTOTOOLS_COPYACLOCAL", False): return taskdepdata = d.getVar("BB_TASKDEPDATA", False) #bb.warn(str(taskdepdata)) - pn = d.getVar("PN", True) - aclocaldir = d.getVar("ACLOCALDIR", True) + pn = d.getVar("PN") + aclocaldir = d.getVar("ACLOCALDIR") oe.path.remove(aclocaldir) bb.utils.mkdirhier(aclocaldir) start = None
meta/classes/base.bbclass +63 -63
354 lines not on this page · raw message
meta/classes/binconfig.bbclass +1 -1
@@ -22,7 +22,7 @@ def get_binconfig_mangle(d): s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False): - s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE", True) + s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE") return s
meta/classes/blacklist.bbclass +2 -2
@@ -16,7 +16,7 @@ addhandler blacklist_multilib_eventhandler blacklist_multilib_eventhandler[eventmask] = "bb.event.ConfigParsed" python blacklist_multilib_eventhandler() { - multilibs = e.data.getVar('MULTILIBS', True) + multilibs = e.data.getVar('MULTILIBS') if not multilibs: return
@@ -38,7 +38,7 @@ python blacklist_multilib_eventhandler() { } python () { - blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN', True), True) + blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN'), True) if blacklist: raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist))
meta/classes/bugzilla.bbclass +12 -12
@@ -110,12 +110,12 @@ python bugzilla_eventhandler() { return if name == "TaskFailed": - xmlrpc = data.getVar("BUGZILLA_XMLRPC", True) - user = data.getVar("BUGZILLA_USER", True) - passw = data.getVar("BUGZILLA_PASS", True) - product = data.getVar("BUGZILLA_PRODUCT", True) - compon = data.getVar("BUGZILLA_COMPONENT", True) - version = data.getVar("BUGZILLA_VERSION", True) + xmlrpc = data.getVar("BUGZILLA_XMLRPC") + user = data.getVar("BUGZILLA_USER") + passw = data.getVar("BUGZILLA_PASS") + product = data.getVar("BUGZILLA_PRODUCT") + compon = data.getVar("BUGZILLA_COMPONENT") + version = data.getVar("BUGZILLA_VERSION") proxy = data.getVar('http_proxy', True ) if (proxy):
@@ -133,14 +133,14 @@ python bugzilla_eventhandler() { 'component': compon} # evil hack to figure out what is going on - debug_file = open(os.path.join(data.getVar("TMPDIR", True),"..","bugzilla-log"),"a") + debug_file = open(os.path.join(data.getVar("TMPDIR"),"..","bugzilla-log"),"a") file = None - bugname = "%(package)s-%(pv)s-autobuild" % { "package" : data.getVar("PN", True), - "pv" : data.getVar("PV", True), + bugname = "%(package)s-%(pv)s-autobuild" % { "package" : data.getVar("PN"), + "pv" : data.getVar("PV"), } - log_file = glob.glob("%s/log.%s.*" % (event.data.getVar('T', True), event.task)) - text = "The %s step in %s failed at %s for machine %s" % (e.task, data.getVar("PN", True), data.getVar('DATETIME', True), data.getVar( 'MACHINE', True ) ) + log_file = glob.glob("%s/log.%s.*" % (event.data.getVar('T'), event.task)) + text = "The %s step in %s failed at %s for machine %s" % (e.task, data.getVar("PN"), data.getVar('DATETIME'), data.getVar( 'MACHINE', True ) ) if len(log_file) != 0: print >> debug_file, "Adding log file %s" % log_file[0] file = open(log_file[0], 'r')
@@ -168,7 +168,7 @@ python bugzilla_eventhandler() { if bug_number and log: print >> debug_file, "The bug is known as '%s'" % bug_number - desc = "Build log for machine %s" % (data.getVar('MACHINE', True)) + desc = "Build log for machine %s" % (data.getVar('MACHINE')) if not bugzilla_create_attachment(debug_file, server, args.copy(), bug_number, text, log_file[0], log, desc): print >> debug_file, "Failed to attach the build log for bug #%s" % bug_number else:
meta/classes/buildhistory.bbclass +31 -31
194 lines not on this page · raw message
meta/classes/buildstats-summary.bbclass +1 -1
@@ -7,7 +7,7 @@ python buildstats_summary () { if not os.path.exists(bsdir): return - sstatetasks = (e.data.getVar('SSTATETASKS', True) or '').split() + sstatetasks = (e.data.getVar('SSTATETASKS') or '').split() built = collections.defaultdict(lambda: [set(), set()]) for pf in os.listdir(bsdir): taskdir = os.path.join(bsdir, pf)
meta/classes/buildstats.bbclass +7 -7
@@ -75,8 +75,8 @@ def get_buildtimedata(var, d): return timediff, cpuperc def write_task_data(status, logfile, e, d): - bn = d.getVar('BUILDNAME', True) - bsdir = os.path.join(d.getVar('BUILDSTATS_BASE', True), bn) + bn = d.getVar('BUILDNAME') + bsdir = os.path.join(d.getVar('BUILDSTATS_BASE'), bn) with open(os.path.join(logfile), "a") as f: elapsedtime = get_timedata("__timedata_task", d, e.time) if elapsedtime:
@@ -106,9 +106,9 @@ python run_buildstats () { import bb.event import time, subprocess, platform - bn = d.getVar('BUILDNAME', True) - bsdir = os.path.join(d.getVar('BUILDSTATS_BASE', True), bn) - taskdir = os.path.join(bsdir, d.getVar('PF', True)) + bn = d.getVar('BUILDNAME') + bsdir = os.path.join(d.getVar('BUILDSTATS_BASE'), bn) + taskdir = os.path.join(bsdir, d.getVar('PF')) if isinstance(e, bb.event.BuildStarted): ########################################################################
@@ -162,7 +162,7 @@ python run_buildstats () { if e.task == "do_rootfs": bs = os.path.join(bsdir, "build_stats") with open(bs, "a") as f: - rootfs = d.getVar('IMAGE_ROOTFS', True) + rootfs = d.getVar('IMAGE_ROOTFS') if os.path.isdir(rootfs): try: rootfs_size = subprocess.check_output(["du", "-sh", rootfs],
@@ -197,7 +197,7 @@ python runqueue_stats () { # are available that we need to find the output directory. # The persistent SystemStats is stored in the datastore and # closed when the build is done. - system_stats = d.getVar('_buildstats_system_stats', True) + system_stats = d.getVar('_buildstats_system_stats') if not system_stats and isinstance(e, (bb.runqueue.sceneQueueTaskStarted, bb.runqueue.runQueueTaskStarted)): system_stats = buildstats.SystemStats(d) d.setVar('_buildstats_system_stats', system_stats)
meta/classes/ccache.bbclass +1 -1
@@ -1,4 +1,4 @@ -CCACHE = "${@bb.utils.which(d.getVar('PATH', True), 'ccache') and 'ccache '}" +CCACHE = "${@bb.utils.which(d.getVar('PATH'), 'ccache') and 'ccache '}" export CCACHE_DIR ?= "${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN}" CCACHE_DISABLE[unexport] = "1"
meta/classes/chrpath.bbclass +2 -2
@@ -44,7 +44,7 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d): p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE) out, err = p.communicate() if p.returncode != 0: - bb.fatal("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN', True), p.returncode, out, err)) + bb.fatal("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN'), p.returncode, out, err)) def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): import subprocess as sub
@@ -72,7 +72,7 @@ def process_dir (rootdir, directory, d): cmd = d.expand('${CHRPATH_BIN}') tmpdir = os.path.normpath(d.getVar('TMPDIR', False)) baseprefix = os.path.normpath(d.expand('${base_prefix}')) - hostos = d.getVar("HOST_OS", True) + hostos = d.getVar("HOST_OS") #bb.debug("Checking %s for binaries to process" % directory) if not os.path.exists(directory):
meta/classes/cmake.bbclass +8 -8
@@ -46,7 +46,7 @@ cmake_do_generate_toolchain_file() { # CMake system name must be something like "Linux". # This is important for cross-compiling. set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` ) -set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH', True))} ) +set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH'))} ) set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} )
@@ -112,15 +112,15 @@ cmake_do_configure() { ${OECMAKE_SITEFILE} \ ${OECMAKE_SOURCEPATH} \ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ - -DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir', True), d.getVar('prefix', True))} \ - -DCMAKE_INSTALL_SBINDIR:PATH=${@os.path.relpath(d.getVar('sbindir', True), d.getVar('prefix', True))} \ - -DCMAKE_INSTALL_LIBEXECDIR:PATH=${@os.path.relpath(d.getVar('libexecdir', True), d.getVar('prefix', True))} \ + -DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir'), d.getVar('prefix'))} \ + -DCMAKE_INSTALL_SBINDIR:PATH=${@os.path.relpath(d.getVar('sbindir'), d.getVar('prefix'))} \ + -DCMAKE_INSTALL_LIBEXECDIR:PATH=${@os.path.relpath(d.getVar('libexecdir'), d.getVar('prefix'))} \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \ - -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${@os.path.relpath(d.getVar('sharedstatedir', True), d. getVar('prefix', True))} \ + -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${@os.path.relpath(d.getVar('sharedstatedir'), d. getVar('prefix'))} \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${@os.path.relpath(d.getVar('libdir', True), d.getVar('prefix', True))} \ - -DCMAKE_INSTALL_INCLUDEDIR:PATH=${@os.path.relpath(d.getVar('includedir', True), d.getVar('prefix', True))} \ - -DCMAKE_INSTALL_DATAROOTDIR:PATH=${@os.path.relpath(d.getVar('datadir', True), d.getVar('prefix', True))} \ + -DCMAKE_INSTALL_LIBDIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix'))} \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=${@os.path.relpath(d.getVar('includedir'), d.getVar('prefix'))} \ + -DCMAKE_INSTALL_DATAROOTDIR:PATH=${@os.path.relpath(d.getVar('datadir'), d.getVar('prefix'))} \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ -DCMAKE_VERBOSE_MAKEFILE=1 \
meta/classes/cml1.bbclass +2 -2
@@ -26,7 +26,7 @@ python do_menuconfig() { except OSError: mtime = 0 - oe_terminal("${SHELL} -c \"make %s; if [ \$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND', True), + oe_terminal("${SHELL} -c \"make %s; if [ \$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND'), d.getVar('PN', True ) + ' Configuration', d) # FIXME this check can be removed when the minimum bitbake version has been bumped
@@ -49,7 +49,7 @@ python do_diffconfig() { import shutil import subprocess - workdir = d.getVar('WORKDIR', True) + workdir = d.getVar('WORKDIR') fragment = workdir + '/fragment.cfg' configorig = '.config.orig' config = '.config'
meta/classes/compress_doc.bbclass +13 -13
@@ -31,25 +31,25 @@ DOC_DECOMPRESS_CMD[xz] ?= "unxz -v" PACKAGE_PREPROCESS_FUNCS += "package_do_compress_doc compress_doc_updatealternatives" python package_do_compress_doc() { - compress_mode = d.getVar('DOC_COMPRESS', True) - compress_list = (d.getVar('DOC_COMPRESS_LIST', True) or '').split() + compress_mode = d.getVar('DOC_COMPRESS') + compress_list = (d.getVar('DOC_COMPRESS_LIST') or '').split() if compress_mode not in compress_list: bb.fatal('Compression policy %s not supported (not listed in %s)\n' % (compress_mode, compress_list)) - dvar = d.getVar('PKGD', True) + dvar = d.getVar('PKGD') compress_cmds = {} decompress_cmds = {} for mode in compress_list: compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode, True) decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode, True) - mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir", True)) + mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir")) if os.path.exists(mandir): # Decompress doc files which format is not compress_mode decompress_doc(mandir, compress_mode, decompress_cmds) compress_doc(mandir, compress_mode, compress_cmds) - infodir = os.path.abspath(dvar + os.sep + d.getVar("infodir", True)) + infodir = os.path.abspath(dvar + os.sep + d.getVar("infodir")) if os.path.exists(infodir): # Decompress doc files which format is not compress_mode decompress_doc(infodir, compress_mode, decompress_cmds)
@@ -218,18 +218,18 @@ python compress_doc_updatealternatives () { if not bb.data.inherits_class('update-alternatives', d): return - mandir = d.getVar("mandir", True) - infodir = d.getVar("infodir", True) - compress_mode = d.getVar('DOC_COMPRESS', True) - for pkg in (d.getVar('PACKAGES', True) or "").split(): - old_names = (d.getVar('ALTERNATIVE_%s' % pkg, True) or "").split() + mandir = d.getVar("mandir") + infodir = d.getVar("infodir") + compress_mode = d.getVar('DOC_COMPRESS') + for pkg in (d.getVar('PACKAGES') or "").split(): + old_names = (d.getVar('ALTERNATIVE_%s' % pkg) or "").split() new_names = [] for old_name in old_names: old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name, True) old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True) or \ d.getVarFlag('ALTERNATIVE_TARGET', old_name, True) or \ - d.getVar('ALTERNATIVE_TARGET_%s' % pkg, True) or \ - d.getVar('ALTERNATIVE_TARGET', True) or \ + d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or \ + d.getVar('ALTERNATIVE_TARGET') or \ old_link # Sometimes old_target is specified as relative to the link name. old_target = os.path.join(os.path.dirname(old_link), old_target)
@@ -247,7 +247,7 @@ python compress_doc_updatealternatives () { elif d.getVarFlag('ALTERNATIVE_TARGET', old_name, True): d.delVarFlag('ALTERNATIVE_TARGET', old_name) d.setVarFlag('ALTERNATIVE_TARGET', new_name, new_target) - elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg, True): + elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg): d.setVar('ALTERNATIVE_TARGET_%s' % pkg, new_target) elif d.getVar('ALTERNATIVE_TARGET', old_name, True): d.setVar('ALTERNATIVE_TARGET', new_target)
meta/classes/copyleft_compliance.bbclass +5 -5
@@ -13,7 +13,7 @@ python do_prepare_copyleft_sources () { import os.path import shutil - p = d.getVar('P', True) + p = d.getVar('P') included, reason = copyleft_should_include(d) if not included: bb.debug(1, 'copyleft: %s is excluded: %s' % (p, reason))
@@ -21,13 +21,13 @@ python do_prepare_copyleft_sources () { else: bb.debug(1, 'copyleft: %s is included: %s' % (p, reason)) - sources_dir = d.getVar('COPYLEFT_SOURCES_DIR', True) - dl_dir = d.getVar('DL_DIR', True) - src_uri = d.getVar('SRC_URI', True).split() + sources_dir = d.getVar('COPYLEFT_SOURCES_DIR') + dl_dir = d.getVar('DL_DIR') + src_uri = d.getVar('SRC_URI').split() fetch = bb.fetch2.Fetch(src_uri, d) ud = fetch.ud - pf = d.getVar('PF', True) + pf = d.getVar('PF') dest = os.path.join(sources_dir, pf) shutil.rmtree(dest, ignore_errors=True) bb.utils.mkdirhier(dest)
meta/classes/copyleft_filter.bbclass +5 -5
@@ -49,7 +49,7 @@ def copyleft_should_include(d): included, motive = False, 'recipe did not match anything' - recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True) + recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE') if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): include, motive = False, 'recipe type "%s" is excluded' % recipe_type
@@ -57,9 +57,9 @@ def copyleft_should_include(d): exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) try: - is_included, reason = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) + is_included, reason = oe.license.is_included(d.getVar('LICENSE'), include, exclude) except oe.license.LicenseError as exc: - bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) + bb.fatal('%s: %s' % (d.getVar('PF'), exc)) else: if is_included: if reason:
@@ -69,10 +69,10 @@ def copyleft_should_include(d): else: included, motive = False, 'recipe has excluded licenses: %s' % ', '.join(reason) - if any(fnmatch(d.getVar('PN', True), name) \ + if any(fnmatch(d.getVar('PN'), name) \ for name in oe.data.typed_value('COPYLEFT_PN_INCLUDE', d)): included, motive = True, 'recipe included by name' - if any(fnmatch(d.getVar('PN', True), name) \ + if any(fnmatch(d.getVar('PN'), name) \ for name in oe.data.typed_value('COPYLEFT_PN_EXCLUDE', d)): included, motive = False, 'recipe excluded by name'
meta/classes/cross-canadian.bbclass +17 -17
@@ -20,25 +20,25 @@ CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}" CANADIANEXTRAVENDOR = "" MODIFYTOS ??= "1" python () { - archs = d.getVar('PACKAGE_ARCHS', True).split() + archs = d.getVar('PACKAGE_ARCHS').split() sdkarchs = [] for arch in archs: sdkarchs.append(arch + '-${SDKPKGSUFFIX}') d.setVar('PACKAGE_ARCHS', " ".join(sdkarchs)) # Allow the following code segment to be disabled, e.g. meta-environment - if d.getVar("MODIFYTOS", True) != "1": + if d.getVar("MODIFYTOS") != "1": return - if d.getVar("TCLIBC", True) == "baremetal": + if d.getVar("TCLIBC") == "baremetal": return - tos = d.getVar("TARGET_OS", True) + tos = d.getVar("TARGET_OS") whitelist = [] extralibcs = [""] - if "uclibc" in d.getVar("BASECANADIANEXTRAOS", True): + if "uclibc" in d.getVar("BASECANADIANEXTRAOS"): extralibcs.append("uclibc") - if "musl" in d.getVar("BASECANADIANEXTRAOS", True): + if "musl" in d.getVar("BASECANADIANEXTRAOS"): extralibcs.append("musl") for variant in ["", "spe", "x32", "eabi", "n32"]: for libc in extralibcs:
@@ -51,33 +51,33 @@ python () { entry = entry + "-" + libc whitelist.append(entry) if tos not in whitelist: - bb.fatal("Building cross-candian for an unknown TARGET_SYS (%s), please update cross-canadian.bbclass" % d.getVar("TARGET_SYS", True)) + bb.fatal("Building cross-candian for an unknown TARGET_SYS (%s), please update cross-canadian.bbclass" % d.getVar("TARGET_SYS")) for n in ["PROVIDES", "DEPENDS"]: - d.setVar(n, d.getVar(n, True)) - d.setVar("STAGING_BINDIR_TOOLCHAIN", d.getVar("STAGING_BINDIR_TOOLCHAIN", True)) + d.setVar(n, d.getVar(n)) + d.setVar("STAGING_BINDIR_TOOLCHAIN", d.getVar("STAGING_BINDIR_TOOLCHAIN")) for prefix in ["AR", "AS", "DLLTOOL", "CC", "CXX", "GCC", "LD", "LIPO", "NM", "OBJDUMP", "RANLIB", "STRIP", "WINDRES"]: n = prefix + "_FOR_TARGET" - d.setVar(n, d.getVar(n, True)) + d.setVar(n, d.getVar(n)) # This is a bit ugly. We need to zero LIBC/ABI extension which will change TARGET_OS # however we need the old value in some variables. We expand those here first. - tarch = d.getVar("TARGET_ARCH", True) + tarch = d.getVar("TARGET_ARCH") if tarch == "x86_64": d.setVar("LIBCEXTENSION", "") d.setVar("ABIEXTENSION", "") d.appendVar("CANADIANEXTRAOS", " linux-gnux32") - for extraos in d.getVar("BASECANADIANEXTRAOS", True).split(): + for extraos in d.getVar("BASECANADIANEXTRAOS").split(): d.appendVar("CANADIANEXTRAOS", " " + extraos + "x32") elif tarch == "powerpc": # PowerPC can build "linux" and "linux-gnuspe" d.setVar("LIBCEXTENSION", "") d.setVar("ABIEXTENSION", "") d.appendVar("CANADIANEXTRAOS", " linux-gnuspe") - for extraos in d.getVar("BASECANADIANEXTRAOS", True).split(): + for extraos in d.getVar("BASECANADIANEXTRAOS").split(): d.appendVar("CANADIANEXTRAOS", " " + extraos + "spe") elif tarch == "mips64": d.appendVar("CANADIANEXTRAOS", " linux-gnun32") - for extraos in d.getVar("BASECANADIANEXTRAOS", True).split(): + for extraos in d.getVar("BASECANADIANEXTRAOS").split(): d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32") if tarch == "arm" or tarch == "armeb": d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi linux-uclibceabi")
@@ -86,10 +86,10 @@ python () { d.setVar("TARGET_OS", "linux") # Also need to handle multilib target vendors - vendors = d.getVar("CANADIANEXTRAVENDOR", True) + vendors = d.getVar("CANADIANEXTRAVENDOR") if not vendors: vendors = all_multilib_tune_values(d, 'TARGET_VENDOR') - origvendor = d.getVar("TARGET_VENDOR_MULTILIB_ORIGINAL", True) + origvendor = d.getVar("TARGET_VENDOR_MULTILIB_ORIGINAL") if origvendor: d.setVar("TARGET_VENDOR", origvendor) if origvendor not in vendors.split():
@@ -116,7 +116,7 @@ HOST_LD_ARCH = "${SDK_LD_ARCH}" HOST_AS_ARCH = "${SDK_AS_ARCH}" #assign DPKG_ARCH -DPKG_ARCH = "${@debian_arch_map(d.getVar('SDK_ARCH', True), '')}" +DPKG_ARCH = "${@debian_arch_map(d.getVar('SDK_ARCH'), '')}" CPPFLAGS = "${BUILDSDK_CPPFLAGS}" CFLAGS = "${BUILDSDK_CFLAGS}"
meta/classes/crosssdk.bbclass +1 -1
@@ -5,7 +5,7 @@ MACHINEOVERRIDES = "" PACKAGE_ARCH = "${SDK_ARCH}" python () { # set TUNE_PKGARCH to SDK_ARCH - d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH', True)) + d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) } STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}"
meta/classes/cve-check.bbclass +23 -23
113 lines not on this page · raw message
meta/classes/debian.bbclass +12 -12
@@ -20,17 +20,17 @@ do_package_write_tar[rdeptask] = "${DEBIANRDEP}" do_package_write_rpm[rdeptask] = "${DEBIANRDEP}" python () { - if not d.getVar("PACKAGES", True): + if not d.getVar("PACKAGES"): d.setVar("DEBIANRDEP", "") } python debian_package_name_hook () { import glob, copy, stat, errno, re - pkgdest = d.getVar('PKGDEST', True) - packages = d.getVar('PACKAGES', True) - bin_re = re.compile(".*/s?" + os.path.basename(d.getVar("bindir", True)) + "$") - lib_re = re.compile(".*/" + os.path.basename(d.getVar("libdir", True)) + "$") + pkgdest = d.getVar('PKGDEST') + packages = d.getVar('PACKAGES') + bin_re = re.compile(".*/s?" + os.path.basename(d.getVar("bindir")) + "$") + lib_re = re.compile(".*/" + os.path.basename(d.getVar("libdir")) + "$") so_re = re.compile("lib.*\.so") def socrunch(s):
@@ -53,11 +53,11 @@ python debian_package_name_hook () { return (s[stat.ST_MODE] & stat.S_IEXEC) def add_rprovides(pkg, d): - newpkg = d.getVar('PKG_' + pkg, True) + newpkg = d.getVar('PKG_' + pkg) if newpkg and newpkg != pkg: - provs = (d.getVar('RPROVIDES_' + pkg, True) or "").split() + provs = (d.getVar('RPROVIDES_' + pkg) or "").split() if pkg not in provs: - d.appendVar('RPROVIDES_' + pkg, " " + pkg + " (=" + d.getVar("PKGV", True) + ")") + d.appendVar('RPROVIDES_' + pkg, " " + pkg + " (=" + d.getVar("PKGV") + ")") def auto_libname(packages, orig_pkg): sonames = []
@@ -70,7 +70,7 @@ python debian_package_name_hook () { if lib_re.match(root): has_libs = 1 if so_re.match(os.path.basename(file)): - cmd = (d.getVar('TARGET_PREFIX', True) or "") + "objdump -p " + file + " 2>/dev/null" + cmd = (d.getVar('TARGET_PREFIX') or "") + "objdump -p " + file + " 2>/dev/null" fd = os.popen(cmd) lines = fd.readlines() fd.close()
@@ -84,7 +84,7 @@ python debian_package_name_hook () { if len(sonames) == 1: soname = sonames[0] elif len(sonames) > 1: - lead = d.getVar('LEAD_SONAME', True) + lead = d.getVar('LEAD_SONAME') if lead: r = re.compile(lead) filtered = []
@@ -115,7 +115,7 @@ python debian_package_name_hook () { newpkg = pkgname else: newpkg = pkg.replace(orig_pkg, devname, 1) - mlpre=d.getVar('MLPREFIX', True) + mlpre=d.getVar('MLPREFIX') if mlpre: if not newpkg.find(mlpre) == 0: newpkg = mlpre + newpkg
@@ -131,7 +131,7 @@ python debian_package_name_hook () { # and later # DEBUG: LIBNAMES: pkgname libtic5 devname libtic pkg ncurses-libticw orig_pkg ncurses-libtic debian_pn None newpkg libticw # so we need to handle ncurses-libticw->libticw5 before ncurses-libtic->libtic5 - for pkg in sorted((d.getVar('AUTO_LIBNAME_PKGS', True) or "").split(), reverse=True): + for pkg in sorted((d.getVar('AUTO_LIBNAME_PKGS') or "").split(), reverse=True): auto_libname(packages, pkg) }
meta/classes/devshell.bbclass +3 -3
@@ -5,14 +5,14 @@ DEVSHELL = "${SHELL}" python do_devshell () { if d.getVarFlag("do_devshell", "manualfakeroot", True): d.prependVar("DEVSHELL", "pseudo ") - fakeenv = d.getVar("FAKEROOTENV", True).split() + fakeenv = d.getVar("FAKEROOTENV").split() for f in fakeenv: k = f.split("=") d.setVar(k[0], k[1]) d.appendVar("OE_TERMINAL_EXPORTS", " " + k[0]) d.delVarFlag("do_devshell", "fakeroot") - oe_terminal(d.getVar('DEVSHELL', True), 'OpenEmbedded Developer Shell', d) + oe_terminal(d.getVar('DEVSHELL'), 'OpenEmbedded Developer Shell', d) } addtask devshell after do_patch
@@ -82,7 +82,7 @@ def devpyshell(d): more = False i = code.InteractiveInterpreter(locals=_context) - print("OE PyShell (PN = %s)\n" % d.getVar("PN", True)) + print("OE PyShell (PN = %s)\n" % d.getVar("PN")) def prompt(more): if more:
meta/classes/distro_features_check.bbclass +4 -4
@@ -11,15 +11,15 @@ python () { # Assume at least one var is set. - distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split() + distro_features = (d.getVar('DISTRO_FEATURES') or "").split() - any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES', True) + any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES') if any_of_distro_features: any_of_distro_features = any_of_distro_features.split() if set.isdisjoint(set(any_of_distro_features),set(distro_features)): raise bb.parse.SkipPackage("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) - required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES', True) + required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') if required_distro_features: required_distro_features = required_distro_features.split() for f in required_distro_features:
@@ -28,7 +28,7 @@ python () { else: raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) - conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True) + conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES') if conflict_distro_features: conflict_distro_features = conflict_distro_features.split() for f in conflict_distro_features:
meta/classes/distrodata.bbclass +66 -66
312 lines not on this page · raw message
meta/classes/distutils-base.bbclass +1 -1
@@ -1,4 +1,4 @@ -DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES', True) == '')]}" +DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES') == '')]}" RDEPENDS_${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" inherit distutils-common-base pythonnative
meta/classes/distutils3-base.bbclass +1 -1
@@ -1,4 +1,4 @@ -DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES', True) == '')]}" +DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES') == '')]}" RDEPENDS_${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" inherit distutils-common-base python3native
meta/classes/externalsrc.bbclass +19 -19
@@ -28,34 +28,34 @@ SRCTREECOVEREDTASKS ?= "do_patch do_unpack do_fetch" EXTERNALSRC_SYMLINKS ?= "oe-workdir:${WORKDIR} oe-logs:${T}" python () { - externalsrc = d.getVar('EXTERNALSRC', True) + externalsrc = d.getVar('EXTERNALSRC') # If this is the base recipe and EXTERNALSRC is set for it or any of its # derivatives, then enable BB_DONT_CACHE to force the recipe to always be # re-parsed so that the file-checksums function for do_compile is run every # time. - bpn = d.getVar('BPN', True) - if bpn == d.getVar('PN', True): - classextend = (d.getVar('BBCLASSEXTEND', True) or '').split() + bpn = d.getVar('BPN') + if bpn == d.getVar('PN'): + classextend = (d.getVar('BBCLASSEXTEND') or '').split() if (externalsrc or ('native' in classextend and - d.getVar('EXTERNALSRC_pn-%s-native' % bpn, True)) or + d.getVar('EXTERNALSRC_pn-%s-native' % bpn)) or ('nativesdk' in classextend and - d.getVar('EXTERNALSRC_pn-nativesdk-%s' % bpn, True)) or + d.getVar('EXTERNALSRC_pn-nativesdk-%s' % bpn)) or ('cross' in classextend and - d.getVar('EXTERNALSRC_pn-%s-cross' % bpn, True))): + d.getVar('EXTERNALSRC_pn-%s-cross' % bpn))): d.setVar('BB_DONT_CACHE', '1') if externalsrc: d.setVar('S', externalsrc) - externalsrcbuild = d.getVar('EXTERNALSRC_BUILD', True) + externalsrcbuild = d.getVar('EXTERNALSRC_BUILD') if externalsrcbuild: d.setVar('B', externalsrcbuild) else: d.setVar('B', '${WORKDIR}/${BPN}-${PV}/') local_srcuri = [] - fetch = bb.fetch2.Fetch((d.getVar('SRC_URI', True) or '').split(), d) + fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d) for url in fetch.urls: url_data = fetch.ud[url] parm = url_data.parm
@@ -94,7 +94,7 @@ python () { # Note that we cannot use d.appendVarFlag() here because deps is expected to be a list object, not a string d.setVarFlag('do_configure', 'deps', (d.getVarFlag('do_configure', 'deps', False) or []) + ['do_unpack']) - for task in d.getVar("SRCTREECOVEREDTASKS", True).split(): + for task in d.getVar("SRCTREECOVEREDTASKS").split(): if local_srcuri and task in fetch_tasks: continue bb.build.deltask(task, d)
@@ -106,13 +106,13 @@ python () { d.setVarFlag('do_configure', 'file-checksums', '${@srctree_configure_hash_files(d)}') # We don't want the workdir to go away - d.appendVar('RM_WORK_EXCLUDE', ' ' + d.getVar('PN', True)) + d.appendVar('RM_WORK_EXCLUDE', ' ' + d.getVar('PN')) # If B=S the same builddir is used even for different architectures. # Thus, use a shared CONFIGURESTAMPFILE and STAMP directory so that # change of do_configure task hash is correctly detected and stamps are # invalidated if e.g. MACHINE changes. - if d.getVar('S', True) == d.getVar('B', True): + if d.getVar('S') == d.getVar('B'): configstamp = '${TMPDIR}/work-shared/${PN}/${EXTENDPE}${PV}-${PR}/configure.sstate' d.setVar('CONFIGURESTAMPFILE', configstamp) d.setVar('STAMP', '${STAMPS_DIR}/work-shared/${PN}/${EXTENDPE}${PV}-${PR}')
@@ -120,10 +120,10 @@ python () { python externalsrc_configure_prefunc() { # Create desired symlinks - symlinks = (d.getVar('EXTERNALSRC_SYMLINKS', True) or '').split() + symlinks = (d.getVar('EXTERNALSRC_SYMLINKS') or '').split() for symlink in symlinks: symsplit = symlink.split(':', 1) - lnkfile = os.path.join(d.getVar('S', True), symsplit[0]) + lnkfile = os.path.join(d.getVar('S'), symsplit[0]) target = d.expand(symsplit[1]) if len(symsplit) > 1: if os.path.islink(lnkfile):
@@ -139,7 +139,7 @@ python externalsrc_configure_prefunc() { python externalsrc_compile_prefunc() { # Make it obvious that this is happening, since forgetting about it could lead to much confusion - bb.plain('NOTE: %s: compiling from external source tree %s' % (d.getVar('PN', True), d.getVar('EXTERNALSRC', True))) + bb.plain('NOTE: %s: compiling from external source tree %s' % (d.getVar('PN'), d.getVar('EXTERNALSRC'))) } def srctree_hash_files(d):
@@ -147,7 +147,7 @@ def srctree_hash_files(d): import subprocess import tempfile - s_dir = d.getVar('EXTERNALSRC', True) + s_dir = d.getVar('EXTERNALSRC') git_dir = os.path.join(s_dir, '.git') oe_hash_file = os.path.join(git_dir, 'oe-devtool-tree-sha1')
@@ -165,7 +165,7 @@ def srctree_hash_files(d): fobj.write(sha1) ret = oe_hash_file + ':True' else: - ret = d.getVar('EXTERNALSRC', True) + '/*:True' + ret = d.getVar('EXTERNALSRC') + '/*:True' return ret def srctree_configure_hash_files(d):
@@ -173,7 +173,7 @@ def srctree_configure_hash_files(d): Get the list of files that should trigger do_configure to re-execute, based on the value of CONFIGURE_FILES """ - in_files = (d.getVar('CONFIGURE_FILES', True) or '').split() + in_files = (d.getVar('CONFIGURE_FILES') or '').split() out_items = [] search_files = [] for entry in in_files:
@@ -182,7 +182,7 @@ def srctree_configure_hash_files(d): else: search_files.append(entry) if search_files: - s_dir = d.getVar('EXTERNALSRC', True) + s_dir = d.getVar('EXTERNALSRC') for root, _, files in os.walk(s_dir): for f in files: if f in search_files:
meta/classes/extrausers.bbclass +1 -1
@@ -15,7 +15,7 @@ inherit useradd_base -PACKAGE_INSTALL_append = " ${@['', 'base-passwd shadow'][bool(d.getVar('EXTRA_USERS_PARAMS', True))]}" +PACKAGE_INSTALL_append = " ${@['', 'base-passwd shadow'][bool(d.getVar('EXTRA_USERS_PARAMS'))]}" # Image level user / group settings ROOTFS_POSTPROCESS_COMMAND_append = " set_user_group;"
meta/classes/fontcache.bbclass +7 -7
@@ -30,26 +30,26 @@ fi } python () { - font_pkgs = d.getVar('FONT_PACKAGES', True).split() - deps = d.getVar("FONT_EXTRA_RDEPENDS", True) + font_pkgs = d.getVar('FONT_PACKAGES').split() + deps = d.getVar("FONT_EXTRA_RDEPENDS") for pkg in font_pkgs: if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps) } python add_fontcache_postinsts() { - for pkg in d.getVar('FONT_PACKAGES', True).split(): + for pkg in d.getVar('FONT_PACKAGES').split(): bb.note("adding fonts postinst and postrm scripts to %s" % pkg) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + postinst = d.getVar('pkg_postinst_%s' % pkg) or d.getVar('pkg_postinst') if not postinst: postinst = '#!/bin/sh\n' - postinst += d.getVar('fontcache_common', True) + postinst += d.getVar('fontcache_common') d.setVar('pkg_postinst_%s' % pkg, postinst) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) + postrm = d.getVar('pkg_postrm_%s' % pkg) or d.getVar('pkg_postrm') if not postrm: postrm = '#!/bin/sh\n' - postrm += d.getVar('fontcache_common', True) + postrm += d.getVar('fontcache_common') d.setVar('pkg_postrm_%s' % pkg, postrm) }
meta/classes/fs-uuid.bbclass +1 -1
@@ -3,7 +3,7 @@ # on ext file systems and depends on tune2fs. def get_rootfs_uuid(d): import subprocess - rootfs = d.getVar('ROOTFS', True) + rootfs = d.getVar('ROOTFS') output = subprocess.check_output(['tune2fs', '-l', rootfs]) for line in output.split('\n'): if line.startswith('Filesystem UUID:'):
meta/classes/gconf.bbclass +6 -6
@@ -42,8 +42,8 @@ done python populate_packages_append () { import re - packages = d.getVar('PACKAGES', True).split() - pkgdest = d.getVar('PKGDEST', True) + packages = d.getVar('PACKAGES').split() + pkgdest = d.getVar('PKGDEST') for pkg in packages: schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg)
@@ -56,15 +56,15 @@ python populate_packages_append () { if schemas != []: bb.note("adding gconf postinst and prerm scripts to %s" % pkg) d.setVar('SCHEMA_FILES', " ".join(schemas)) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) + postinst = d.getVar('pkg_postinst_%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' - postinst += d.getVar('gconf_postinst', True) + postinst += d.getVar('gconf_postinst') d.setVar('pkg_postinst_%s' % pkg, postinst) - prerm = d.getVar('pkg_prerm_%s' % pkg, True) + prerm = d.getVar('pkg_prerm_%s' % pkg) if not prerm: prerm = '#!/bin/sh\n' - prerm += d.getVar('gconf_prerm', True) + prerm += d.getVar('gconf_prerm') d.setVar('pkg_prerm_%s' % pkg, prerm) d.appendVar("RDEPENDS_%s" % pkg, ' ' + d.getVar('MLPREFIX', False) + 'gconf') }
meta/classes/gettext.bbclass +4 -4
@@ -1,15 +1,15 @@ def gettext_dependencies(d): - if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): + if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): return "" - if d.getVar('USE_NLS', True) == 'no': + if d.getVar('USE_NLS') == 'no': return "gettext-minimal-native" return d.getVar('DEPENDS_GETTEXT', False) def gettext_oeconf(d): - if d.getVar('USE_NLS', True) == 'no': + if d.getVar('USE_NLS') == 'no': return '--disable-nls' # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set - if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): + if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'): return '--disable-nls' return "--enable-nls"
meta/classes/gio-module-cache.bbclass +5 -5
@@ -17,21 +17,21 @@ fi } python populate_packages_append () { - packages = d.getVar('GIO_MODULE_PACKAGES', True).split() + packages = d.getVar('GIO_MODULE_PACKAGES').split() for pkg in packages: bb.note("adding gio-module-cache postinst and postrm scripts to %s" % pkg) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) + postinst = d.getVar('pkg_postinst_%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' - postinst += d.getVar('gio_module_cache_common', True) + postinst += d.getVar('gio_module_cache_common') d.setVar('pkg_postinst_%s' % pkg, postinst) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) + postrm = d.getVar('pkg_postrm_%s' % pkg) if not postrm: postrm = '#!/bin/sh\n' - postrm += d.getVar('gio_module_cache_common', True) + postrm += d.getVar('gio_module_cache_common') d.setVar('pkg_postrm_%s' % pkg, postrm) }
meta/classes/grub-efi.bbclass +11 -11
@@ -72,14 +72,14 @@ efi_hddimg_populate() { python build_efi_cfg() { import sys - workdir = d.getVar('WORKDIR', True) + workdir = d.getVar('WORKDIR') if not workdir: bb.error("WORKDIR not defined, unable to package") return - gfxserial = d.getVar('GRUB_GFXSERIAL', True) or "" + gfxserial = d.getVar('GRUB_GFXSERIAL') or "" - labels = d.getVar('LABELS', True) + labels = d.getVar('LABELS') if not labels: bb.debug(1, "LABELS not defined, nothing to do") return
@@ -88,7 +88,7 @@ python build_efi_cfg() { bb.debug(1, "No labels, nothing to do") return - cfile = d.getVar('GRUB_CFG', True) + cfile = d.getVar('GRUB_CFG') if not cfile: bb.fatal('Unable to read GRUB_CFG')
@@ -99,33 +99,33 @@ python build_efi_cfg() { cfgfile.write('# Automatically created by OE\n') - opts = d.getVar('GRUB_OPTS', True) + opts = d.getVar('GRUB_OPTS') if opts: for opt in opts.split(';'): cfgfile.write('%s\n' % opt) cfgfile.write('default=%s\n' % (labels.split()[0])) - timeout = d.getVar('GRUB_TIMEOUT', True) + timeout = d.getVar('GRUB_TIMEOUT') if timeout: cfgfile.write('timeout=%s\n' % timeout) else: cfgfile.write('timeout=50\n') - root = d.getVar('GRUB_ROOT', True) + root = d.getVar('GRUB_ROOT') if not root: bb.fatal('GRUB_ROOT not defined') if gfxserial == "1": btypes = [ [ " graphics console", "" ], - [ " serial console", d.getVar('GRUB_SERIAL', True) or "" ] ] + [ " serial console", d.getVar('GRUB_SERIAL') or "" ] ] else: btypes = [ [ "", "" ] ] for label in labels.split(): localdata = d.createCopy() - overrides = localdata.getVar('OVERRIDES', True) + overrides = localdata.getVar('OVERRIDES') if not overrides: bb.fatal('OVERRIDES not defined')
@@ -141,8 +141,8 @@ python build_efi_cfg() { cfgfile.write(' %s' % replace_rootfs_uuid(d, root)) - append = localdata.getVar('APPEND', True) - initrd = localdata.getVar('INITRD', True) + append = localdata.getVar('APPEND') + initrd = localdata.getVar('INITRD') if append: append = replace_rootfs_uuid(d, append)
meta/classes/gsettings.bbclass +5 -5
@@ -18,20 +18,20 @@ gsettings_postinstrm () { } python populate_packages_append () { - pkg = d.getVar('PN', True) + pkg = d.getVar('PN') bb.note("adding gsettings postinst scripts to %s" % pkg) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + postinst = d.getVar('pkg_postinst_%s' % pkg) or d.getVar('pkg_postinst') if not postinst: postinst = '#!/bin/sh\n' - postinst += d.getVar('gsettings_postinstrm', True) + postinst += d.getVar('gsettings_postinstrm') d.setVar('pkg_postinst_%s' % pkg, postinst) bb.note("adding gsettings postrm scripts to %s" % pkg) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) + postrm = d.getVar('pkg_postrm_%s' % pkg) or d.getVar('pkg_postrm') if not postrm: postrm = '#!/bin/sh\n' - postrm += d.getVar('gsettings_postinstrm', True) + postrm += d.getVar('gsettings_postinstrm') d.setVar('pkg_postrm_%s' % pkg, postrm) }
meta/classes/gtk-icon-cache.bbclass +7 -7
@@ -35,11 +35,11 @@ fi } python populate_packages_append () { - packages = d.getVar('PACKAGES', True).split() - pkgdest = d.getVar('PKGDEST', True) + packages = d.getVar('PACKAGES').split() + pkgdest = d.getVar('PKGDEST') for pkg in packages: - icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, d.getVar('datadir', True)) + icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, d.getVar('datadir')) if not os.path.exists(icon_dir): continue
@@ -49,16 +49,16 @@ python populate_packages_append () { bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) + postinst = d.getVar('pkg_postinst_%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' - postinst += d.getVar('gtk_icon_cache_postinst', True) + postinst += d.getVar('gtk_icon_cache_postinst') d.setVar('pkg_postinst_%s' % pkg, postinst) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) + postrm = d.getVar('pkg_postrm_%s' % pkg) if not postrm: postrm = '#!/bin/sh\n' - postrm += d.getVar('gtk_icon_cache_postrm', True) + postrm += d.getVar('gtk_icon_cache_postrm') d.setVar('pkg_postrm_%s' % pkg, postrm) }
meta/classes/gtk-immodules-cache.bbclass +5 -5
@@ -61,21 +61,21 @@ fi } python populate_packages_append () { - gtkimmodules_pkgs = d.getVar('GTKIMMODULES_PACKAGES', True).split() + gtkimmodules_pkgs = d.getVar('GTKIMMODULES_PACKAGES').split() for pkg in gtkimmodules_pkgs: bb.note("adding gtk-immodule-cache postinst and postrm scripts to %s" % pkg) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) + postinst = d.getVar('pkg_postinst_%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' - postinst += d.getVar('gtk_immodule_cache_postinst', True) + postinst += d.getVar('gtk_immodule_cache_postinst') d.setVar('pkg_postinst_%s' % pkg, postinst) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) + postrm = d.getVar('pkg_postrm_%s' % pkg) if not postrm: postrm = '#!/bin/sh\n' - postrm += d.getVar('gtk_immodule_cache_postrm', True) + postrm += d.getVar('gtk_immodule_cache_postrm') d.setVar('pkg_postrm_%s' % pkg, postrm) }
meta/classes/icecc.bbclass +2 -2
@@ -100,7 +100,7 @@ def use_icecc(bb,d): if icecc_is_allarch(bb, d): return "no" - pn = d.getVar('PN', True) + pn = d.getVar('PN') system_class_blacklist = [] user_class_blacklist = (d.getVar('ICECC_USER_CLASS_BL', False) or "none").split()
@@ -139,7 +139,7 @@ def use_icecc(bb,d): return "yes" def icecc_is_allarch(bb, d): - return d.getVar("PACKAGE_ARCH", True) == "all" or bb.data.inherits_class('allarch', d) + return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d) def icecc_is_kernel(bb, d): return \
meta/classes/image-buildinfo.bbclass +5 -5
@@ -18,7 +18,7 @@ def image_buildinfo_outputvars(vars, listvars, d): listvars = listvars.split() ret = "" for var in vars: - value = d.getVar(var, True) or "" + value = d.getVar(var) or "" if (d.getVarFlag(var, 'type', True) == "list"): value = oe.utils.squashspaces(value) ret += "%s = %s\n" % (var, value)
@@ -42,7 +42,7 @@ def get_layer_git_status(path): # Returns layer revisions along with their respective status def get_layer_revs(d): - layers = (d.getVar("BBLAYERS", True) or "").split() + layers = (d.getVar("BBLAYERS") or "").split() medadata_revs = ["%-17s = %s:%s %s" % (os.path.basename(i), \ base_get_metadata_git_branch(i, None).strip(), \ base_get_metadata_git_revision(i, None), \
@@ -52,11 +52,11 @@ def get_layer_revs(d): def buildinfo_target(d): # Get context - if d.getVar('BB_WORKERCONTEXT', True) != '1': + if d.getVar('BB_WORKERCONTEXT') != '1': return "" # Single and list variables to be read - vars = (d.getVar("IMAGE_BUILDINFO_VARS", True) or "") - listvars = (d.getVar("IMAGE_BUILDINFO_LVARS", True) or "") + vars = (d.getVar("IMAGE_BUILDINFO_VARS") or "") + listvars = (d.getVar("IMAGE_BUILDINFO_LVARS") or "") return image_buildinfo_outputvars(vars, listvars, d) # Write build information to target filesystem
meta/classes/image-live.bbclass +4 -4
@@ -51,8 +51,8 @@ IMAGE_TYPEDEP_hddimg = "ext4" IMAGE_TYPES_MASKED += "live hddimg iso" python() { - image_b = d.getVar('IMAGE_BASENAME', True) - initrd_i = d.getVar('INITRD_IMAGE_LIVE', True) + image_b = d.getVar('IMAGE_BASENAME') + initrd_i = d.getVar('INITRD_IMAGE_LIVE') if image_b == initrd_i: bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i) bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.')
@@ -264,9 +264,9 @@ build_hddimg() { python do_bootimg() { set_live_vm_vars(d, 'LIVE') - if d.getVar("PCBIOS", True) == "1": + if d.getVar("PCBIOS") == "1": bb.build.exec_func('build_syslinux_cfg', d) - if d.getVar("EFI", True) == "1": + if d.getVar("EFI") == "1": bb.build.exec_func('build_efi_cfg', d) bb.build.exec_func('build_hddimg', d) bb.build.exec_func('build_iso', d)
meta/classes/image-vm.bbclass +6 -6
@@ -112,9 +112,9 @@ build_boot_dd() { python do_bootdirectdisk() { validate_disk_signature(d) set_live_vm_vars(d, 'VM') - if d.getVar("PCBIOS", True) == "1": + if d.getVar("PCBIOS") == "1": bb.build.exec_func('build_syslinux_cfg', d) - if d.getVar("EFI", True) == "1": + if d.getVar("EFI") == "1": bb.build.exec_func('build_efi_cfg', d) bb.build.exec_func('build_boot_dd', d) }
@@ -132,7 +132,7 @@ def generate_disk_signature(): def validate_disk_signature(d): import re - disk_signature = d.getVar("DISK_SIGNATURE", True) + disk_signature = d.getVar("DISK_SIGNATURE") if not re.match(r'^[0-9a-fA-F]{8}$', disk_signature): bb.fatal("DISK_SIGNATURE '%s' must be an 8 digit hex string" % disk_signature)
@@ -158,11 +158,11 @@ create_qcow2_image () { } python do_vmimg() { - if 'vmdk' in d.getVar('IMAGE_FSTYPES', True): + if 'vmdk' in d.getVar('IMAGE_FSTYPES'): bb.build.exec_func('create_vmdk_image', d) - if 'vdi' in d.getVar('IMAGE_FSTYPES', True): + if 'vdi' in d.getVar('IMAGE_FSTYPES'): bb.build.exec_func('create_vdi_image', d) - if 'qcow2' in d.getVar('IMAGE_FSTYPES', True): + if 'qcow2' in d.getVar('IMAGE_FSTYPES'): bb.build.exec_func('create_qcow2_image', d) }
meta/classes/image.bbclass +48 -48
265 lines not on this page · raw message
meta/classes/image_types.bbclass +12 -12
@@ -17,20 +17,20 @@ def imagetypes_getdepends(d): d += ":do_populate_sysroot" deps.add(d) - fstypes = set((d.getVar('IMAGE_FSTYPES', True) or "").split()) - fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS', True) or "").split()) + fstypes = set((d.getVar('IMAGE_FSTYPES') or "").split()) + fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS') or "").split()) deps = set() for typestring in fstypes: types = typestring.split(".") basetype, resttypes = types[0], types[1:] - adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps) - for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): - adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) + adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps) + for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split(): + adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends) , deps) for ctype in resttypes: - adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) - adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps) + adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps) + adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype), deps) # Sort the set so that ordering is consistant return " ".join(sorted(deps))
@@ -220,7 +220,7 @@ WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH} do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" python () { - if d.getVar('USING_WIC', True) and 'do_bootimg' in d: + if d.getVar('USING_WIC') and 'do_bootimg' in d: bb.build.addtask('do_image_wic', '', 'do_bootimg', d) }
@@ -228,7 +228,7 @@ python do_write_wks_template () { """Write out expanded template contents to WKS_FULL_PATH.""" import re - template_body = d.getVar('_WKS_TEMPLATE', True) + template_body = d.getVar('_WKS_TEMPLATE') # Remove any remnant variable references left behind by the expansion # due to undefined variables
@@ -240,18 +240,18 @@ python do_write_wks_template () { else: template_body = new_body - wks_file = d.getVar('WKS_FULL_PATH', True) + wks_file = d.getVar('WKS_FULL_PATH') with open(wks_file, 'w') as f: f.write(template_body) } python () { - if d.getVar('USING_WIC', True): + if d.getVar('USING_WIC'): wks_file_u = d.getVar('WKS_FULL_PATH', False) wks_file = d.expand(wks_file_u) base, ext = os.path.splitext(wks_file) if ext == '.in' and os.path.exists(wks_file): - wks_out_file = os.path.join(d.getVar('WORKDIR', True), os.path.basename(base)) + wks_out_file = os.path.join(d.getVar('WORKDIR'), os.path.basename(base)) d.setVar('WKS_FULL_PATH', wks_out_file) d.setVar('WKS_TEMPLATE_PATH', wks_file_u) d.setVar('WKS_FILE_CHECKSUM', '${WKS_TEMPLATE_PATH}:True')
meta/classes/insane.bbclass +97 -97
415 lines not on this page · raw message
meta/classes/kernel-module-split.bbclass +19 -19
Lines of this file are not shown. View the raw message.
meta/classes/libc-package.bbclass +30 -30
60 lines not on this page · raw message
meta/classes/license.bbclass +48 -48
96 lines not on this page · raw message
meta/classes/migrate_localcount.bbclass +6 -6
Lines of this file are not shown. View the raw message.
meta/classes/package.bbclass +141 -141
282 lines not on this page · raw message
meta/classes/package_deb.bbclass +27 -27
54 lines not on this page · raw message
meta/classes/package_ipk.bbclass +30 -30
60 lines not on this page · raw message
meta/classes/package_rpm.bbclass +68 -68
136 lines not on this page · raw message
meta/classes/packagefeed-stability.bbclass +7 -7
Lines of this file are not shown. View the raw message.
meta/classes/populate_sdk_base.bbclass +18 -18
Lines of this file are not shown. View the raw message.
meta/classes/populate_sdk_ext.bbclass +54 -54
108 lines not on this page · raw message
meta/classes/rootfs-postcommands.bbclass +3 -3
Lines of this file are not shown. View the raw message.
meta/classes/sanity.bbclass +54 -54
108 lines not on this page · raw message
meta/classes/sstate.bbclass +57 -57
114 lines not on this page · raw message
meta/classes/tinderclient.bbclass +27 -27
54 lines not on this page · raw message
meta/classes/uboot-extlinux-config.bbclass +12 -12
Lines of this file are not shown. View the raw message.
meta/classes/update-alternatives.bbclass +26 -26
52 lines not on this page · raw message
meta/classes/useradd-staticids.bbclass +24 -24
48 lines not on this page · raw message
meta/conf/distro/include/tclibc-glibc.inc +3 -3
Lines of this file are not shown. View the raw message.
meta/conf/machine/include/arm/arch-arm.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/conf/machine/include/arm/arch-arm64.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/conf/machine/include/arm/feature-arm-thumb.inc +5 -5
Lines of this file are not shown. View the raw message.
meta/conf/machine/include/arm/feature-arm-vfp.inc +5 -5
Lines of this file are not shown. View the raw message.
meta/conf/machine/include/mips/feature-mips-mips16e.inc +3 -3
Lines of this file are not shown. View the raw message.
meta/lib/oe/package_manager.py +87 -87
174 lines not on this page · raw message
meta/lib/oe/rootfs.py +57 -57
114 lines not on this page · raw message
meta/lib/oe/sdk.py +38 -38
76 lines not on this page · raw message
meta/lib/oeqa/controllers/masterimage.py +8 -8
Lines of this file are not shown. View the raw message.
meta/lib/oeqa/oetest.py +30 -30
60 lines not on this page · raw message
meta/lib/oeqa/targetcontrol.py +26 -26
52 lines not on this page · raw message
meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-connectivity/bluez5/bluez5.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-connectivity/connman/connman.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/base-files/base-files_3.0.14.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/busybox/busybox_1.24.1.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/busybox/busybox_git.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/coreutils/coreutils_6.9.bb +4 -4
Lines of this file are not shown. View the raw message.
meta/recipes-core/coreutils/coreutils_8.25.bb +4 -4
Lines of this file are not shown. View the raw message.
meta/recipes-core/glibc/glibc-locale.inc +4 -4
Lines of this file are not shown. View the raw message.
meta/recipes-core/glibc/glibc-package.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/libxml/libxml2_2.9.4.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/meta/meta-environment-extsdk.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/meta/meta-environment.bb +3 -3
Lines of this file are not shown. View the raw message.
meta/recipes-core/meta/meta-extsdk-toolchain.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/meta/meta-world-pkgdata.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/os-release/os-release.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/packagegroups/packagegroup-base.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/psplash/psplash_git.bb +10 -10
Lines of this file are not shown. View the raw message.
meta/recipes-core/systemd/systemd_232.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-core/util-linux/util-linux.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-core/volatile-binds/volatile-binds.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/apt/apt-native.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/apt/apt-package.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/automake/automake.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils-2.27.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils.inc +3 -3
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/cmake/cmake_3.7.0.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/gcc/gcc-common.inc +16 -16
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/gcc/gcc-configure-common.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/gcc/gcc-cross.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/gcc/gcc-multilib-config.inc +10 -10
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/gcc/libgcc-common.inc +19 -19
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/gcc/libgfortran.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/perl/perl_5.24.0.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/prelink/prelink_git.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/python/python-smartpm_git.bb +3 -3
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/qemu/qemu-targets.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/rpm/rpm_5.4.16.bb +30 -30
60 lines not on this page · raw message
meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-extended/net-tools/net-tools_1.60-26.bb +4 -4
Lines of this file are not shown. View the raw message.
meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-extended/pam/libpam_1.3.0.bb +7 -7
Lines of this file are not shown. View the raw message.
meta/recipes-extended/procps/procps_3.3.12.bb +4 -4
Lines of this file are not shown. View the raw message.
meta/recipes-extended/texinfo/texinfo_6.3.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-extended/tzdata/tzdata_2016i.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.0.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-gnome/gtk+/gtk+_2.24.31.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-graphics/cairo/cairo-fpu.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-kernel/linux/linux-yocto.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-kernel/lttng/lttng-modules_git.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-kernel/perf/perf-features.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-multimedia/alsa/alsa-fpu.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +5 -5
Lines of this file are not shown. View the raw message.
meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-rt/images/core-image-rt-sdk.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-rt/images/core-image-rt.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-support/boost/boost-1.62.0.inc +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-support/libiconv/libiconv_1.11.1.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-support/libiconv/libiconv_1.14.bb +2 -2
Lines of this file are not shown. View the raw message.
meta/recipes-support/libnl/libnl_3.2.28.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-support/libsoup/libsoup-2.4_2.56.0.bb +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-support/sqlite/sqlite3.inc +1 -1
Lines of this file are not shown. View the raw message.
meta/recipes-support/taglib/taglib_1.11.1.bb +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.9.3
Part of the diff is not shown here. View the raw message.
PATCH 2/4 scripts: remove True option to getVar calls
In reply to Joshua LockgetVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
--- scripts/contrib/list-packageconfig-flags.py | 6 +-- scripts/contrib/verify-homepage.py | 2 +- scripts/devtool | 2 +- scripts/lib/devtool/__init__.py | 8 ++-- scripts/lib/devtool/build_image.py | 10 ++-- scripts/lib/devtool/deploy.py | 2 +- scripts/lib/devtool/package.py | 2 +- scripts/lib/devtool/runqemu.py | 4 +- scripts/lib/devtool/sdk.py | 8 ++-- scripts/lib/devtool/search.py | 4 +- scripts/lib/devtool/standard.py | 58 ++++++++++++------------ scripts/lib/devtool/upgrade.py | 20 ++++---- scripts/lib/devtool/utilcmds.py | 18 ++++---- scripts/lib/recipetool/append.py | 22 ++++----- scripts/lib/recipetool/create.py | 24 +++++----- scripts/lib/recipetool/create_buildsys_python.py | 4 +- scripts/lib/recipetool/create_kernel.py | 4 +- scripts/lib/recipetool/create_npm.py | 6 +-- scripts/lib/recipetool/newappend.py | 2 +- scripts/lib/scriptutils.py | 2 +- scripts/oe-pkgdata-util | 2 +- scripts/recipetool | 2 +- 22 files changed, 106 insertions(+), 106 deletions(-)
scripts/contrib/list-packageconfig-flags.py +3 -3
@@ -76,7 +76,7 @@ def collect_pkgs(data_dict): for fn in data_dict: pkgconfigflags = data_dict[fn].getVarFlags("PACKAGECONFIG") pkgconfigflags.pop('doc', None) - pkgname = data_dict[fn].getVar("P", True) + pkgname = data_dict[fn].getVar("P") pkg_dict[pkgname] = sorted(pkgconfigflags.keys()) return pkg_dict
@@ -124,9 +124,9 @@ def display_all(data_dict): ''' Display all pkgs and PACKAGECONFIG information ''' print(str("").ljust(50, '=')) for fn in data_dict: - print('%s' % data_dict[fn].getVar("P", True)) + print('%s' % data_dict[fn].getVar("P")) print(fn) - packageconfig = data_dict[fn].getVar("PACKAGECONFIG", True) or '' + packageconfig = data_dict[fn].getVar("PACKAGECONFIG") or '' if packageconfig.strip() == '': packageconfig = 'None' print('PACKAGECONFIG %s' % packageconfig)
scripts/contrib/verify-homepage.py +1 -1
@@ -44,7 +44,7 @@ def verifyHomepage(bbhandler): if realfn in checked: continue data = bbhandler.parse_recipe_file(realfn) - homepage = data.getVar("HOMEPAGE", True) + homepage = data.getVar("HOMEPAGE") if homepage: try: urllib.request.urlopen(homepage, timeout=5)
scripts/devtool +1 -1
@@ -291,7 +291,7 @@ def main(): try: tinfoil = setup_tinfoil(config_only=True, basepath=basepath) try: - global_args.bbpath = tinfoil.config_data.getVar('BBPATH', True) + global_args.bbpath = tinfoil.config_data.getVar('BBPATH') finally: tinfoil.shutdown() except bb.BBHandledException:
scripts/lib/devtool/__init__.py +4 -4
@@ -87,13 +87,13 @@ def exec_watch(cmd, **options): def exec_fakeroot(d, cmd, **kwargs): """Run a command under fakeroot (pseudo, in fact) so that it picks up the appropriate file permissions""" # Grab the command and check it actually exists - fakerootcmd = d.getVar('FAKEROOTCMD', True) + fakerootcmd = d.getVar('FAKEROOTCMD') if not os.path.exists(fakerootcmd): logger.error('pseudo executable %s could not be found - have you run a build yet? pseudo-native should install this and if you have run any build then that should have been built') return 2 # Set up the appropriate environment newenv = dict(os.environ) - fakerootenv = d.getVar('FAKEROOTENV', True) + fakerootenv = d.getVar('FAKEROOTENV') for varvalue in fakerootenv.split(): if '=' in varvalue: splitval = varvalue.split('=', 1)
@@ -179,7 +179,7 @@ def use_external_build(same_dir, no_same_dir, d): logger.info('Using source tree as build directory since --same-dir specified') elif bb.data.inherits_class('autotools-brokensep', d): logger.info('Using source tree as build directory since recipe inherits autotools-brokensep') - elif d.getVar('B', True) == os.path.abspath(d.getVar('S', True)): + elif d.getVar('B') == os.path.abspath(d.getVar('S')): logger.info('Using source tree as build directory since that would be the default for this recipe') else: b_is_s = False
@@ -256,7 +256,7 @@ def ensure_npm(config, basepath, fixed_setup=False): """ tinfoil = setup_tinfoil(config_only=True, basepath=basepath) try: - nativepath = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE', True) + nativepath = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE') finally: tinfoil.shutdown()
scripts/lib/devtool/build_image.py +5 -5
@@ -34,8 +34,8 @@ def _get_packages(tinfoil, workspace, config): result = [] for recipe in workspace: data = parse_recipe(config, tinfoil, recipe, True) - if 'class-target' in data.getVar('OVERRIDES', True).split(':'): - if recipe in data.getVar('PACKAGES', True).split(): + if 'class-target' in data.getVar('OVERRIDES').split(':'): + if recipe in data.getVar('PACKAGES').split(): result.append(recipe) else: logger.warning("Skipping recipe %s as it doesn't produce a "
@@ -95,7 +95,7 @@ def build_image_task(config, basepath, workspace, image, add_packages=None, task raise TargetNotImageError() # Get the actual filename used and strip the .bb and full path - target_basename = rd.getVar('FILE', True) + target_basename = rd.getVar('FILE') target_basename = os.path.splitext(os.path.basename(target_basename))[0] config.set('SDK', 'target_basename', target_basename) config.write()
@@ -132,9 +132,9 @@ def build_image_task(config, basepath, workspace, image, add_packages=None, task afile.write('%s\n' % line) if task in ['populate_sdk', 'populate_sdk_ext']: - outputdir = rd.getVar('SDK_DEPLOY', True) + outputdir = rd.getVar('SDK_DEPLOY') else: - outputdir = rd.getVar('DEPLOY_DIR_IMAGE', True) + outputdir = rd.getVar('DEPLOY_DIR_IMAGE') tmp_tinfoil = tinfoil tinfoil = None
scripts/lib/devtool/deploy.py +1 -1
@@ -160,7 +160,7 @@ def deploy(args, config, basepath, workspace): except Exception as e: raise DevtoolError('Exception parsing recipe %s: %s' % (args.recipename, e)) - recipe_outdir = rd.getVar('D', True) + recipe_outdir = rd.getVar('D') if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir): raise DevtoolError('No files to deploy - have you built the %s ' 'recipe? If so, the install step has not installed '
scripts/lib/devtool/package.py +1 -1
@@ -32,7 +32,7 @@ def package(args, config, basepath, workspace): try: image_pkgtype = config.get('Package', 'image_pkgtype', '') if not image_pkgtype: - image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE', True) + image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE') deploy_dir_pkg = tinfoil.config_data.getVar('DEPLOY_DIR_%s' % image_pkgtype.upper(), True) finally:
scripts/lib/devtool/runqemu.py +2 -2
@@ -31,8 +31,8 @@ def runqemu(args, config, basepath, workspace): tinfoil = setup_tinfoil(config_only=True, basepath=basepath) try: - machine = tinfoil.config_data.getVar('MACHINE', True) - bindir_native = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE', True) + machine = tinfoil.config_data.getVar('MACHINE') + bindir_native = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE') finally: tinfoil.shutdown()
scripts/lib/devtool/sdk.py +4 -4
@@ -132,9 +132,9 @@ def sdk_update(args, config, basepath, workspace): # Grab variable values tinfoil = setup_tinfoil(config_only=True, basepath=basepath) try: - stamps_dir = tinfoil.config_data.getVar('STAMPS_DIR', True) - sstate_mirrors = tinfoil.config_data.getVar('SSTATE_MIRRORS', True) - site_conf_version = tinfoil.config_data.getVar('SITE_CONF_VERSION', True) + stamps_dir = tinfoil.config_data.getVar('STAMPS_DIR') + sstate_mirrors = tinfoil.config_data.getVar('SSTATE_MIRRORS') + site_conf_version = tinfoil.config_data.getVar('SITE_CONF_VERSION') finally: tinfoil.shutdown()
@@ -273,7 +273,7 @@ def sdk_install(args, config, basepath, workspace): rd = parse_recipe(config, tinfoil, recipe, True) if not rd: return 1 - stampprefixes[recipe] = '%s.%s' % (rd.getVar('STAMP', True), tasks[0]) + stampprefixes[recipe] = '%s.%s' % (rd.getVar('STAMP'), tasks[0]) if checkstamp(recipe): logger.info('%s is already installed' % recipe) else:
scripts/lib/devtool/search.py +2 -2
@@ -31,7 +31,7 @@ def search(args, config, basepath, workspace): tinfoil = setup_tinfoil(config_only=False, basepath=basepath) try: - pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR', True) + pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR') defsummary = tinfoil.config_data.getVar('SUMMARY', False) or '' keyword_rc = re.compile(args.keyword)
@@ -70,7 +70,7 @@ def search(args, config, basepath, workspace): if match: rd = parse_recipe(config, tinfoil, fn, True) - summary = rd.getVar('SUMMARY', True) + summary = rd.getVar('SUMMARY') if summary == rd.expand(defsummary): summary = '' print("%s %s" % (fn.ljust(20), summary))
scripts/lib/devtool/standard.py +29 -29
201 lines not on this page · raw message
scripts/lib/devtool/upgrade.py +10 -10
@@ -68,7 +68,7 @@ def _remove_patch_dirs(recipefolder): shutil.rmtree(os.path.join(root,d)) def _recipe_contains(rd, var): - rf = rd.getVar('FILE', True) + rf = rd.getVar('FILE') varfiles = oe.recipeutils.get_var_files(rf, [var], rd) for var, fn in varfiles.items(): if fn and fn.startswith(os.path.dirname(rf) + os.sep):
@@ -132,7 +132,7 @@ def _write_append(rc, srctree, same_dir, no_same_dir, rev, copied, workspace, d) if rev: f.write('# initial_rev: %s\n' % rev) if copied: - f.write('# original_path: %s\n' % os.path.dirname(d.getVar('FILE', True))) + f.write('# original_path: %s\n' % os.path.dirname(d.getVar('FILE'))) f.write('# original_files: %s\n' % ' '.join(copied)) return af
@@ -154,7 +154,7 @@ def _upgrade_error(e, rf, srctree): raise DevtoolError(e) def _get_uri(rd): - srcuris = rd.getVar('SRC_URI', True).split() + srcuris = rd.getVar('SRC_URI').split() if not len(srcuris): raise DevtoolError('SRC_URI not found on recipe') # Get first non-local entry in SRC_URI - usually by convention it's
@@ -185,7 +185,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin crd = rd.createCopy() - pv = crd.getVar('PV', True) + pv = crd.getVar('PV') crd.setVar('PV', newpv) tmpsrctree = None
@@ -270,15 +270,15 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, workspace, tinfoil, rd): """Creates the new recipe under workspace""" - bpn = rd.getVar('BPN', True) + bpn = rd.getVar('BPN') path = os.path.join(workspace, 'recipes', bpn) bb.utils.mkdirhier(path) copied, _ = oe.recipeutils.copy_recipe_files(rd, path) - oldpv = rd.getVar('PV', True) + oldpv = rd.getVar('PV') if not newpv: newpv = oldpv - origpath = rd.getVar('FILE', True) + origpath = rd.getVar('FILE') fullpath = _rename_recipe_files(origpath, bpn, oldpv, newpv, path) logger.debug('Upgraded %s => %s' % (origpath, fullpath))
@@ -341,7 +341,7 @@ def upgrade(args, config, basepath, workspace): if not rd: return 1 - pn = rd.getVar('PN', True) + pn = rd.getVar('PN') if pn != args.recipename: logger.info('Mapping %s to %s' % (args.recipename, pn)) if pn in workspace:
@@ -353,12 +353,12 @@ def upgrade(args, config, basepath, workspace): srctree = standard.get_default_srctree(config, pn) standard._check_compatible_recipe(pn, rd) - old_srcrev = rd.getVar('SRCREV', True) + old_srcrev = rd.getVar('SRCREV') if old_srcrev == 'INVALID': old_srcrev = None if old_srcrev and not args.srcrev: raise DevtoolError("Recipe specifies a SRCREV value; you must specify a new one when upgrading") - if rd.getVar('PV', True) == args.version and old_srcrev == args.srcrev: + if rd.getVar('PV') == args.version and old_srcrev == args.srcrev: raise DevtoolError("Current and upgrade versions are the same version") rf = None
scripts/lib/devtool/utilcmds.py +9 -9
@@ -39,7 +39,7 @@ def edit_recipe(args, config, basepath, workspace): rd = parse_recipe(config, tinfoil, args.recipename, True) if not rd: return 1 - recipefile = rd.getVar('FILE', True) + recipefile = rd.getVar('FILE') finally: tinfoil.shutdown() else:
@@ -62,20 +62,20 @@ def configure_help(args, config, basepath, workspace): rd = parse_recipe(config, tinfoil, args.recipename, appends=True, filter_workspace=False) if not rd: return 1 - b = rd.getVar('B', True) - s = rd.getVar('S', True) + b = rd.getVar('B') + s = rd.getVar('S') configurescript = os.path.join(s, 'configure') confdisabled = 'noexec' in rd.getVarFlags('do_configure') or 'do_configure' not in (rd.getVar('__BBTASKS', False) or []) - configureopts = oe.utils.squashspaces(rd.getVar('CONFIGUREOPTS', True) or '') - extra_oeconf = oe.utils.squashspaces(rd.getVar('EXTRA_OECONF', True) or '') - extra_oecmake = oe.utils.squashspaces(rd.getVar('EXTRA_OECMAKE', True) or '') - do_configure = rd.getVar('do_configure', True) or '' + configureopts = oe.utils.squashspaces(rd.getVar('CONFIGUREOPTS') or '') + extra_oeconf = oe.utils.squashspaces(rd.getVar('EXTRA_OECONF') or '') + extra_oecmake = oe.utils.squashspaces(rd.getVar('EXTRA_OECMAKE') or '') + do_configure = rd.getVar('do_configure') or '' do_configure_noexpand = rd.getVar('do_configure', False) or '' packageconfig = rd.getVarFlags('PACKAGECONFIG') or [] autotools = bb.data.inherits_class('autotools', rd) and ('oe_runconf' in do_configure or 'autotools_do_configure' in do_configure) cmake = bb.data.inherits_class('cmake', rd) and ('cmake_do_configure' in do_configure) - cmake_do_configure = rd.getVar('cmake_do_configure', True) - pn = rd.getVar('PN', True) + cmake_do_configure = rd.getVar('cmake_do_configure') + pn = rd.getVar('PN') finally: tinfoil.shutdown()
scripts/lib/recipetool/append.py +11 -11
@@ -48,7 +48,7 @@ def find_target_file(targetpath, d, pkglist=None): """Find the recipe installing the specified target path, optionally limited to a select list of packages""" import json - pkgdata_dir = d.getVar('PKGDATA_DIR', True) + pkgdata_dir = d.getVar('PKGDATA_DIR') # The mix between /etc and ${sysconfdir} here may look odd, but it is just # being consistent with usage elsewhere
@@ -110,8 +110,8 @@ def determine_file_source(targetpath, rd): import oe.recipeutils # See if it's in do_install for the recipe - workdir = rd.getVar('WORKDIR', True) - src_uri = rd.getVar('SRC_URI', True) + workdir = rd.getVar('WORKDIR') + src_uri = rd.getVar('SRC_URI') srcfile = '' modpatches = [] elements = check_do_install(rd, targetpath)
@@ -190,7 +190,7 @@ def get_source_path(cmdelements): def get_func_deps(func, d): """Find the function dependencies of a shell function""" - deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True)) + deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) deps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) funcdeps = [] for dep in deps:
@@ -200,12 +200,12 @@ def get_func_deps(func, d): def check_do_install(rd, targetpath): """Look at do_install for a command that installs/copies the specified target path""" - instpath = os.path.abspath(os.path.join(rd.getVar('D', True), targetpath.lstrip('/'))) - do_install = rd.getVar('do_install', True) + instpath = os.path.abspath(os.path.join(rd.getVar('D'), targetpath.lstrip('/'))) + do_install = rd.getVar('do_install') # Handle where do_install calls other functions (somewhat crudely, but good enough for this purpose) deps = get_func_deps('do_install', rd) for dep in deps: - do_install = do_install.replace(dep, rd.getVar(dep, True)) + do_install = do_install.replace(dep, rd.getVar(dep)) # Look backwards through do_install as we want to catch where a later line (perhaps # from a bbappend) is writing over the top
@@ -322,12 +322,12 @@ def appendfile(args): def appendsrc(args, files, rd, extralines=None): import oe.recipeutils - srcdir = rd.getVar('S', True) - workdir = rd.getVar('WORKDIR', True) + srcdir = rd.getVar('S') + workdir = rd.getVar('WORKDIR') import bb.fetch simplified = {} - src_uri = rd.getVar('SRC_URI', True).split() + src_uri = rd.getVar('SRC_URI').split() for uri in src_uri: if uri.endswith(';'): uri = uri[:-1]
@@ -340,7 +340,7 @@ def appendsrc(args, files, rd, extralines=None): for newfile, srcfile in files.items(): src_destdir = os.path.dirname(srcfile) if not args.use_workdir: - if rd.getVar('S', True) == rd.getVar('STAGING_KERNEL_DIR', True): + if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'): srcdir = os.path.join(workdir, 'git') if not bb.data.inherits_class('kernel-yocto', rd): logger.warn('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git')
scripts/lib/recipetool/create.py +12 -12
@@ -68,8 +68,8 @@ class RecipeHandler(object): return # First build up library->package mapping shlib_providers = oe.package.read_shlib_providers(d) - libdir = d.getVar('libdir', True) - base_libdir = d.getVar('base_libdir', True) + libdir = d.getVar('libdir') + base_libdir = d.getVar('base_libdir') libpaths = list(set([base_libdir, libdir])) libname_re = re.compile('^lib(.+)\.so.*$') pkglibmap = {}
@@ -85,7 +85,7 @@ class RecipeHandler(object): logger.debug('unable to extract library name from %s' % lib) # Now turn it into a library->recipe mapping - pkgdata_dir = d.getVar('PKGDATA_DIR', True) + pkgdata_dir = d.getVar('PKGDATA_DIR') for libname, pkg in pkglibmap.items(): try: with open(os.path.join(pkgdata_dir, 'runtime', pkg)) as f:
@@ -109,9 +109,9 @@ class RecipeHandler(object): '''Build up development file->recipe mapping''' if RecipeHandler.recipeheadermap: return - pkgdata_dir = d.getVar('PKGDATA_DIR', True) - includedir = d.getVar('includedir', True) - cmakedir = os.path.join(d.getVar('libdir', True), 'cmake') + pkgdata_dir = d.getVar('PKGDATA_DIR') + includedir = d.getVar('includedir') + cmakedir = os.path.join(d.getVar('libdir'), 'cmake') for pkg in glob.glob(os.path.join(pkgdata_dir, 'runtime', '*-dev')): with open(os.path.join(pkgdata_dir, 'runtime', pkg)) as f: pn = None
@@ -140,9 +140,9 @@ class RecipeHandler(object): '''Build up native binary->recipe mapping''' if RecipeHandler.recipebinmap: return - sstate_manifests = d.getVar('SSTATE_MANIFESTS', True) - staging_bindir_native = d.getVar('STAGING_BINDIR_NATIVE', True) - build_arch = d.getVar('BUILD_ARCH', True) + sstate_manifests = d.getVar('SSTATE_MANIFESTS') + staging_bindir_native = d.getVar('STAGING_BINDIR_NATIVE') + build_arch = d.getVar('BUILD_ARCH') fileprefix = 'manifest-%s-' % build_arch for fn in glob.glob(os.path.join(sstate_manifests, '%s*-native.populate_sysroot' % fileprefix)): with open(fn, 'r') as f:
@@ -837,7 +837,7 @@ def get_license_md5sums(d, static_only=False): md5sums = {} if not static_only: # Gather md5sums of license files in common license dir - commonlicdir = d.getVar('COMMON_LICENSE_DIR', True) + commonlicdir = d.getVar('COMMON_LICENSE_DIR') for fn in os.listdir(commonlicdir): md5value = bb.utils.md5_file(os.path.join(commonlicdir, fn)) md5sums[md5value] = fn
@@ -1007,7 +1007,7 @@ def split_pkg_licenses(licvalues, packages, outlines, fallback_licenses=None, pn return outlicenses def read_pkgconfig_provides(d): - pkgdatadir = d.getVar('PKGDATA_DIR', True) + pkgdatadir = d.getVar('PKGDATA_DIR') pkgmap = {} for fn in glob.glob(os.path.join(pkgdatadir, 'shlibs2', '*.pclist')): with open(fn, 'r') as f:
@@ -1117,7 +1117,7 @@ def convert_rpm_xml(xmlfile): def check_npm(d, debugonly=False): - if not os.path.exists(os.path.join(d.getVar('STAGING_BINDIR_NATIVE', True), 'npm')): + if not os.path.exists(os.path.join(d.getVar('STAGING_BINDIR_NATIVE'), 'npm')): log_error_cond('npm required to process specified source, but npm is not available - you need to build nodejs-native first', debugonly) sys.exit(14)
scripts/lib/recipetool/create_buildsys_python.py +2 -2
@@ -532,11 +532,11 @@ class PythonRecipeHandler(RecipeHandler): def parse_pkgdata_for_python_packages(self): suffixes = [t[0] for t in imp.get_suffixes()] - pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR', True) + pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR') ldata = tinfoil.config_data.createCopy() bb.parse.handle('classes/python-dir.bbclass', ldata, True) - python_sitedir = ldata.getVar('PYTHON_SITEPACKAGES_DIR', True) + python_sitedir = ldata.getVar('PYTHON_SITEPACKAGES_DIR') dynload_dir = os.path.join(os.path.dirname(python_sitedir), 'lib-dynload') python_dirs = [python_sitedir + os.sep,
scripts/lib/recipetool/create_kernel.py +2 -2
@@ -41,7 +41,7 @@ class KernelRecipeHandler(RecipeHandler): handled.append('buildsystem') del lines_after[:] del classes[:] - template = os.path.join(tinfoil.config_data.getVar('COREBASE', True), 'meta-skeleton', 'recipes-kernel', 'linux', 'linux-yocto-custom.bb') + template = os.path.join(tinfoil.config_data.getVar('COREBASE'), 'meta-skeleton', 'recipes-kernel', 'linux', 'linux-yocto-custom.bb') def handle_var(varname, origvalue, op, newlines): if varname in ['SRCREV', 'SRCREV_machine']: while newlines[-1].startswith('#'):
@@ -85,7 +85,7 @@ class KernelRecipeHandler(RecipeHandler): elif varname == 'COMPATIBLE_MACHINE': while newlines[-1].startswith('#'): del newlines[-1] - machine = tinfoil.config_data.getVar('MACHINE', True) + machine = tinfoil.config_data.getVar('MACHINE') return machine, op, 0, True return origvalue, op, 0, True with open(template, 'r') as f:
scripts/lib/recipetool/create_npm.py +3 -3
@@ -49,7 +49,7 @@ class NpmRecipeHandler(RecipeHandler): def _shrinkwrap(self, srctree, localfilesdir, extravalues, lines_before): try: - runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH', True)) + runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH')) bb.process.run('npm shrinkwrap', cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) except bb.process.ExecutionError as e: logger.warn('npm shrinkwrap failed:\n%s' % e.stdout)
@@ -62,7 +62,7 @@ class NpmRecipeHandler(RecipeHandler): lines_before.append('NPM_SHRINKWRAP := "${THISDIR}/${PN}/npm-shrinkwrap.json"') def _lockdown(self, srctree, localfilesdir, extravalues, lines_before): - runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH', True)) + runenv = dict(os.environ, PATH=tinfoil.config_data.getVar('PATH')) if not NpmRecipeHandler.lockdownpath: NpmRecipeHandler.lockdownpath = tempfile.mkdtemp('recipetool-npm-lockdown') bb.process.run('npm install lockdown --prefix %s' % NpmRecipeHandler.lockdownpath,
@@ -257,7 +257,7 @@ class NpmRecipeHandler(RecipeHandler): if version != '*' and not '/' in version: pkgfullname += "@'%s'" % version logger.debug(2, "Calling getdeps on %s" % pkg) - runenv = dict(os.environ, PATH=d.getVar('PATH', True)) + runenv = dict(os.environ, PATH=d.getVar('PATH')) fetchcmd = "npm view %s --json" % pkgfullname output, _ = bb.process.run(fetchcmd, stderr=subprocess.STDOUT, env=runenv, shell=True) data = self._parse_view(output)
scripts/lib/recipetool/newappend.py +1 -1
@@ -60,7 +60,7 @@ def newappend(args): if not path_ok: logger.warn('Unable to determine correct subdirectory path for bbappend file - check that what %s adds to BBFILES also matches .bbappend files. Using %s for now, but until you fix this the bbappend will not be applied.', os.path.join(args.destlayer, 'conf', 'layer.conf'), os.path.dirname(append_path)) - layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS', True).split()] + layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS').split()] if not os.path.abspath(args.destlayer) in layerdirs: logger.warn('Specified layer is not currently enabled in bblayers.conf, you will need to add it before this bbappend will be active')
scripts/lib/scriptutils.py +1 -1
@@ -93,7 +93,7 @@ def fetch_uri(d, uri, destdir, srcrev=None): fetcher.download() for u in fetcher.ud: ud = fetcher.ud[u] - if ud.localpath.rstrip(os.sep) == localdata.getVar('DL_DIR', True).rstrip(os.sep): + if ud.localpath.rstrip(os.sep) == localdata.getVar('DL_DIR').rstrip(os.sep): raise Exception('Local path is download directory - please check that the URI "%s" is correct' % uri) fetcher.unpack(destdir) for u in fetcher.ud:
scripts/oe-pkgdata-util +1 -1
@@ -570,7 +570,7 @@ def main(): logger.debug('Found bitbake path: %s' % bitbakepath) tinfoil = tinfoil_init() try: - args.pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR', True) + args.pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR') finally: tinfoil.shutdown() logger.debug('Value of PKGDATA_DIR is "%s"' % args.pkgdata_dir)
scripts/recipetool +1 -1
@@ -79,7 +79,7 @@ def main(): tinfoil = tinfoil_init(False) try: - for path in (tinfoil.config_data.getVar('BBPATH', True).split(':') + for path in (tinfoil.config_data.getVar('BBPATH').split(':') + [scripts_path]): pluginpath = os.path.join(path, 'lib', 'recipetool') scriptutils.load_plugins(logger, plugins, pluginpath)
Signature · 1 line
2.9.3
PATCH 3/4 meta: remove True option to getVarFlag calls
In reply to Joshua LockgetVarFlag() now defaults to expanding by default, thus remove the True option from getVarFlag() calls with a regex search and replace.
Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)
--- meta/classes/archiver.bbclass | 28 ++++++++++++++-------------- meta/classes/blacklist.bbclass | 2 +- meta/classes/compress_doc.bbclass | 14 +++++++------- meta/classes/devshell.bbclass | 4 ++-- meta/classes/externalsrc.bbclass | 2 +- meta/classes/image-buildinfo.bbclass | 2 +- meta/classes/image.bbclass | 4 ++-- meta/classes/license.bbclass | 16 ++++++++-------- meta/classes/package.bbclass | 4 ++-- meta/classes/package_rpm.bbclass | 6 +++--- meta/classes/package_tar.bbclass | 2 +- meta/classes/packagefeed-stability.bbclass | 2 +- meta/classes/patch.bbclass | 2 +- meta/classes/populate_sdk_ext.bbclass | 4 ++-- meta/classes/rootfs_ipk.bbclass | 2 +- meta/classes/rootfs_rpm.bbclass | 2 +- meta/classes/sstate.bbclass | 14 +++++++------- meta/classes/testexport.bbclass | 2 +- meta/classes/typecheck.bbclass | 2 +- meta/classes/update-alternatives.bbclass | 14 +++++++------- meta/classes/utility-tasks.bbclass | 6 +++--- meta/lib/oe/data.py | 2 +- meta/lib/oe/packagegroup.py | 4 ++-- meta/lib/oe/sstatesig.py | 2 +- 24 files changed, 71 insertions(+), 71 deletions(-)
meta/classes/archiver.bbclass +14 -14
@@ -73,9 +73,9 @@ python () { bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn) return - ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True) - ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True) - ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe', True) + ar_src = d.getVarFlag('ARCHIVER_MODE', 'src') + ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata') + ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe') if ar_src == "original": d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_original' % pn)
@@ -104,7 +104,7 @@ python () { d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_recipe' % pn) # Output the srpm package - ar_srpm = d.getVarFlag('ARCHIVER_MODE', 'srpm', True) + ar_srpm = d.getVarFlag('ARCHIVER_MODE', 'srpm') if ar_srpm == "1": if d.getVar('PACKAGES') != '' and d.getVar('IMAGE_PKGTYPE') == 'rpm': d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_package_write_rpm' % pn)
@@ -127,7 +127,7 @@ python do_ar_original() { import shutil, tempfile - if d.getVarFlag('ARCHIVER_MODE', 'src', True) != "original": + if d.getVarFlag('ARCHIVER_MODE', 'src') != "original": return ar_outdir = d.getVar('ARCHIVER_OUTDIR')
@@ -191,7 +191,7 @@ python do_ar_original() { python do_ar_patched() { - if d.getVarFlag('ARCHIVER_MODE', 'src', True) != 'patched': + if d.getVarFlag('ARCHIVER_MODE', 'src') != 'patched': return # Get the ARCHIVER_OUTDIR before we reset the WORKDIR
@@ -206,7 +206,7 @@ python do_ar_configured() { import shutil ar_outdir = d.getVar('ARCHIVER_OUTDIR') - if d.getVarFlag('ARCHIVER_MODE', 'src', True) == 'configured': + if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured': bb.note('Archiving the configured source...') pn = d.getVar('PN') # "gcc-source-${PV}" recipes don't have "do_configure"
@@ -226,12 +226,12 @@ python do_ar_configured() { bb.build.exec_func('do_kernel_configme', d) if bb.data.inherits_class('cmake', d): bb.build.exec_func('do_generate_toolchain_file', d) - prefuncs = d.getVarFlag('do_configure', 'prefuncs', True) + prefuncs = d.getVarFlag('do_configure', 'prefuncs') for func in (prefuncs or '').split(): if func != "sysroot_cleansstate": bb.build.exec_func(func, d) bb.build.exec_func('do_configure', d) - postfuncs = d.getVarFlag('do_configure', 'postfuncs', True) + postfuncs = d.getVarFlag('do_configure', 'postfuncs') for func in (postfuncs or '').split(): if func != "do_qa_configure": bb.build.exec_func(func, d)
@@ -279,7 +279,7 @@ def create_diff_gz(d, src_orig, src, ar_outdir): # exclude. src_patched = src + '.patched' oe.path.copyhardlinktree(src, src_patched) - for i in d.getVarFlag('ARCHIVER_MODE', 'diff-exclude', True).split(): + for i in d.getVarFlag('ARCHIVER_MODE', 'diff-exclude').split(): bb.utils.remove(os.path.join(src_orig, i), recurse=True) bb.utils.remove(os.path.join(src_patched, i), recurse=True)
@@ -293,9 +293,9 @@ def create_diff_gz(d, src_orig, src, ar_outdir): # Run do_unpack and do_patch python do_unpack_and_patch() { - if d.getVarFlag('ARCHIVER_MODE', 'src', True) not in \ + if d.getVarFlag('ARCHIVER_MODE', 'src') not in \ [ 'patched', 'configured'] and \ - d.getVarFlag('ARCHIVER_MODE', 'diff', True) != '1': + d.getVarFlag('ARCHIVER_MODE', 'diff') != '1': return ar_outdir = d.getVar('ARCHIVER_OUTDIR') ar_workdir = d.getVar('ARCHIVER_WORKDIR')
@@ -314,7 +314,7 @@ python do_unpack_and_patch() { bb.build.exec_func('do_unpack', d) # Save the original source for creating the patches - if d.getVarFlag('ARCHIVER_MODE', 'diff', True) == '1': + if d.getVarFlag('ARCHIVER_MODE', 'diff') == '1': src = d.getVar('S').rstrip('/') src_orig = '%s.orig' % src oe.path.copytree(src, src_orig)
@@ -324,7 +324,7 @@ python do_unpack_and_patch() { bb.build.exec_func('do_patch', d) # Create the patches - if d.getVarFlag('ARCHIVER_MODE', 'diff', True) == '1': + if d.getVarFlag('ARCHIVER_MODE', 'diff') == '1': bb.note('Creating diff gz...') create_diff_gz(d, src_orig, src, ar_outdir) bb.utils.remove(src_orig, recurse=True)
meta/classes/blacklist.bbclass +1 -1
@@ -33,7 +33,7 @@ python blacklist_multilib_eventhandler() { continue for p in prefixes: newpkg = p + "-" + pkg - if not e.data.getVarFlag('PNBLACKLIST', newpkg, True): + if not e.data.getVarFlag('PNBLACKLIST', newpkg): e.data.setVarFlag('PNBLACKLIST', newpkg, reason) }
meta/classes/compress_doc.bbclass +7 -7
@@ -40,8 +40,8 @@ python package_do_compress_doc() { compress_cmds = {} decompress_cmds = {} for mode in compress_list: - compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode, True) - decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode, True) + compress_cmds[mode] = d.getVarFlag('DOC_COMPRESS_CMD', mode) + decompress_cmds[mode] = d.getVarFlag('DOC_DECOMPRESS_CMD', mode) mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir")) if os.path.exists(mandir):
@@ -225,9 +225,9 @@ python compress_doc_updatealternatives () { old_names = (d.getVar('ALTERNATIVE_%s' % pkg) or "").split() new_names = [] for old_name in old_names: - old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name, True) - old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True) or \ - d.getVarFlag('ALTERNATIVE_TARGET', old_name, True) or \ + old_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', old_name) + old_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) or \ + d.getVarFlag('ALTERNATIVE_TARGET', old_name) or \ d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or \ d.getVar('ALTERNATIVE_TARGET') or \ old_link
@@ -241,10 +241,10 @@ python compress_doc_updatealternatives () { new_target = old_target + '.' + compress_mode d.delVarFlag('ALTERNATIVE_LINK_NAME', old_name) d.setVarFlag('ALTERNATIVE_LINK_NAME', new_name, new_link) - if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name, True): + if d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name): d.delVarFlag('ALTERNATIVE_TARGET_%s' % pkg, old_name) d.setVarFlag('ALTERNATIVE_TARGET_%s' % pkg, new_name, new_target) - elif d.getVarFlag('ALTERNATIVE_TARGET', old_name, True): + elif d.getVarFlag('ALTERNATIVE_TARGET', old_name): d.delVarFlag('ALTERNATIVE_TARGET', old_name) d.setVarFlag('ALTERNATIVE_TARGET', new_name, new_target) elif d.getVar('ALTERNATIVE_TARGET_%s' % pkg):
meta/classes/devshell.bbclass +2 -2
@@ -3,7 +3,7 @@ inherit terminal DEVSHELL = "${SHELL}" python do_devshell () { - if d.getVarFlag("do_devshell", "manualfakeroot", True): + if d.getVarFlag("do_devshell", "manualfakeroot"): d.prependVar("DEVSHELL", "pseudo ") fakeenv = d.getVar("FAKEROOTENV").split() for f in fakeenv:
@@ -27,7 +27,7 @@ do_devshell[nostamp] = "1" # be done as the normal user. We therfore carefully construct the envionment # manually python () { - if d.getVarFlag("do_devshell", "fakeroot", True): + if d.getVarFlag("do_devshell", "fakeroot"): # We need to signal our code that we want fakeroot however we # can't manipulate the environment and variables here yet (see YOCTO #4795) d.setVarFlag("do_devshell", "manualfakeroot", "1")
meta/classes/externalsrc.bbclass +1 -1
@@ -69,7 +69,7 @@ python () { # Dummy value because the default function can't be called with blank SRC_URI d.setVar('SRCPV', '999') - tasks = filter(lambda k: d.getVarFlag(k, "task", True), d.keys()) + tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys()) for task in tasks: if task.endswith("_setscene"):
meta/classes/image-buildinfo.bbclass +1 -1
@@ -19,7 +19,7 @@ def image_buildinfo_outputvars(vars, listvars, d): ret = "" for var in vars: value = d.getVar(var) or "" - if (d.getVarFlag(var, 'type', True) == "list"): + if (d.getVarFlag(var, 'type') == "list"): value = oe.utils.squashspaces(value) ret += "%s = %s\n" % (var, value) return ret.rstrip('\n')
meta/classes/image.bbclass +2 -2
@@ -51,7 +51,7 @@ FEATURE_PACKAGES_splash = "${SPLASH}" IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}' def check_image_features(d): - valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems', True) or "").split() + valid_features = (d.getVarFlag('IMAGE_FEATURES', 'validitems') or "").split() valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys() for var in d: if var.startswith("PACKAGE_GROUP_"):
@@ -595,7 +595,7 @@ python create_symlinks() { manifest_name = d.getVar('IMAGE_MANIFEST') taskname = d.getVar("BB_CURRENTTASK") subimages = (d.getVarFlag("do_" + taskname, 'subimages', False) or "").split() - imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix', True) or d.expand("${IMAGE_NAME_SUFFIX}.") + imgsuffix = d.getVarFlag("do_" + taskname, 'imgsuffix') or d.expand("${IMAGE_NAME_SUFFIX}.") if not link_name: return
meta/classes/license.bbclass +8 -8
@@ -249,7 +249,7 @@ def get_boot_dependencies(d): for task in boot_tasks: boot_depends_string = "%s %s" % (boot_depends_string, - d.getVarFlag(task, "depends", True) or "") + d.getVarFlag(task, "depends") or "") boot_depends = [dep.split(":")[0] for dep in boot_depends_string.split() if not dep.split(":")[0].endswith("-native")]
@@ -431,10 +431,10 @@ def find_license_files(d): # unless NO_GENERIC_LICENSE is set. for lic_dir in license_source_dirs: if not os.path.isfile(os.path.join(lic_dir, license_type)): - if d.getVarFlag('SPDXLICENSEMAP', license_type, True) != None: + if d.getVarFlag('SPDXLICENSEMAP', license_type) != None: # Great, there is an SPDXLICENSEMAP. We can copy! bb.debug(1, "We need to use a SPDXLICENSEMAP for %s" % (license_type)) - spdx_generic = d.getVarFlag('SPDXLICENSEMAP', license_type, True) + spdx_generic = d.getVarFlag('SPDXLICENSEMAP', license_type) license_source = lic_dir break elif os.path.isfile(os.path.join(lic_dir, license_type)):
@@ -442,7 +442,7 @@ def find_license_files(d): license_source = lic_dir break - non_generic_lic = d.getVarFlag('NO_GENERIC_LICENSE', license_type, True) + non_generic_lic = d.getVarFlag('NO_GENERIC_LICENSE', license_type) if spdx_generic and license_source: # we really should copy to generic_ + spdx_generic, however, that ends up messing the manifest # audit up. This should be fixed in emit_pkgdata (or, we actually got and fix all the recipes)
@@ -451,7 +451,7 @@ def find_license_files(d): # The user may attempt to use NO_GENERIC_LICENSE for a generic license which doesn't make sense # and should not be allowed, warn the user in this case. - if d.getVarFlag('NO_GENERIC_LICENSE', license_type, True): + if d.getVarFlag('NO_GENERIC_LICENSE', license_type): bb.warn("%s: %s is a generic license, please don't use NO_GENERIC_LICENSE for it." % (pn, license_type)) elif non_generic_lic and non_generic_lic in lic_chksums:
@@ -505,7 +505,7 @@ def return_spdx(d, license): """ This function returns the spdx mapping of a license if it exists. """ - return d.getVarFlag('SPDXLICENSEMAP', license, True) + return d.getVarFlag('SPDXLICENSEMAP', license) def canonical_license(d, license): """
@@ -514,7 +514,7 @@ def canonical_license(d, license): 'X' if availabel and the tailing '+' (so GPLv3+ becomes GPL-3.0+), or the passed license if there is no canonical form. """ - lic = d.getVarFlag('SPDXLICENSEMAP', license, True) or "" + lic = d.getVarFlag('SPDXLICENSEMAP', license) or "" if not lic and license.endswith('+'): lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'), True) if lic:
@@ -531,7 +531,7 @@ def expand_wildcard_licenses(d, wildcard_licenses): spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys() for wld_lic in wildcard_licenses: spdxflags = fnmatch.filter(spdxmapkeys, wld_lic) - licenses += [d.getVarFlag('SPDXLICENSEMAP', flag, True) for flag in spdxflags] + licenses += [d.getVarFlag('SPDXLICENSEMAP', flag) for flag in spdxflags] spdx_lics = (d.getVar('SRC_DISTRIBUTE_LICENSES', False) or '').split() for wld_lic in wildcard_licenses:
meta/classes/package.bbclass +2 -2
@@ -462,7 +462,7 @@ def get_package_additional_metadata (pkg_type, d): if d.getVar(key, False) is None: continue d.setVarFlag(key, "type", "list") - if d.getVarFlag(key, "separator", True) is None: + if d.getVarFlag(key, "separator") is None: d.setVarFlag(key, "separator", "\\n") metadata_fields = [field.strip() for field in oe.data.typed_value(key, d)] return "\n".join(metadata_fields).strip()
@@ -1963,7 +1963,7 @@ python package_depchains() { for suffix in pkgs: for pkg in pkgs[suffix]: - if d.getVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', True): + if d.getVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs'): continue (base, func) = pkgs[suffix][pkg] if suffix == "-dev":
meta/classes/package_rpm.bbclass +3 -3
@@ -86,14 +86,14 @@ python write_specfile () { # append information for logs and patches to %prep def add_prep(d,spec_files_bottom): - if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): + if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): spec_files_bottom.append('%%prep -n %s' % d.getVar('PN') ) spec_files_bottom.append('%s' % "echo \"include logs and patches, Please check them in SOURCES\"") spec_files_bottom.append('') # append the name of tarball to key word 'SOURCE' in xxx.spec. def tail_source(d): - if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): + if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): ar_outdir = d.getVar('ARCHIVER_OUTDIR') if not os.path.exists(ar_outdir): return
@@ -720,7 +720,7 @@ python do_package_rpm () { cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'" cmd = cmd + " --define '_tmppath " + workdir + "'" - if d.getVarFlag('ARCHIVER_MODE', 'srpm', True) == '1' and bb.data.inherits_class('archiver', d): + if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_OUTDIR') + "'" cmdsrpm = cmdsrpm + " -bs " + outspecfile
meta/classes/package_tar.bbclass +1 -1
@@ -58,7 +58,7 @@ python do_package_tar () { python () { if d.getVar('PACKAGES') != '': - deps = (d.getVarFlag('do_package_write_tar', 'depends', True) or "").split() + deps = (d.getVarFlag('do_package_write_tar', 'depends') or "").split() deps.append('tar-native:do_populate_sysroot') deps.append('virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_package_write_tar', 'depends', " ".join(deps))
meta/classes/packagefeed-stability.bbclass +1 -1
@@ -51,7 +51,7 @@ python() { d.appendVarFlag('do_build', 'recrdeptask', ' ' + pkgcomparefunc) - if d.getVarFlag(pkgwritefunc, 'noexec', True) or not d.getVarFlag(pkgwritefunc, 'task', True): + if d.getVarFlag(pkgwritefunc, 'noexec') or not d.getVarFlag(pkgwritefunc, 'task'): # Packaging is disabled for this recipe, we shouldn't do anything continue
meta/classes/patch.bbclass +1 -1
@@ -12,7 +12,7 @@ inherit terminal python () { if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1': - tasks = list(filter(lambda k: d.getVarFlag(k, "task", True), d.keys())) + tasks = list(filter(lambda k: d.getVarFlag(k, "task"), d.keys())) extratasks = [] def follow_chain(task, endtask, chain=None): if not chain:
meta/classes/populate_sdk_ext.bbclass +2 -2
@@ -629,7 +629,7 @@ def get_ext_sdk_depends(d): pn = d.getVar('PN') deplist = ['%s:%s' % (pn, dep) for dep in deps] for task in ['do_image_complete', 'do_rootfs', 'do_build']: - deplist.extend((d.getVarFlag(task, 'depends', True) or '').split()) + deplist.extend((d.getVarFlag(task, 'depends') or '').split()) return ' '.join(deplist) python do_sdk_depends() {
@@ -652,7 +652,7 @@ def get_sdk_ext_rdepends(d): localdata = d.createCopy() localdata.appendVar('OVERRIDES', ':task-populate-sdk-ext') bb.data.update_data(localdata) - return localdata.getVarFlag('do_populate_sdk', 'rdepends', True) + return localdata.getVarFlag('do_populate_sdk', 'rdepends') do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
meta/classes/rootfs_ipk.bbclass +1 -1
@@ -28,7 +28,7 @@ MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg" python () { if d.getVar('BUILD_IMAGES_FROM_FEEDS'): - flags = d.getVarFlag('do_rootfs', 'recrdeptask', True) + flags = d.getVarFlag('do_rootfs', 'recrdeptask') flags = flags.replace("do_package_write_ipk", "") flags = flags.replace("do_deploy", "") flags = flags.replace("do_populate_sysroot", "")
meta/classes/rootfs_rpm.bbclass +1 -1
@@ -26,7 +26,7 @@ do_rootfs[vardeps] += "PACKAGE_FEED_URIS" python () { if d.getVar('BUILD_IMAGES_FROM_FEEDS'): - flags = d.getVarFlag('do_rootfs', 'recrdeptask', True) + flags = d.getVarFlag('do_rootfs', 'recrdeptask') flags = flags.replace("do_package_write_rpm", "") flags = flags.replace("do_deploy", "") flags = flags.replace("do_populate_sysroot", "")
meta/classes/sstate.bbclass +7 -7
@@ -125,12 +125,12 @@ def sstate_state_fromvars(d, task = None): if task.startswith("do_"): task = task[3:] - inputs = (d.getVarFlag("do_" + task, 'sstate-inputdirs', True) or "").split() - outputs = (d.getVarFlag("do_" + task, 'sstate-outputdirs', True) or "").split() - plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs', True) or "").split() - lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile', True) or "").split() - lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared', True) or "").split() - interceptfuncs = (d.getVarFlag("do_" + task, 'sstate-interceptfuncs', True) or "").split() + inputs = (d.getVarFlag("do_" + task, 'sstate-inputdirs') or "").split() + outputs = (d.getVarFlag("do_" + task, 'sstate-outputdirs') or "").split() + plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs') or "").split() + lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile') or "").split() + lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared') or "").split() + interceptfuncs = (d.getVarFlag("do_" + task, 'sstate-interceptfuncs') or "").split() if not task or len(inputs) != len(outputs): bb.fatal("sstate variables not setup correctly?!")
@@ -425,7 +425,7 @@ def sstate_clean(ss, d): d2 = d.createCopy() stamp_clean = d.getVar("STAMPCLEAN") - extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True) + extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info') if extrainf: d2.setVar("SSTATE_MANMACH", extrainf) wildcard_stfile = "%s.do_%s*.%s" % (stamp_clean, ss['task'], extrainf)
meta/classes/testexport.bbclass +1 -1
@@ -58,7 +58,7 @@ def exportTests(d,tc): savedata["target"]["server_ip"] = tc.target.server_ip or d.getVar("TEST_SERVER_IP") keys = [ key for key in d.keys() if not key.startswith("_") and not key.startswith("BB") \ - and not key.startswith("B_pn") and not key.startswith("do_") and not d.getVarFlag(key, "func", True)] + and not key.startswith("B_pn") and not key.startswith("do_") and not d.getVarFlag(key, "func")] for key in keys: try: savedata["d"][key] = d.getVar(key)
meta/classes/typecheck.bbclass +1 -1
@@ -5,7 +5,7 @@ python check_types() { import oe.types for key in e.data.keys(): - if e.data.getVarFlag(key, "type", True): + if e.data.getVarFlag(key, "type"): oe.data.typed_value(key, e.data) } addhandler check_types
meta/classes/update-alternatives.bbclass +7 -7
@@ -133,12 +133,12 @@ python perform_packagecopy_append () { # If the src == dest, we know we need to rename the dest by appending ${BPN} link_rename = {} for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): - alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name, True) + alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name) if not alt_link: alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) - alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name, True) + alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name) alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link # Sometimes alt_target is specified as relative to the link name. alt_target = os.path.join(os.path.dirname(alt_link), alt_target)
@@ -198,13 +198,13 @@ python populate_packages_updatealternatives () { alt_setup_links = "" alt_remove_links = "" for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): - alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name, True) - alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name, True) + alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name) + alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name) alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link # Sometimes alt_target is specified as relative to the link name. alt_target = os.path.join(os.path.dirname(alt_link), alt_target) - alt_priority = d.getVarFlag('ALTERNATIVE_PRIORITY_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_PRIORITY', alt_name, True) + alt_priority = d.getVarFlag('ALTERNATIVE_PRIORITY_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_PRIORITY', alt_name) alt_priority = alt_priority or d.getVar('ALTERNATIVE_PRIORITY_%s' % pkg) or d.getVar('ALTERNATIVE_PRIORITY') # This shouldn't trigger, as it should have been resolved earlier!
@@ -247,8 +247,8 @@ python package_do_filedeps_append () { for pkg in packages.split(): for alt_name in (d.getVar('ALTERNATIVE_%s' % pkg) or "").split(): - alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name, True) - alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name, True) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name, True) + alt_link = d.getVarFlag('ALTERNATIVE_LINK_NAME', alt_name) + alt_target = d.getVarFlag('ALTERNATIVE_TARGET_%s' % pkg, alt_name) or d.getVarFlag('ALTERNATIVE_TARGET', alt_name) alt_target = alt_target or d.getVar('ALTERNATIVE_TARGET_%s' % pkg) or d.getVar('ALTERNATIVE_TARGET') or alt_link if alt_link == alt_target:
meta/classes/utility-tasks.bbclass +3 -3
@@ -4,12 +4,12 @@ python do_listtasks() { taskdescs = {} maxlen = 0 for e in d.keys(): - if d.getVarFlag(e, 'task', True): + if d.getVarFlag(e, 'task'): maxlen = max(maxlen, len(e)) if e.endswith('_setscene'): - desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc', True) or '') + desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc') or '') else: - desc = d.getVarFlag(e, 'doc', True) or '' + desc = d.getVarFlag(e, 'doc') or '' taskdescs[e] = desc tasks = sorted(taskdescs.keys())
meta/lib/oe/data.py +1 -1
@@ -3,7 +3,7 @@ import oe.maketype def typed_value(key, d): """Construct a value for the specified metadata variable, using its flags to determine the type and parameters for construction.""" - var_type = d.getVarFlag(key, 'type', True) + var_type = d.getVarFlag(key, 'type') flags = d.getVarFlags(key) if flags is not None: flags = dict((flag, d.expand(value))
meta/lib/oe/packagegroup.py +2 -2
@@ -3,9 +3,9 @@ import itertools def is_optional(feature, d): packages = d.getVar("FEATURE_PACKAGES_%s" % feature) if packages: - return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional", True)) + return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) else: - return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional", True)) + return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional")) def packages(features, d): for feature in features:
meta/lib/oe/sstatesig.py +1 -1
@@ -348,7 +348,7 @@ def sstate_get_manifest_filename(task, d): Also returns the datastore that can be used to query related variables. """ d2 = d.createCopy() - extrainf = d.getVarFlag("do_" + task, 'stamp-extra-info', True) + extrainf = d.getVarFlag("do_" + task, 'stamp-extra-info') if extrainf: d2.setVar("SSTATE_MANMACH", extrainf) return (d2.expand("${SSTATE_MANFILEPREFIX}.%s" % task), d2)
Signature · 1 line
2.9.3
PATCH 4/4 scripts: remove True option to getVarFlag calls
In reply to Joshua LockgetVarFlag() now defaults to expanding by default, thus remove the True option from getVarFlag() calls with a regex search and replace.
Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)
--- scripts/lib/recipetool/append.py | 6 +++--- scripts/verify-bashisms | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
scripts/lib/recipetool/append.py +3 -3
@@ -121,7 +121,7 @@ def determine_file_source(targetpath, rd): logger.debug('source path: %s' % srcpath) if not srcpath.startswith('/'): # Handle non-absolute path - srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs', True).split()[-1], srcpath)) + srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs').split()[-1], srcpath)) if srcpath.startswith(workdir): # OK, now we have the source file name, look for it in SRC_URI workdirfile = os.path.relpath(srcpath, workdir)
@@ -191,10 +191,10 @@ def get_source_path(cmdelements): def get_func_deps(func, d): """Find the function dependencies of a shell function""" deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) - deps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) + deps |= set((d.getVarFlag(func, "vardeps") or "").split()) funcdeps = [] for dep in deps: - if d.getVarFlag(dep, 'func', True): + if d.getVarFlag(dep, 'func'): funcdeps.append(dep) return funcdeps
scripts/verify-bashisms +1 -1
@@ -97,7 +97,7 @@ if __name__=='__main__': result = [] data = tinfoil.parse_recipe_file(fn) for key in data.keys(): - if data.getVarFlag(key, "func", True) and not data.getVarFlag(key, "python", True): + if data.getVarFlag(key, "func") and not data.getVarFlag(key, "python"): script = data.getVar(key, False) if not script: continue #print ("%s:%s" % (fn, key))
Signature · 1 line
2.9.3