summaryrefslogtreecommitdiff
path: root/conf
AgeCommit message (Collapse)AuthorFilesLines
2015-01-23tizen-distro: pull meta-tizen from "master" branchPatrick Ohly1-1/+1
As discussed in https://bugs.tizen.org/jira/browse/TC-1964 using the "master" branch and not maintaining a "tizen" branch with identical content for meta-tizen makes more sense. (cherry picked from commit 4a7b826daea8373bbc2845a49a33fc5be24af5b8) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
2015-01-09meta-qt5: update to revision used in tizen-distro 0.9Patrick Ohly1-1/+1
First ran "combo-layer update meta-qt5", then "git reset --hard" to the commit corresponding to the code used in tizen-distro 0.9.
2015-01-09meta-openembedded: updated to branch point of dizzyPatrick Ohly1-1/+1
First ran "combo-layer update meta-openembedded", then "git reset --hard" to the commit corresponding to the d2f6561 branch point. Was less manual work this way than picking patches interactively...
2015-01-09tizen-distro: be more careful when importing patchesPatrick Ohly2-2/+2
The combo-layer hooks for bitbake and meta-tizen patch the Subject line of patches. This change must be limited to the Subject of the main patch itself, in particular patches embedded in the patch must not be changed. Achieved by limiting the replacement to the lines until the first Subject in the patch. Found when importing meta-tizen and diffing against a direct copy of the final revision.
2015-01-09tizen-distro: improve layerhook for meta-tizenPatrick Ohly1-1/+5
Not all commits in meta-tizen have a Signed-of-by tag. If missing, just append the rev number at the end of the commit message. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
2015-01-09tizen-distro: configure combo-layerPatrick Ohly8-0/+117
Up to this point, the tizen-distro repository is identical to the poky master branch minus the "yocto" and "documentation" parts. It was created by checking out 081fddd3e464935e5f438a7686eb8f8856da6281 (the commit where "dizzy" was branched off from master) and stripping out these undesired files with: git filter-branch --prune-empty --tree-filter 'rm -rf *yocto* documentation' HEAD Then the last_revision properties for bitbake and openembedded-core were set based on the commit messages generated in poky by the combo-layer commit hook. Because these extra comments are useful, the same commit hooks are also used in tizen-distro. Now the repository is ready for importing the other components.