From afa281b7a997bf265bfe221d1693a8a5bd4a243d Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@burtonini.com>
Date: Thu, 3 Dec 2020 17:21:37 +0000
Subject: [PATCH] arm/opencsd: upgrade to 1.14.4

Notable changes include resolving a build race.

Clean up the recipe so that arguments are not passed twice in do_compile(),
and always pass the install path arguments to clean up the tasks.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Change-Id: I7e32a40092403fd0c0c53d157ae4581f7903356c
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../{opencsd_0.14.3.bb => opencsd_0.14.4.bb}    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
 rename meta-arm/recipes-devtools/opencsd/{opencsd_0.14.3.bb => opencsd_0.14.4.bb} (61%)

diff --git a/meta-arm/recipes-devtools/opencsd/opencsd_0.14.3.bb b/meta-arm/recipes-devtools/opencsd/opencsd_0.14.4.bb
similarity index 61%
rename from meta-arm/recipes-devtools/opencsd/opencsd_0.14.3.bb
rename to meta-arm/recipes-devtools/opencsd/opencsd_0.14.4.bb
index bec3dc71..2d71a56a 100644
--- a/meta-arm/recipes-devtools/opencsd/opencsd_0.14.3.bb
+++ b/meta-arm/recipes-devtools/opencsd/opencsd_0.14.4.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/Linaro/OpenCSD"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
 
-SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master"
-SRCREV = "957d18219d162f52ebe2426f32a4263ec10f357d"
+SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https"
+SRCREV = "f4344d1b7d5eb191b6af3d64aa253407a2608e15"
 
 S = "${WORKDIR}/git"
 
@@ -18,19 +18,18 @@ EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
                 LINKER='${CXX}' \
                 LINUX64=1 \
                 DEBUG=1 \
+                PREFIX=${D}/usr \
+                INSTALL_BIN_DIR=${D}/${bindir} \
+                INSTALL_INCLUDE_DIR=${D}/${includedir} \
+                INSTALL_LIB_DIR=${D}/${libdir} \
                 "
 
 do_compile() {
-    oe_runmake -C ${S}/decoder/build/linux ${EXTRA_OEMAKE}
+    oe_runmake -C ${S}/decoder/build/linux
 }
 
 do_install() {
-    oe_runmake \
-        PREFIX=${D}/usr \
-        INSTALL_BIN_DIR=${D}/${bindir} \
-        INSTALL_INCLUDE_DIR=${D}/${includedir} \
-        INSTALL_LIB_DIR=${D}/${libdir} \
-        -C ${S}/decoder/build/linux install
+    oe_runmake -C ${S}/decoder/build/linux install
 }
 
 BBCLASSEXTEND = "native"