diff mbox series

[meta-arago,master,v2,08/14] sysrepo-plugins-common: move and clean up

Message ID 20250313190516.22522-9-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series Update and cleanup sysrepo packages | expand

Commit Message

Ryan Eatmon March 13, 2025, 7:05 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

* Move into recipes-extended
* Shorten SUMMARY and don't empty DESCRIPTION
* Move patch into correct dir, don't alter FILESEXTRAPATHS
* Update patch to remove fuzz
* Set PV to a numeric value
* Don't hardcode /usr when passing to CMake
* No need for empty do_install:append

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../0001-so-version.patch                     | 23 ++++++++++++++++
 .../sysrepo/sysrepo-plugins-common_git.bb     | 17 ++++++++++++
 .../0001-so-version.patch                     | 15 -----------
 .../sysrepo-plugins-common_git.bb             | 26 -------------------
 4 files changed, 40 insertions(+), 41 deletions(-)
 create mode 100644 meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common/0001-so-version.patch
 create mode 100644 meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common_git.bb
 delete mode 100644 meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/0001-so-version.patch
 delete mode 100644 meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/sysrepo-plugins-common_git.bb
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common/0001-so-version.patch b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common/0001-so-version.patch
new file mode 100644
index 00000000..fbae80c0
--- /dev/null
+++ b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common/0001-so-version.patch
@@ -0,0 +1,23 @@ 
+From 3e2db769c1579010cb83d90f4a63ed256ddda4b8 Mon Sep 17 00:00:00 2001
+From: Ravi Gunasekaran <r-gunasekaran@ti.com>
+Date: Tue, 27 Jun 2023 17:20:59 +0000
+Subject: [PATCH] so version
+
+Upstream-Status: Inappropriate [arago specific]
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc4e5d4..5b04b51 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,6 +37,7 @@ include_directories(${LIBYANG_INCLUDE_DIRS})
+ include_directories(${SYSREPO_INCLUDE_DIRS})
+
+ add_library(${PROJECT_NAME} SHARED ${SRPC_SOURCES})
++set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1)
+
+ # project version
+ set_target_properties(${PROJECT_NAME}
diff --git a/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common_git.bb b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common_git.bb
new file mode 100644
index 00000000..f398a3e2
--- /dev/null
+++ b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common_git.bb
@@ -0,0 +1,17 @@ 
+SUMMARY = "Common utilities/functionalities for sysrepo plugins"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f91d5dfaae99cc1943a8eca222cafa5c"
+
+SRC_URI = "gitsm://github.com/telekom/sysrepo-plugins-common.git;protocol=https;branch=devel"
+SRC_URI += "file://0001-so-version.patch"
+
+PV = "0.1+git"
+SRCREV = "20885de0d3bb95a05610fdb3a0f83d8f7c370fad"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "libyang sysrepo"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX:PATH=${prefix}"
diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/0001-so-version.patch b/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/0001-so-version.patch
deleted file mode 100644
index 5e2fc3a5..00000000
--- a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/0001-so-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@ 
-
-Upstream-Status: Inappropriate [arago specific]
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd64b80..910510d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,6 +23,7 @@ include_directories(${LIBYANG_INCLUDE_DIRS})
- include_directories(${SYSREPO_INCLUDE_DIRS})
-
- add_library(${PROJECT_NAME} SHARED ${SRPC_SOURCES})
-+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1)
-
- install(
-     TARGETS ${PROJECT_NAME}
diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/sysrepo-plugins-common_git.bb b/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/sysrepo-plugins-common_git.bb
deleted file mode 100644
index 23d42fcc..00000000
--- a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/sysrepo-plugins-common_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@ 
-SUMMARY = "Set of utilities/functionalities which can be used for easier build of sysrepo plugins."
-DESCRIPTION = ""
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f91d5dfaae99cc1943a8eca222cafa5c"
-
-SRC_URI = "gitsm://github.com/telekom/sysrepo-plugins-common.git;protocol=https;branch=devel "
-SRC_URI += " file://0001-so-version.patch "
-FILESEXTRAPATHS:prepend := "${THISDIR}:"
-
-PV = "dev+git"
-SRCREV = "20885de0d3bb95a05610fdb3a0f83d8f7c370fad"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "libyang sysrepo"
-
-FILES:${PN} += ""
-
-inherit cmake pkgconfig
-
-# Specify any options you want to pass to cmake using EXTRA_OECMAKE:
-EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX:PATH=/usr "
-
-do_install:append () {
-    true
-}