Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Make opensuse build #37

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions kernel/linux-container.spec-template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 11 additions & 3 deletions proxy/cc-proxy.spec-template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,-)
Expand Down
7 changes: 6 additions & 1 deletion qemu-lite/qemu-lite.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
6 changes: 6 additions & 0 deletions runtime/cc-runtime.spec-template
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 11 additions & 2 deletions shim/cc-shim.spec-template
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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