projects
/
vuplus_openvuplus_3.0
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dvbapp] increase PR.
[vuplus_openvuplus_3.0]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
23c441e
..
efa07d5
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-19,6
+19,8
@@
# THE SOFTWARE.
#
# 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
# 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.
# 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 ?= vuu
ltimo
+MACHINE ?= vuu
no4k
MULTI_TEMPORARILY ?= YES
MULTI_TEMPORARILY ?= YES
@@
-43,7
+45,7
@@
XSUM ?= md5sum
BUILD_DIR = $(CURDIR)/build
TOPDIR = $(BUILD_DIR)/$(MACHINE)
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
ifeq ($(MULTI_TEMPORARILY), YES)
SSTATE_DIR = $(TOPDIR)/sstate-cache
@@
-56,10
+58,13
@@
DEPDIR = $(BUILD_DIR)/.deps
endif
BBLAYERS ?= \
endif
BBLAYERS ?= \
- $(CURDIR)/meta-bsp/$(MACHINE) \
- $(CURDIR)/meta-bsp/common \
+ $(CURDIR)/meta-bsp \
$(CURDIR)/meta-openvuplus \
$(CURDIR)/meta-openembedded/meta-oe \
$(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 = \
$(CURDIR)/openembedded-core/meta
CONFFILES = \
@@
-86,6
+91,7
@@
$(BBLAYERS):
[ -d $@ ] || $(MAKE) $(MFLAGS) update
init: $(BBLAYERS) $(CONFFILES)
[ -d $@ ] || $(MAKE) $(MFLAGS) update
init: $(BBLAYERS) $(CONFFILES)
+ @if [ ! -e $(CURDIR)/sources ]; then mkdir -p $(CURDIR)/sources; fi
help:
@echo "Your options:"
help:
@echo "Your options:"
@@
-216,7
+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)' >> $@
@echo 'USER_CLASSES = "buildstats"' >> $@
@echo 'include $(DISTRO_INCLUDE_CONF)' >> $@
@echo 'include $(MACHINE_INCLUDE_CONF)' >> $@
-# @echo 'INHERIT+="rm_work"' >> $@
+ @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"' \
BBLAYERS_CONF_HASH := $(call hash, \
'BBLAYERS_CONF_VERSION = "0"' \