fix v4.0.0-rc1 build

- got rid of machine-cni
- fixed install.systemd target

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-01-19 15:35:02 -05:00
parent 1139fcd46d
commit 94059da927

View File

@ -37,14 +37,6 @@
%global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84
%global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7})
# podman-machine-cni
%global repo_mcni %{name}-machine-cni
# https://github.com/containers/podman-machine-cni
%global import_path_mcni %{provider}.%{provider_tld}/%{project}/%{repo_mcni}
%global git_mcni https://%{import_path_mcni}
%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
# gvproxy # gvproxy
%global repo_gvproxy gvisor-tap-vsock %global repo_gvproxy gvisor-tap-vsock
# https://github.com/containers/gvisor-tap-vsock # https://github.com/containers/gvisor-tap-vsock
@ -74,8 +66,7 @@ URL: https://%{name}.io/
ExclusiveArch: %{golang_arches} ExclusiveArch: %{golang_arches}
Source0: %{git0}/archive/%{built_tag}.tar.gz Source0: %{git0}/archive/%{built_tag}.tar.gz
Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz
Source2: %{git_mcni}/archive/%{commit_mcni}/%{repo_mcni}-%{shortcommit_mcni}.tar.gz Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz
Source3: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz
Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
%if 0%{?fedora} && ! 0%{?rhel} %if 0%{?fedora} && ! 0%{?rhel}
BuildRequires: btrfs-progs-devel BuildRequires: btrfs-progs-devel
@ -422,15 +413,13 @@ dynamic port forwarding.
%prep %prep
%autosetup -Sgit -n %{name}-%{built_tag_strip} %autosetup -Sgit -n %{name}-%{built_tag_strip}
sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
# untar dnsname # untar dnsname
tar zxf %{SOURCE1} tar zxf %{SOURCE1}
# untar %%{name}-machine-cni
tar zxf %{SOURCE2}
# untar %%{name}-gvproxy # untar %%{name}-gvproxy
tar zxf %{SOURCE3} tar zxf %{SOURCE2}
%build %build
%set_build_flags %set_build_flags
@ -453,15 +442,18 @@ ln -s ../../../../ src/%{import_path}
popd popd
ln -s vendor src ln -s vendor src
# build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here?
LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
# build rootlessport first
%gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport
# build %%{name} # build %%{name}
export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh)" export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh)"
%if 0%{?fedora} >= 35 %if 0%{?fedora} >= 35
export BUILDTAGS+=" $(hack/libsubid_tag.sh)" export BUILDTAGS+=" $(hack/libsubid_tag.sh)"
%endif %endif
# build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here?
LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
%gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
# build %%{name}-remote # build %%{name}-remote
@ -479,17 +471,6 @@ export GOPATH=$(pwd)/_build:$(pwd)
%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname
popd popd
pushd %{repo_mcni}-%{commit_mcni}
mkdir _build
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
ln -s ../../../../ src/%{import_path_mcni}
popd
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
%gobuild -o bin/%{name}-machine %{import_path_mcni}/plugins/meta/%{name}-machine
popd
pushd %{repo_gvproxy}-%{commit_gvproxy} pushd %{repo_gvproxy}-%{commit_gvproxy}
mkdir _build mkdir _build
pushd _build pushd _build
@ -506,15 +487,13 @@ popd
%install %install
install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_unitdir}
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
install.bin-nobuild \ install.bin-nobuild \
install.man-nobuild \ install.man-nobuild \
install.systemd \ install.systemd \
install.completions \ install.completions \
install.docker \ install.docker \
install.docker-docs-nobuild \ install.docker-docs-nobuild \
%if 0%{?fedora} || 0%{?rhel} install.remote-nobuild \
install.remote-nobuild \
%endif
mv pkg/hooks/README.md pkg/hooks/README-hooks.md mv pkg/hooks/README.md pkg/hooks/README-hooks.md
@ -523,11 +502,6 @@ pushd %{repo_plugins}-%{commit_plugins}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
popd popd
# install machine-cni plugin
pushd %{repo_mcni}-%{commit_mcni}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
popd
# install gvproxy # install gvproxy
pushd %{repo_gvproxy}-%{commit_gvproxy} pushd %{repo_gvproxy}-%{commit_gvproxy}
install -dp %{buildroot}%{_libexecdir}/%{name} install -dp %{buildroot}%{_libexecdir}/%{name}
@ -613,23 +587,18 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%license LICENSE %license LICENSE
%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
%{_bindir}/%{name} %{_bindir}/%{name}
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/rootlessport
%{_datadir}/bash-completion/completions/%{name} %{_datadir}/bash-completion/completions/%{name}
# By "owning" the site-functions dir, we don't need to Require zsh # By "owning" the site-functions dir, we don't need to Require zsh
%dir %{_datadir}/zsh/site-functions %dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_%{name} %{_datadir}/zsh/site-functions/_%{name}
%dir %{_datadir}/fish/vendor_completions.d %dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/%{name}.fish %{_datadir}/fish/vendor_completions.d/%{name}.fish
%{_unitdir}/%{name}-auto-update.service %{_unitdir}/%{name}*
%{_unitdir}/%{name}-auto-update.timer %{_userunitdir}/%{name}*
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
%{_unitdir}/%{name}-restart.service
%{_userunitdir}/%{name}-auto-update.service
%{_userunitdir}/%{name}-auto-update.timer
%{_userunitdir}/%{name}.service
%{_userunitdir}/%{name}.socket
%{_userunitdir}/%{name}-restart.service
%{_usr}/lib/tmpfiles.d/%{name}.conf %{_usr}/lib/tmpfiles.d/%{name}.conf
%{_mandir}/man5/docker*.5.gz
%files docker %files docker
%{_bindir}/docker %{_bindir}/docker
@ -671,7 +640,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%doc %{repo_plugins}-%{commit_plugins}/{README.md,README_PODMAN.md} %doc %{repo_plugins}-%{commit_plugins}/{README.md,README_PODMAN.md}
%dir %{_libexecdir}/cni %dir %{_libexecdir}/cni
%{_libexecdir}/cni/dnsname %{_libexecdir}/cni/dnsname
%{_libexecdir}/cni/%{name}-machine
%files gvproxy %files gvproxy
%license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE %license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE