From 43a25b2e96f728cd711031f27e5774707a92506c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@burtonini.com>
Date: Tue, 12 Jan 2021 21:20:33 +0000
Subject: [PATCH] arm/opencsd: upgrade to 1.0.0

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

diff --git a/meta-arm/recipes-devtools/opencsd/opencsd_0.14.4.bb b/meta-arm/recipes-devtools/opencsd/opencsd_1.0.0.bb
similarity index 64%
rename from meta-arm/recipes-devtools/opencsd/opencsd_0.14.4.bb
rename to meta-arm/recipes-devtools/opencsd/opencsd_1.0.0.bb
index 2d71a56a..cb75ce1a 100644
--- a/meta-arm/recipes-devtools/opencsd/opencsd_0.14.4.bb
+++ b/meta-arm/recipes-devtools/opencsd/opencsd_1.0.0.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
 
 SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https"
-SRCREV = "f4344d1b7d5eb191b6af3d64aa253407a2608e15"
+SRCREV = "01d44a34f8fc057f4b041c01f8d9502d77fe612f"
 
 S = "${WORKDIR}/git"
 
@@ -19,9 +19,10 @@ EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
                 LINUX64=1 \
                 DEBUG=1 \
                 PREFIX=${D}/usr \
-                INSTALL_BIN_DIR=${D}/${bindir} \
-                INSTALL_INCLUDE_DIR=${D}/${includedir} \
-                INSTALL_LIB_DIR=${D}/${libdir} \
+                INSTALL_BIN_DIR=${D}${bindir} \
+                INSTALL_INCLUDE_DIR=${D}${includedir} \
+                INSTALL_LIB_DIR=${D}${libdir} \
+                INSTALL_MAN_DIR=${D}${mandir}/man1 \
                 "
 
 do_compile() {
@@ -29,7 +30,9 @@ do_compile() {
 }
 
 do_install() {
-    oe_runmake -C ${S}/decoder/build/linux install
+    # Remove mkdir when upgrading (https://github.com/Linaro/OpenCSD/pull/36)
+    mkdir --parents ${D}${mandir}/man1
+    oe_runmake -C ${S}/decoder/build/linux install install_man
 }
 
 BBCLASSEXTEND = "native"