From e50cceeb2fbc32283e4987c95812eea7a3048f21 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Tue, 30 Jan 2024 12:05:18 +0300 Subject: [PATCH] Added debug patch for checking fail in build (added arch info). second fix --- SOURCES/check_uexpected.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/SOURCES/check_uexpected.patch b/SOURCES/check_uexpected.patch index de49844..39a1efc 100644 --- a/SOURCES/check_uexpected.patch +++ b/SOURCES/check_uexpected.patch @@ -1,10 +1,18 @@ diff --git a/python/build-crypto-policies.py b/python/build-crypto-policies.py -index 2eab19b..a00f1ba 100755 +index 2eab19b..767209b 100755 --- a/python/build-crypto-policies.py +++ b/python/build-crypto-policies.py -@@ -71,6 +71,8 @@ def save_config(cmdline, policy_name, config_name, config): - #Make test expected file same for x86 and x86_64 systems - old_config = old_config.replace('dynamic_path = /usr/lib/engines-3/gost.so', 'dynamic_path = /usr/lib64/engines-3/gost.so') +@@ -66,11 +66,12 @@ def save_config(cmdline, policy_name, config_name, config): + with open(path, mode='r', encoding='utf-8') as f: + old_config = f.read() + if '[gost_section]' in old_config: +- arch, links = platform.architecture() +- if arch == '32bit': +- #Make test expected file same for x86 and x86_64 systems +- old_config = old_config.replace('dynamic_path = /usr/lib/engines-3/gost.so', 'dynamic_path = /usr/lib64/engines-3/gost.so') ++ #Make test expected file same for x86 and x86_64 systems ++ old_config = old_config.replace('dynamic_path = /usr/lib/engines-3/gost.so', 'dynamic_path = /usr/lib64/engines-3/gost.so') ++ print('Replace of GOST done') if old_config != config: + print ("------------------------------------------------------------expected----------------------------------------------\n%s------------------------------------------------------------expected----------------------------------------------\n" % old_config) + print ("------------------------------------------------------------got----------------------------------------------\n%s------------------------------------------------------------expected----------------------------------------------\n" % config)