From patchwork Thu Mar 13 19:05:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 58973 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CCC8C35FF7 for ; Thu, 13 Mar 2025 19:05:23 +0000 (UTC) Received: from fllvem-ot03.ext.ti.com (fllvem-ot03.ext.ti.com [198.47.19.245]) by mx.groups.io with SMTP id smtpd.web10.23279.1741892719284866357 for ; Thu, 13 Mar 2025 12:05:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=t4llBQGO; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: reatmon@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 52DJ5H4l1432107 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Mar 2025 14:05:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1741892718; bh=ya/CROSd5vmEuZUKCPxnOaJuD6R/i+OSQmNZA2lp2xA=; h=From:To:Subject:Date:In-Reply-To:References; b=t4llBQGOZOk8nhPMk4vCzJgsFKvpfzlLNk6QddQhl5Pa4w4QaTWoec/P0qmvn/ogl DrB8dFczvJZEzamvSGTIfFXh7X3ztOEeb6C0oGlJRPkIke/3I2hZmtqpgKq0+eVSsZ t02CDxtzt2wnN8H5PsyapbT1TiO9efFM5fHIhwWY= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 52DJ5Hqt008944 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 13 Mar 2025 14:05:17 -0500 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 13 Mar 2025 14:05:17 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 13 Mar 2025 14:05:17 -0500 Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 52DJ5HLP026771; Thu, 13 Mar 2025 14:05:17 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1tsnrp-0005su-FR; Thu, 13 Mar 2025 14:05:17 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-arago][master][PATCH v2 08/14] sysrepo-plugins-common: move and clean up Date: Thu, 13 Mar 2025 14:05:10 -0500 Message-ID: <20250313190516.22522-9-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250313190516.22522-1-reatmon@ti.com> References: <20250313190516.22522-1-reatmon@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 13 Mar 2025 19:05:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/16043 From: Denys Dmytriyenko * 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 Signed-off-by: Ryan Eatmon --- .../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 --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 +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 -}