mirror of
https://git.yoctoproject.org/poky
synced 2026-09-12 06:49:32 +02:00
meta/meta-selftest: Fix variable assignment whitespace
Recipes are much more readable with whitespace around the assignment operators. Fix various assignments in OE-Core to show this is definitely the preferred formatting. (From OE-Core rev: 30ea609d3357fb3de911f2f6a5e6856c151b976a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -52,7 +52,7 @@ export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
|
||||
|
||||
export CXX_FOR_BUILD = "${BUILD_CXX}"
|
||||
export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
|
||||
export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
|
||||
|
||||
export LD_FOR_BUILD = "${BUILD_LD}"
|
||||
export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
|
||||
|
||||
@@ -42,7 +42,7 @@ CARGO_BUILD_FLAGS = "-v --frozen --target ${RUST_HOST_SYS} ${BUILD_MODE} --manif
|
||||
# This is based on the content of CARGO_BUILD_FLAGS and generally will need to
|
||||
# change if CARGO_BUILD_FLAGS changes.
|
||||
BUILD_DIR = "${@['release', 'debug'][d.getVar('DEBUG_BUILD') == '1']}"
|
||||
CARGO_TARGET_SUBDIR="${RUST_HOST_SYS}/${BUILD_DIR}"
|
||||
CARGO_TARGET_SUBDIR = "${RUST_HOST_SYS}/${BUILD_DIR}"
|
||||
oe_cargo_build () {
|
||||
export RUSTFLAGS="${RUSTFLAGS}"
|
||||
bbnote "Using rust targets from ${RUST_TARGET_PATH}"
|
||||
|
||||
@@ -20,8 +20,8 @@ export GOCACHE = "${B}/.cache"
|
||||
|
||||
export GOARCH = "${TARGET_GOARCH}"
|
||||
export GOOS = "${TARGET_GOOS}"
|
||||
export GOHOSTARCH="${BUILD_GOARCH}"
|
||||
export GOHOSTOS="${BUILD_GOOS}"
|
||||
export GOHOSTARCH = "${BUILD_GOARCH}"
|
||||
export GOHOSTOS = "${BUILD_GOOS}"
|
||||
|
||||
GOARM[export] = "0"
|
||||
GOARM:arm:class-target = "${TARGET_GOARM}"
|
||||
|
||||
@@ -16,7 +16,7 @@ GTKIC_CMD = "${@ 'gtk4-update-icon-cache' if d.getVar('GTKIC_VERSION') == '4' el
|
||||
inherit features_check
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
|
||||
DEPENDS +=" ${@ '' if d.getVar('BPN') == 'hicolor-icon-theme' else 'hicolor-icon-theme' } \
|
||||
DEPENDS += "${@ '' if d.getVar('BPN') == 'hicolor-icon-theme' else 'hicolor-icon-theme' } \
|
||||
${@ '' if d.getVar('BPN') == 'gdk-pixbuf' else 'gdk-pixbuf' } \
|
||||
${@ '' if d.getVar('BPN') == d.getVar('GTKPN') else d.getVar('GTKPN') } \
|
||||
${GTKPN}-native \
|
||||
|
||||
@@ -661,7 +661,7 @@ KERNEL_LOCALVERSION ??= ""
|
||||
# Note: This class saves the value of localversion to a file
|
||||
# so other recipes like make-mod-scripts can restore it via the
|
||||
# helper function get_kernellocalversion_file
|
||||
export LOCALVERSION="${KERNEL_LOCALVERSION}"
|
||||
export LOCALVERSION = "${KERNEL_LOCALVERSION}"
|
||||
|
||||
kernel_do_configure() {
|
||||
# fixes extra + in /lib/modules/2.6.37+
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
inherit python3-dir
|
||||
|
||||
PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
|
||||
PYTHON = "${STAGING_BINDIR_NATIVE}/python3-native/python3"
|
||||
EXTRANATIVEPATH += "python3-native"
|
||||
DEPENDS:append = " python3-native "
|
||||
|
||||
@@ -20,8 +20,8 @@ export STAGING_LIBDIR
|
||||
# find_package(PythonLibs REQUIRED)
|
||||
# which ends up using libs/includes from build host
|
||||
# Therefore pre-empt that effort
|
||||
export PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
|
||||
export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
|
||||
export PYTHON_LIBRARY = "${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
|
||||
export PYTHON_INCLUDE_DIR = "${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
|
||||
|
||||
# suppress host user's site-packages dirs.
|
||||
export PYTHONNOUSERSITE = "1"
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
inherit cargo python3-dir siteinfo
|
||||
|
||||
export PYO3_CROSS="1"
|
||||
export PYO3_CROSS_PYTHON_VERSION="${PYTHON_BASEVERSION}"
|
||||
export PYO3_CROSS_LIB_DIR="${STAGING_LIBDIR}"
|
||||
export CARGO_BUILD_TARGET="${RUST_HOST_SYS}"
|
||||
export PYO3_CROSS = "1"
|
||||
export PYO3_CROSS_PYTHON_VERSION = "${PYTHON_BASEVERSION}"
|
||||
export PYO3_CROSS_LIB_DIR = "${STAGING_LIBDIR}"
|
||||
export CARGO_BUILD_TARGET = "${RUST_HOST_SYS}"
|
||||
export RUSTFLAGS
|
||||
export PYO3_PYTHON="${PYTHON}"
|
||||
export PYO3_CONFIG_FILE="${WORKDIR}/pyo3.config"
|
||||
export PYO3_PYTHON = "${PYTHON}"
|
||||
export PYO3_CONFIG_FILE = "${WORKDIR}/pyo3.config"
|
||||
|
||||
python_pyo3_do_configure () {
|
||||
cat > ${WORKDIR}/pyo3.config << EOF
|
||||
|
||||
@@ -43,9 +43,9 @@ HOST_CFLAGS ?= "${CFLAGS}"
|
||||
HOST_CXXFLAGS ?= "${CXXFLAGS}"
|
||||
HOST_CPPFLAGS ?= "${CPPFLAGS}"
|
||||
|
||||
rustlib_suffix="${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${RUST_HOST_SYS}/lib"
|
||||
rustlib_suffix = "${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${RUST_HOST_SYS}/lib"
|
||||
# Native sysroot standard library path
|
||||
rustlib_src="${prefix}/lib/${rustlib_suffix}"
|
||||
rustlib_src = "${prefix}/lib/${rustlib_suffix}"
|
||||
# Host sysroot standard library path
|
||||
rustlib="${libdir}/${rustlib_suffix}"
|
||||
rustlib:class-native="${libdir}/rustlib/${BUILD_SYS}/lib"
|
||||
rustlib = "${libdir}/${rustlib_suffix}"
|
||||
rustlib:class-native = "${libdir}/rustlib/${BUILD_SYS}/lib"
|
||||
|
||||
@@ -49,4 +49,4 @@ setuptools3_do_install() {
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_compile do_install
|
||||
|
||||
export LDSHARED="${CCLD} -shared"
|
||||
export LDSHARED = "${CCLD} -shared"
|
||||
|
||||
@@ -79,6 +79,6 @@ setuptools3_legacy_do_install[vardepsexclude] = "MACHINE"
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_compile do_install
|
||||
|
||||
export LDSHARED="${CCLD} -shared"
|
||||
export LDSHARED = "${CCLD} -shared"
|
||||
DEPENDS += "python3-setuptools-native"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user