Merge pull request #37 from thiagomacieira/make-opensuse-build

Make opensuse build
clearcontainers · Aug 7, 2017 · 59c3de5 · 59c3de5
2 parents 121c2ce + 83f5502
commit 59c3de5
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/kernel/linux-container.spec-template b/kernel/linux-container.spec-template
@@ -21,7 +21,11 @@ BuildRequires:  bc
 # For bfd support in perf/trace
 BuildRequires:  binutils-devel
 BuildRequires:  elfutils
+%if 0%{?rhel_version}
 BuildRequires:  elfutils-devel
+%else
+BuildRequires:  pkgconfig(libelf)
+%endif
 BuildRequires:  make >= 3.78
 BuildRequires:  openssl
 BuildRequires:  openssl-devel

diff --git a/proxy/cc-proxy.spec-template b/proxy/cc-proxy.spec-template
@@ -6,12 +6,19 @@
 %global IMPORTNAME %{DOMAIN}/%{ORG}/%{PROJECT}
 %global GO_VERSION @GO_VERSION@
 
+%if 0%{?suse_version}
+%define LIBEXECDIR %{_libdir}
+%else
+%define LIBEXECDIR %{_libexecdir}
+%endif
+
 %undefine _missing_build_ids_terminate_build
 Name:      cc-proxy
 Version:   @VERSION@
 Release:   0
 Source0:   %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pkgconfig(systemd)
 Summary  : No detailed summary available
 Group    : Development/Tools
 License  : Apache-2.0 GPL-2.0
@@ -60,22 +67,23 @@ export COMMIT=%{version}
 mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG}
 ln -s %{_builddir}/%{name}-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
 cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
-make
+make LIBEXECDIR=%{LIBEXECDIR}
 
 %check
 export http_proxy=http://127.0.0.1:9/
 export https_proxy=http://127.0.0.1:9/
 export no_proxy=localhost
 
 %install
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} LIBEXECDIR=%{LIBEXECDIR}
 
 %files
 %defattr(-,root,root,-)
 
 %files bin
 %defattr(-,root,root,-)
-/usr/libexec/clear-containers/cc-proxy
+%{LIBEXECDIR}/clear-containers
+%{LIBEXECDIR}/clear-containers/cc-proxy
 
 %files config
 %defattr(-,root,root,-)

diff --git a/qemu-lite/qemu-lite.spec b/qemu-lite/qemu-lite.spec
@@ -12,6 +12,7 @@ Requires: qemu-lite-data
 BuildRequires : automake
 BuildRequires : bison
 BuildRequires : flex
+BuildRequires : gcc-c++
 BuildRequires : glib2-devel
 BuildRequires : libattr-devel
 BuildRequires : libcap-devel
@@ -20,9 +21,13 @@ BuildRequires : libtool
 BuildRequires : libtool-ltdl-devel
 BuildRequires : libtool
 BuildRequires : m4
+%if 0%{?suse_version}
+BuildRequires : libnuma-devel
+%else
 BuildRequires : numactl-devel
+%endif
 BuildRequires : python-devel
-BuildRequires : zlib
+BuildRequires : zlib-devel
 BuildRequires : pkgconfig(pixman-1)
 Patch1: configure.patch
 

diff --git a/runtime/cc-runtime.spec-template b/runtime/cc-runtime.spec-template
@@ -89,8 +89,14 @@ make install DESTDIR=%{buildroot} PREFIX=/usr SYSCONFDIR=/etc LOCALSTATEDIR=/var
 %files bin
 %defattr(-,root,root,-)
 /usr/bin/cc-runtime
+/var/lib/clear-containers
+/var/lib/clear-containers/runtime
+/var/lib/clear-containers/runtime/bundles
+/var/lib/clear-containers/runtime/bundles/pause_bundle
+/var/lib/clear-containers/runtime/bundles/pause_bundle/bin
 /var/lib/clear-containers/runtime/bundles/pause_bundle/bin/pause
 
 %files config
 %defattr(-,root,root,-)
+/etc/clear-containers
 /etc/clear-containers/configuration.toml
diff --git a/shim/cc-shim.spec-template b/shim/cc-shim.spec-template
@@ -1,9 +1,17 @@
+%if 0%{?suse_version}
+%define LIBEXECDIR %{_libdir}
+%else
+%define LIBEXECDIR %{_libexecdir}
+%endif
+
 %undefine _missing_build_ids_terminate_build
 Name:      cc-shim
 Version:   @VERSION@
 Release:   0
 Source0:   %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: autoconf
+BuildRequires: automake
 Summary  : No detailed summary available
 Group    : Development/Tools
 License  : Apache-2.0 GPL-2.0
@@ -29,7 +37,7 @@ bin components for the cc-oci-shim package.
 %setup -q
 
 %build
-./autogen.sh
+./autogen.sh --libexecdir=%{LIBEXECDIR}/clear-containers
 make DESTDIR=%{buildroot}
 
 %check
@@ -45,4 +53,5 @@ make install DESTDIR=%{buildroot}
 
 %files bin
 %defattr(-,root,root,-)
-/usr/libexec/clear-containers/cc-shim
+%{LIBEXECDIR}/clear-containers
+%{LIBEXECDIR}/clear-containers/cc-shim