github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-01 17:52:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #225 from nitkon/master

Browse Source 
ppc64le: Fix linux-container OBS packaging
This commit is contained in:
James O. D. Hunt 2018-10-16 09:38:01 +01:00 committed by GitHub
commit 4ee1e26813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
obs-packaging/linux-container/kata-linux-container.spec-template
View File

@ -28,6 +28,7 @@ BuildRequires: elfutils-devel
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libelf-devel BuildRequires: libelf-devel
BuildRequires: fdupes
%endif %endif
%if 0%{?fedora} || 0%{?centos_version} %if 0%{?fedora} || 0%{?centos_version}
@ -51,7 +52,7 @@ BuildRequires: bison
The Linux kernel. The Linux kernel.
%package debug %package debug
Summary: Debug components for the kata-linux-container package. Summary: Debug components for the kata-linux-container package
Group: Default Group: Default
%description debug %description debug
@ -72,6 +73,10 @@ BuildKernel() {
Arch=%{_arch} Arch=%{_arch}
ExtraVer="-%{release}.container" ExtraVer="-%{release}.container"
%ifarch ppc64le
Arch=powerpc
%endif
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${ExtraVer}/" Makefile perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${ExtraVer}/" Makefile
make -s mrproper make -s mrproper
@ -101,9 +106,11 @@ InstallKernel() {
mkdir -p ${KernelDir} mkdir -p ${KernelDir}
%ifarch x86_64
cp $KernelImage ${KernelDir}/vmlinuz-$KernelVer cp $KernelImage ${KernelDir}/vmlinuz-$KernelVer
chmod 755 ${KernelDir}/vmlinuz-$KernelVer chmod 755 ${KernelDir}/vmlinuz-$KernelVer
ln -sf vmlinuz-$KernelVer ${KernelDir}/vmlinuz.container ln -sf vmlinuz-$KernelVer ${KernelDir}/vmlinuz.container
%endif
cp $KernelImageRaw ${KernelDir}/vmlinux-$KernelVer cp $KernelImageRaw ${KernelDir}/vmlinux-$KernelVer
chmod 755 ${KernelDir}/vmlinux-$KernelVer chmod 755 ${KernelDir}/vmlinux-$KernelVer
@ -116,16 +123,26 @@ InstallKernel() {
rm -f %{buildroot}/usr/lib/modules/$KernelVer/source rm -f %{buildroot}/usr/lib/modules/$KernelVer/source
} }
%ifarch ppc64le
InstallKernel $(realpath vmlinux) $(realpath vmlinux)
%else
InstallKernel arch/%{bzimage_arch}/boot/bzImage vmlinux InstallKernel arch/%{bzimage_arch}/boot/bzImage vmlinux
%endif
rm -rf %{buildroot}/usr/lib/firmware rm -rf %{buildroot}/usr/lib/firmware
%if 0%{?suse_version}
%fdupes -s %{buildroot}
%endif
%files %files
%dir /usr/share/kata-containers %dir /usr/share/kata-containers
/usr/share/kata-containers/vmlinux-%{kversion} /usr/share/kata-containers/vmlinux-%{kversion}
/usr/share/kata-containers/vmlinux.container /usr/share/kata-containers/vmlinux.container
%ifarch x86_64
/usr/share/kata-containers/vmlinuz-%{kversion} /usr/share/kata-containers/vmlinuz-%{kversion}
/usr/share/kata-containers/vmlinuz.container /usr/share/kata-containers/vmlinuz.container
%endif
%files debug %files debug
%defattr(-,root,root,-) %defattr(-,root,root,-)