From nobody Thu Apr 25 21:16:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+43505+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43505+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785523; cv=none; d=zoho.com; s=zohoarc; b=SsxdEiG4HV+DR5fB77pL1tAjez4RlWdEW75bryKg1KflRS685DpbVw6oI/yMugHZcwQQ4DLGNiytlAx4sxpG17zzXOo5i1+9kKL0/Xc7R04RHmWy6fH3eJwoA4N20GZB2wunUo0h4nHt9We0esbQ3c8IgaPaHSnWv906xU1Juys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785523; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=elsHW4MT8GHOCm9/zu4OjNOVPesDNtaHFP6KbxsGuD8=; b=K4gDRlCNxsHzxSEjXSpUupov0QIwErMZM8gzWxjQXugEyyVMoXXYnnMKa3o87ht5/VtJRDFD7/OqQbbCNssWAtUQqhMzC8RjYBEk3ZD6q9arRtFwI9K4K5NN597iqzqfsQ0mjV8Um+NwP9+muXdEuB6jvBu8wOPa6gNPJqnu0+s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43505+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1562785523239153.25541807668128; Wed, 10 Jul 2019 12:05:23 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008196" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:20 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-devel] [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts Date: Wed, 10 Jul 2019 12:05:04 -0700 Message-Id: <20190710190516.6012-17-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1562785522; bh=jG3/rrbzE/LN3qdlNvoGC5Kw+YT7X9LYA65eAUuLaKg=; h=Cc:Date:From:Reply-To:Subject:To; b=BJmTGWKPO1qpk9cnbMbHVB/COAbocdGOyXW/bug5vl8xVTr2O3EEjA3Mb3wq7JWqDGr QZiQJQdSw2JbX0J2y+/McyR39Pgb0hedIaHVVBUus6q6llgJ7kw/P8uIF5jYB46AtNJML GHd8Dr5/for+2MsTBYdne1yY9d8jBTc08MI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" * Do not change WORKSPACE env var. Assume it is set before running script. * Access Conf dir relative to WORKSPACE * Run Build_IFWI.sh from the Vlv2Tbl2DevicePkg dir * run bld_vlv.sh from same dir as Build_IFWI.sh Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney Reviewed-By: Zailiang Sun --- .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 5 +- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 49 ++++++++++--------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Inte= l/Vlv2TbltDevicePkg/Build_IFWI.sh index 2a22309f5f..f8954cc9cd 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh @@ -85,13 +85,10 @@ else IFWI_Suffix=3D"/S $3" fi =20 -## Go to root directory -cd ../../.. - ## Build BIOS echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D" echo "Build_IFWI: Calling BIOS build Script..." -./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type = $Build_Target +. bld_vlv.sh $Build_Flags $Platform_Type $Build_Target =20 echo echo Finished Building BIOS. diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index c68e59398a..aac8534677 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -26,7 +26,6 @@ echo -e $(date) ##********************************************************************** ## Initial Setup ##********************************************************************** -export WORKSPACE=3D$(pwd) #build_threads=3D($NUMBER_OF_PROCESSORS)+1 Build_Flags=3D exitCode=3D0 @@ -38,31 +37,31 @@ export PLATFORM_PATH=3D$WORKSPACE/edk2-platforms/Platfo= rm/Intel/ export SILICON_PATH=3D$WORKSPACE/edk2-platforms/Silicon/Intel/ export BINARY_PATH=3D$WORKSPACE/edk2-non-osi/Silicon/Intel/ export PACKAGES_PATH=3D$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH -cd ./edk2 =20 ## Clean up previous build files. -if [ -e $CORE_PATH/EDK2.log ]; then - rm $CORE_PATH/EDK2.log +if [ -e $WORKSPACE/EDK2.log ]; then + rm $WORKSPACE/EDK2.log fi =20 -if [ -e $CORE_PATH/Unitool.log ]; then - rm $CORE_PATH/Unitool.log +if [ -e $WORKSPACE/Unitool.log ]; then + rm $WORKSPACE/Unitool.log fi =20 -if [ -e $CORE_PATH/Conf/target.txt ]; then - rm $CORE_PATH/Conf/target.txt +if [ -e $WORKSPACE/Conf/target.txt ]; then + rm $WORKSPACE/Conf/target.txt fi =20 -if [ -e $CORE_PATH/Conf/tools_def.txt ]; then - rm $CORE_PATH/Conf/tools_def.txt +if [ -e $WORKSPACE/Conf/tools_def.txt ]; then + rm $WORKSPACE/Conf/tools_def.txt fi =20 -if [ -e $CORE_PATH/Conf/build_rule.txt ]; then - rm $CORE_PATH/Conf/build_rule.txt +if [ -e $WORKSPACE/Conf/build_rule.txt ]; then + rm $WORKSPACE/Conf/build_rule.txt fi =20 ## Setup EDK environment. Edksetup puts new copies of target.txt, tools_de= f.txt, build_rule.txt in WorkSpace\Conf ## Also run edksetup as soon as possible to avoid it from changing environ= ment variables we're overriding +cd $CORE_PATH . edksetup.sh BaseTools make -C BaseTools =20 @@ -72,6 +71,8 @@ PLATFORM_PKG_PATH=3D$PLATFORM_PATH/$PLATFORM_PACKAGE config_file=3D$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc auto_config_inc=3D$PLATFORM_PKG_PATH/AutoPlatformCFG.txt =20 +cd $PLATFORM_PKG_PATH + ## create new AutoPlatformCFG.txt file if [ -f "$auto_config_inc" ]; then rm $auto_config_inc @@ -149,11 +150,11 @@ echo "Ensuring correct build directory is present for= GenBiosId..." =20 echo Modifying Conf files for this build... ## Remove lines with these tags from target.txt -sed -i '/^ACTIVE_PLATFORM/d' Conf/target.txt -sed -i '/^TARGET /d' Conf/target.txt -sed -i '/^TARGET_ARCH/d' Conf/target.txt -sed -i '/^TOOL_CHAIN_TAG/d' Conf/target.txt -sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target.txt +sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt +sed -i '/^TARGET /d' $WORKSPACE/Conf/target.txt +sed -i '/^TARGET_ARCH/d' $WORKSPACE/Conf/target.txt +sed -i '/^TOOL_CHAIN_TAG/d' $WORKSPACE/Conf/target.txt +sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt =20 gcc_version=3D$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in @@ -174,15 +175,15 @@ esac =20 ACTIVE_PLATFORM=3D$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc export TOOL_CHAIN_TAG=3D$TARGET_TOOLS -MAX_CONCURRENT_THREAD_NUMBER=3D1 -echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM >> Con= f/target.txt -echo TARGET =3D $TARGET >> Con= f/target.txt -echo TOOL_CHAIN_TAG =3D $TOOL_CHAIN_TAG >> Con= f/target.txt -echo MAX_CONCURRENT_THREAD_NUMBER =3D $MAX_CONCURRENT_THREAD_NUMBER >> Con= f/target.txt +MAX_CONCURRENT_THREAD_NUMBER=3D8 +echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM >> $WO= RKSPACE/Conf/target.txt +echo TARGET =3D $TARGET >> $WO= RKSPACE/Conf/target.txt +echo TOOL_CHAIN_TAG =3D $TOOL_CHAIN_TAG >> $WO= RKSPACE/Conf/target.txt +echo MAX_CONCURRENT_THREAD_NUMBER =3D $MAX_CONCURRENT_THREAD_NUMBER >> $WO= RKSPACE/Conf/target.txt if [ $Arch =3D=3D "IA32" ]; then - echo TARGET_ARCH =3D IA32 >> Con= f/target.txt + echo TARGET_ARCH =3D IA32 >> $WO= RKSPACE/Conf/target.txt else - echo TARGET_ARCH =3D IA32 X64 >> Con= f/target.txt + echo TARGET_ARCH =3D IA32 X64 >> $WO= RKSPACE/Conf/target.txt fi =20 ##********************************************************************** --=20 2.21.0.windows.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 (#43505): https://edk2.groups.io/g/devel/message/43505 Mute This Topic: https://groups.io/mt/32419738/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-