diff --git a/SOURCE b/SOURCE new file mode 100644 index 0000000000000000000000000000000000000000..077d20b6bf8ff94bcd01b36f728e407107e8d524 --- /dev/null +++ b/SOURCE @@ -0,0 +1 @@ +git clone -b openEuler-1.0 git@gitee.com:openeuler/kernel.git diff --git a/kernel.spec b/kernel.spec index f5d7354b81415be75a57fc8b4a2cecca19451c10..75be4d6b2dca19f39cfc14b3fcbd7f8187088a0b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,9 +12,9 @@ %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 @@ -24,14 +24,14 @@ Name: kernel Version: 4.19.90 -Release: %{hulkrelease}.0024 +Release: %{hulkrelease}.0025 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ %if 0%{?with_patch} Source0: linux-%{TarballVer}.tar.gz %else -Source0: linux-%{version}.tar.gz +Source0: linux-%{version}.tar.gz#/kernel.tar.gz %endif Source10: sign-modules Source11: x509.genkey @@ -215,6 +215,7 @@ fi cp -rl vanilla-%{TarballVer} linux-%{KernelVer} %else %setup -q -n kernel-%{version} -c +mv kernel linux-%{version} cp -rl linux-%{version} linux-%{KernelVer} %endif @@ -273,8 +274,8 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}/" Mak ## make linux make mrproper %{_smp_mflags} -make ARCH=%{Arch} euleros_defconfig -make ARCH=%{Arch} oldnoconfig +make ARCH=%{Arch} openeuler_defconfig +make ARCH=%{Arch} olddefconfig TargetImage=$(basename $(make -s image_name)) @@ -284,7 +285,8 @@ make ARCH=%{Arch} modules %{?_smp_mflags} %if 0%{?with_kabichk} chmod 0755 %{SOURCE18} 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 echo "**** NOTE: Cannot find reference Module.kabi file. ****" fi @@ -795,6 +797,9 @@ fi %endif %changelog +* Mon Jan 13 2020 luochunsheng - 4.19.90-vhulk1912.2.1.0025 +- update kernel code from https://gitee.com/openeuler/kernel/ + * Mon Jan 6 2020 zhanghailiang - 4.19.90-vhulk1912.2.1.0024 - support more than 256 vcpus for VM diff --git a/linux-4.19.90.tar.gz b/linux-4.19.90.tar.gz deleted file mode 100644 index d058b07dbf555c863bb21326a33f390168eb2802..0000000000000000000000000000000000000000 Binary files a/linux-4.19.90.tar.gz and /dev/null differ diff --git a/patches.tar.bz2 b/patches.tar.bz2 deleted file mode 100644 index d33a43763628759a50d4b7cc2de30f449094b4d5..0000000000000000000000000000000000000000 Binary files a/patches.tar.bz2 and /dev/null differ diff --git a/series.conf b/series.conf deleted file mode 100644 index 76ee6720ad36b2621f42453cf02f3f216e1a7b70..0000000000000000000000000000000000000000 --- a/series.conf +++ /dev/null @@ -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