From f35e8e0c1011eb1096ab47dac45015bfd91384d0 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 16 May 2017 10:26:50 +0800
Subject: [PATCH] Add our layer merging script to the pyro release

---
 merge-all.sh  | 11 +++++++++++
 merge-init.sh | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100755 merge-all.sh
 create mode 100755 merge-init.sh

diff --git a/merge-all.sh b/merge-all.sh
new file mode 100755
index 0000000000..469602d4d7
--- /dev/null
+++ b/merge-all.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+merge()
+{
+	git subtree pull --prefix=$1 rem-$1 master
+}
+
+merge meta-telephony
+merge meta-sysmocom-bsp
+merge meta-smalltalk
+merge meta-qt5
diff --git a/merge-init.sh b/merge-init.sh
new file mode 100755
index 0000000000..b86142a83e
--- /dev/null
+++ b/merge-init.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+
+merge()
+{
+	echo $1
+	git remote add rem-$1 $2
+	git fetch rem-$1
+	git subtree add --prefix=$1 rem-$1/master
+}
+
+
+merge meta-telephony git://github.com/sysmocom/meta-telephony.git
+merge meta-sysmocom-bsp git://git.sysmocom.de/poky/meta-sysmocom-bsp
+merge meta-smalltalk git://github.com/sysmocom/meta-smalltalk.git
+merge meta-qt5 git://github.com/sysmocom/meta-qt5.git
+