From nobody Tue Feb 10 01:16:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+84310+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84310+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638547728; cv=none; d=zohomail.com; s=zohoarc; b=huf613Z1qf2ArFNspE6HoJG+XhbsXTNp8XHRw9oWCxbKcH0hYvb1NQ69PbI+alQXDFITnbT7fdmf5mZHAezrcGZiErFlVNiDc+ZqWJuyg/kN8NsvdBKwS/0AXx1ZWtMerZSnqhL4PSO3JL07ajMYxU2zg/G9ZMLBvg/VQOYo4Pg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638547728; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=4aB4GpICsMiuhT+IC9ZSX5y1YrdJ93LcEo8GcG5GGFU=; b=ZTbTfbRsRhQ+Hwntmk2qxxt4xKnp96S0taWYNNjXkCk9GylFOFsSy00ZSauLantcwwAXcFQiYyzDdL2a7ClR72MIfnZxkyODhyAS8h7snooLZYW9kq7gCiIoECg2gcOYDrRMRVJnd1Eotk+XOU9y/pp3WMQJT9L0fIR9tDhoHm4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84310+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1638547728738233.67223215135152; Fri, 3 Dec 2021 08:08:48 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6yJcYY1788612xCUl9GbjlZL; Fri, 03 Dec 2021 08:08:48 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web09.13281.1638547727747119937 for ; Fri, 03 Dec 2021 08:08:47 -0800 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-420-b50QdA0gPPOW8LtzHSCfAA-1; Fri, 03 Dec 2021 11:08:43 -0500 X-MC-Unique: b50QdA0gPPOW8LtzHSCfAA-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BDB281CCB6; Fri, 3 Dec 2021 16:08:42 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.170]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF3244EC37; Fri, 3 Dec 2021 16:08:14 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CE208180039C; Fri, 3 Dec 2021 17:07:48 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Guomin Jiang , Pawel Polawski , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Xiaoyu Lu , Gerd Hoffmann Subject: [edk2-devel] [PATCH 05/24] CryptoPkg/openssl: process_files.pl: change config header handling Date: Fri, 3 Dec 2021 17:07:29 +0100 Message-Id: <20211203160748.866150-6-kraxel@redhat.com> In-Reply-To: <20211203160748.866150-1-kraxel@redhat.com> References: <20211203160748.866150-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: AIlfBBKyd46PKbigEIYK5UZnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638547728; bh=wFLw5AiBBJfR+IxeyU5z5IoNwSuJxal0ForZ8BtGSq0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=uC9iyUmfHNR1S4CUs4XSOdAwoUwMYe4Gzp7acus447apo+9MzdGRCjdDhxAg52aRIu8 M8AFT83JydaTo5yRvwqA+QLRFwStG3jkGnCWh8rW3Z4nDD7NezUI3eo56sNvhwtgRFl/H rIz7a6M6MtN6KG6ZUcULLLZKohn/NJ5c1AY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638547730590100002 Content-Type: text/plain; charset="utf-8" Let the openssl build system create the generated files. Just run 'make build_generated' instead of duplicating the build rules in process_files.pl. openssl 3.0 has split the configuration into multiple smaller files. Find them all using glob and process them in a loop. Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/OpensslLib/process_files.pl | 43 +++++-------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Libr= ary/OpensslLib/process_files.pl index 51138f8edab8..e903263a7582 100755 --- a/CryptoPkg/Library/OpensslLib/process_files.pl +++ b/CryptoPkg/Library/OpensslLib/process_files.pl @@ -203,21 +203,8 @@ BEGIN { ) =3D=3D 0 || die "OpenSSL Configure failed!\n"; =20 - # Generate opensslconf.h per config data - system( - "perl -I. -Mconfigdata util/dofile.pl " . - "include/openssl/opensslconf.h.in " . - "> include/openssl/opensslconf.h" - ) =3D=3D 0 || - die "Failed to generate opensslconf.h!\n"; - - # Generate dso_conf.h per config data - system( - "perl -I. -Mconfigdata util/dofile.pl " . - "include/crypto/dso_conf.h.in " . - "> include/crypto/dso_conf.h" - ) =3D=3D 0 || - die "Failed to generate dso_conf.h!\n"; + # Generate files per config data + system("make build_all_generated"); =20 chdir($basedir) || die "Cannot change to base directory \"" . $basedir . "\""; @@ -416,25 +403,15 @@ if (!defined $arch) { } =20 # -# Copy opensslconf.h and dso_conf.h generated from OpenSSL Configuration +# Copy generated files # -print "\n--> Duplicating opensslconf.h into Include/openssl ... "; -system( - "perl -pe 's/\\n/\\r\\n/' " . - "< " . $OPENSSL_PATH . "/include/openssl/opensslconf.h " . - "> " . $OPENSSL_PATH . "/../../Include/openssl/opensslconf.h" - ) =3D=3D 0 || - die "Cannot copy opensslconf.h!"; -print "Done!"; - -print "\n--> Duplicating dso_conf.h into Include/crypto ... "; -system( - "perl -pe 's/\\n/\\r\\n/' " . - "< " . $OPENSSL_PATH . "/include/crypto/dso_conf.h" . - "> " . $OPENSSL_PATH . "/../../Include/crypto/dso_conf.h" - ) =3D=3D 0 || - die "Cannot copy dso_conf.h!"; -print "Done!\n"; +for my $file (map { s/\.in//; $_ } glob($OPENSSL_PATH . "/include/*/*.h.in= ")) { + my $dest =3D $file; + $dest =3D~ s|.*/include/|../Include/|; + print "\n--> Duplicating $file into $dest ... "; + system("perl -pe 's/\\n/\\r\\n/' < $file > $dest") =3D=3D 0 + or die "Cannot copy $file !"; +} =20 print "\nProcessing Files Done!\n"; =20 --=20 2.33.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#84310): https://edk2.groups.io/g/devel/message/84310 Mute This Topic: https://groups.io/mt/87479943/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-