From b9ff62a0d0096138cb762ec5dbee9fd056999b70 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Mon, 13 Jun 2011 20:20:53 +0800 Subject: combo-layer-tool: add tool to manipulate combo layers This patch adds the script "combo-layer" to manipulate combo layer repos. A combo layer repo is a repo containing multiple component repos, e.g. oe-core, bitbake, BSP repos. The combo layer repo needs to be updated by syncing with the component repo upstream. This script is written to assist the combo layer handling. The combo layer tool provides three functionalities: - init: when the combo layer repo and component repo does not exist, init will "git init" the combo layer repo, and also "git clone" the component repos - update: combo layer tool will pull the latest commit from component repo upstream, and apply the commits since last update commit to the combo repo. If the user specifies interactive mode(--interactive), they can edit the patch list to select which commits to apply. - splitpatch: split the combo repo commit into separate patches per component repo, to facilitate upstream submission. Combo layer tool uses a config file to define the component repo info. Please check the combo-layer.conf.example for a detailed explanation of the config file fields. (From OE-Core rev: 68394476748386e58f40173643967f5a248173b1) Signed-off-by: Yu Ke Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/combo-layer.conf.example | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 scripts/combo-layer.conf.example (limited to 'scripts/combo-layer.conf.example') diff --git a/scripts/combo-layer.conf.example b/scripts/combo-layer.conf.example new file mode 100644 index 0000000000..09b94156fd --- /dev/null +++ b/scripts/combo-layer.conf.example @@ -0,0 +1,37 @@ +# component name +[bitbake] +# mandatory options +# git upstream uri +src_uri = git://git.openembedded.org/bitbake + +# the directory to clone the component repo +local_repo_dir = /home/kyu3/src/test/bitbake + +# the relative dir to commit the repo patch +# use "." if it is root dir +dest_dir = bitbake + +# the updated revision last time. +# If empty, the tool will start from the first commit +last_revision = + +# optional options + +# file_filter: only include the interested file +# file_filter = [path] [path] ... +# example: +# file_filter = src/ : only include the subdir src +# file_filter = src/*.c : only include the src *.c file +# file_filter = src/main.c src/Makefile.am : only include these two files + +# hook: if provided, the tool will call the hook to process the generated patch from upstream, +# and then apply the modified patch to combo repo +# the hook's parameter is: ./hook patchpath revision reponame +# example: +# hook = combo-layer-hook-default.sh + +[oe-core] +src_uri = git://git.openembedded.org/openembedded-core +local_repo_dir = /home/kyu3/src/test/oecore +dest_dir = . +last_revision = -- cgit v1.2.3-54-g00ecf