X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=Makefile;h=a8e7a314a8a1552a2611ebd09dd1a4e5f6f85def;hp=0f2f4580968122fcc8fdf51d9ef00042cb93cf2d;hb=695f1f29a053ac259d7028dcb1100fac13419a30;hpb=4687a81ca527b3e0c66614939dbd7f3588ef36e9

diff --git a/Makefile b/Makefile
index 0f2f458..a8e7a31 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,14 @@
 -include conf/make.conf
 
 # Target platform:
-# vusolo, bm750, vuuno, vuultimo, vusolo2, vuduo2
+# vusolo, bm750, vuuno, vuultimo, vusolo2
 #
 # 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
+MULTI_TEMPORARILY ?= NO
 
 # Adjust according to the number CPU cores to use for parallel build.
 # Default: Number of processors in /proc/cpuinfo, if present, or 1.
@@ -43,7 +43,7 @@ XSUM ?= md5sum
 
 BUILD_DIR = $(CURDIR)/build
 TOPDIR = $(BUILD_DIR)/$(MACHINE)
-DL_DIR = $(CURDIR)/resource/sources
+DL_DIR = $(CURDIR)/sources
 
 ifeq ($(MULTI_TEMPORARILY), YES)
 SSTATE_DIR = $(TOPDIR)/sstate-cache
@@ -60,6 +60,10 @@ BBLAYERS ?= \
 	$(CURDIR)/meta-bsp/common \
 	$(CURDIR)/meta-openvuplus \
 	$(CURDIR)/meta-openembedded/meta-oe \
+	$(CURDIR)/meta-openembedded/meta-networking \
+	$(CURDIR)/meta-openembedded/meta-multimedia \
+	$(CURDIR)/meta-openembedded/meta-filesystems \
+	$(CURDIR)/meta-openembedded/meta-python \
 	$(CURDIR)/openembedded-core/meta
 
 CONFFILES = \
@@ -86,6 +90,7 @@ $(BBLAYERS):
 	[ -d $@ ] || $(MAKE) $(MFLAGS) update
 
 init: $(BBLAYERS) $(CONFFILES)
+	@if [ ! -e $(CURDIR)/sources ]; then mkdir -p $(CURDIR)/sources; fi
 
 help:
 	@echo "Your options:"
@@ -95,14 +100,14 @@ help:
 	@echo
 	@echo "  * Select a new target machine:"
 	@echo "      $$ echo MACHINE=vuultimo >> conf/make.conf"
-	@echo "    [Valid values: vusolo, bm750, vuuno, vuultimo, vusolo2, vuduo2]"
+	@echo "    [Valid values: vusolo, bm750, vuuno, vuultimo, vusolo2]"
 	@echo
 	@echo "  * Build a firmware image for the selected target machine:"
 	@echo "      $$ $(MAKE) image"
 	@echo
 	@echo "  * Build a firmware image for a different target machine:"
 	@echo "      $$ $(MAKE) image MACHINE=vuultimo"
-	@echo "    [Valid values: vusolo, bm750, vuuno, vuultimo, vusolo2, vuduo2]"
+	@echo "    [Valid values: vusolo, bm750, vuuno, vuultimo, vusolo2]"
 	@echo
 	@echo "  * Download all source files at once:"
 	@echo "      $$ $(MAKE) download"
@@ -216,7 +221,7 @@ $(TOPDIR)/conf/local.conf: $(DEPDIR)/.local.conf.$(MACHINE).$(LOCAL_CONF_HASH)
 	@echo 'USER_CLASSES = "buildstats"' >> $@
 	@echo 'include $(DISTRO_INCLUDE_CONF)' >> $@
 	@echo 'include $(MACHINE_INCLUDE_CONF)' >> $@
-#	@echo 'INHERIT+="rm_work"' >> $@
+	@echo 'INHERIT += "rm_work"' >> $@
 
 BBLAYERS_CONF_HASH := $(call hash, \
 	'BBLAYERS_CONF_VERSION = "0"' \