combo-layer-sumo: Add sumo configuration

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-05-23 15:42:56 +01:00
parent 559549e61e
commit 976e4deea8
5 changed files with 51 additions and 8 deletions

View File

@ -1,6 +1,6 @@
cd ~/Repos/yocto-docs
git fetch origin
for i in master daisy dora dylan dizzy fido jethro krogoth morty pyro; do
for i in master daisy dora dylan dizzy fido jethro krogoth morty pyro rocko sumo; do
git checkout $i
git rebase origin/$i
done

View File

@ -3,6 +3,7 @@ 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
@ -17,8 +18,13 @@ 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

35
combo-layer-sumo.conf Normal file
View File

@ -0,0 +1,35 @@
[bitbake]
src_uri = git://git.openembedded.org/bitbake
local_repo_dir = /home/richard/Repos/bitbake
dest_dir = bitbake
branch = 1.38
last_revision = 76b17ffcea5c7275c2f9735a058256ba909b1a75
hook = /home/richard/Repos/pokyconfig/combo-layerhook-bitbake.sh
file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO
[oe-core]
src_uri = git://git.openembedded.org/openembedded-core
local_repo_dir = /home/richard/Repos/oe-core
dest_dir = .
branch = sumo
last_revision = dceca6d34071b4cbef9e28bbf19dc12f5d925525
hook = /home/richard/Repos/pokyconfig/combo-layerhook-oecore.sh
file_exclude = meta/conf/bblayers.conf.sample meta/conf/local.conf.sample meta/conf/local.conf.sample.extended meta/conf/site.conf.sample
[yocto-docs]
src_uri = git://git.yoctoproject.org/yocto-docs
local_repo_dir = /home/richard/Repos/yocto-docs
dest_dir = .
file_filter = documentation/
branch = sumo
last_revision = 9ad25836b2b3ca79aa3430be014871f50205cf9e
hook = /home/richard/Repos/pokyconfig/combo-layerhook-yoctodocs.sh
[meta-yocto]
src_uri = git://git.yoctoproject.org/meta-yocto
local_repo_dir = /home/richard/Repos/meta-yocto
dest_dir = .
branch = sumo
last_revision = eb759d24a69da5d649386a333461f4f226920f0d
hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh

2
do-ba
View File

@ -25,6 +25,8 @@ elif [ $BRANCH = "pyro" ]; then
RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb"
elif [ $BRANCH = "rocko" ]; then
RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb"
elif [ $BRANCH = "sumo" ]; then
RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb"
elif [ $BRANCH = "master" ]; then
RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb"
fi

14
pushit
View File

@ -1,14 +1,14 @@
#!/bin/sh
cd ~/Repos/poky
git push origin master:master denzil:denzil danny:danny dylan:dylan dora:dora daisy:daisy dizzy:dizzy fido:fido jethro:jethro krogoth:krogoth morty:morty pyro:pyro rocko:rocko
git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next master-next:master-next -f
git push origin master:master denzil:denzil danny:danny dylan:dylan dora:dora daisy:daisy dizzy:dizzy fido:fido jethro:jethro krogoth:krogoth morty:morty pyro:pyro rocko:rocko sumo:sumo
git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next rocko-next:rocko-next sumo-next:sumo-next master-next:master-next -f
git push contrib master:master
cd ~/Repos/oe-core
git push origin master:master denzil:denzil danny:danny dylan:dylan dora:dora daisy:daisy dizzy:dizzy fido:fido jethro:jethro krogoth:krogoth morty:morty pyro:pyro rocko:rocko
git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next master-next:master-next -f
git push origin master:master denzil:denzil danny:danny dylan:dylan dora:dora daisy:daisy dizzy:dizzy fido:fido jethro:jethro krogoth:krogoth morty:morty pyro:pyro rocko:rocko sumo:sumo
git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next rocko-next:rocko-next sumo-next:sumo-next master-next:master-next -f
cd ~/Repos/meta-yocto
git push origin master:master denzil:denzil danny:danny dylan:dylan dora:dora daisy:daisy dizzy:dizzy fido:fido jethro:jethro krogoth:krogoth morty:morty pyro:pyro rocko:rocko
git push origin master-next:master-next -f
git push origin master:master denzil:denzil danny:danny dylan:dylan dora:dora daisy:daisy dizzy:dizzy fido:fido jethro:jethro krogoth:krogoth morty:morty pyro:pyro rocko:rocko sumo:sumo
git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next rocko-next:rocko-next sumo-next:sumo-next master-next:master-next -f
cd ~/Repos/bitbake
git push origin master:master 1.16:1.16 1.18:1.18 1.20:1.20 1.22:1.22 1.24:1.24 1.26:1.26 1.28:1.28 1.30:1.30 1.32:1.32 1.34:1.34 1.36:1.36
git push origin master:master 1.16:1.16 1.18:1.18 1.20:1.20 1.22:1.22 1.24:1.24 1.26:1.26 1.28:1.28 1.30:1.30 1.32:1.32 1.34:1.34 1.36:1.36 1.38:1.38
git push origin master-next:master-next -f