From 2bbdefaa904e3cc8eca9d97b3d29beebffb9164b Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 14 Aug 2018 23:38:40 -0500 Subject: [PATCH] obs: fix installation path for proxy and shim. Installation path was not the expected in SUSE. Signed-off-by: Jose Carlos Venegas Munoz --- obs-packaging/proxy/kata-proxy.spec-template | 6 +----- obs-packaging/shim/kata-shim.spec-template | 9 +++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/obs-packaging/proxy/kata-proxy.spec-template b/obs-packaging/proxy/kata-proxy.spec-template index 8986b47923..1b4b6560c2 100644 --- a/obs-packaging/proxy/kata-proxy.spec-template +++ b/obs-packaging/proxy/kata-proxy.spec-template @@ -6,11 +6,7 @@ %global IMPORTNAME %{DOMAIN}/%{ORG}/%{PROJECT} %global GO_VERSION @GO_VERSION@ -%if 0%{?suse_version} -%define LIBEXECDIR %{_libdir} -%else -%define LIBEXECDIR %{_libexecdir} -%endif +%define LIBEXECDIR /usr/libexec %undefine _missing_build_ids_terminate_build Name: kata-proxy diff --git a/obs-packaging/shim/kata-shim.spec-template b/obs-packaging/shim/kata-shim.spec-template index 4237d7a404..ae30e98b51 100644 --- a/obs-packaging/shim/kata-shim.spec-template +++ b/obs-packaging/shim/kata-shim.spec-template @@ -4,11 +4,7 @@ %global IMPORTNAME %{DOMAIN}/%{ORG}/%{PROJECT} %global GO_VERSION @GO_VERSION@ -%if 0%{?suse_version} -%define LIBEXECDIR %{_libdir} -%else -%define LIBEXECDIR %{_libexecdir} -%endif +%define LIBEXECDIR /usr/libexec %undefine _missing_build_ids_terminate_build Name: kata-shim @@ -77,5 +73,6 @@ make install LIBEXECDIR=%{buildroot}%{LIBEXECDIR} COMMIT=@HASH@ %files bin %defattr(-,root,root,-) -%{LIBEXECDIR}/kata-containers +%dir %{LIBEXECDIR} +%dir %{LIBEXECDIR}/kata-containers %{LIBEXECDIR}/kata-containers/kata-shim