From d847f56b4a98311c8249fda7b074cf76e02eff0b Mon Sep 17 00:00:00 2001 From: Robi Buranyi Date: Mon, 12 Apr 2021 21:48:13 -0700 Subject: ipmctl: support CRLF line endings in EDK2 The EDK2 sources are DOS-style on server (contains CRLF) and this may cause interop issues on Linux machines (patches do not apply clean) The standard solution is to use the "dos2unix" bbclass, but that can modify only files under the ${S} folder - meaning we have to move the edk2 checkout folder from ${S}/../edk2 to ${S}/edk2. Also, the LICENSE file checksum is going to be impacted by the dos2unix conversion. Signed-off-by: Robi Buranyi Signed-off-by: Anuj Mittal --- .../recipes-support/ipmctl/ipmctl_03.00.00.0302.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dynamic-layers') diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0302.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0302.bb index 688ad108..dce7dacb 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0302.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0302.bb @@ -13,11 +13,11 @@ BUGTRACKER = "https://github.com/intel/ipmctl/issues" LICENSE = "BSD-3-Clause | BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ - file://../edk2/License.txt;md5=2b415520383f7964e96700ae12b4570a" + file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ - git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=edk2; \ - file://0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch;patchdir=../edk2 \ + git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2; \ + file://0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch;patchdir=edk2 \ " SRCREV_ipmctl = "4579c7ec127d6c678ce25136f928b66c7ba51097" @@ -26,7 +26,7 @@ SRCREV_edk2 = "ef91b07388e1c0a50c604e5350eeda98428ccea6" S = "${WORKDIR}/git" -inherit cmake +inherit cmake dos2unix DEPENDS = "ndctl" @@ -34,6 +34,6 @@ EXTRA_OECMAKE = "-DRELEASE=ON" do_configure_prepend() { for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do - ln -sf ../edk2/${dir} ${S} + ln -sf edk2/${dir} ${S} done } -- cgit v1.2.3-54-g00ecf