Skip to content

Keep containerd's rpmbuild.env if it exists. #524

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.

Sign up for GitHub

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

Open
Romain-Geissler-1A wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −0
Open

Keep containerd's rpmbuild.env if it exists. #524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions pkg/containerd/rpm/containerd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,15 @@ low-level storage and network attachments, etc.


%prep
# Recent rpm distribution create an rpmbuild.env file as part of the build
# setup, which is needed for other recipes, so keep it while we totally
# destroy the existing build directory.
if [ -e %{_builddir}/rpmbuild.env ]; then
cp -a %{_builddir}/rpmbuild.env /go/src/%{import_path}/rpmbuild.env
fi

rm -rf %{_builddir}

if [ ! -d %{_sourcedir}/containerd ]; then
# Copy over our source code from our gopath to our source directory
cp -rf /go/src/%{import_path} %{_sourcedir}/containerd;
Expand Down
Loading