Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v4.5] RPM: bump gvisor-tap-vsock subpackage and fix packit scripts #18735

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
2 changes: 1 addition & 1 deletion .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- fedora-all
actions:
pre-sync:
- "cd rpm && bash update-spec-provides.sh"
- "bash rpm/update-spec-provides.sh"

- job: koji_build
trigger: commit
Expand Down
98 changes: 0 additions & 98 deletions contrib/spec/python-podman.spec.in

This file was deleted.

5 changes: 4 additions & 1 deletion rpm/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
# https://github.com/containers/gvisor-tap-vsock
%global import_path_gvproxy %{provider}.%{provider_tld}/%{project}/%{repo_gvproxy}
%global git_gvproxy https://%{import_path_gvproxy}
%global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544

# podman
%global git0 https://github.com/containers/%{name}
Expand Down Expand Up @@ -313,6 +313,7 @@ cd ..
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
%gobuild -o bin/gvproxy %{import_path_gvproxy}/cmd/gvproxy
%gobuild -o bin/gvforwarder %{import_path_gvproxy}/cmd/vm
cd ..

%{__make} docs docker-docs
Expand Down Expand Up @@ -342,6 +343,7 @@ cd ..
cd %{repo_gvproxy}-%{commit_gvproxy}
install -dp %{buildroot}%{_libexecdir}/%{name}
install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name}
install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/%{name}
cd ..

# do not include docker and podman-remote man pages in main package
Expand Down Expand Up @@ -410,6 +412,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%doc %{repo_gvproxy}-%{commit_gvproxy}/README.md
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/gvproxy
%{_libexecdir}/%{name}/gvforwarder

%changelog
%if %{with changelog}
Expand Down
3 changes: 2 additions & 1 deletion rpm/update-spec-provides.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

set -e

SPEC_FILE=$(pwd)/podman.spec
# script is run from git root directory
SPEC_FILE=rpm/podman.spec

sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE

Expand Down
4 changes: 3 additions & 1 deletion rpm/update-spec-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

set -e

SPEC_FILE=$(pwd)/podman.spec
# Script is run from git root directory
SPEC_FILE=rpm/podman.spec

LATEST_TAG=$(git tag --sort=creatordate | tail -1)
LATEST_VERSION=$(echo $LATEST_TAG | sed -e 's/^v//')

Expand Down