Skip to content

Commit ed55d18

Browse files
Cobalt: define config option to enable/disable thunder defined data path as the installation path for cobalt data (#472)
1 parent ca88486 commit ed55d18

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

package/cobalt/Config.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ config BR2_PACKAGE_COBALT_IMAGE_AS_LIB
1414
This option allows to create cobalt.so,
1515
default is cobalt bin
1616

17+
config BR2_PACKAGE_COBALT_USE_WPEFRAMEWORK_DATA_PATH
18+
bool "Use Thunder defined Data path"
19+
default y
20+
help
21+
This option allows to set thunder define data path
22+
for cobalt data installation
23+
1724
choice BR2_PACKAGE_COBALT_BUILD_TYPE
1825
prompt "Build type"
1926
default BR2_PACKAGE_COBALT_BUILD_TYPE_GOLD

package/cobalt/cobalt.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,23 @@ else
5656
export COBALT_EXECUTABLE_TYPE = executable
5757
endif
5858

59+
ifeq ($(BR2_PACKAGE_COBALT_USE_WPEFRAMEWORK_DATA_PATH), y)
5960
export COBALT_DATA_PATH = "$(subst ",,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)")/Cobalt"
6061
COBALT_DATA_INSTALL_PATH = $(TARGET_DIR)/$(COBALT_DATA_PATH)
62+
COBALT_DATA_SRC_PATH = content/data/*
63+
else
64+
COBALT_DATA_INSTALL_PATH = $(TARGET_DIR)/usr/share/
65+
COBALT_DATA_SRC_PATH = content
66+
endif
6167

6268
define COBALT_BUILD_CMDS
6369
$(@D)/src/cobalt/build/gyp_cobalt -C $(COBALT_BUILD_TYPE) $(COBALT_PLATFORM)
6470
$(HOST_DIR)/usr/bin/ninja -C $(@D)/src/out/$(COBALT_PLATFORM)_$(COBALT_BUILD_TYPE) cobalt_deploy
6571
endef
6672

6773
define COBALT_INSTALL_TARGET_CMDS
68-
cp -a $(@D)/src/out/$(COBALT_PLATFORM)_$(COBALT_BUILD_TYPE)/content/data/* $(COBALT_DATA_INSTALL_PATH)
74+
mkdir -p $(COBALT_DATA_INSTALL_PATH)
75+
cp -a $(@D)/src/out/$(COBALT_PLATFORM)_$(COBALT_BUILD_TYPE)/$(COBALT_DATA_SRC_PATH) $(COBALT_DATA_INSTALL_PATH)
6976
endef
7077

7178

0 commit comments

Comments
 (0)