[gstreamer1.0-plugin-dvbmediasink] update srcrev.

[vuplus_openvuplus_3.0] / Makefile

diff --git a/Makefile b/Makefile
index 5812f37..0f5f4be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@
 # 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
@@ -29,7 +31,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 ?= vusolose
+MACHINE ?= vusolo4k
 
 MULTI_TEMPORARILY ?= YES
 
@@ -43,7 +45,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
@@ -56,13 +58,13 @@ 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 = \
@@ -89,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:"
@@ -219,6 +222,9 @@ $(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, \