Skip to content

Commit 50afb90

Browse files
author
Santhosh
committed
Fix Amazon library install paths
1 parent 77c15f1 commit 50afb90

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

package/amazon-ignition/Config.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ config BR2_PACKAGE_AMAZON_IGNITION
55
select BR2_PACKAGE_LIBPNG
66
select BR2_PACKAGE_WPEFRAMEWORK
77
select BR2_PACKAGE_WPEFRAMEWORK_VIRTUALINPUT
8+
select BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY
89
bool "amazon-ignition"
910
help
1011
Amazon project

package/amazon-ignition/amazon-ignition.mk

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,19 @@ define AMAZON_IGNITION_INSTALL_IGNITION
134134
@$(call MESSAGE,"Installing ignition to: $(call qstrip,$(1))")
135135
@$(INSTALL) -v -d -m 0755 $(call qstrip,$(1))/$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
136136

137-
rsync -av ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/ $(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
137+
$(INSTALL) -d $(1)/usr/lib
138+
$(INSTALL) -m 755 ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/lib/*.so $(1)/usr/lib
138139

139-
ln -sf "../../../lib/libamazon-backend.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)lib/libamazon-backend.so"
140+
rsync -av --exclude lib/ ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/ $(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
141+
$(INSTALL) -d $(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib
140142

141-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)lib/libignition.so" "$(call qstrip,$(1))/usr/lib/libignition.so"
142-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)lib/libprime-video-device-layer.so" "$(call qstrip,$(1))/usr/lib/libprime-video-device-layer.so"
143-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)lib/libamazon_playready.so" "$(call qstrip,$(1))/usr/lib/libamazon_playready.so"
144-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)lib/libamazon_player_mediapipeline.so" "$(call qstrip,$(1))/usr/lib/libamazon_player_mediapipeline.so"
145-
ln -sf "$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)lib/libamazon_player.so" "$(call qstrip,$(1))/usr/lib/libamazon_player.so"
143+
ln -sf "../../../lib/libignition.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libignition.so"
144+
ln -sf "../../../lib/libprime-video-device-layer.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libprime-video-device-layer.so"
145+
ln -sf "../../../lib/libamazon_playready.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_playready.so"
146+
ln -sf "../../../lib/libamazon_player_mediapipeline.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player_mediapipeline.so"
147+
ln -sf "../../../lib/libamazon_player.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player.so"
148+
149+
ln -sf "../../../lib/libamazon-backend.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon-backend.so"
146150
endef
147151

148152
define AMAZON_IGNITION_INSTALL_IGNITION_DEV

0 commit comments

Comments
 (0)