From 72b88fe641386f75328ac5899463d32271d7ba04 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Wed, 29 Apr 2020 11:05:03 +0200 Subject: buildconf: export: Add use-head-next also on repo 2.5 Signed-off-by: Philippe Schenker (cherry picked from commit adb62ac9dfeed9827e0a706a5c2c2a64ebb95b06) --- buildconf/export | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildconf/export b/buildconf/export index 11f9d8e..ec943e6 100644 --- a/buildconf/export +++ b/buildconf/export @@ -19,9 +19,9 @@ if [ $FIRST_TIME -eq 1 ]; then mkdir -p conf cp ../layers/meta-toradex-distro/buildconf/*.conf conf/ - if [ -f conf/local.conf -a \ - -z "$(grep use-head-next conf/local.conf)" -a \ - -z "$(grep -c "meta-toradex-bsp-common.git.*upstream" ../.repo/manifest.xml)" ] + if grep -q "meta-toradex-bsp-common" ../.repo/manifest.xml && \ + ! grep -q "meta-toradex-bsp-common.git.*upstream" ../.repo/manifest.xml || \ + grep -qE "(integration.xml|next.xml)" ../.repo/manifest.xml then { echo "# This is needed when building on integration. With use-head-next you" -- cgit v1.2.3