From 46bccda0a5fa31138e0c39e11acd42db19302b67 Mon Sep 17 00:00:00 2001 From: Petr Fedchenkov Date: Thu, 29 Dec 2022 10:10:32 +0300 Subject: [PATCH 1/2] All modules are signed if CONFIG_MODULE_SIG_ALL set We must adjust module-signature-check to expect that all modules are signed if CONFIG_MODULE_SIG_ALL set. Signed-off-by: Petr Fedchenkov --- debian/scripts/checks/module-signature-check | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/scripts/checks/module-signature-check b/debian/scripts/checks/module-signature-check index 67736c289820..cea4c62d3e3f 100755 --- a/debian/scripts/checks/module-signature-check +++ b/debian/scripts/checks/module-signature-check @@ -17,7 +17,11 @@ for d in debian "${DEBIAN}" ; do fi done -if [ "${#sig_incs[@]}" -gt 0 ] ; then +if grep -q CONFIG_MODULE_SIG_ALL=y "${root}/debian/build/build-${flavor}/.config" ; then + echo "WW: CONFIG_MODULE_SIG_ALL is set" + echo "II: All modules must be signed" + sig_all=1 +elif [ "${#sig_incs[@]}" -gt 0 ] ; then echo "II: Use signature inclusion file(s):" printf " %s\n" "${sig_incs[@]}" sig_all=0 -- 2.37.2 From 77a994e38b7e5caf77c36c30e086176daf9321d7 Mon Sep 17 00:00:00 2001 From: Petr Fedchenkov Date: Thu, 29 Dec 2022 10:26:28 +0300 Subject: [PATCH 2/2] Fix abi-check script for removed symbols Seems we try to compare symbols which are not defined for some reason II: Checking for ABI changes... Traceback (most recent call last): File "/data/CLionProjects/mainline-crack/debian/scripts/checks/abi-check", line 108, in if vals['loc'] != vals['old']['loc']: KeyError: 'loc' Signed-off-by: Petr Fedchenkov --- debian/scripts/checks/abi-check | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/scripts/checks/abi-check b/debian/scripts/checks/abi-check index 5bc1c935d7e0..07d2a11f3823 100755 --- a/debian/scripts/checks/abi-check +++ b/debian/scripts/checks/abi-check @@ -96,6 +96,7 @@ with open('{}/{}'.format(prev_abidir, flavor)) as fh: print('read {} symbols.'.format(old_count)) print('II: Checking for ABI changes...') +removed = 0 changed_loc = 0 changed_type = 0 error = False @@ -104,6 +105,11 @@ for sym, vals in symbols.items(): if 'old' not in vals: continue + if 'loc' not in vals: + removed += 1 + print(' REMOVED : {:40} : {}'.format(sym, vals['old']['loc'])) + continue + # Changes in location don't hurt us, but log it anyway if vals['loc'] != vals['old']['loc']: changed_loc += 1 @@ -122,6 +128,9 @@ for sym, vals in symbols.items(): print(' TYPE : {:40} : {} => {}{}'.format(sym, vals['old']['type'], vals['type'], ignored)) +if removed > 0: + print('II: {} symbols removed'.format(removed)) + if changed_loc > 0: print('II: {} symbols changed location'.format(changed_loc)) -- 2.37.2