X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=Makefile;h=0f5f4be2887721f8a15d98f61c0b40fa04695c88;hp=a7382196bfd65dae24c1e2e486ced3a03728185e;hb=937dfbd3f7455fbb9c5a6b19f450a4db52602071;hpb=ed0cfb11b7561461932ad8089ef8f347f547736d

diff --git a/Makefile b/Makefile
index a738219..0f5f4be 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,21 @@
 # THE SOFTWARE.
 #
 
+SHELL=/bin/bash
+
 # Note: You can override all variables by storing them
 # in an external file called "make.conf".
 -include conf/make.conf
 
 # Target platform:
-# vusolo, bm750, vuuno, vuultimo, 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 ?= vusolo4k
 
-MULTI_TEMPORARILY ?=
+MULTI_TEMPORARILY ?= YES
 
 # Adjust according to the number CPU cores to use for parallel build.
 # Default: Number of processors in /proc/cpuinfo, if present, or 1.
@@ -56,14 +58,17 @@ DEPDIR = $(BUILD_DIR)/.deps
 endif
 
 BBLAYERS ?= \
-	$(CURDIR)/meta-bsp/$(MACHINE) \
-	$(CURDIR)/meta-bsp/common \
+	$(CURDIR)/meta-bsp \
 	$(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 = \
-	bitbake.env \
+	$(TOPDIR)/bitbake.env \
 	$(TOPDIR)/conf/bblayers.conf \
 	$(TOPDIR)/conf/local.conf
 
@@ -86,6 +91,7 @@ $(BBLAYERS):
 	[ -d $@ ] || $(MAKE) $(MFLAGS) update
 
 init: $(BBLAYERS) $(CONFFILES)
+	@if [ ! -e $(CURDIR)/sources ]; then mkdir -p $(CURDIR)/sources; fi
 
 help:
 	@echo "Your options:"
@@ -95,21 +101,21 @@ 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"
 	@echo
 	@echo "  * Set up the environment to build recipes manually:"
+	@echo "      $$ cd $(BUILD_DIR)"
 	@echo "      $$ source bitbake.env"
-	@echo "      $$ cd build/$(MACHINE)"
 	@echo "      $$ bitbake <target>"
 	@echo "    [Replace <target> with a recipe name, e.g. vuplus-image or enigma2]"
 	@echo
@@ -146,11 +152,11 @@ distclean: clean
 
 image: init
 	@echo '[*] Building image for $(MACHINE)'
-	@. $(CURDIR)/bitbake.env && cd $(TOPDIR) && bitbake vuplus-image
+	@. $(TOPDIR)/bitbake.env && cd $(TOPDIR) && bitbake vuplus-image
 
 download: init
 	@echo '[*] Downloading sources'
-	@. $(CURDIR)/bitbake.env && cd $(TOPDIR) && bitbake -cfetchall -k vuplus-image
+	@. $(TOPDIR)/bitbake.env && cd $(TOPDIR) && bitbake -cfetchall -k vuplus-image
 
 update:
 	@echo '[*] Updating Git repositories...'
@@ -177,8 +183,9 @@ BITBAKE_ENV_HASH := $(call hash, \
 	'CURDIR = "$(CURDIR)"' \
 	)
 
-bitbake.env: $(DEPDIR)/.bitbake.env.$(BITBAKE_ENV_HASH)
+$(TOPDIR)/bitbake.env: $(DEPDIR)/.bitbake.env.$(BITBAKE_ENV_HASH)
 	@echo '[*] Generating $@'
+	@test -d $(@D) || mkdir -p $(@D)
 	@echo '# Automatically generated file. Do not edit!' > $@
 	@echo 'export PATH=$(CURDIR)/openembedded-core/scripts:$(CURDIR)/bitbake/bin:$${PATH}' >> $@
 
@@ -215,6 +222,10 @@ $(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)' >> $@
+	@if [ "$(MULTI_TEMPORARILY)" == "YES" ] ; then \
+		echo "DEPLOY_DIR_IMAGE = \"\$${DEPLOY_DIR}/images\"" >> $@; \
+	fi
+	@echo 'INHERIT += "rm_work"' >> $@
 
 BBLAYERS_CONF_HASH := $(call hash, \
 	'BBLAYERS_CONF_VERSION = "0"' \