From f5f7c5e0925350e1c4c06cc07441dccb1fe3d7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 5 Dec 2016 16:38:56 +0100 Subject: [PATCH] replace bb.data.getVar by d.getVar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/distro/include/angstrom-glibc.inc | 6 +++--- conf/distro/include/angstrom-musl.inc | 4 ++-- conf/distro/include/angstrom-uclibc.inc | 4 ++-- conf/distro/include/angstrom-uclinux-uclibc.inc | 2 +- conf/distro/include/angstrom.inc | 4 ++-- recipes-angstrom/angstrom/angstrom-version.bb | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 5fb623c..0d67e3a 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -6,13 +6,13 @@ TARGET_OS = "linux" # sane-toolchain.inc has this, and explains the GNU and ABI suffices: #TARGET_OS = "${@compute_os_portion_of_target_triplet(d)}" -TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TUNE_PKGARCH',d,1) in ['ppce500', 'ppce500v2']]}" +TARGET_OS .= "${@['','-gnueabi'][d.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +TARGET_OS .= "${@['','-gnuspe'][d.getVar('TUNE_PKGARCH',d,1) in ['ppce500', 'ppce500v2']]}" # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][d.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" # We use gold as default linker for arm/x86 on eglibc based images DISTRO_FEATURES_append_arm = " ld-is-gold" diff --git a/conf/distro/include/angstrom-musl.inc b/conf/distro/include/angstrom-musl.inc index aec1986..130d745 100644 --- a/conf/distro/include/angstrom-musl.inc +++ b/conf/distro/include/angstrom-musl.inc @@ -2,7 +2,7 @@ # The things uclibc can provide. We default to wanting uclibc to provide them. # libc settings -DISTRO_FEATURES += "${@['', ' nls'][bb.data.getVar('ENABLE_BINARY_LOCALE_GENERATION', d, 1) == '1']}" +DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION', d, 1) == '1']}" # FIXME: We enable IPv4 per default to avoid alot of breakage. # FIXME: Figure out an acceptable way to negotiate either # FIXME: desired features or hard requirements, either top-down or bottom-up. @@ -12,4 +12,4 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]}" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][d.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]}" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index f307b16..a09029b 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -17,7 +17,7 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "nativesdk-egl PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-nativesdk = "nativesdk-eglibc" PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "nativesdk-eglibc" # libc settings -DISTRO_FEATURES += "${@['', ' nls'][bb.data.getVar('ENABLE_BINARY_LOCALE_GENERATION', d, 1) == '1']}" +DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION', d, 1) == '1']}" # FIXME: We enable IPv4 per default to avoid alot of breakage. # FIXME: Figure out an acceptable way to negotiate either # FIXME: desired features or hard requirements, either top-down or bottom-up. @@ -39,4 +39,4 @@ TARGET_OS_bfin = "uclinux-uclibc" #Note that this testing was done without the gcc-pr32889.patch. FULL_OPTIMIZATION_avr32 = "-Os -pipe ${DEBUG_FLAGS}" -TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]}" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][d.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]}" diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc index 2ecb337..d49650d 100644 --- a/conf/distro/include/angstrom-uclinux-uclibc.inc +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -6,7 +6,7 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][d.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #Gcc will die with 'internal consistency error when using the above optimizations FULL_OPTIMIZATION_avr32 = "" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 3a3ae16..e7058b6 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -27,7 +27,7 @@ FEED_ARCH_bfin = "blackfin" # Add FEED_ARCH to machine overrides so we get access to e.g. 'armv7a' and 'sh4' # Hopefully we'll never see a machine or arch with 'all' as substring -MACHINEOVERRIDES .= ":${@bb.data.getVar('FEED_ARCH', d,1).replace('all','noarch')}" +MACHINEOVERRIDES .= ":${@d.getVar('FEED_ARCH', d,1).replace('all','noarch')}" # Put links to sources in deploy/sources to make it easier for people to be GPL compliant #INHERIT += "src_distribute_local" @@ -151,7 +151,7 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" SDIMG_ROOTFS_TYPE = "ext4" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" +DISTRO_CHECK := "${@d.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" # We want images supporting the following features (for packagegroup(-core)-base) DISTRO_FEATURES = "alsa argp bluetooth ext2 ipv4 ipv6 irda largefile nfs pam pci pcmcia ppp smbfs systemd usbgadget usbhost vfat wifi xattr zeroconf gobject-introspection-data" diff --git a/recipes-angstrom/angstrom/angstrom-version.bb b/recipes-angstrom/angstrom/angstrom-version.bb index 32b7d33..4079f9b 100644 --- a/recipes-angstrom/angstrom/angstrom-version.bb +++ b/recipes-angstrom/angstrom/angstrom-version.bb @@ -11,7 +11,7 @@ PACKAGES = "${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" def get_layers(bb, d): - layers = (bb.data.getVar("BBLAYERS", d, 1) or "").split() + layers = (d.getVar("BBLAYERS", d, 1) or "").split() layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \ base_get_metadata_git_branch(i, None).strip().strip('()'), \ base_get_metadata_git_revision(i, None)) \