diff --git a/.gitignore b/.gitignore index 7003999..f938e7f 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,5 @@ /libpod-6b4ab2a.tar.gz /cri-o-0acf849.tar.gz /cri-o-acc0ee7.tar.gz +/cri-o-4e7f71b.tar.gz +/libpod-f38eb4f.tar.gz diff --git a/f27.patch b/f27.patch new file mode 100644 index 0000000..c4234c9 --- /dev/null +++ b/f27.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index bbd00e4..477890a 100644 +--- a/Makefile ++++ b/Makefile +@@ -236,8 +236,6 @@ install.docker: docker-docs + install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1 + + install.systemd: +- install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.socket ${SYSTEMDDIR}/io.podman.socket +- install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.service ${SYSTEMDDIR}/io.podman.service + install ${SELINUXOPT} -m 644 -D contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf + + install.python: +diff --git a/libpod.conf b/libpod.conf +index cef5a12..3a363e2 100644 +--- a/libpod.conf ++++ b/libpod.conf +@@ -30,7 +30,7 @@ conmon_env_vars = [ + ] + + # CGroup Manager - valid values are "systemd" and "cgroupfs" +-cgroup_manager = "systemd" ++cgroup_manager = "cgroupfs" + + # Directory for persistent libpod files (database, etc) + # By default, this will be configured relative to where containers/storage diff --git a/podman.spec b/podman.spec index 64727bc..7e7a3e7 100644 --- a/podman.spec +++ b/podman.spec @@ -23,12 +23,6 @@ # Generate unit-test rpm %global with_unit_test 0 -%if 0%{?fedora} >= 28 -%bcond_without varlink -%else -%bcond_with varlink -%endif - %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 @@ -48,23 +42,23 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 6b4ab2a2b49af2ffacadcf6b8202a4fe3a89a1cf +%global commit f38eb4fe50427549db8957e5033b73f04b4d5c82 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o %global git_conmon https://%{import_path_conmon} -%global commit_conmon 0acf849406a02620e13376c4f0902e02e775c21e +%global commit_conmon 4e7f71b714932dafc6a70e9b6dc09112da478be1 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.8.1 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.8.2.1 +Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} Source0: %{git_podman}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz -Patch0: makefile.patch +Patch0: f27.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} @@ -200,20 +194,6 @@ Provides: bundled(golang(gopkg.in/yaml.v2)) = v2 libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. -%if %{with varlink} -%package -n python3-%{name} -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-varlink -Requires: python3-varlink -Provides: python3-%{name} = %{version}-%{release} -Summary: Python 3 bindings for %{name} - -%description -n python3-%{name} -This package contains Python 3 bindings for %{name}. -%endif # varlink - %if 0%{?with_devel} %package -n libpod-devel Summary: Library for applications looking to use Container Pods @@ -390,17 +370,9 @@ ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" -GOPATH=$GOPATH go generate ./cmd/podman/varlink/... GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} BUILDTAGS=$BUILDTAGS make binaries docs -%if %{with varlink} -#untar contents for python-podman -pushd contrib/python/dist -tar zxf %{name}*.tar.gz -popd -%endif # varlink - # build conmon pushd cri-o-%{commit_conmon} @@ -418,14 +390,12 @@ popd %install install -dp %{buildroot}%{_unitdir} -%make_install PREFIX=%{buildroot}%{_prefix} install install.completions - -%if %{with varlink} -#install python-podman -pushd contrib/python -%{__python3} setup.py install --root %{buildroot} -popd -%endif # varlink +%{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ + install.bin \ + install.man \ + install.cni \ + install.systemd \ + install.completions \ # install libpod.conf install -dp %{buildroot}%{_datadir}/containers @@ -512,18 +482,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf -%{_unitdir}/io.%{project}.%{name}.service -%{_unitdir}/io.%{project}.%{name}.socket /usr/lib/tmpfiles.d/podman.conf -%if %{with varlink} -%files -n python3-%{name} -%license LICENSE -%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md -%dir %{python3_sitelib} -%{python3_sitelib}/* -%endif # varlink - %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE @@ -538,6 +498,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Aug 11 2018 Dan Walsh - 0.8.2.1-1.git7a526bb +- Upstream 0.8.2.1 release + * Mon Aug 06 2018 baude - 0.8.1-2.git6b4ab2a - Revert conmon commit as it was causing failures on F27 diff --git a/sources b/sources index fe45e54..98fd7b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ SHA512 (cri-o-0acf849.tar.gz) = 37eac432a1bc8786ff0ee6c20d04cb739c9b745d8140fdcdeac44d5da5c6cc096784aea35b6f18fcbda3e5d960540f395679f79a70b174304382a0c5dae961fb SHA512 (libpod-6b4ab2a.tar.gz) = 5ba35bdab6507f60c03e59a32a9ffcd49773ce30ffb7c60a4e3205d8ef50c03c8c231fd6804077180da191eac9e0c3865bc895a07e0bba59cab9a59f9988c7a2 +SHA512 (cri-o-4e7f71b.tar.gz) = 268d098b1312132f27164d4c07101edf8bbde97c5b65a13f254cd2b4868cb9ff0102a6e63af1a2dc8d91696d3b49f2da62b94414d59ab8f6107b04faf6b5a35d +SHA512 (libpod-f38eb4f.tar.gz) = d3df28f8284aa1c34ea14c650848b264226b5ad4dc8a1694ee984a34a562e4784c07fdb8bc2b131f4fcc05078977bdcbbd19a5d1b883735474e138655a65c742