diff --git a/check-kabi b/check-kabi index 1dc05f2..db6c7e1 100644 --- a/check-kabi +++ b/check-kabi @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # check-kabi - Red Hat kABI reference checking tool # @@ -41,7 +41,7 @@ def load_symvers(symvers,filename): break if in_line == "\n": continue - checksum,symbol,directory,type = in_line.split() + checksum,symbol,directory,type,namespace = in_line.split('\t') symvers[symbol] = in_line[0:-1] @@ -56,7 +56,7 @@ def load_kabi(kabi,filename): break if in_line == "\n": continue - checksum,symbol,directory,type = in_line.split() + checksum,symbol,directory,type,namespace = in_line.split('\t') kabi[symbol] = in_line[0:-1] @@ -71,9 +71,9 @@ def check_kabi(symvers,kabi): losted_symbols=[] for symbol in kabi: - abi_hash,abi_sym,abi_dir,abi_type = kabi[symbol].split() + abi_hash,abi_sym,abi_dir,abi_type,abi_namespace = kabi[symbol].split('\t') if symbol in symvers: - sym_hash,sym_sym,sym_dir,sym_type = symvers[symbole].split() + sym_hash,sym_sym,sym_dir,sym_type,sym_namespace = symvers[symbol].split('\t') if abi_hash != sym_hash: fail=1 changed_symbols.append(symbol) diff --git a/kernel.spec b/kernel.spec index 0dcb5d5..0ee3964 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,5 +1,5 @@ %define with_signmodules 1 -%define with_kabichk 0 +%define with_kabichk 1 # Default without toolchain_clang %bcond_with toolchain_clang @@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_sublevel 0 %global devel_release 28 %global maintenance_release .0.0 -%global pkg_release .36 +%global pkg_release .37 %global openeuler_lts 1 %global openeuler_major 2403 @@ -609,7 +609,9 @@ popd install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KernelVer} install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KernelVer} +%if 0%{?with_kabichk} gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-%{KernelVer}.gz +%endif mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -m 755 %{SOURCE200} $RPM_BUILD_ROOT%{_sbindir}/mkgrub-menu-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh @@ -975,7 +977,9 @@ fi %ifarch aarch64 riscv64 /boot/dtb-* %endif +%if 0%{?with_kabichk} /boot/symvers-* +%endif /boot/System.map-* /boot/vmlinuz-* %ghost /boot/initramfs-%{KernelVer}.img @@ -1085,6 +1089,9 @@ fi %endif %changelog +* Thu Jun 13 2024 ZhangPeng - 6.6.0-28.0.0.37 +- Enable kabi check for src and change the check-kabi format to Python3 + * Thu Jun 6 2024 Mingzheng Xing - 6.6.0-28.0.0.36 - riscv-kernel patch update to 6.6.0-29.0.0 - Fix QEMU UEFI boot panic