commit libcontainers-common for openSUSE:Factory
Hello community, here is the log from the commit of package libcontainers-common for openSUSE:Factory checked in at 2019-01-30 11:43:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old) and /work/SRC/openSUSE:Factory/.libcontainers-common.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcontainers-common" Wed Jan 30 11:43:13 2019 rev:9 rq:668672 version:20190125 Changes: -------- --- /work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes 2019-01-15 09:08:46.650657093 +0100 +++ /work/SRC/openSUSE:Factory/.libcontainers-common.new.28833/libcontainers-common.changes 2019-01-30 11:43:15.071830299 +0100 @@ -1,0 +2,22 @@ +Fri Jan 25 14:30:45 UTC 2019 - Richard Brown <rbrown@suse.com> + +- Upgrade to storage v1.8 + * Check for the OS when setting btrfs/libdm/ostree tags +- Upgrade to image v1.3 + * vendor: use github.com/klauspost/pgzip instead of compress/gzip + * vendor latest ostree +- Refactor specfile to use versioned tarballs +- Established package versioning scheme (ISODATE of change) +- Remove non-upstream storage.conf +- Set btrfs as default driver if /var/lib is on btrfs [boo#1123119] +- Version 20190125 + +------------------------------------------------------------------- +Thu Jan 17 14:20:49 UTC 2019 - Richard Brown <rbrown@suse.com> + +- Upgrade to storage v1.6 + * Remove private mount from zfs driver + * Update zfs driver to be closer to moby driver + * Use mount options when mounting the chown layer. + +------------------------------------------------------------------- Old: ---- image.tar.xz libpod.tar.xz storage.conf storage.tar.xz New: ---- image-1.3.tar.xz libpod-1.0.0.tar.xz storage-1.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcontainers-common.spec ++++++ --- /var/tmp/diff_new_pack.IMP0fs/_old 2019-01-30 11:43:16.263828918 +0100 +++ /var/tmp/diff_new_pack.IMP0fs/_new 2019-01-30 11:43:16.267828914 +0100 @@ -15,22 +15,29 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# libpodver - version from containers/libpod +%define libpodver 1.0.0 + +# storagever - version from containers/storage +%define storagever 1.8 + +# imagever - version from containers/image +%define imagever 1.3 Name: libcontainers-common -Version: 0.0.1 +Version: 20190125 Release: 0 Summary: Configuration files common to github.com/containers License: Apache-2.0 Group: System/Management URL: https://github.com/containers -Source0: image.tar.xz -Source1: storage.tar.xz +Source0: image-%{imagever}.tar.xz +Source1: storage-%{storagever}.tar.xz Source2: LICENSE Source3: policy.json -Source4: storage.conf Source5: mounts.conf Source6: registries.conf -Source7: libpod.tar.xz +Source7: libpod-%{libpodver}.tar.xz BuildRequires: go-go-md2man Provides: libcontainers-image Provides: libcontainers-storage @@ -43,9 +50,9 @@ github.com/containers libraries, such as Buildah, CRI-O, Podman and Skopeo. %prep -%setup -q -T -D -b 0 -n image -%setup -q -T -D -b 1 -n storage -%setup -q -T -D -b 7 -n storage +%setup -q -T -D -b 0 -n image-%{imagever} +%setup -q -T -D -b 1 -n storage-%{storagever} +%setup -q -T -D -b 7 -n libpod-%{libpodver} # copy the LICENSE file in the build root cd .. cp %{SOURCE2} . @@ -54,7 +61,7 @@ cd .. pwd # compile containers/image manpages -cd image +cd image-%{imagever} for md in docs/*.md do go-md2man -in $md -out $md @@ -63,7 +70,7 @@ rename '.md' '.1' docs/* cd .. # compile containers/storage manpages -cd storage +cd storage-%{storagever} for md in docs/*.5.md do go-md2man -in $md -out $md @@ -71,7 +78,7 @@ rename '.5.md' '.5' docs/* cd .. # compile subset of containers/libpod manpages -cd libpod +cd libpod-%{libpodver} go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5 cd .. @@ -83,18 +90,26 @@ install -d -m 0755 %{buildroot}/%{_sysconfdir}/containers/registries.d install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json -install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/containers/storage.conf +install -D -m 0644 storage-%{storagever}/storage.conf %{buildroot}/%{_sysconfdir}/containers/storage.conf install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf -install -D -m 0644 libpod/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json -install -D -m 0644 libpod/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json +install -D -m 0644 libpod-%{libpodver}/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json +install -D -m 0644 libpod-%{libpodver}/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json install -d %{buildroot}/%{_mandir}/man1 install -d %{buildroot}/%{_mandir}/man5 -install -D -m 0644 image/docs/*.1 %{buildroot}/%{_mandir}/man1/ -install -D -m 0644 storage/docs/*.5 %{buildroot}/%{_mandir}/man5/ -install -D -m 0644 libpod/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/ +install -D -m 0644 image-%{imagever}/docs/*.1 %{buildroot}/%{_mandir}/man1/ +install -D -m 0644 storage-%{storagever}/docs/*.5 %{buildroot}/%{_mandir}/man5/ +install -D -m 0644 libpod-%{libpodver}/pkg/hooks/docs/oci-hooks.5 %{buildroot}/%{_mandir}/man5/ + +%post +# If installing, check if /var/lib is btrfs and set it driver to "btrfs" if not +if [ $1 -eq 1 ] ; then + if [ "`findmnt -o FSTYPE -l --target /var/lib|grep -v FSTYPE`" = "btrfs" ]; then + sed -i 's/driver = ""/driver = "btrfs"/g' %{_sysconfdir}/containers/storage.conf + fi +fi %files %dir %{_sysconfdir}/containers
participants (1)
-
root