diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-30 15:49:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 15:49:26 +0100 |
| commit | a35d002b722c9beb711796de4a62faf30d067387 (patch) | |
| tree | 8d85600990c53b23867409f25aaaf8715e5879ea /contrib/spec/podman.spec.in | |
| parent | 63b57f5147462bef19df842f9c92868f7bdaea8a (diff) | |
| parent | 2046be6ae04603a581d3caffb26fc970f43765a2 (diff) | |
| download | podman-a35d002b722c9beb711796de4a62faf30d067387.tar.gz podman-a35d002b722c9beb711796de4a62faf30d067387.tar.bz2 podman-a35d002b722c9beb711796de4a62faf30d067387.zip | |
Merge pull request #4376 from giuseppe/drop-ostree
build: drop support for ostree
Diffstat (limited to 'contrib/spec/podman.spec.in')
| -rw-r--r-- | contrib/spec/podman.spec.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index d5247f689..8e0cb9950 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -63,7 +63,6 @@ BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd-devel @@ -139,7 +138,6 @@ Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = v1.0.0 Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = 625e2322645b151a7cbb93a8b42920933e72167f Provides: bundled(golang(github.com/opencontainers/selinux)) = b6fa367ed7f534f9ba25391cc2d467085dbb445a Provides: bundled(golang(github.com/openshift/imagebuilder)) = master -Provides: bundled(golang(github.com/ostreedev/ostree-go)) = master Provides: bundled(golang(github.com/pkg/errors)) = v0.8.0 Provides: bundled(golang(github.com/pmezard/go-difflib)) = 792786c7400a136282c1664665ae0a8db921c6c2 Provides: bundled(golang(github.com/pquerna/ffjson)) = d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac @@ -383,7 +381,7 @@ mkdir -p src/%{provider}.%{provider_tld}/{containers,opencontainers} ln -s $(dirs +1 -l) src/%{import_path_conmon} popd -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" BUILDTAGS=$BUILDTAGS make popd |