From c4f5d75bfef926c186272e2be5bdd1968db3fe88 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Mon, 12 Oct 2020 12:35:05 +0200
Subject: Automatically merge overlays with most recent upstream version

This avoids the need to rebase the overlay when nothing has changed.
---
 dev/tools/create_overlays.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'dev/tools')

diff --git a/dev/tools/create_overlays.sh b/dev/tools/create_overlays.sh
index ad60b1115f..78ed27ba03 100755
--- a/dev/tools/create_overlays.sh
+++ b/dev/tools/create_overlays.sh
@@ -66,8 +66,7 @@ do
     make ci-$_CONTRIB_NAME || true
     setup_contrib_git $_CONTRIB_DIR $_CONTRIB_GITPUSHURL
 
-    echo "    ${_CONTRIB_NAME}_CI_REF=$OVERLAY_BRANCH" >> $OVERLAY_FILE
-    echo "    ${_CONTRIB_NAME}_CI_GITURL=$_CONTRIB_GITURL" >> $OVERLAY_FILE
+    echo "    overlay ${_CONTRIB_NAME} $_CONTRIB_GITURL $OVERLAY_BRANCH" >> $OVERLAY_FILE
     echo "" >> $OVERLAY_FILE
     shift
 done
-- 
cgit v1.2.3