[2/4] bitbake.conf: Add all layers (from BBLAYERS) to PSEUDO_IGNORE_PATHS

Submitted by Peter Kjellerstedt on Nov. 25, 2020, 1:30 p.m. | Patch ID: 178172

Details

Message ID 9d90bc03e13030cfa8c46aafcd6d3c4c1cc6ba25.1606310940.git.pkj@axis.com
State New
Headers show

Commit Message

Peter Kjellerstedt Nov. 25, 2020, 1:30 p.m.
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(-)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144972): https://lists.openembedded.org/g/openembedded-core/message/144972
Mute This Topic: https://lists.openembedded.org/mt/78499178/3616849
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [michael@yoctoproject.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patch hide | download patch | download mbox

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

Comments

Martin Jansa Nov. 25, 2020, 1:32 p.m.
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

>

> 

>

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144975): https://lists.openembedded.org/g/openembedded-core/message/144975
Mute This Topic: https://lists.openembedded.org/mt/78499178/1003190
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-
Peter Kjellerstedt Nov. 25, 2020, 1:47 p.m.
But duh. Ok, patch v2 incoming…

//Peter

From: Martin Jansa <martin.jansa@gmail.com>

Sent: den 25 november 2020 14:32
To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Cc: Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH 2/4] bitbake.conf: Add all layers (from BBLAYERS) to PSEUDO_IGNORE_PATHS

Looks like some unrelated changes sneaked into this one.

On Wed, Nov 25, 2020 at 2:31 PM Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto: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<mailto: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(-)
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#144976): https://lists.openembedded.org/g/openembedded-core/message/144976
Mute This Topic: https://lists.openembedded.org/mt/78499178/1003190
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-