Re: [OE-core] [PATCH 2/4] bitbake.conf: Add all layers (from BBLAYERS) to PSEUDO_IGNORE_PATHS

Martin Jansa
2020-11-25T13:32:34Z

[-- Attachment #1: Type: text/plain, Size: 3909 bytes --]

Looks like some unrelated changes sneaked into this one.

On Wed, Nov 25, 2020 at 2:31 PM Peter Kjellerstedt <
peter.kjellerstedt@axis.com> wrote:

> Instead of ignoring ${COREBASE}/meta in PSEUDO_IGNORE_PATHS (which may
> or may not ignore all layers depending on how they are named and placed
> under ${COREBASE}), ignore all layers.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> meta/conf/bitbake.conf | 2 +-
> meta/conf/machine/include/tune-thunderx.inc | 2 +-
> scripts/contrib/bb-perf/bb-matrix-plot.sh | 8 +++++---
> 3 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 0d38eac094..9742fe4fe2 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -685,7 +685,7 @@ SRC_URI = ""
> PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
> PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}"
> PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native"
> -PSEUDO_IGNORE_PATHS =
> "/usr/,/etc/,/lib,/dev/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${COREBASE}/meta,${CCACHE_DIR}"
> +PSEUDO_IGNORE_PATHS =
> "/usr/,/etc/,/lib,/dev/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${@','.join(d.getVar('BBLAYERS').split())},${CCACHE_DIR}"
>
> export PSEUDO_DISABLED = "1"
> #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
> diff --git a/meta/conf/machine/include/tune-thunderx.inc
> b/meta/conf/machine/include/tune-thunderx.inc
> index d1aaf4891e..dadcadedc6 100644
> --- a/meta/conf/machine/include/tune-thunderx.inc
> +++ b/meta/conf/machine/include/tune-thunderx.inc
> @@ -11,7 +11,7 @@ ARMPKGARCH_tune-thunderx ?= "thunderx"
> ARMPKGARCH_tune-thunderx_be ?= "thunderx"
>
> TUNE_FEATURES_tune-thunderx = "${TUNE_FEATURES_tune-aarch64} thunderx"
> -TUNE_FEATURES_tune-thunderx_be = "${TUNE_FEATURES_tune-thunderx}
> bigendian"
> +TUNE_FEATURES_tune-thunderx_be = "${TUNE_FEATURES_tune-aarch64_be}
> thunderx"
> BASE_LIB_tune-thunderx = "lib64"
> BASE_LIB_tune-thunderx_be = "lib64"
>
> diff --git a/scripts/contrib/bb-perf/bb-matrix-plot.sh
> b/scripts/contrib/bb-perf/bb-matrix-plot.sh
> index e7bd129e9e..450afcb559 100755
> --- a/scripts/contrib/bb-perf/bb-matrix-plot.sh
> +++ b/scripts/contrib/bb-perf/bb-matrix-plot.sh
> @@ -90,10 +90,12 @@ fi
> # Determine the dgrid3d mesh dimensions size
> MIN=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 1 | sed 's/^0*//' | sort -n |
> uniq | head -n1)
> MAX=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 1 | sed 's/^0*//' | sort -n |
> uniq | tail -n1)
> -BB_CNT=$[${MAX} - $MIN + 1]
> +#BB_CNT=$[${MAX} - $MIN + 1]
> +BB_CNT=$[(${MAX} - $MIN)/4 + 1]
> MIN=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 2 | sed 's/^0*//' | sort -n |
> uniq | head -n1)
> MAX=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 2 | sed 's/^0*//' | sort -n |
> uniq | tail -n1)
> -PM_CNT=$[${MAX} - $MIN + 1]
> +#PM_CNT=$[${MAX} - $MIN + 1]
> +PM_CNT=$[(${MAX} - $MIN)/4 + 1]
>
>
> (cat <<EOF
> @@ -118,7 +120,7 @@ set output "$PLOT_BASENAME-pm.png"
> replot
>
> set view 60,30
> -set term wxt size $SIZE
> +set term qt size $SIZE
> replot
> EOF
> ) | gnuplot --persist
>
>
>
>

[-- Attachment #2: Type: text/html, Size: 4697 bytes --]