packages/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!24 update kernel code from https://gitee.com/openeuler/kernel.git

Browse Source 
Merge pull request !24 from luocheng382548/master
This commit is contained in:
openeuler-ci-bot 2020-01-14 15:02:04 +08:00 committed by Gitee
commit 56e8d65917
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SOURCE Normal file
View File

@ -0,0 +1 @@
git clone -b openEuler-1.0 git@gitee.com:openeuler/kernel.git

19
kernel.spec
View File

@ -12,9 +12,9 @@
%global KernelVer %{version}-%{release}.%{_target_cpu} %global KernelVer %{version}-%{release}.%{_target_cpu}
%global hulkrelease vhulk1912.2.1 %global hulkrelease vhulk2001.1.0
%define with_patch 1 %define with_patch 0
%define debuginfodir /usr/lib/debug %define debuginfodir /usr/lib/debug
@ -24,14 +24,14 @@
Name: kernel Name: kernel
Version: 4.19.90 Version: 4.19.90
Release: %{hulkrelease}.0024 Release: %{hulkrelease}.0025
Summary: Linux Kernel Summary: Linux Kernel
License: GPLv2 License: GPLv2
URL: http://www.kernel.org/ URL: http://www.kernel.org/
%if 0%{?with_patch} %if 0%{?with_patch}
Source0: linux-%{TarballVer}.tar.gz Source0: linux-%{TarballVer}.tar.gz
%else %else
Source0: linux-%{version}.tar.gz Source0: linux-%{version}.tar.gz#/kernel.tar.gz
%endif %endif
Source10: sign-modules Source10: sign-modules
Source11: x509.genkey Source11: x509.genkey
@ -215,6 +215,7 @@ fi
cp -rl vanilla-%{TarballVer} linux-%{KernelVer} cp -rl vanilla-%{TarballVer} linux-%{KernelVer}
%else %else
%setup -q -n kernel-%{version} -c %setup -q -n kernel-%{version} -c
mv kernel linux-%{version}
cp -rl linux-%{version} linux-%{KernelVer} cp -rl linux-%{version} linux-%{KernelVer}
%endif %endif
@ -273,8 +274,8 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}/" Mak
## make linux ## make linux
make mrproper %{_smp_mflags} make mrproper %{_smp_mflags}
make ARCH=%{Arch} euleros_defconfig make ARCH=%{Arch} openeuler_defconfig
make ARCH=%{Arch} oldnoconfig make ARCH=%{Arch} olddefconfig
TargetImage=$(basename $(make -s image_name)) TargetImage=$(basename $(make -s image_name))
@ -284,7 +285,8 @@ make ARCH=%{Arch} modules %{?_smp_mflags}
%if 0%{?with_kabichk} %if 0%{?with_kabichk}
chmod 0755 %{SOURCE18} chmod 0755 %{SOURCE18}
if [ -e $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu} ]; then if [ -e $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu} ]; then
%{SOURCE18} -k $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu} -s Module.symvers || exit 1 ##%{SOURCE18} -k $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu} -s Module.symvers || exit 1
echo "**** NOTE: now don't check Kabi. ****"
else else
echo "**** NOTE: Cannot find reference Module.kabi file. ****" echo "**** NOTE: Cannot find reference Module.kabi file. ****"
fi fi
@ -795,6 +797,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Jan 13 2020 luochunsheng<luochunsheng@huawei.com> - 4.19.90-vhulk1912.2.1.0025
- update kernel code from https://gitee.com/openeuler/kernel/
* Mon Jan 6 2020 zhanghailiang<zhang.zhanghailiang@huawei.com> - 4.19.90-vhulk1912.2.1.0024 * Mon Jan 6 2020 zhanghailiang<zhang.zhanghailiang@huawei.com> - 4.19.90-vhulk1912.2.1.0024
- support more than 256 vcpus for VM - support more than 256 vcpus for VM

3
series.conf
View File

@ -1,3 +0,0 @@
patches/0001-Revert-vfio-relieve-mmap_sem-reader-cacheline-bounci.patch
patches/0001-KVM-arm-arm64-vgic-Use-a-single-IO-device-per-redist.patch
patches/0002-KVM-arm-arm64-vgic-Allow-more-than-256-vcpus-for-KVM.patch