Skip to content

Commit 91f0b79

Browse files
bramoosterhuisbramoosterhuis
committed
[amazon] Update instalation
1 parent e181849 commit 91f0b79

File tree

1 file changed

+38
-32
lines changed

1 file changed

+38
-32
lines changed

‎package/amazon/amazon.mk‎

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,6 @@ define AMAZON_BUILD_DPC_DPP
148148
$(call AMAZON_MAKE, dpc, BUILD_TYPE=$(AMAZON_BUILD_TYPE))
149149
endef
150150

151-
ifeq ($(AMAZON_BUILD_TYPE),testing)
152-
define AMAZON_INSTALL_TESTS
153-
$(INSTALL) -v -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
154-
$(INSTALL) -v -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.so $(1)/usr/lib
155-
$(INSTALL) -v -m 750 -D $(@D)/build/devicepropertiesprovider/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
156-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CoreUnitTests/CoreUnitTests $(1)/usr/bin
157-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CryptoUnitTests/CryptoUnitTests $(1)/usr/bin
158-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/HawaiiUnitTests/HawaiiUnitTests $(1)/usr/bin
159-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/NetworkUnitTests/NetworkUnitTests $(1)/usr/bin
160-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerFrontendUnitTests/VideoPlayerFrontendUnitTests $(1)/usr/bin
161-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerMediaPipelineBackendUnitTests/VideoPlayerMediaPipelineBackendUnitTests $(1)/usr/bin
162-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerUnitTests/VideoPlayerUnitTests $(1)/usr/bin
163-
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/XmlUnitTests/XmlUnitTests $(1)/usr/bin
164-
endef
165-
endif
166-
167151
################################################################################
168152
# Ruby
169153
################################################################################
@@ -180,29 +164,30 @@ define AMAZON_BUILD_RUBY
180164
endef
181165

182166
define AMAZON_INSTALL_RUBY
167+
$(INSTALL) -v -d -m 0755 $(1)/usr/lib
183168
$(INSTALL) -v -m 750 -D $(@D)/install/$(BR2_PACKAGE_AMAZON_PLATFORM_NAME)/bin/*.so $(1)/usr/lib
184169
endef
185170

186171
define AMAZON_INSTALL_RUBY_DEV
187172
$(call AMAZON_INSTALL_RUBY, ${STAGING_DIR})
188173

189174
$(INSTALL) -v -d -m 0755 $(STAGING_DIR)/usr/include/amazon
190-
cp -av $(@D)/ruby/amp/libs/Network/Network/include/* $(STAGING_DIR)/usr/include/amazon
191-
cp -av $(@D)/ruby/amp/libs/Gfx/Gfx/include/* $(STAGING_DIR)/usr/include/amazon
192-
cp -av $(@D)/ruby/amp/libs/Crypto/Crypto/include/* $(STAGING_DIR)/usr/include/amazon
193-
cp -av $(@D)/ruby/amp/libs/BareClient/BareClient/include/* $(STAGING_DIR)/usr/include/amazon
194-
cp -av $(@D)/ruby/amp/libs/Pad/Pad/include/* $(STAGING_DIR)/usr/include/amazon
195-
cp -av $(@D)/ruby/amp/libs/Hawaii/HawaiiBindings/include/* $(STAGING_DIR)/usr/include/amazon
196-
cp -av $(@D)/ruby/amp/libs/Hawaii/Hawaii/include/* $(STAGING_DIR)/usr/include/amazon
197-
cp -av $(@D)/ruby/amp/libs/Xml/Xml/include/* $(STAGING_DIR)/usr/include/amazon
198-
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackendCommon/include/* $(STAGING_DIR)/usr/include/amazon
199-
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFakeBackend/include/* $(STAGING_DIR)/usr/include/amazon
200-
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerMediaPipelineBackend/include/* $(STAGING_DIR)/usr/include/amazon
201-
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFrontend/include/* $(STAGING_DIR)/usr/include/amazon
202-
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerApp/include/* $(STAGING_DIR)/usr/include/amazon
203-
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackend/include/* $(STAGING_DIR)/usr/include/amazon
204-
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayer/include/* $(STAGING_DIR)/usr/include/amazon
205-
cp -av $(@D)/ruby/amp/libs/Core/Core/include/* $(STAGING_DIR)/usr/include/amazon
175+
cp -a $(@D)/ruby/amp/libs/Network/Network/include/* $(STAGING_DIR)/usr/include/amazon
176+
cp -a $(@D)/ruby/amp/libs/Gfx/Gfx/include/* $(STAGING_DIR)/usr/include/amazon
177+
cp -a $(@D)/ruby/amp/libs/Crypto/Crypto/include/* $(STAGING_DIR)/usr/include/amazon
178+
cp -a $(@D)/ruby/amp/libs/BareClient/BareClient/include/* $(STAGING_DIR)/usr/include/amazon
179+
cp -a $(@D)/ruby/amp/libs/Pad/Pad/include/* $(STAGING_DIR)/usr/include/amazon
180+
cp -a $(@D)/ruby/amp/libs/Hawaii/HawaiiBindings/include/* $(STAGING_DIR)/usr/include/amazon
181+
cp -a $(@D)/ruby/amp/libs/Hawaii/Hawaii/include/* $(STAGING_DIR)/usr/include/amazon
182+
cp -a $(@D)/ruby/amp/libs/Xml/Xml/include/* $(STAGING_DIR)/usr/include/amazon
183+
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackendCommon/include/* $(STAGING_DIR)/usr/include/amazon
184+
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFakeBackend/include/* $(STAGING_DIR)/usr/include/amazon
185+
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerMediaPipelineBackend/include/* $(STAGING_DIR)/usr/include/amazon
186+
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFrontend/include/* $(STAGING_DIR)/usr/include/amazon
187+
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerApp/include/* $(STAGING_DIR)/usr/include/amazon
188+
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackend/include/* $(STAGING_DIR)/usr/include/amazon
189+
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayer/include/* $(STAGING_DIR)/usr/include/amazon
190+
cp -a $(@D)/ruby/amp/libs/Core/Core/include/* $(STAGING_DIR)/usr/include/amazon
206191
endef
207192

208193
################################################################################
@@ -235,6 +220,27 @@ ifeq ($(BR2_PACKAGE_AMAZON_INCLUDE_IGNITION),y)
235220
endef
236221
endif
237222

223+
224+
################################################################################
225+
# Tests
226+
################################################################################
227+
ifeq ($(AMAZON_BUILD_TYPE),testing)
228+
define AMAZON_INSTALL_TESTS
229+
$(INSTALL) -d -m 0755 $(1)/usr/bin
230+
$(INSTALL) -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
231+
$(INSTALL) -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.so $(1)/usr/lib
232+
$(INSTALL) -m 750 -D $(@D)/build/devicepropertiesprovider/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
233+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CoreUnitTests/CoreUnitTests $(1)/usr/bin
234+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CryptoUnitTests/CryptoUnitTests $(1)/usr/bin
235+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/HawaiiUnitTests/HawaiiUnitTests $(1)/usr/bin
236+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/NetworkUnitTests/NetworkUnitTests $(1)/usr/bin
237+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerFrontendUnitTests/VideoPlayerFrontendUnitTests $(1)/usr/bin
238+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerMediaPipelineBackendUnitTests/VideoPlayerMediaPipelineBackendUnitTests $(1)/usr/bin
239+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerUnitTests/VideoPlayerUnitTests $(1)/usr/bin
240+
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/XmlUnitTests/XmlUnitTests $(1)/usr/bin
241+
endef
242+
endif
243+
238244
################################################################################
239245
# Generic buildroot
240246
################################################################################

0 commit comments

Comments
 (0)