diff mbox series

[master-wip,2/8] sysrepo-plugins-common: move and clean up

Message ID 20250311200139.3845524-2-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master-wip,1/8] sysrepo: move and clean up | expand

Commit Message

Denys Dmytriyenko March 11, 2025, 8:01 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>
---
 .../0001-so-version.patch                     | 20 +++++++++++++------
 .../sysrepo}/sysrepo-plugins-common_git.bb    | 19 +++++-------------
 2 files changed, 19 insertions(+), 20 deletions(-)
 rename meta-arago-extras/{recipes-sysrepo => recipes-extended/sysrepo}/sysrepo-plugins-common/0001-so-version.patch (44%)
 rename meta-arago-extras/{recipes-sysrepo/sysrepo-plugins-common => recipes-extended/sysrepo}/sysrepo-plugins-common_git.bb (41%)
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/0001-so-version.patch b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common/0001-so-version.patch
similarity index 44%
rename from meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/0001-so-version.patch
rename to meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common/0001-so-version.patch
index 5e2fc3a5..ef82fb7a 100644
--- a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/0001-so-version.patch
+++ b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common/0001-so-version.patch
@@ -1,15 +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 fd64b80..910510d 100644
+index dc4e5d4..5b04b51 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -23,6 +23,7 @@ include_directories(${LIBYANG_INCLUDE_DIRS})
+@@ -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)
-
- install(
-     TARGETS ${PROJECT_NAME}
+ 
+ # project version
+ set_target_properties(${PROJECT_NAME}
diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/sysrepo-plugins-common_git.bb b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common_git.bb
similarity index 41%
rename from meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/sysrepo-plugins-common_git.bb
rename to meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common_git.bb
index 23d42fcc..f398a3e2 100644
--- a/meta-arago-extras/recipes-sysrepo/sysrepo-plugins-common/sysrepo-plugins-common_git.bb
+++ b/meta-arago-extras/recipes-extended/sysrepo/sysrepo-plugins-common_git.bb
@@ -1,26 +1,17 @@ 
-SUMMARY = "Set of utilities/functionalities which can be used for easier build of sysrepo plugins."
-DESCRIPTION = ""
+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 "
-FILESEXTRAPATHS:prepend := "${THISDIR}:"
+SRC_URI = "gitsm://github.com/telekom/sysrepo-plugins-common.git;protocol=https;branch=devel"
+SRC_URI += "file://0001-so-version.patch"
 
-PV = "dev+git"
+PV = "0.1+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
-}
+EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX:PATH=${prefix}"