Skip to content

Commit ad05199

Browse files
HaseenaSainulDivya-563
authored andcommitted
AmazonIgnition Library install path syncup with configured for WPEPluginAmazon (#482)
1 parent 98ecedb commit ad05199

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

package/amazon-ignition/amazon-ignition.mk

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ AMAZON_IGNITION_CONF_OPTS += \
9393
-DBUILD_SHARED_LIBRARY_LAUNCHER=ON
9494
endif
9595

96+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE),"")
97+
AMAZON_IGNITION_IG_INSTALL_PATH = $(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE)
98+
else
99+
AMAZON_IGNITION_IG_INSTALL_PATH = $(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
100+
endif
101+
96102
ifeq ($(BR2_PACKAGE_AMAZON_IGNITION_BUILD_TYPE_RELEASE),y)
97103
AMAZON_IGNITION_BUILD_TYPE = Release
98104
else ifeq ($(BR2_PACKAGE_AMAZON_IGNITION_BUILD_TYPE_RELEASE_DEBUG),y)
@@ -132,19 +138,19 @@ endef
132138

133139
define AMAZON_IGNITION_INSTALL_IGNITION
134140
@$(call MESSAGE,"Installing ignition to: $(call qstrip,$(TARGET_DIR))")
135-
@$(INSTALL) -v -d -m 0755 $(call qstrip,$(TARGET_DIR))/$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
141+
@$(INSTALL) -v -d -m 0755 $(call qstrip,$(TARGET_DIR))/$(AMAZON_IGNITION_IG_INSTALL_PATH)
136142

137-
rsync -av --exclude lib/ ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/ $(call qstrip,$(TARGET_DIR))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
143+
rsync -av --exclude lib/ ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/ $(call qstrip,$(TARGET_DIR))$(AMAZON_IGNITION_IG_INSTALL_PATH)
138144

139-
$(INSTALL) -d $(call qstrip,$(TARGET_DIR))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib
140-
$(INSTALL) -m 755 ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/lib/*.so $(call qstrip,$(TARGET_DIR))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib
145+
$(INSTALL) -d $(call qstrip,$(TARGET_DIR))$(AMAZON_IGNITION_IG_INSTALL_PATH)/lib
146+
$(INSTALL) -m 755 ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/lib/*.so $(call qstrip,$(TARGET_DIR))$(AMAZON_IGNITION_IG_INSTALL_PATH)/lib
141147

142148
$(INSTALL) -d $(TARGET_DIR)/usr/lib
143-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libignition.so" "$(TARGET_DIR)/usr/lib/libignition.so"
144-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player.so" "$(TARGET_DIR)/usr/lib/libamazon_player.so"
145-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_playready.so" "$(TARGET_DIR)/usr/lib/libamazon_playready.so"
146-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player_mediapipeline.so" "$(TARGET_DIR)/usr/lib/libamazon_player_mediapipeline.so"
147-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libprime-video-device-layer.so" "$(TARGET_DIR)/usr/lib/libprime-video-device-layer.so"
149+
ln -sf "$(AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libignition.so" "$(TARGET_DIR)/usr/lib/libignition.so"
150+
ln -sf "$(AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player.so" "$(TARGET_DIR)/usr/lib/libamazon_player.so"
151+
ln -sf "$(AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_playready.so" "$(TARGET_DIR)/usr/lib/libamazon_playready.so"
152+
ln -sf "$(AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player_mediapipeline.so" "$(TARGET_DIR)/usr/lib/libamazon_player_mediapipeline.so"
153+
ln -sf "$(AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libprime-video-device-layer.so" "$(TARGET_DIR)/usr/lib/libprime-video-device-layer.so"
148154
endef
149155

150156
define AMAZON_IGNITION_INSTALL_IGNITION_DEV

0 commit comments

Comments
 (0)