From 8a364b078483f0ed489aefb743e5855ff05025ea Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Mon, 15 Oct 2018 23:15:13 +0530 Subject: [PATCH] ppc64le: Fix linux-container OBS packaging Linux-container OBS packaging for ppc64le fails as the spec file is x86 specific for kernel build and install process. Fixes: #224 Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com --- .../kata-linux-container.spec-template | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/obs-packaging/linux-container/kata-linux-container.spec-template b/obs-packaging/linux-container/kata-linux-container.spec-template index 713eb6ef7..3da67f3fe 100644 --- a/obs-packaging/linux-container/kata-linux-container.spec-template +++ b/obs-packaging/linux-container/kata-linux-container.spec-template @@ -28,6 +28,7 @@ BuildRequires: elfutils-devel %if 0%{?suse_version} BuildRequires: libelf-devel +BuildRequires: fdupes %endif %if 0%{?fedora} || 0%{?centos_version} @@ -51,7 +52,7 @@ BuildRequires: bison The Linux kernel. %package debug -Summary: Debug components for the kata-linux-container package. +Summary: Debug components for the kata-linux-container package Group: Default %description debug @@ -72,6 +73,10 @@ BuildKernel() { Arch=%{_arch} ExtraVer="-%{release}.container" + %ifarch ppc64le + Arch=powerpc + %endif + perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${ExtraVer}/" Makefile make -s mrproper @@ -101,9 +106,11 @@ InstallKernel() { mkdir -p ${KernelDir} + %ifarch x86_64 cp $KernelImage ${KernelDir}/vmlinuz-$KernelVer chmod 755 ${KernelDir}/vmlinuz-$KernelVer ln -sf vmlinuz-$KernelVer ${KernelDir}/vmlinuz.container + %endif cp $KernelImageRaw ${KernelDir}/vmlinux-$KernelVer chmod 755 ${KernelDir}/vmlinux-$KernelVer @@ -116,16 +123,26 @@ InstallKernel() { rm -f %{buildroot}/usr/lib/modules/$KernelVer/source } +%ifarch ppc64le +InstallKernel $(realpath vmlinux) $(realpath vmlinux) +%else InstallKernel arch/%{bzimage_arch}/boot/bzImage vmlinux +%endif rm -rf %{buildroot}/usr/lib/firmware +%if 0%{?suse_version} +%fdupes -s %{buildroot} +%endif + %files %dir /usr/share/kata-containers /usr/share/kata-containers/vmlinux-%{kversion} /usr/share/kata-containers/vmlinux.container +%ifarch x86_64 /usr/share/kata-containers/vmlinuz-%{kversion} /usr/share/kata-containers/vmlinuz.container +%endif %files debug %defattr(-,root,root,-)