Fixed complict related to boot-animation

Change-Id: I010caf9f93523548c91c4339152c8e17a85c78fc

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 08f9d4bc9e182854070b967c644bce52184ce255..642f2fba08f4aadda3e848b34d585bea46095627 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -82,9 +82,15 @@ Source3502:  platform-preset-iot-headed-images.inc
 Source3503:    platform-preset-partitions.inc
 
 Source3800:    platform-preset-boards.inc
+%ifarch armv7l aarch64
 Source3801:    platform-preset-boards-rpi3.inc
+%endif
+%ifarch armv7l
 Source3802:    platform-preset-boards-artik530.inc
+%endif
+%ifarch i586 i686 x86_64
 Source3803: platform-preset-boards-emul.inc
+%endif
 
 # To get .ks files
 BuildRequires: image-configurations
@@ -403,9 +409,15 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE3503}}
 
 %{include_if_mainbuild %{SOURCE3800}}
+%ifarch armv7l aarch64
 %{include_if_mainbuild %{SOURCE3801}}
+%endif
+%ifarch armv7l
 %{include_if_mainbuild %{SOURCE3802}}
+%endif
+%ifarch i586 i686 x86_64
 %{include_if_mainbuild %{SOURCE3803}}
+%endif
 %package       mapping-files
 Summary:       Some mapping-files for building-blocks
 Requires:      sed

diff --git a/packaging/domain-features-bootanimation.inc b/packaging/domain-features-bootanimation.inc
index de560d98c06570465b803cd24beebc3bdb9251f8..31fe942b6849f85a0632e6218555ff0f0b688c8a 100644 (file)
--- a/packaging/domain-features-bootanimation.inc
+++ b/packaging/domain-features-bootanimation.inc
@@ -7,10 +7,13 @@
 %package sub1-domain_Feature-BootAni
 Summary:       Boot Animation packages
 Requires: boot-animation
+%ifarch armv7l aarch64
 Requires: boot-animation-sound-file-profile_common
+%endif
 %ifarch i586 i686 x86_64
 Requires: boot-animation-extension_emulator
 %endif
 %description sub1-domain_Feature-BootAni
 Tizen block (set of packages) for Boot Animation of Tizen
 %files sub1-domain_Feature-BootAni
+

diff --git a/packaging/platform-preset-boards.inc b/packaging/platform-preset-boards.inc
index a4a601fcb7b4ce378207958584710446223abf40..d28d74d3c7fd77f50c6c3c80fd998f3de4374c60 100644 (file)
--- a/packaging/platform-preset-boards.inc
+++ b/packaging/platform-preset-boards.inc
@@ -8,7 +8,9 @@ Suggests:       %{name}-sub1-Preset_boards-ARTIK530
 Suggests:      %{name}-sub1-Preset_boards-TM1
 Suggests:      %{name}-sub1-Preset_boards-TM2
 %endif
+%ifarch armv7l aarch64
 Suggests:      %{name}-sub1-Preset_boards-RPI3
+%endif
 %ifarch i586 i686 x86_64
 Suggests:      %{name}-sub1-Preset_boards-EMUL
 %endif