From c2af7de627fefc711b2e62ef59033cf4a3cf3d52 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Mon, 27 Mar 2017 17:16:20 +0900 Subject: [PATCH] packaging: Remove unneeded script code This patch removes the unneeded script code in the pass.spec file and add the 'ExclusiveArch' defintion to build the pass only for both {arm} and aarch64 architecture. Change-Id: Id3cbb54b2fd4e18d9e909dbf54165ecbf2a7403d Suggested-by: Seung-Woo Kim Signed-off-by: Chanwoo Choi --- packaging/pass.spec | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/packaging/pass.spec b/packaging/pass.spec index 3e3f798..268f252 100644 --- a/packaging/pass.spec +++ b/packaging/pass.spec @@ -3,17 +3,6 @@ %define daemon_name pass %define hal_name pass-hal-devel -%if "%{?profile}" == "mobile" -%endif -%if "%{?profile}" == "wearable" -%endif -%if "%{?profile}" == "tv" -%endif -%if "%{?profile}" == "ivi" -%if "%{?_repository}" == "x86_64" -%endif -%endif - Name: %{daemon_name} Summary: Power Aware System Service Version: 0.0.1 @@ -24,6 +13,8 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest Source2: %{hal_name}.manifest +ExclusiveArch: %{arm} aarch64 + BuildRequires: cmake BuildRequires: libattr-devel BuildRequires: gettext-devel @@ -61,35 +52,10 @@ Header files required to build pass-hal packages for specific boards. %prep %setup -q -%if %{with emulator} - %define ARCH emulator -%else - %ifarch %{arm} aarch64 - %define ARCH arm - %else - %define ARCH x86 - %endif -%endif - -%ifarch %{arm} %ix86 - %define ARCH_BIT 32 -%else - %define ARCH_BIT 64 -%endif - -%if 0%{?tizen_build_devel_mode} == 1 -%define engineer_mode on -%else -%define engineer_mode off -%endif %cmake . \ -DTZ_SYS_ETC=%TZ_SYS_ETC \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DARCH=%{ARCH} \ - -DARCH_BIT=%{ARCH_BIT} \ - -DENGINEER_MODE=%{engineer_mode} \ - -DPROFILE=%{profile} \ #eol %build @@ -129,6 +95,7 @@ systemctl daemon-reload %{_unitdir}/sockets.target.wants/%{daemon_name}.socket %{_unitdir}/%{daemon_name}.service %{_unitdir}/%{daemon_name}.socket + %files -n %{hal_name} %defattr(-,root,root,-) %manifest %{hal_name}.manifest -- 2.7.4