Skip to content

[OPKG] consistent build flags #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[OPKG] consistent build flags #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package/wpe/wpeframework-netflix/wpeframework-netflix.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ WPEFRAMEWORK_NETFLIX_SITE = [email protected]:WebPlatformForEmbedded/WPEPluginNetfl
WPEFRAMEWORK_NETFLIX_INSTALL_STAGING = YES

# wpeframework-netflix binary package config
WPEFRAMEWORK_NETFLIX_OPKG_NAME = "wpeframework-netflix"
WPEFRAMEWORK_NETFLIX_OPKG_VERSION = "1.0.0"
WPEFRAMEWORK_NETFLIX_OPKG_ARCHITECTURE = "${BR2_ARCH}"
WPEFRAMEWORK_NETFLIX_OPKG_MAINTAINER = "Metrological"
WPEFRAMEWORK_NETFLIX_OPKG_DESCRIPTION = "WPEFramework Netflix plugin"
PLUGIN_NETFLIX_OPKG_NAME = "wpeframework-netflix"
PLUGIN_NETFLIX_OPKG_VERSION = "1.0.0"
PLUGIN_NETFLIX_OPKG_ARCHITECTURE = "${BR2_ARCH}"
PLUGIN_NETFLIX_OPKG_MAINTAINER = "Metrological"
PLUGIN_NETFLIX_OPKG_DESCRIPTION = "WPEFramework Netflix plugin"

WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DBUILD_REFERENCE=${WPEFRAMEWORK_NETFLIX_VERSION}

Expand Down Expand Up @@ -160,17 +160,17 @@ endif

ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)

WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DWPEFRAMEWORK_CREATE_IPKG_TARGETS=ON
WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DPLUGINS_CREATE_IPKG_TARGETS=ON

$(call SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA,WPEFRAMEWORK_NETFLIX)
WPEFRAMEWORK_NETFLIX_CONF_OPTS += ${WPEFRAMEWORK_NETFLIX_OPKG_CPACK_METADATA}
$(call SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA,PLUGIN_NETFLIX)
WPEFRAMEWORK_NETFLIX_CONF_OPTS += ${PLUGIN_NETFLIX_OPKG_CPACK_METADATA}

WPEFRAMEWORK_NETFLIX_POST_BUILD_HOOKS += SIMPLE_OPKG_TOOLS_MAKE_PACKAGE

define WPEFRAMEWORK_NETFLIX_INSTALL_TARGET_CMDS
@# install package
$(call SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE,\
${@D}/${WPEFRAMEWORK_NETFLIX_OPKG_NAME}_${WPEFRAMEWORK_NETFLIX_OPKG_VERSION}_${WPEFRAMEWORK_NETFLIX_OPKG_ARCHITECTURE}.deb)
${@D}/${PLUGIN_NETFLIX_OPKG_NAME}_${PLUGIN_NETFLIX_OPKG_VERSION}_${PLUGIN_NETFLIX_OPKG_ARCHITECTURE}.deb)
endef # WPEFRAMEWORK_NETFLIX_INSTALL_TARGET_CMDS

endif # ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
Expand Down
18 changes: 9 additions & 9 deletions package/wpe/wpeframework-plugins/wpeframework-plugins.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework wpeframework-interfaces wpeframework-clientlibraries libpng

# wpeframework-netflix binary package config
WPEFRAMEWORK_PLUGINS_OPKG_NAME = "wpeframework-plugins"
WPEFRAMEWORK_PLUGINS_OPKG_VERSION = "1.0.0"
WPEFRAMEWORK_PLUGINS_OPKG_ARCHITECTURE = "${BR2_ARCH}"
WPEFRAMEWORK_PLUGINS_OPKG_MAINTAINER = "Metrological"
WPEFRAMEWORK_PLUGINS_OPKG_DESCRIPTION = "WPEFramework plugins"
PLUGINS_OPKG_NAME = "wpeframework-plugins"
PLUGINS_OPKG_VERSION = "1.0.0"
PLUGINS_OPKG_ARCHITECTURE = "${BR2_ARCH}"
PLUGINS_OPKG_MAINTAINER = "Metrological"
PLUGINS_OPKG_DESCRIPTION = "WPEFramework plugins"

WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_REFERENCE=${WPEFRAMEWORK_PLUGINS_VERSION}

Expand Down Expand Up @@ -580,15 +580,15 @@ endif
endif

ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
$(call SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA,WPEFRAMEWORK_PLUGINS)
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DWPEFRAMEWORK_CREATE_IPKG_TARGETS=ON
WPEFRAMEWORK_PLUGINS_CONF_OPTS += ${WPEFRAMEWORK_PLUGINS_OPKG_CPACK_METADATA}
$(call SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA,PLUGINS)
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGINS_CREATE_IPKG_TARGETS=ON
WPEFRAMEWORK_PLUGINS_CONF_OPTS += ${PLUGINS_OPKG_CPACK_METADATA}

WPEFRAMEWORK_PLUGINS_POST_BUILD_HOOKS += SIMPLE_OPKG_TOOLS_MAKE_PACKAGE
WPEFRAMEWORK_PLUGINS_POST_INSTALL_TARGET_HOOKS += WPEFRAMEWORK_PLUGINS_INSTALL_IPKG_CMDS

define WPEFRAMEWORK_PLUGINS_INSTALL_IPKG_CMDS
$(eval PACKAGE_NAME_PREFIX := ${WPEFRAMEWORK_PLUGINS_OPKG_NAME}_${WPEFRAMEWORK_PLUGINS_OPKG_VERSION}_${WPEFRAMEWORK_PLUGINS_OPKG_ARCHITECTURE})
$(eval PACKAGE_NAME_PREFIX := ${PLUGINS_OPKG_NAME}_${PLUGINS_OPKG_VERSION}_${PLUGINS_OPKG_ARCHITECTURE})
$(call SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE,${@D}/${PACKAGE_NAME_PREFIX}-WPEFrameworkWebKitBrowser.deb)
$(call SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE,${@D}/${PACKAGE_NAME_PREFIX}-WPEInjectedBundle.deb)

Expand Down
28 changes: 23 additions & 5 deletions package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ WPEFRAMEWORK_RDKSERVICES_SITE = [email protected]:WebPlatformForEmbedded/ThunderNan
WPEFRAMEWORK_RDKSERVICES_INSTALL_STAGING = YES
WPEFRAMEWORK_RDKSERVICES_DEPENDENCIES = wpeframework wpeframework-interfaces wpeframework-clientlibraries

WPEFRAMEWORK_RDKSERVICES_OPKG_NAME = "wpeframework-rdkservices"
WPEFRAMEWORK_RDKSERVICES_OPKG_VERSION = "1.0.0"
WPEFRAMEWORK_RDKSERVICES_OPKG_ARCHITECTURE = "${BR2_ARCH}"
WPEFRAMEWORK_RDKSERVICES_OPKG_MAINTAINER = "Metrological"
WPEFRAMEWORK_RDKSERVICES_OPKG_DESCRIPTION = "WPEFramework rdkservices"
PLUGINS_RDKSERVICES_OPKG_NAME = "wpeframework-rdkservices"
PLUGINS_RDKSERVICES_OPKG_VERSION = "1.0.0"
PLUGINS_RDKSERVICES_OPKG_ARCHITECTURE = "${BR2_ARCH}"
PLUGINS_RDKSERVICES_OPKG_MAINTAINER = "Metrological"
PLUGINS_RDKSERVICES_OPKG_DESCRIPTION = "WPEFramework rdkservices"

WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DBUILD_REFERENCE=${WPEFRAMEWORK_RDKSERVICES_VERSION}

Expand Down Expand Up @@ -322,5 +322,23 @@ endif
endif
endif

ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
$(call SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA,PLUGINS_RDKSERVICES)
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGINS_CREATE_IPKG_TARGETS=ON
WPEFRAMEWORK_PLUGINS_CONF_OPTS += ${PLUGINS_RDKSERVICES_OPKG_CPACK_METADATA}

WPEFRAMEWORK_PLUGINS_POST_BUILD_HOOKS += SIMPLE_OPKG_TOOLS_MAKE_PACKAGE
WPEFRAMEWORK_PLUGINS_POST_INSTALL_TARGET_HOOKS += WPEFRAMEWORK_PLUGINS_INSTALL_IPKG_CMDS

define WPEFRAMEWORK_PLUGINS_INSTALL_IPKG_CMDS
$(eval PACKAGE_NAME_PREFIX := ${PLUGINS_RDKSERVICES_OPKG_NAME}_${PLUGINS_RDKSERVICES_OPKG_VERSION}_${PLUGINS_RDKSERVICES_OPKG_ARCHITECTURE})
$(call SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE,${@D}/${PACKAGE_NAME_PREFIX}-WPEFrameworkWebKitBrowser.deb)
$(call SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE,${@D}/${PACKAGE_NAME_PREFIX}-WPEInjectedBundle.deb)

$(call SIMPLE_OPKG_TOOLS_REMOVE_FROM_TARGET)
endef # WPEFRAMEWORK_PLUGINS_INSTALL_TARGET_CMDS

endif # ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)


$(eval $(cmake-package))