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

openEuler-24.03-LTS update check-kabi format

Browse Source 
Enable kabi check for src and change the check-kabi format to Python3

Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
This commit is contained in:
ZhangPeng 2024-06-13 09:58:03 +08:00
parent fcce3bebd8
commit 767110ae26
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
check-kabi
View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
# #
# check-kabi - Red Hat kABI reference checking tool # check-kabi - Red Hat kABI reference checking tool
# #
@ -41,7 +41,7 @@ def load_symvers(symvers,filename):
break break
if in_line == "\n": if in_line == "\n":
continue continue
checksum,symbol,directory,type = in_line.split() checksum,symbol,directory,type,namespace = in_line.split('\t')
symvers[symbol] = in_line[0:-1] symvers[symbol] = in_line[0:-1]
@ -56,7 +56,7 @@ def load_kabi(kabi,filename):
break break
if in_line == "\n": if in_line == "\n":
continue continue
checksum,symbol,directory,type = in_line.split() checksum,symbol,directory,type,namespace = in_line.split('\t')
kabi[symbol] = in_line[0:-1] kabi[symbol] = in_line[0:-1]
@ -71,9 +71,9 @@ def check_kabi(symvers,kabi):
losted_symbols=[] losted_symbols=[]
for symbol in kabi: 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: 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: if abi_hash != sym_hash:
fail=1 fail=1
changed_symbols.append(symbol) changed_symbols.append(symbol)

11
kernel.spec
View File

@ -1,5 +1,5 @@
%define with_signmodules 1 %define with_signmodules 1
%define with_kabichk 0 %define with_kabichk 1
# Default without toolchain_clang # Default without toolchain_clang
%bcond_with 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 upstream_sublevel 0
%global devel_release 28 %global devel_release 28
%global maintenance_release .0.0 %global maintenance_release .0.0
%global pkg_release .36 %global pkg_release .37
%global openeuler_lts 1 %global openeuler_lts 1
%global openeuler_major 2403 %global openeuler_major 2403
@ -609,7 +609,9 @@ popd
install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KernelVer} install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KernelVer}
install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{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 gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-%{KernelVer}.gz
%endif
mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -m 755 %{SOURCE200} $RPM_BUILD_ROOT%{_sbindir}/mkgrub-menu-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh 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 %ifarch aarch64 riscv64
/boot/dtb-* /boot/dtb-*
%endif %endif
%if 0%{?with_kabichk}
/boot/symvers-* /boot/symvers-*
%endif
/boot/System.map-* /boot/System.map-*
/boot/vmlinuz-* /boot/vmlinuz-*
%ghost /boot/initramfs-%{KernelVer}.img %ghost /boot/initramfs-%{KernelVer}.img
@ -1085,6 +1089,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Jun 13 2024 ZhangPeng <zhangpeng362@huawei.com> - 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 <xingmingzheng@iscas.ac.cn> - 6.6.0-28.0.0.36 * Thu Jun 6 2024 Mingzheng Xing <xingmingzheng@iscas.ac.cn> - 6.6.0-28.0.0.36
- riscv-kernel patch update to 6.6.0-29.0.0 - riscv-kernel patch update to 6.6.0-29.0.0
- Fix QEMU UEFI boot panic - Fix QEMU UEFI boot panic