diff options
-rwxr-xr-x | buildit-docs | 3 | ||||
-rwxr-xr-x | combo-layer | 36 | ||||
-rw-r--r-- | combo-layer-dunfell.conf | 35 | ||||
-rw-r--r-- | combo-layer-gatesgarth.conf | 35 | ||||
-rw-r--r-- | combo-layer-hardknott.conf | 35 | ||||
-rw-r--r-- | combo-layer-honister.conf | 35 | ||||
-rw-r--r-- | combo-layer-kirkstone.conf | 35 | ||||
-rw-r--r-- | combo-layer-langdale.conf | 35 | ||||
-rw-r--r-- | combo-layer-mickledore.conf | 35 | ||||
-rw-r--r-- | combo-layer-next.conf | 12 | ||||
-rw-r--r-- | combo-layer-pyro.conf | 2 | ||||
-rw-r--r-- | combo-layer-rocko.conf | 2 | ||||
-rw-r--r-- | combo-layer-sumo.conf | 8 | ||||
-rw-r--r-- | combo-layer-thud.conf | 8 | ||||
-rw-r--r-- | combo-layer-warrior.conf | 35 | ||||
-rw-r--r-- | combo-layer-zeus.conf | 35 | ||||
-rw-r--r-- | combo-layer.conf | 14 | ||||
-rwxr-xr-x | do-ba | 6 | ||||
-rwxr-xr-x | pushit | 20 |
19 files changed, 386 insertions, 40 deletions
diff --git a/buildit-docs b/buildit-docs index 2ddcded..c580641 100755 --- a/buildit-docs +++ b/buildit-docs @@ -1,6 +1,7 @@ cd ~/Repos/yocto-docs git fetch origin -for i in master daisy dora dylan dizzy fido jethro krogoth morty pyro rocko sumo thud; do +# daisy dora dylan dizzy fido jethro krogoth morty pyro rocko +for i in master sumo thud warrior zeus dunfell; do git checkout $i git rebase origin/$i done diff --git a/combo-layer b/combo-layer index a634dd6..2312cef 100755 --- a/combo-layer +++ b/combo-layer @@ -19,9 +19,8 @@ import tempfile import configparser import re import copy -import pipes +import shlex import shutil -from collections import OrderedDict from string import Template from functools import reduce @@ -192,6 +191,23 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None): logger.debug("output: %s" % output.replace(chr(0), '\\0')) return output +def action_sync_revs(conf, args): + """ + Update the last_revision config option for each repo with the latest + revision in the remote's branch. Useful if multiple people are using + combo-layer. + """ + repos = get_repos(conf, args[1:]) + + for name in repos: + repo = conf.repos[name] + ldir = repo['local_repo_dir'] + branch = repo.get('branch', "master") + runcmd("git fetch", ldir) + lastrev = runcmd('git rev-parse origin/%s' % branch, ldir).strip() + print("Updating %s to %s" % (name, lastrev)) + conf.update(name, "last_revision", lastrev) + def action_init(conf, args): """ Clone component repositories @@ -508,7 +524,7 @@ def check_patch(patchfile): f.close() if of: of.close() - os.rename(patchfile + '.tmp', patchfile) + os.rename(of.name, patchfile) def drop_to_shell(workdir=None): if not sys.stdin.isatty(): @@ -1259,7 +1275,7 @@ def apply_commit(parent, rev, largs, wargs, dest_dir, file_filter=None): target = os.path.join(wargs["destdir"], dest_dir) if not os.path.isdir(target): os.makedirs(target) - quoted_target = pipes.quote(target) + quoted_target = shlex.quote(target) # os.sysconf('SC_ARG_MAX') is lying: running a command with # string length 629343 already failed with "Argument list too # long" although SC_ARG_MAX = 2097152. "man execve" explains @@ -1271,7 +1287,7 @@ def apply_commit(parent, rev, largs, wargs, dest_dir, file_filter=None): unquoted_args = [] cmdsize = 100 + len(quoted_target) while update: - quoted_next = pipes.quote(update[0]) + quoted_next = shlex.quote(update[0]) size_next = len(quoted_next) + len(dest_dir) + 1 logger.debug('cmdline length %d + %d < %d?' % (cmdsize, size_next, os.sysconf('SC_ARG_MAX'))) if cmdsize + size_next < max_cmdsize: @@ -1302,6 +1318,7 @@ actions = { "update": action_update, "pull": action_pull, "splitpatch": action_splitpatch, + "sync-revs": action_sync_revs, } def main(): @@ -1312,10 +1329,11 @@ def main(): Create and update a combination layer repository from multiple component repositories. Action: - init initialise the combo layer repo - update [components] get patches from component repos and apply them to the combo repo - pull [components] just pull component repos only - splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") + init initialise the combo layer repo + update [components] get patches from component repos and apply them to the combo repo + pull [components] just pull component repos only + sync-revs [components] update the config file's last_revision for each repository + splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).", action = "store", dest = "conffile", default = "conf/combo-layer.conf") diff --git a/combo-layer-dunfell.conf b/combo-layer-dunfell.conf new file mode 100644 index 0000000..3dc6309 --- /dev/null +++ b/combo-layer-dunfell.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 1.46 +last_revision = a4cd5b0b4b355b7b75fb48c61289700e3e908b2a +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 = dunfell +last_revision = 1c7d555379c4b0962bccd018870989050d87675f +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 = dunfell +last_revision = f4ef0e9c695207bde309434191b5d6d82149683c +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 = dunfell +last_revision = 8485f6da8c49c7a8cd1d768facf3ff3b746f3b49 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-gatesgarth.conf b/combo-layer-gatesgarth.conf new file mode 100644 index 0000000..ebf4808 --- /dev/null +++ b/combo-layer-gatesgarth.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 1.48 +last_revision = 38bff0badf916098732fb20210e0ed6d0dd38250 +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 = gatesgarth +last_revision = 9cce475ffc4bd71977d8e0a31c1a4df7a2f30ef7 +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 = gatesgarth +last_revision = 9dbd3e8726b5eebd067d01973540724ea3e246c4 +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 = gatesgarth +last_revision = c5087f8bc8f2b4e2292f7ebb9aa2815d69bffbfe +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-hardknott.conf b/combo-layer-hardknott.conf new file mode 100644 index 0000000..502a661 --- /dev/null +++ b/combo-layer-hardknott.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 1.50 +last_revision = d01d8326331cfe59208674cfc53aa26c0028b313 +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 = hardknott +last_revision = fbbb689c8df7f82644b8a9bc5bb6884bc6516660 +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 = hardknott +last_revision = f462982ddb6e32052217d44c0c44e8a4df115589 +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 = hardknott +last_revision = c381b983b12536c10a03ac1ca0ec59d0e64088d8 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-honister.conf b/combo-layer-honister.conf new file mode 100644 index 0000000..f2231ff --- /dev/null +++ b/combo-layer-honister.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 1.52 +last_revision = c2d8f9b2137bd4a98eb0f51519493131773e7517 +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 = honister +last_revision = 6f0d16ddf3bbac1eea31683b262e866ec65fba2e +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 = honister +last_revision = 9ae3071f66c1811d847ed559cb773999ff6185fc +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 = honister +last_revision = 3739e5aba6eaebd8d1cc7c256721bb79f4d855d0 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-kirkstone.conf b/combo-layer-kirkstone.conf new file mode 100644 index 0000000..5946e65 --- /dev/null +++ b/combo-layer-kirkstone.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 2.0 +last_revision = 2802adb572eb73a3eb2725a74a9bbdaafc543fa7 +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 = kirkstone +last_revision = ff4b57ffff903a93b710284c7c7f916ddd74712f +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 = kirkstone +last_revision = 86d0b38a97941ad52b1af220c7b801a399d50e93 +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 = kirkstone +last_revision = 15fd5faf510329a8022b60c53576eb76451d4358 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-langdale.conf b/combo-layer-langdale.conf new file mode 100644 index 0000000..f1c835f --- /dev/null +++ b/combo-layer-langdale.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 2.2 +last_revision = 88a9cc0318c6ef01976d8b09dfc1a92cf0a1e498 +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 = langdale +last_revision = 6c9ca2f2de98c84d11beccbfde7c1e26cb25dfb6 +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] +branch = langdale +src_uri = git://git.yoctoproject.org/yocto-docs +local_repo_dir = /home/richard/Repos/yocto-docs +dest_dir = . +file_filter = documentation/ +last_revision = da685fc5e69d49728e3ffd6c4d623e7e1745059d +hook = /home/richard/Repos/pokyconfig/combo-layerhook-yoctodocs.sh + +[meta-yocto] +branch = langdale +src_uri = git://git.yoctoproject.org/meta-yocto +local_repo_dir = /home/richard/Repos/meta-yocto +dest_dir = . +last_revision = f507cfd7db1aca197f2382a1f96132980ddcca56 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-mickledore.conf b/combo-layer-mickledore.conf new file mode 100644 index 0000000..e941550 --- /dev/null +++ b/combo-layer-mickledore.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 2.4 +last_revision = ae2efb05196f9e29ef56ad9a84e2eae5fbdd8030 +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 = mickledore +last_revision = 85c1713bf0c01c68558bfba38edcc005c1ebb1c9 +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] +branch = mickledore +src_uri = git://git.yoctoproject.org/yocto-docs +local_repo_dir = /home/richard/Repos/yocto-docs +dest_dir = . +file_filter = documentation/ +last_revision = 40f0cf9302b9f0ce01a1270977644b1b2fdfc650 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-yoctodocs.sh + +[meta-yocto] +branch = mickledore +src_uri = git://git.yoctoproject.org/meta-yocto +local_repo_dir = /home/richard/Repos/meta-yocto +dest_dir = . +last_revision = 9294211a349523a07a81eebf6ce4edb126797d23 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-next.conf b/combo-layer-next.conf index 2d60602..ca41368 100644 --- a/combo-layer-next.conf +++ b/combo-layer-next.conf @@ -3,7 +3,7 @@ src_uri = git://git.openembedded.org/bitbake local_repo_dir = /home/richard/Repos/bitbake dest_dir = bitbake branch = master-next -last_revision = fef56d28c3efec4876c379898cbc4d4c65303aee +last_revision = 074da4c469d1f4177a1c5be72b9f3ccdfd379d67 hook = /home/richard/Repos/pokyconfig/combo-layerhook-bitbake.sh file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO @@ -12,24 +12,24 @@ src_uri = git://git.openembedded.org/openembedded-core local_repo_dir = /home/richard/Repos/oe-core dest_dir = . branch = master-next -last_revision = 8e975655516594ca1f6a99e5cad3167c6217c6c2 +last_revision = 8cfef328af846f134fe67846f457d437f70a4822 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] +branch = master-next src_uri = git://git.yoctoproject.org/yocto-docs local_repo_dir = /home/richard/Repos/yocto-docs dest_dir = . file_filter = documentation/ -branch = master-next -last_revision = d39d196713a68df8d298f6ed0f40899bc148a323 +last_revision = a35d1b546c219407bc93c87789a7147a9ade270e hook = /home/richard/Repos/pokyconfig/combo-layerhook-yoctodocs.sh [meta-yocto] +branch = master-next src_uri = git://git.yoctoproject.org/meta-yocto local_repo_dir = /home/richard/Repos/meta-yocto dest_dir = . -branch = master-next -last_revision = 3b3b77dd9e3f020e9da33ff2a97c9ea3911df15b +last_revision = 913bd8ba4dd1d5d2a38261bde985b64a36e36281 hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh diff --git a/combo-layer-pyro.conf b/combo-layer-pyro.conf index ae4e3f1..614493f 100644 --- a/combo-layer-pyro.conf +++ b/combo-layer-pyro.conf @@ -3,7 +3,7 @@ src_uri = git://git.openembedded.org/bitbake local_repo_dir = /home/richard/Repos/bitbake dest_dir = bitbake branch = 1.34 -last_revision = 0d436ff788f019c366cd4e66097fce928b6ff6c5 +last_revision = 08aafc53ba911337d2d3558654b06f294ae634e2 hook = /home/richard/Repos/pokyconfig/combo-layerhook-bitbake.sh file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO diff --git a/combo-layer-rocko.conf b/combo-layer-rocko.conf index b0a0fd2..a0ca7e8 100644 --- a/combo-layer-rocko.conf +++ b/combo-layer-rocko.conf @@ -3,7 +3,7 @@ src_uri = git://git.openembedded.org/bitbake local_repo_dir = /home/richard/Repos/bitbake dest_dir = bitbake branch = 1.36 -last_revision = 582f1d7a8d150cf5917dfc1efa844f40131ae4bf +last_revision = 1b989fb76e3e5f044c2e14c7b26a5562803fde9d hook = /home/richard/Repos/pokyconfig/combo-layerhook-bitbake.sh file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO diff --git a/combo-layer-sumo.conf b/combo-layer-sumo.conf index 457894d..d3f0dba 100644 --- a/combo-layer-sumo.conf +++ b/combo-layer-sumo.conf @@ -3,7 +3,7 @@ src_uri = git://git.openembedded.org/bitbake local_repo_dir = /home/richard/Repos/bitbake dest_dir = bitbake branch = 1.38 -last_revision = 0cfc389598939039496488038c18286d2d9fa735 +last_revision = 1df4fb1c9bf2fde0b274374bff1235c4b1f7ac79 hook = /home/richard/Repos/pokyconfig/combo-layerhook-bitbake.sh file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO @@ -12,7 +12,7 @@ src_uri = git://git.openembedded.org/openembedded-core local_repo_dir = /home/richard/Repos/oe-core dest_dir = . branch = sumo -last_revision = 31f0c5e59c7fb0ae0915de584fbfcf3d95bbb061 +last_revision = 84f19e78d9b1f3d634cf1d46ce48f24670199d0b 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 @@ -22,7 +22,7 @@ local_repo_dir = /home/richard/Repos/yocto-docs dest_dir = . file_filter = documentation/ branch = sumo -last_revision = 7047930390d16d0a349ee552969b72de073a7627 +last_revision = 26c5549580e108c40aa7c95860d12c675596820c hook = /home/richard/Repos/pokyconfig/combo-layerhook-yoctodocs.sh [meta-yocto] @@ -30,6 +30,6 @@ src_uri = git://git.yoctoproject.org/meta-yocto local_repo_dir = /home/richard/Repos/meta-yocto dest_dir = . branch = sumo -last_revision = 8bb2d9892b1b24318095282c8c51721dd68751fd +last_revision = c19ec95877614314ab236fd89d9b5055f33de0c4 hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh diff --git a/combo-layer-thud.conf b/combo-layer-thud.conf index dd4ef60..6f155d8 100644 --- a/combo-layer-thud.conf +++ b/combo-layer-thud.conf @@ -3,7 +3,7 @@ src_uri = git://git.openembedded.org/bitbake local_repo_dir = /home/richard/Repos/bitbake dest_dir = bitbake branch = 1.40 -last_revision = 238a936f60cbffb73f7b370b867e45f91925951c +last_revision = 964958b8b11dc69fb289fc6c97c1dbc8d76ad0f8 hook = /home/richard/Repos/pokyconfig/combo-layerhook-bitbake.sh file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO @@ -12,7 +12,7 @@ src_uri = git://git.openembedded.org/openembedded-core local_repo_dir = /home/richard/Repos/oe-core dest_dir = . branch = thud -last_revision = 748f946ee74f7480200a7eb0bb0b695467b08f0a +last_revision = 1351f9be973cfbd043f9b10d218e3cecaa0ab372 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 @@ -22,7 +22,7 @@ local_repo_dir = /home/richard/Repos/yocto-docs dest_dir = . file_filter = documentation/ branch = thud -last_revision = d085c285a41bacc15aa78a9f3900f4be7c45fa62 +last_revision = 421a80308c36c3da98d5fb6f6100ee3fab6abd0e hook = /home/richard/Repos/pokyconfig/combo-layerhook-yoctodocs.sh [meta-yocto] @@ -30,6 +30,6 @@ src_uri = git://git.yoctoproject.org/meta-yocto local_repo_dir = /home/richard/Repos/meta-yocto dest_dir = . branch = thud -last_revision = e9a9591f36d1e7a602fdb245a1f2d1707958e0e5 +last_revision = bf00cab7a55e2038e09a307378af5aec04c99380 hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh diff --git a/combo-layer-warrior.conf b/combo-layer-warrior.conf new file mode 100644 index 0000000..d530d6c --- /dev/null +++ b/combo-layer-warrior.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 1.42 +last_revision = af479e239d1e4dc93f0162c5936369a94c1c529d +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 = warrior +last_revision = 856674d6f75e2b99ae961d5ab869ff071ff5c362 +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 = warrior +last_revision = 3fd1432890f04fd659952c0f20f5750fb8c3a909 +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 = warrior +last_revision = e16269fae87b674a686c96488daa2120f0ea8ba7 +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer-zeus.conf b/combo-layer-zeus.conf new file mode 100644 index 0000000..a46d072 --- /dev/null +++ b/combo-layer-zeus.conf @@ -0,0 +1,35 @@ +[bitbake] +src_uri = git://git.openembedded.org/bitbake +local_repo_dir = /home/richard/Repos/bitbake +dest_dir = bitbake +branch = 1.44 +last_revision = 7150c8286fba6c4b5ab03d3a74f06e068c9c28c8 +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 = zeus +last_revision = db8ceed8f2eca92a4cffe8295481d8041281fdd0 +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 = zeus +last_revision = 9f51be3a11b7422aba3617a90a98336c3c75f71e +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 = zeus +last_revision = 6cd2fc85bd6a40474b21b83408c0a57bb819649f +hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh + diff --git a/combo-layer.conf b/combo-layer.conf index 7108017..c51c153 100644 --- a/combo-layer.conf +++ b/combo-layer.conf @@ -3,7 +3,7 @@ src_uri = git://git.openembedded.org/bitbake local_repo_dir = /home/richard/Repos/bitbake dest_dir = bitbake branch = master -last_revision = 4359b037de578095db2595f119dfb8e3340e1414 +last_revision = 074da4c469d1f4177a1c5be72b9f3ccdfd379d67 hook = /home/richard/Repos/pokyconfig/combo-layerhook-bitbake.sh file_exclude = classes/base.bbclass conf/bitbake.conf .gitignore MANIFEST.in setup.py TODO @@ -12,24 +12,24 @@ src_uri = git://git.openembedded.org/openembedded-core local_repo_dir = /home/richard/Repos/oe-core dest_dir = . branch = master -last_revision = 920824125eb87928a329a072fa6c5a839efc932b +last_revision = 744a2277844ec9a384a9ca7dae2a634d5a0d3590 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 +file_exclude = meta/conf/templates/default/bblayers.conf.sample meta/conf/templates/default/local.conf.sample meta/conf/templates/default/local.conf.sample.extended meta/conf/templates/default/site.conf.sample [yocto-docs] +branch = master src_uri = git://git.yoctoproject.org/yocto-docs local_repo_dir = /home/richard/Repos/yocto-docs dest_dir = . file_filter = documentation/ -branch = master -last_revision = d39d196713a68df8d298f6ed0f40899bc148a323 +last_revision = a35d1b546c219407bc93c87789a7147a9ade270e hook = /home/richard/Repos/pokyconfig/combo-layerhook-yoctodocs.sh [meta-yocto] +branch = master src_uri = git://git.yoctoproject.org/meta-yocto local_repo_dir = /home/richard/Repos/meta-yocto dest_dir = . -branch = master -last_revision = 74bd707f129975a74c3b99a6744681da96f39f75 +last_revision = 913bd8ba4dd1d5d2a38261bde985b64a36e36281 hook = /home/richard/Repos/pokyconfig/combo-layerhook-metayocto.sh @@ -31,6 +31,12 @@ elif [ $BRANCH = "sumo" ]; then RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb" elif [ $BRANCH = "thud" ]; then RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb" +elif [ $BRANCH = "warrior" ]; then + RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb" +elif [ $BRANCH = "zeus" ]; then + RECIPE="meta/recipes-core/images/build-appliance-image_15.0.0.bb" +elif [ $BRANCH = "dunfell" -o $BRANCH = "gatesgarth" -o $BRANCH = "hardknott" -o $BRANCH = "honister" -o $BRANCH = "kirkstone" -o $BRANCH = "langdale" ]; 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 @@ -1,14 +1,20 @@ #!/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 sumo:sumo thud:thud -git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next rocko-next:rocko-next sumo-next:sumo-next thud-next:thud-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 thud:thud warrior:warrior zeus:zeus dunfell:dunfell gatesgarth:gatesgarth hardknott:hardknott honister:honister kirkstone:kirkstone master-uninative:master-uninative langdale:langdale mickledore:mickledore +git push origin master-next:master-next -f git push contrib master:master +git push github master-next:master-next -f +git push github 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 sumo:sumo thud:thud -git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next rocko-next:rocko-next sumo-next:sumo-next thud-next:thud-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 thud:thud warrior:warrior zeus:zeus dunfell:dunfell gatesgarth:gatesgarth hardknott:hardknott honister:honister kirkstone:kirkstone master-uninative:master-uninative langdale:langdale mickledore:mickledore +git push origin 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 sumo:sumo thud:thud -git push origin krogoth-next:krogoth-next morty-next:morty-next pyro-next:pyro-next rocko-next:rocko-next sumo-next:sumo-next thud-next:thud-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 thud:thud warrior:warrior zeus:zeus dunfell:dunfell gatesgarth:gatesgarth hardknott:hardknott honister:honister kirkstone:kirkstone langdale:langdale mickledore:mickledore +git push origin 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 1.38:1.38 1.40:1.40 +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 1.40:1.40 1.42:1.42 1.44:1.44 1.46:1.46 1.48:1.48 1.50:1.50 1.52:1.52 2.0:2.0 2.2:2.2 2.4:2.4 git push origin master-next:master-next -f +cd ~/Repos/yocto-docs +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 thud:thud warrior:warrior zeus:zeus dunfell:dunfell gatesgarth:gatesgarth hardknott:hardknott honister:honister kirkstone:kirkstone langdale:langdale mickledore:mickledore +#git push origin master-next:master-next + |