X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=blobdiff_plain;f=Makefile;h=08d1e6d7ccef36e92434d4eb395807f5dc53ac60;hp=bf190563ab1f3c592ae83a369f3f884b92af43f5;hb=8fef4469fad18e3e18400ee62e5d5dda3438ab15;hpb=9ee8333445ef0abb65e95279e899dc0f98f27bd7

diff --git a/Makefile b/Makefile
index bf19056..08d1e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,14 @@
 -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 ?= vusolo2
+MACHINE ?= vuultimo
 
-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.
@@ -43,7 +43,7 @@ XSUM ?= md5sum
 
 BUILD_DIR = $(CURDIR)/build
 TOPDIR = $(BUILD_DIR)/$(MACHINE)
-DL_DIR = $(CURDIR)/sources
+DL_DIR = $(CURDIR)/resource/sources
 
 ifeq ($(MULTI_TEMPORARILY), YES)
 SSTATE_DIR = $(TOPDIR)/sstate-cache
@@ -63,7 +63,7 @@ BBLAYERS ?= \
 	$(CURDIR)/openembedded-core/meta
 
 CONFFILES = \
-	bitbake.env \
+	$(TOPDIR)/bitbake.env \
 	$(TOPDIR)/conf/bblayers.conf \
 	$(TOPDIR)/conf/local.conf
 
@@ -95,21 +95,21 @@ help:
 	@echo
 	@echo "  * Select a new target machine:"
 	@echo "      $$ echo MACHINE=vuultimo >> conf/make.conf"
-	@echo "    [Valid values: vusolo, bm750, vuuno, vuultimo, 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, 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
@@ -122,16 +122,6 @@ help:
 	@echo "Trouble finding a recipe? Try ./scripts/drepo grep 'search string'"
 	@echo "or ./scripts/drepo find -name \"*recipe*\"."
 	@echo
-	@if [ -z "$(GIT_USER_NAME)" -o -z "$(GIT_USER_EMAIL)" ]; then \
-		echo "Before doing any commits, please configure your name and email"; \
-		echo "address using the following commands:"; \
-		echo; \
-		echo "  $$ $(GIT) config user.name \"Your Name\""; \
-		echo "  $$ $(GIT) config user.email \"mail@example.com\""; \
-	else \
-		echo "Git has been configured for $(GIT_USER_NAME) <$(GIT_USER_EMAIL)>."; \
-		echo "Please submit patches to <enigma2-devel@lists.elitedvb.net>."; \
-	fi
 
 usage:
 	@echo "[*] Please run '$(MAKE) help' to display further information!"
@@ -156,11 +146,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...'
@@ -187,8 +177,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}' >> $@
 
@@ -225,6 +216,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"' >> $@
 
 BBLAYERS_CONF_HASH := $(call hash, \
 	'BBLAYERS_CONF_VERSION = "0"' \