blob: 599458188a0211bb576b806c7c615fa37db5df55 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
#!/bin/bash
branch=${1:-master}
nextbranch=${branch}-next
for i in oe-core yocto-docs bitbake meta-yocto; do
echo $i
if [ $branch != "master" -a $i = "bitbake" ]; then
continue
fi
cd ~/Repos/$i
git checkout $nextbranch
git rebase $branch
done
cd ~/Repos/poky
layerfile=combo-layer-${branch}.conf
if [ $branch = "master" ]; then
layerfile=combo-layer.conf
fi
cp ../pokyconfig/$layerfile ../pokyconfig/combo-layer-next.conf
sed -i -e "s/${branch}/${nextbranch}/g" ../pokyconfig/combo-layer-next.conf
if [ $nextbranch = "sumo-next" ]; then
sed -i -z -e "s/\(bitbake\nbranch = \)sumo-next/\11.38/g" ../pokyconfig/combo-layer-next.conf
fi
git checkout $nextbranch
git reset $branch --hard
# Add -D option for debug
../pokyconfig/combo-layer -c ../pokyconfig/combo-layer-next.conf -n update
git checkout master
|