diff options
| author | hschang <chang@dev3> | 2014-07-18 05:00:52 (GMT) |
|---|---|---|
| committer | hschang <chang@dev3> | 2014-07-18 05:00:52 (GMT) |
| commit | 8205d55cd1f4f813c303e01e8bf54b5aa45ce915 (patch) | |
| tree | 4adbc90908e55fd24eaccdf22420986da75e7059 /Makefile | |
| parent | 735cc71cb1eef9d3ff532cc586dbde959c48bbbb (diff) | |
| parent | 3a8416b9628b940abaa6d8c4c825c1617cc3f42f (diff) | |
Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
Conflicts:
meta-openvuplus/recipes-core/tasks/task-core-boot.inc
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -29,7 +29,7 @@ # This only sets the default value. All platforms now use a shared build # directory. Run "MACHINE=vuultimo bitbake vuplus-image" to build an image # for the vuultimo, if it is not the default. -MACHINE ?= vuultimo +MACHINE ?= vusolose MULTI_TEMPORARILY ?= YES |