https://bugzilla.redhat.com/show_bug.cgi?id=1909767
Eduardo Lima (Etrunko) <elima(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Flags| |needinfo?(dinechin(a)redhat.c
| |om)
--- Comment #5 from Eduardo Lima (Etrunko) <elima(a)redhat.com> ---
I have just pushed new versions of the spec file and srpm to the URL above.
Here is the link to the koji build.
https://koji.fedoraproject.org/koji/taskinfo?taskID=61314049
And if you want to check, the diff on the spec file:
diff --git a/kata-containers.spec b/kata-containers.spec
index f12b336..97243fd 100644
--- a/kata-containers.spec
+++ b/kata-containers.spec
@@ -1,8 +1,8 @@
# go-rpm-macros are not available on RHEL.
%if 0%{?fedora}
- %define have_go_rpm_macros 1
+ %global have_go_rpm_macros 1
%else
- %define have_go_rpm_macros 0
+ %global have_go_rpm_macros 0
%endif
%global with_debug 0
@@ -59,7 +59,7 @@ workload isolation and security advantages of VMs.
https://katacontainers.io/.}
Name: %{repo}
Release: 1%{?rcrel}%{?dist}
-Summary: Kata Containers version 2.x repository.
+Summary: Kata Containers version 2.x repository
License: ASL 2.0
Url: https://%{download}
Source0:
https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{?rcstr}.tar.gz
@@ -74,6 +74,7 @@ Source3: 15-dracut-rhel.conf
Patch0001: 0001-Add-vendor-code.patch
# Keep this patch downstream as it'd be hard to justify such change upstream
Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch
+Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch
%if 0%{?have_go_rpm_macros}
@@ -87,9 +88,10 @@ BuildRequires: git-core
BuildRequires: libselinux-devel
BuildRequires: make
BuildRequires: systemd
+BuildRequires: gcc
%{?systemd_requires}
-# %check requirements
+# %%check requirements
BuildRequires: dracut
BuildRequires: kernel
@@ -153,6 +155,7 @@ Conflicts: kata-runtime
Conflicts: kata-shim
# The following architectures lack the required qemu support
+# s390 fail to build:
https://github.com/kata-containers/kata-containers/issues/1204
ExcludeArch: %{arm} %{ix86} s390 s390x
@@ -166,11 +169,11 @@ ExcludeArch: %{arm} %{ix86} s390 s390x
# The machine type uses a modern default
# The kernel parameters workaround an issue with cgroupsv2 after kernel 5.3
# To-do: add BUILDFLAGS=gobuildflags when the macro becomes available
-%define qemu qemu-kvm
+%global qemu qemu-kvm
%if 0%{?fedora}
-%define qemupath %{_bindir}/%{qemu}
+%global qemupath %{_bindir}/%{qemu}
%else
-%define qemupath %{_libexecdir}/%{qemu}
+%global qemupath %{_libexecdir}/%{qemu}
%endif
# The machine type to be used is architecture specific:
@@ -179,16 +182,16 @@ ExcludeArch: %{arm} %{ix86} s390 s390x
# s390x: s390-ccw-virtio
# x86_64: q35
%ifarch aarch64
-%define machinetype "virt"
+%global machinetype "virt"
%endif
%ifarch ppc64le
-%define machinetype "pseries"
+%global machinetype "pseries"
%endif
%ifarch s390x
-%define machinetype "s390-ccw-virtio"
+%global machinetype "s390-ccw-virtio"
%endif
%ifarch x86_64
-%define machinetype "q35"
+%global machinetype "q35"
%endif
%global katadatadir %{_datadir}/kata-containers
@@ -252,8 +255,7 @@ export PATH=$PATH:$GOPATH/bin
cd go/src/%{importname}
-mkdir -p %{buildroot}%{katalibexecdir}
-cp -L VERSION %{buildroot}%{katalibexecdir}
+install -m 0644 -D -t %{buildroot}%{katalibexecdir} VERSION
pushd src/runtime
%make_install %{runtime_make_vars}
@@ -266,19 +268,22 @@ popd
pushd tools/osbuilder
rm .gitignore
rm rootfs-builder/.gitignore
-mkdir -p %{buildroot}%{kataosbuilderdir}
mkdir -p %{buildroot}%{katalocalstatecachedir}
-cp -aR nsdax %{buildroot}/%{kataosbuilderdir}
-cp -aR rootfs-builder %{buildroot}/%{kataosbuilderdir}
-cp -aR image-builder %{buildroot}/%{kataosbuilderdir}
-cp -aR initrd-builder %{buildroot}/%{kataosbuilderdir}
-cp -aR scripts %{buildroot}%{kataosbuilderdir}
-cp -aR dracut %{buildroot}%{kataosbuilderdir}
-cp -a %{SOURCE3} %{buildroot}%{kataosbuilderdir}/dracut/dracut.conf.d/
-cp -a %{SOURCE1} %{buildroot}%{kataosbuilderdir}
-chmod +x %{buildroot}/%{kataosbuilderdir}/scripts/lib.sh
-
-install -m 0644 -D -t %{buildroot}%{_unitdir}
%{_sourcedir}/kata-osbuilder-generate.service
+
+install -m 0644 -D -t %{buildroot}%{_unitdir} %{SOURCE2}
+install -m 0755 -D -t %{buildroot}%{kataosbuilderdir} nsdax
+install -m 0644 -D -t %{buildroot}%{kataosbuilderdir} %{SOURCE1}
+
+cp -aR rootfs-builder %{buildroot}%{kataosbuilderdir}
+cp -aR image-builder %{buildroot}%{kataosbuilderdir}
+cp -aR initrd-builder %{buildroot}%{kataosbuilderdir}
+cp -aR scripts %{buildroot}%{kataosbuilderdir}
+cp -aR dracut %{buildroot}%{kataosbuilderdir}
+
+rm -f %{buildroot}%{kataosbuilderdir}/image-builder/nsdax.gpl.c
+install -m 0644 -D -t %{buildroot}%{kataosbuilderdir}/dracut/dracut.conf.d/
%{SOURCE3}
+chmod +x %{buildroot}%{kataosbuilderdir}/scripts/lib.sh
+chmod +x %{buildroot}%{kataosbuilderdir}/kata-osbuilder.sh
popd
# Disable the image= option, so we use initrd= by default
@@ -317,7 +322,7 @@ if test -w %{katalocalstatecachedir}; then
TMPOUT="$(mktemp -t kata-rpm-post-XXXXXX.log)"
echo "Creating kata appliance initrd..."
- bash %{kataosbuilderdir}/kata-osbuilder.sh > ${TMPOUT} 2>&1
+ %{kataosbuilderdir}/kata-osbuilder.sh > ${TMPOUT} 2>&1
if test "$?" != "0" ; then
echo "Building failed. Here is the log details:"
cat ${TMPOUT}
@@ -363,7 +368,6 @@ fi
%exclude %{kataosbuilderdir}/rootfs-builder/template
%exclude %{kataosbuilderdir}/rootfs-builder/suse
%exclude %{kataosbuilderdir}/rootfs-builder/ubuntu
-%exclude %{kataosbuilderdir}/scripts/install-yq.sh
%changelog
--
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component