Merge pull request #97 from WebPlatformForEmbedded/agebicz/packager/4

Add possibility to generate DEBIAN 2.0 binary packages from the Buildroot

Makefile

@@ -377,6 +377,7 @@ unexport RUBYOPT
 
 include package/pkg-utils.mk
 include package/doc-asciidoc.mk
+include package/simple-opkg-tools.mk
 
 ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 

package/netflix/netflix.mk

@@ -13,6 +13,17 @@ NETFLIX_INSTALL_TARGET = YES
 NETFLIX_SUBDIR = netflix
 NETFLIX_RESOURCE_LOC = $(call qstrip,${BR2_PACKAGE_NETFLIX_RESOURCE_LOCATION})
 
+# netflix binary package config
+NETFLIX_OPKG_NAME = "netflix"
+NETFLIX_OPKG_VERSION = "1.0.0"
+NETFLIX_OPKG_ARCHITECTURE = "${BR2_ARCH}"
+NETFLIX_OPKG_DEPENDS = ""
+NETFLIX_OPKG_MAINTAINER = "Metrological"
+NETFLIX_OPKG_PRIORITY = "optional"
+NETFLIX_OPKG_SECTION = "graphics"
+NETFLIX_OPKG_SOURCE = ${NETFLIX_SITE}
+NETFLIX_OPKG_DESCRIPTION = "This is a description for the Netflix package"
+
 NETFLIX_CONF_OPTS = \
 	-DBUILD_DPI_DIRECTORY=$(@D)/partner/dpi \
 	-DCMAKE_INSTALL_PREFIX=$(@D)/release \
@@ -235,18 +246,48 @@ define NETFLIX_INSTALL_STAGING_CMDS
 		$(STAGING_DIR)/usr/include/netflix/nrdbase/tr1.h
 endef
 
-define NETFLIX_INSTALL_TARGET_CMDS
+define NETFLIX_INSTALL_TARGET_FILES
+	@# install files
+	$(INSTALL) -d $(TARGET_DIR)/usr/lib
 	$(INSTALL) -m 755 $(@D)/netflix/src/platform/gibbon/libnetflix.so $(TARGET_DIR)/usr/lib
-endef
+endef # NETFLIX_INSTALL_TARGET_FILES
 
-else
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
+
+NETFLIX_DEPENDENCIES += ${SIMPLE_OPKG_TOOLS_DEPENDENCIES}
+
+define NETFLIX_INSTALL_TARGET_CMDS
+	@# prepare package metadata
+	$(call SIMPLE_OPKG_TOOLS_INIT,NETFLIX,${@D})
+
+	@# set install target
+	$(call SIMPLE_OPKG_TOOLS_SET_TARGET,NETFLIX,${@D})
 
+	@# install target files
+	$(call NETFLIX_INSTALL_TARGET_FILES)
+
+	@# build package
+	$(call SIMPLE_OPKG_TOOLS_BUILD_PACKAGE,${@D})
+
+	@# install package
+	$(call SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE,${@D}/${NETFLIX_OPKG_NAME}_${NETFLIX_OPKG_VERSION}_${NETFLIX_OPKG_ARCHITECTURE}.ipk)
+
+	@# set previous TARGET_DIR
+	$(call SIMPLE_OPKG_TOOLS_UNSET_TARGET,NETFLIX)
+endef # NETFLIX_INSTALL_TARGET_CMDS
+else # ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
+define NETFLIX_INSTALL_TARGET_CMDS
+	@# install target files
+	$(call NETFLIX_INSTALL_TARGET_FILES)
+endef # NETFLIX_INSTALL_TARGET_CMDS
+endif # ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
+
+else # ($(BR2_PACKAGE_NETFLIX_LIB),y)
 define NETFLIX_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 $(@D)/netflix/src/platform/gibbon/netflix $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 $(@D)/netflix/src/platform/gibbon/manufss $(TARGET_DIR)/usr/bin
-endef
-
-endif
+endef # NETFLIX_INSTALL_TARGET_CMDS
+endif # ($(BR2_PACKAGE_NETFLIX_LIB),y)
 
 define NETFLIX_PREPARE_DPI
 	mkdir -p $(TARGET_DIR)/root/Netflix/dpi

package/simple-opkg-tools.mk

@@ -0,0 +1,127 @@
+# directory name that will hold temporary package generation files
+SIMPLE_OPKG_TOOLS_TEMP_FILENAME=package.tmp
+# directory where generated packages will be installed
+SIMPLE_OPKG_TOOLS_PKG_OUTPUT_DIR=${BASE_DIR}/ipkg
+# packages that needs to be built before
+SIMPLE_OPKG_TOOLS_DEPENDENCIES=host-opkg-utils
+
+define inner-sot-ensure-var-set
+	@# Checks whether given variable is set and strips it from quotes
+	$(if ${${1}},\
+	@echo "${1}=${${1}}",\
+	$(error "${1} not defined!")\
+	)
+
+	$(eval ${1} := $(call qstrip,${${1}}))
+endef # inner-sot-ensure-var-set
+
+define SIMPLE_OPKG_TOOLS_INIT
+	@# Creates necessary files and directories to build package
+	@# Input arguments:
+	@# 	1 - package name
+	@#	2 - workdir/destination
+
+	@# ensure that all REQUIRED fields are present
+	$(call inner-sot-ensure-var-set,${1}_OPKG_NAME)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_VERSION)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_DEPENDS)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_ARCHITECTURE)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_MAINTAINER)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_SOURCE)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_SECTION)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_PRIORITY)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_DESCRIPTION)
+
+	@# prepare necessary files
+	${INSTALL} -d ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}
+	$(RM) -r ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/*
+	${INSTALL} -d ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL
+
+	@# create fields in control file
+	@echo "Package: ${${1}_OPKG_NAME}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Version: ${${1}_OPKG_VERSION}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Depends: ${${1}_OPKG_DEPENDS}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Architecture: ${${1}_OPKG_ARCHITECTURE}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Maintainer: ${${1}_OPKG_MAINTAINER}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Section: ${${1}_OPKG_SECTION}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Source: ${${1}_OPKG_SOURCE}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Priority: ${${1}_OPKG_PRIORITY}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+	@echo "Description: ${${1}_OPKG_DESCRIPTION}" >> ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+endef # SIMPLE_OPKG_TOOLS_INIT
+
+define SIMPLE_OPKG_TOOLS_SET_CUSTOM_FIELD
+	@# Adds custom field to package control file
+	@# Input arguments:
+	@#	1 - workdir/destination
+	@#	2 - custom field key
+	@#	3 - custom field value
+	@echo "${2}: ${3}" >> ${1}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME}/CONTROL/control
+endef # SIMPLE_OPKG_TOOLS_SET_CUSTOM_FIELD
+
+define SIMPLE_OPKG_TOOLS_BUILD_PACKAGE
+	@# Builds package from already prepared directory
+	@# Input arguments:
+	@#	1 - package target directory
+	opkg-build ${1}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME} ${1}
+endef # SIMPLE_OPKG_TOOLS_BUILD_PACKAGE
+
+define SIMPLE_OPKG_TOOLS_SET_TARGET
+	@# Sets new target path to package temporary directory
+	@# Input arguments:
+	@#	1 - package name
+	@#	2 - new TARGET_DIR
+	$(eval ${1}_ORIGINAL_TARGET := ${TARGET_DIR})
+	$(eval TARGET_DIR := ${2}/${SIMPLE_OPKG_TOOLS_TEMP_FILENAME})
+	@echo "New TARGET_DIR=${TARGET_DIR}"
+endef # SIMPLE_OPKG_TOOLS_SET_TARGET
+
+define SIMPLE_OPKG_TOOLS_UNSET_TARGET
+	@# Reverts target path, set by SIMPLE_OPKG_TOOLS_SET_TARGET
+	@# Input arguments:
+	@#	1 - package name
+	$(eval TARGET_DIR := ${${1}_ORIGINAL_TARGET})
+	@echo "New TARGET_DIR=${TARGET_DIR}"
+endef # SIMPLE_OPKG_TOOLS_UNSET_TARGET
+
+define SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE
+	@# Installs built package in output path
+	@# Input arguments:
+	@#	1 - package path
+	${INSTALL} -d  ${SIMPLE_OPKG_TOOLS_PKG_OUTPUT_DIR}
+	${INSTALL} -m 755 ${1} ${SIMPLE_OPKG_TOOLS_PKG_OUTPUT_DIR}
+endef # SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE
+
+define SIMPLE_OPKG_TOOLS_MAKE_PACKAGE
+	@# Makes package from CPack generated makefile
+	${MAKE} package -C ${@D}
+endef # SIMPLE_OPKG_TOOLS_MAKE_PACKAGE
+
+define SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA
+	@# Creates CMake build parameters for CPack configuration
+	@# Input arguments:
+	@# 	1 - package name
+	$(call inner-sot-ensure-var-set,${1}_OPKG_NAME)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_VERSION)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_ARCHITECTURE)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_MAINTAINER)
+	$(call inner-sot-ensure-var-set,${1}_OPKG_DESCRIPTION)
+
+	$(eval ${1}_OPKG_CPACK_METADATA += -D${1}_OPKG_NAME="${${1}_OPKG_NAME}")
+	$(eval ${1}_OPKG_CPACK_METADATA += -D${1}_OPKG_VERSION="${${1}_OPKG_VERSION}")
+	$(eval ${1}_OPKG_CPACK_METADATA += -D${1}_OPKG_ARCHITECTURE="${${1}_OPKG_ARCHITECTURE}")
+	$(eval ${1}_OPKG_CPACK_METADATA += -D${1}_OPKG_MAINTAINER="${${1}_OPKG_MAINTAINER}")
+	$(eval ${1}_OPKG_CPACK_METADATA += -D${1}_OPKG_DESCRIPTION="${${1}_OPKG_DESCRIPTION}")
+	$(eval ${1}_OPKG_CPACK_METADATA += -D${1}_OPKG_FILE_NAME="${${1}_OPKG_NAME}_${${1}_OPKG_VERSION}_${${1}_OPKG_ARCHITECTURE}")
+endef # SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA
+
+define SIMPLE_OPKG_TOOLS_REMOVE_FROM_TARGET
+	@# Remove files installed by CMake in TARGET_DIR, that already belongs to the packages
+	@( \
+	for manifest in ${@D}/install_manifest_*; \
+	do \
+		echo "Removing file(s) included in $${manifest}..."; \
+		cat $${manifest} | xargs printf -- "$${TARGET_DIR}/%s\n"; \
+		cat $${manifest} | xargs printf -- "$${TARGET_DIR}/%s\n" | xargs rm; \
+	done \
+	)
+endef # SIMPLE_OPKG_TOOLS_REMOVE_FROM_TARGET

package/wpe/wpeframework-netflix/wpeframework-netflix.mk

@@ -20,6 +20,13 @@ WPEFRAMEWORK_NETFLIX_SITE_METHOD = git
 WPEFRAMEWORK_NETFLIX_SITE = [email protected]:WebPlatformForEmbedded/WPEPluginNetflix.git
 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"
+
 WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DBUILD_REFERENCE=${WPEFRAMEWORK_NETFLIX_VERSION}
 
 # TODO: Do not have WPEFRAMEWORK versioning yet
@@ -57,5 +64,22 @@ WPEFRAMEWORK_NETFLIX_DEPENDENCIES += gst1-libav
 endif
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
+
+WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DWPEFRAMEWORK_CREATE_IPKG_TARGETS=ON
+
+$(call SIMPLE_OPKG_TOOLS_CREATE_CPACK_METADATA,WPEFRAMEWORK_NETFLIX)
+WPEFRAMEWORK_NETFLIX_CONF_OPTS += ${WPEFRAMEWORK_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)
+endef # WPEFRAMEWORK_NETFLIX_INSTALL_TARGET_CMDS
+
+endif # ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
+
 $(eval $(cmake-package))
 

package/wpe/wpeframework-packager/wpeframework-packager.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_PACKAGER_VERSION = 8401322e9fa285373fef5e546fd4db00bed87cf4
+WPEFRAMEWORK_PACKAGER_VERSION = 1eb4b913a6c106be71cba84fc0e6cd62dfc3bb25
 WPEFRAMEWORK_PACKAGER_SITE_METHOD = git
 WPEFRAMEWORK_PACKAGER_SITE = [email protected]:WebPlatformForEmbedded/WPEPluginPackager.git
 WPEFRAMEWORK_PACKAGER_INSTALL_STAGING = YES

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

@@ -9,6 +9,13 @@ WPEFRAMEWORK_PLUGINS_SITE = $(call github,WebPlatformForEmbedded,WPEFrameworkPlu
 WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
 WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework 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"
+
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_REFERENCE=${WPEFRAMEWORK_PLUGINS_VERSION}
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DEBUG),y)
@@ -478,4 +485,22 @@ 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}
+
+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})
+    $(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))

package/wpe/wpeframework/Config.in

@@ -40,6 +40,14 @@ config BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_PRODUCTION
 
 endchoice
 
+config BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS
+	bool "create ipkg targets"
+	select BR2_PACKAGE_HOST_OPKG_UTILS
+	depends on BR2_PACKAGE_WPEFRAMEWORK_PACKAGER
+	help
+		Creates from configured targets, a DEBIAN 2.0 (ipk, opk, deb) packages. Configured packages will install theirs
+		staging file, but not target files on the root filesystem
+
 config BR2_PACKAGE_WPEFRAMEWORK_PORT
 	string "port"
 	default "80"

package/wpe/wpewebkit/wpewebkit.mk

@@ -27,6 +27,17 @@ WPEWEBKIT_USE_PORT=JSCOnly
 endif
 endif
 
+# wpewebkit binary package config
+WPEWEBKIT_OPKG_NAME = "wpewebkit"
+WPEWEBKIT_OPKG_VERSION = "0.0.20170728"
+WPEWEBKIT_OPKG_ARCHITECTURE = "${BR2_ARCH}"
+WPEWEBKIT_OPKG_DEPENDS = ""
+WPEWEBKIT_OPKG_MAINTAINER = "Metrological"
+WPEWEBKIT_OPKG_PRIORITY = "optional"
+WPEWEBKIT_OPKG_SECTION = "graphics"
+WPEWEBKIT_OPKG_SOURCE = "${WPEWEBKIT_SITE}"
+WPEWEBKIT_OPKG_DESCRIPTION = "This is a description for WPEWebKit package"
+
 WPEWEBKIT_DEPENDENCIES = host-bison host-cmake host-flex host-gperf host-ruby icu pcre
 
 ifeq ($(WPEWEBKIT_BUILD_WEBKIT),y)
@@ -270,6 +281,7 @@ endef
 
 ifeq ($(WPEWEBKIT_BUILD_JSC),y)
 define WPEWEBKIT_INSTALL_TARGET_CMDS_JSC
+	$(INSTALL) -d $(TARGET_DIR)/usr/bin/ && \
 	cp $(WPEWEBKIT_BUILDDIR)/bin/jsc $(TARGET_DIR)/usr/bin/ && \
 	$(STRIPCMD) $(TARGET_DIR)/usr/bin/jsc
 endef
@@ -279,20 +291,47 @@ endif
 
 ifeq ($(WPEWEBKIT_BUILD_WEBKIT),y)
 define WPEWEBKIT_INSTALL_TARGET_CMDS_WEBKIT
+	$(INSTALL) -d $(TARGET_DIR)/usr/bin/ && \
 	cp $(WPEWEBKIT_BUILDDIR)/bin/WPE{Network,Storage,Web}Process $(TARGET_DIR)/usr/bin/ && \
 	cp $(WPEWEBKIT_BUILDDIR)/bin/WPEWebDriver $(TARGET_DIR)/usr/bin/ && \
+	$(INSTALL) -d $(TARGET_DIR)/usr/lib/ && \
 	cp -d $(WPEWEBKIT_BUILDDIR)/lib/libWPE* $(TARGET_DIR)/usr/lib/ && \
 	$(STRIPCMD) $(TARGET_DIR)/usr/lib/libWPEWebKit*.so.*
 endef
 else
 WPEWEBKIT_INSTALL_TARGET_CMDS_WEBKIT = true
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
+
+WPEWEBKIT_DEPENDENCIES += ${SIMPLE_OPKG_TOOLS_DEPENDENCIES}
+
 define WPEWEBKIT_INSTALL_TARGET_CMDS
+	@# prepare package metadata
+	$(call SIMPLE_OPKG_TOOLS_INIT,WPEWEBKIT,${@D})
+
+	@# set install target
+	$(call SIMPLE_OPKG_TOOLS_SET_TARGET,WPEWEBKIT,${@D})
+
+	@# install target files
 	($(WPEWEBKIT_INSTALL_TARGET_CMDS_JSC) && \
 	$(WPEWEBKIT_INSTALL_TARGET_CMDS_WEBKIT))
-endef
 
+	@# build package
+	$(call SIMPLE_OPKG_TOOLS_BUILD_PACKAGE,${@D})
+
+	@# install package
+	$(call SIMPLE_OPKG_TOOLS_INSTALL_PACKAGE,${@D}/${WPEWEBKIT_OPKG_NAME}_${WPEWEBKIT_OPKG_VERSION}_${WPEWEBKIT_OPKG_ARCHITECTURE}.ipk)
+
+	@# set previous TARGET_DIR
+	$(call SIMPLE_OPKG_TOOLS_UNSET_TARGET,WPEWEBKIT)
+endef
+else # ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
+define WPEWEBKIT_INSTALL_TARGET_CMDS
+	($(WPEWEBKIT_INSTALL_TARGET_CMDS_JSC) && \
+	$(WPEWEBKIT_INSTALL_TARGET_CMDS_WEBKIT))
+endef
+endif # ($(BR2_PACKAGE_WPEFRAMEWORK_CREATE_IPKG_TARGETS),y)
 endif
 
 RSYNC_VCS_EXCLUSIONS += --exclude LayoutTests --exclude WebKitBuild