generic-poky/merge-all.sh

#!/bin/sh

merge()
{
	git subtree pull --prefix=$1 rem-$1 201310
}

merge meta-telephony
merge meta-sysmocom-bsp
merge meta-smalltalk
merge meta-qt5
Add script to merge layers again 2014-07-30 15:27:28 +00:00			`#!/bin/sh`

			`merge()`
			`{`
update merge-all to use 201310 branch It doesn't make sense to try to support too many different OE versions like dora and krogoth from one branch. Also, the sysmocom 201310 and 201705 will use different versions of the osmcoom programs lile osmo-bts. Hence, we introduce a 201310 legacy branch which we merge into this repository (which has maintenance updates for 201310 only), rather than trying to follow master of those upstream meta-layers. 2017-06-14 09:57:22 +00:00			`git subtree pull --prefix=$1 rem-$1 201310`
Add script to merge layers again 2014-07-30 15:27:28 +00:00			`}`

			`merge meta-telephony`
			`merge meta-sysmocom-bsp`
			`merge meta-smalltalk`
			`merge meta-qt5`