diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2020-04-29 11:05:03 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-01 11:57:00 +0200 |
| commit | 72b88fe641386f75328ac5899463d32271d7ba04 (patch) | |
| tree | 905ee6f38937161840e13f5146495b355d5c0653 | |
| parent | da3d8e859bf9bb02f4a2e0811d349c7fe4a9dd9b (diff) | |
buildconf: export: Add use-head-next also on repo 2.5
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
(cherry picked from commit adb62ac9dfeed9827e0a706a5c2c2a64ebb95b06)
| -rw-r--r-- | buildconf/export | 6 |
1 files 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" |