From: hk57.kim Date: Fri, 30 Dec 2016 06:17:56 +0000 (+0900) Subject: [4.0] build error fix when tv/wearable profile for aarch64 and x86_64 X-Git-Tag: accepted/tizen/ivi/20170124.120519^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F107837%2F12;p=platform%2Fcore%2Fappfw%2Fsppc.git [4.0] build error fix when tv/wearable profile for aarch64 and x86_64 - This is for Tizen 4.0. - There are not ready for .so files of tv/wearable aarch64 and x86_64 - fix issue of having choice of .so files for "Unified" profile Change-Id: I24a5efaf7b3b35258adf7b1af0652b62fb099fec Signed-off-by: hk57.kim --- diff --git a/packaging/push.spec b/packaging/push.spec index 61432ef..19b77b2 100644 --- a/packaging/push.spec +++ b/packaging/push.spec @@ -20,6 +20,11 @@ Requires(post): /usr/bin/sqlite3 Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(libtzplatform-config) +# There are not ready for .so files of tv/wearable aarch64 and x86_64 +%if "%{?profile}" == "wearable" || "%{?profile}" == "tv" +ExcludeArch: aarch64 x86_64 +%endif + %if %{_support_weblog} BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(json-glib-1.0) @@ -34,7 +39,6 @@ Group: Application Framework/Libraries Requires: %{name}-bin = %{version}-%{release} Requires: libpush-compat = %{version}-%{release} Recommends: libpush-profile_common = %{version}-%{release} -Provides: libpush.so.0 %description -n libpush Push service client library @@ -206,12 +210,15 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/pushd.service install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/pushd.path %endif +%ifarch %{ix86} || %{arm} # This is for backward-compatibility. This does not deteriorate 4.0 Configurability # if wearable || tv || "undefined" %if "%{?profile}" != "mobile" && "%{?profile}" != "ivi" && "%{?profile}" != "common" %install_service multi-user.target.wants pushd.service %endif +%endif //%ifarch %{ix86} || %{arm} + mkdir -p %{buildroot}/usr/share/licenses/%{name} cp -f LICENSE %{buildroot}/usr/share/licenses/%{name} @@ -288,10 +295,7 @@ popd %ifarch aarch64 -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if mobile || ivi || common || "undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" -pushd aarch64/lib/ +pushd aarch64/lib64/ for FILE in libpush.so*; do cp -a "$FILE" "%{buildroot}%{_libdir}/$FILE"; done popd pushd aarch64/bin/ @@ -306,8 +310,6 @@ popd %endif %endif -%endif //%ifarch aarch64 - %ifarch %{ix86} # This is for backward-compatibility. This does not deteriorate 4.0 Configurability @@ -365,10 +367,6 @@ popd %ifarch x86_64 - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if mobile || ivi || common || "undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" pushd x86_64/lib64/ for FILE in libpush.so*; do cp -a "$FILE" "%{buildroot}%{_libdir}/$FILE"; done popd @@ -383,8 +381,6 @@ popd %endif %endif -%endif //%ifarch x86_64 - %post bin mkdir -p %{TZ_SYS_GLOBALUSER_DB} sqlite3 %{TZ_SYS_GLOBALUSER_DB}/.push.db "PRAGMA journal_mode = PERSIST; create table a(a); drop table a;" > /dev/null @@ -402,6 +398,8 @@ chsmack -a "*" %{TZ_SYS_GLOBALUSER_DB}/.push.db-journal ln -sf ../pushd.path %{_unitdir}/multi-user.target.wants/ %endif + +%ifarch %{ix86} || %{arm} # This is for backward-compatibility. This does not deteriorate 4.0 Configurability # if tv || "undefined" %if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "ivi" && "%{?profile}" != "common" @@ -446,9 +444,18 @@ popd %endif +%endif //%ifarch %{ix86} || %{arm} + %files -n libpush %manifest libpush.manifest +# This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# if mobile || ivi || common || "undefined" +%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" +%attr(755,root,root) %{_libdir}/libpush.so* +%exclude %{_libdir}/libpush.so*.tv +%exclude %{_libdir}/libpush.so*.wearable +%endif %files -n libpush-devel %{_includedir}/*.h @@ -472,10 +479,7 @@ popd %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" %files -n libpush-profile_common -%manifest libpush.manifest -%attr(755,root,root) %{_libdir}/libpush.so* -%exclude %{_libdir}/libpush.so*.tv -%exclude %{_libdir}/libpush.so*.wearable +# default .so files are housed in the main pkg. %files bin-profile_common %{_bindir}/pushd @@ -487,6 +491,7 @@ popd %endif +%ifarch %{ix86} || %{arm} # This is for backward-compatibility. This does not deteriorate 4.0 Configurability # if tv || "undefined" %if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "ivi" && "%{?profile}" != "common" @@ -523,6 +528,8 @@ popd %endif +%endif //%ifarch %{ix86} || %{arm} + %changelog * Sat Nov 3 2012 Jooseok Park - 0.2.26 - Prevent bug fixed(out-of bounds read, dead code,..)