From patchwork Tue Mar 11 20:01:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58750 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 C4118C35FF4 for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.20217.1741723305007679157 for ; Tue, 11 Mar 2025 13:01:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 3EA9540B66; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wCwAKM-m5Usf; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1D68B40CB0; Tue, 11 Mar 2025 20:01:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 35D2F1642E7; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 1/8] sysrepo: move and clean up Date: Tue, 11 Mar 2025 16:01:32 -0400 Message-Id: <20250311200139.3845524-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15984 From: Denys Dmytriyenko * Move into recipes-extended * Shorten SUMMARY and don't empty DESCRIPTION * Don't hardode /usr and /etc when passing to CMake * No need to change SYSROOT_DIRS Signed-off-by: Denys Dmytriyenko --- ...-Hardcode-correct-path-to-tar-binary.patch | 0 .../sysrepo/sysrepo/sysrepo | 0 .../sysrepo/sysrepo/sysrepod.service | 0 .../sysrepo/sysrepo_git.bb | 31 ++++++++++--------- 4 files changed, 16 insertions(+), 15 deletions(-) rename meta-arago-extras/{recipes-sysrepo => recipes-extended}/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch (100%) rename meta-arago-extras/{recipes-sysrepo => recipes-extended}/sysrepo/sysrepo/sysrepo (100%) rename meta-arago-extras/{recipes-sysrepo => recipes-extended}/sysrepo/sysrepo/sysrepod.service (100%) rename meta-arago-extras/{recipes-sysrepo => recipes-extended}/sysrepo/sysrepo_git.bb (68%) diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch b/meta-arago-extras/recipes-extended/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch similarity index 100% rename from meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch rename to meta-arago-extras/recipes-extended/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/sysrepo b/meta-arago-extras/recipes-extended/sysrepo/sysrepo/sysrepo similarity index 100% rename from meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/sysrepo rename to meta-arago-extras/recipes-extended/sysrepo/sysrepo/sysrepo diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/sysrepod.service b/meta-arago-extras/recipes-extended/sysrepo/sysrepo/sysrepod.service similarity index 100% rename from meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/sysrepod.service rename to meta-arago-extras/recipes-extended/sysrepo/sysrepo/sysrepod.service diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb b/meta-arago-extras/recipes-extended/sysrepo/sysrepo_git.bb similarity index 68% rename from meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb rename to meta-arago-extras/recipes-extended/sysrepo/sysrepo_git.bb index 0877a65f..2dbfa55f 100644 --- a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb +++ b/meta-arago-extras/recipes-extended/sysrepo/sysrepo_git.bb @@ -1,15 +1,13 @@ -# Recipe created by recipetool -SUMMARY = "YANG-based configuration and operational state data store for Unix/Linux applications." -DESCRIPTION = "" +SUMMARY = "YANG-based configuration and operational state data store" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=ef345f161efb68c3836e6f5648b2312f" -SRC_URI = "git://github.com/sysrepo/sysrepo.git;protocol=https;branch=master \ - file://0001-Hardcode-correct-path-to-tar-binary.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', \ - 'file://sysrepo','', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', \ - 'file://sysrepod.service','', d)}" +SRC_URI = " \ + git://github.com/sysrepo/sysrepo.git;protocol=https;branch=master \ + file://0001-Hardcode-correct-path-to-tar-binary.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'file://sysrepo','', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://sysrepod.service','', d)} \ +" PV = "3.3.10+git" SRCREV = "ef93a1253cc97f13671759f6e7790cbf729a5ae9" @@ -23,9 +21,15 @@ FILES:${PN} += "${datadir}/yang/* ${libdir}/sysrepo-plugind/* ${bindir}/*" inherit cmake pkgconfig python3native python3-dir inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} - -# Specify any options you want to pass to cmake using EXTRA_OECMAKE: -EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String=Release -DBUILD_EXAMPLES:String=False -DENABLE_TESTS:String=False -DREPOSITORY_LOC:PATH=/etc/sysrepo -DCALL_TARGET_BINS_DIRECTLY=False -DGEN_LANGUAGE_BINDINGS:String=False " +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ + -DCMAKE_BUILD_TYPE:String=Release \ + -DBUILD_EXAMPLES:String=False \ + -DENABLE_TESTS:String=False \ + -DREPOSITORY_LOC:PATH=${sysconfdir}/sysrepo \ + -DCALL_TARGET_BINS_DIRECTLY=False \ + -DGEN_LANGUAGE_BINDINGS:String=False \ +" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "sysrepod.service" @@ -52,6 +56,3 @@ do_install:append:class-target () { } BBCLASSEXTEND = "native" - -SYSROOT_DIRS:append = " ${bindir}" - From patchwork Tue Mar 11 20:01:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58747 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 B671BC2BA1B for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.20216.1741723304986230498 for ; Tue, 11 Mar 2025 13:01:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 4144A40CB8; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GoOaJLkP45Zv; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1AE5C40C21; Tue, 11 Mar 2025 20:01:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 420D31642E8; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 2/8] sysrepo-plugins-common: move and clean up Date: Tue, 11 Mar 2025 16:01:33 -0400 Message-Id: <20250311200139.3845524-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311200139.3845524-1-denis@denix.org> References: <20250311200139.3845524-1-denis@denix.org> MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15983 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 --- .../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 --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 +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}" From patchwork Tue Mar 11 20:01:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58744 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 A83E5C282EC for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.19981.1741723304970926808 for ; Tue, 11 Mar 2025 13:01:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 3315040A20; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21NFt_m-zkWN; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1915640B66; Tue, 11 Mar 2025 20:01:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 4DCE61642E9; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 3/8] libyang: move bbappend Date: Tue, 11 Mar 2025 16:01:34 -0400 Message-Id: <20250311200139.3845524-3-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311200139.3845524-1-denis@denix.org> References: <20250311200139.3845524-1-denis@denix.org> MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15981 From: Denys Dmytriyenko * Move into recipes-extended Signed-off-by: Denys Dmytriyenko --- .../libyang => recipes-extended/sysrepo}/libyang_%.bbappend | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-arago-extras/{recipes-sysrepo/libyang => recipes-extended/sysrepo}/libyang_%.bbappend (100%) diff --git a/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend b/meta-arago-extras/recipes-extended/sysrepo/libyang_%.bbappend similarity index 100% rename from meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend rename to meta-arago-extras/recipes-extended/sysrepo/libyang_%.bbappend From patchwork Tue Mar 11 20:01:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58746 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 B6AB7C35FF2 for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.19980.1741723304970714362 for ; Tue, 11 Mar 2025 13:01:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 34ADF40CBE; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VxV28lW07Frq; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1C37040CAA; Tue, 11 Mar 2025 20:01:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 58A671642EA; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 4/8] libnetconf2: move and clean up Date: Tue, 11 Mar 2025 16:01:35 -0400 Message-Id: <20250311200139.3845524-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311200139.3845524-1-denis@denix.org> References: <20250311200139.3845524-1-denis@denix.org> MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15982 From: Denys Dmytriyenko * Move into recipes-extended * Shorten SUMMARY, split DESCRIPTION * Don't hardcode /usr when passing to CMake Signed-off-by: Denys Dmytriyenko --- .../sysrepo}/libnetconf2_git.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) rename meta-arago-extras/{recipes-sysrepo/libnetconf2 => recipes-extended/sysrepo}/libnetconf2_git.bb (51%) diff --git a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb b/meta-arago-extras/recipes-extended/sysrepo/libnetconf2_git.bb similarity index 51% rename from meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb rename to meta-arago-extras/recipes-extended/sysrepo/libnetconf2_git.bb index c55c9ff5..3ffd19ea 100644 --- a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb +++ b/meta-arago-extras/recipes-extended/sysrepo/libnetconf2_git.bb @@ -1,5 +1,6 @@ -SUMMARY = "libnetconf2 is a NETCONF library in C intended for building NETCONF clients and servers" -DESCRIPTION = "The library provides functions to connect NETCONF client and server to each other via SSH and to send, receive and process NETCONF messages." +SUMMARY = "NETCONF library in C for building NETCONF clients and servers" +DESCRIPTION = "The library provides functions to connect NETCONF client and server \ +to each other via SSH and to send, receive and process NETCONF messages." SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=08a5578c9bab06fb2ae84284630b973f" @@ -17,8 +18,6 @@ FILES:${PN} += "${datadir}/yang/modules/libnetconf2/*" inherit cmake pkgconfig -# Specify any options you want to pass to cmake using EXTRA_OECMAKE: -#EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String=Release -DLIBYANG_INCLUDE_DIR=/usr/include -DLIBYANG_LIBRARY=/usr/lib " -EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String=Release " +EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX:PATH=${prefix} -DCMAKE_BUILD_TYPE:String=Release" BBCLASSEXTEND = "native nativesdk" From patchwork Tue Mar 11 20:01:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58745 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 A842BC28B2F for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.19982.1741723304985409581 for ; Tue, 11 Mar 2025 13:01:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 263CA40CB5; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mLjO3oC19QBS; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1188A40A20; Tue, 11 Mar 2025 20:01:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 646A41642EB; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 5/8] libredblack: move and clean up Date: Tue, 11 Mar 2025 16:01:36 -0400 Message-Id: <20250311200139.3845524-5-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311200139.3845524-1-denis@denix.org> References: <20250311200139.3845524-1-denis@denix.org> MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15980 From: Denys Dmytriyenko * Move into recipes-extended * Clean unnecessary comments Signed-off-by: Denys Dmytriyenko libredblack cleanup Signed-off-by: Denys Dmytriyenko --- .../sysrepo}/libredblack_git.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) rename meta-arago-extras/{recipes-sysrepo/libredblack => recipes-extended/sysrepo}/libredblack_git.bb (62%) diff --git a/meta-arago-extras/recipes-sysrepo/libredblack/libredblack_git.bb b/meta-arago-extras/recipes-extended/sysrepo/libredblack_git.bb similarity index 62% rename from meta-arago-extras/recipes-sysrepo/libredblack/libredblack_git.bb rename to meta-arago-extras/recipes-extended/sysrepo/libredblack_git.bb index 412d08d8..80283c73 100644 --- a/meta-arago-extras/recipes-sysrepo/libredblack/libredblack_git.bb +++ b/meta-arago-extras/recipes-extended/sysrepo/libredblack_git.bb @@ -10,12 +10,8 @@ SRCREV = "a399310d99b61eec4d3c0677573ab5dddcf9395d" S = "${WORKDIR}/git" -# NOTE: if this software is not capable of being built in a separate build directory -# from the source, you should replace autotools with autotools-brokensep in the -# inherit line inherit python3native autotools -# Specify any options you want to pass to the configure script using EXTRA_OECONF: -EXTRA_OECONF = " --without-rbgen " +EXTRA_OECONF = "--without-rbgen" BBCLASSEXTEND = "native nativesdk" From patchwork Tue Mar 11 20:01:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58748 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 A86C6C3DA4A for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.20220.1741723306414371380 for ; Tue, 11 Mar 2025 13:01:46 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 7F5F940CB6; Tue, 11 Mar 2025 20:01:45 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08QxvBSBAxyn; Tue, 11 Mar 2025 20:01:45 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 673C540CAA; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 668DF1642ED; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 6/8] nw-configurator: move and clean up Date: Tue, 11 Mar 2025 16:01:37 -0400 Message-Id: <20250311200139.3845524-6-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311200139.3845524-1-denis@denix.org> References: <20250311200139.3845524-1-denis@denix.org> MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15986 From: Denys Dmytriyenko * Move into recipes-extended * Set SUMMARY instead of DESCRIPTION * FILES_${PN}-dev is incorrect - old syntax and is not needed * Tabs/spaces cleanup Signed-off-by: Denys Dmytriyenko --- .../sysrepo}/nw-configurator.bb | 6 ++---- .../sysrepo/nw-configurator}/nw-configurator.c | 0 2 files changed, 2 insertions(+), 4 deletions(-) rename meta-arago-extras/{recipes-sysrepo/nw-configurator => recipes-extended/sysrepo}/nw-configurator.bb (74%) rename meta-arago-extras/{recipes-sysrepo/nw-configurator/files => recipes-extended/sysrepo/nw-configurator}/nw-configurator.c (100%) diff --git a/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb b/meta-arago-extras/recipes-extended/sysrepo/nw-configurator.bb similarity index 74% rename from meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb rename to meta-arago-extras/recipes-extended/sysrepo/nw-configurator.bb index b383571d..50debb36 100644 --- a/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb +++ b/meta-arago-extras/recipes-extended/sysrepo/nw-configurator.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Sysrepo based repo to configure EST" +SUMMARY = "Sysrepo based repo to configure EST" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://nw-configurator.c;beginline=1;endline=33;md5=3538caaf9bfb8372347877ad393660fa" @@ -8,14 +8,12 @@ SRC_URI = "file://nw-configurator.c" S = "${WORKDIR}/sources" UNPACKDIR = "${S}" -FILES_${PN}-dev = "${includedir}" - DEPENDS = "sysrepo" inherit autotools pkgconfig do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -I=${STAGING_INCDIR} ${S}/nw-configurator.c -o nw-configurator -lsysrepo + ${CC} ${CFLAGS} ${LDFLAGS} -I=${STAGING_INCDIR} ${S}/nw-configurator.c -o nw-configurator -lsysrepo } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-arago-extras/recipes-sysrepo/nw-configurator/files/nw-configurator.c b/meta-arago-extras/recipes-extended/sysrepo/nw-configurator/nw-configurator.c similarity index 100% rename from meta-arago-extras/recipes-sysrepo/nw-configurator/files/nw-configurator.c rename to meta-arago-extras/recipes-extended/sysrepo/nw-configurator/nw-configurator.c From patchwork Tue Mar 11 20:01:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58749 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 C40CEC35FF1 for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.20218.1741723306392420040 for ; Tue, 11 Mar 2025 13:01:46 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 8B88D40CC1; Tue, 11 Mar 2025 20:01:45 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mxHNTRwNzPT2; Tue, 11 Mar 2025 20:01:45 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 645E740C21; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 71EE41642EE; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 7/8] tsn-yang-models: move and clean up Date: Tue, 11 Mar 2025 16:01:38 -0400 Message-Id: <20250311200139.3845524-7-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311200139.3845524-1-denis@denix.org> References: <20250311200139.3845524-1-denis@denix.org> MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15985 From: Denys Dmytriyenko * Move into recipes-extended * Don't empty DESCRIPTION Signed-off-by: Denys Dmytriyenko --- .../sysrepo}/tsn-yang-models_git.bb | 2 -- 1 file changed, 2 deletions(-) rename meta-arago-extras/{recipes-sysrepo/tsn-yang-models => recipes-extended/sysrepo}/tsn-yang-models_git.bb (96%) diff --git a/meta-arago-extras/recipes-sysrepo/tsn-yang-models/tsn-yang-models_git.bb b/meta-arago-extras/recipes-extended/sysrepo/tsn-yang-models_git.bb similarity index 96% rename from meta-arago-extras/recipes-sysrepo/tsn-yang-models/tsn-yang-models_git.bb rename to meta-arago-extras/recipes-extended/sysrepo/tsn-yang-models_git.bb index c8406062..8024a6ab 100644 --- a/meta-arago-extras/recipes-sysrepo/tsn-yang-models/tsn-yang-models_git.bb +++ b/meta-arago-extras/recipes-extended/sysrepo/tsn-yang-models_git.bb @@ -1,6 +1,4 @@ -# Recipe created by recipetool SUMMARY = "TSN based YANG models" -DESCRIPTION = "" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://README.md;md5=a89040f014c0c9c9360e29ddf88bf4a7" From patchwork Tue Mar 11 20:01:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 58751 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 D3454C35FF5 for ; Tue, 11 Mar 2025 20:01:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.20219.1741723306412150430 for ; Tue, 11 Mar 2025 13:01:46 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 8A50F40CAA; Tue, 11 Mar 2025 20:01:45 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XBOCuDQHOnD4; Tue, 11 Mar 2025 20:01:45 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 6BE6840CB0; Tue, 11 Mar 2025 20:01:44 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7CAB71642EF; Tue, 11 Mar 2025 16:01:41 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master-wip][PATCH 8/8] netopeer2-server: move and clean up Date: Tue, 11 Mar 2025 16:01:39 -0400 Message-Id: <20250311200139.3845524-8-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250311200139.3845524-1-denis@denix.org> References: <20250311200139.3845524-1-denis@denix.org> MIME-Version: 1.0 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 ; Tue, 11 Mar 2025 20:01:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/15987 From: Denys Dmytriyenko * Move into recipes-extended * Combine with bbappend * Shorten SUMMARY, split DESCRIPTION * Update DEPENDS - remove systemd and add sysrepo-native * Don't hardcode /usr when passing to CMake * Also pass -DSYSREPO_SETUP=OFF to CMake * Update installing scripts - remove user/group, add permissions Signed-off-by: Denys Dmytriyenko --- .../0001-Add-EST-Yang-Models.patch | 0 .../netopeer2-server/netopeer2-server | 0 .../netopeer2-serverd.service | 0 .../sysrepo}/netopeer2-server_git.bb | 38 +++++++++++-------- .../netopeer2-server_git.bbappend | 5 --- 5 files changed, 22 insertions(+), 21 deletions(-) rename meta-arago-extras/{recipes-sysrepo/netopeer2-server => recipes-extended/sysrepo}/netopeer2-server/0001-Add-EST-Yang-Models.patch (100%) rename meta-arago-extras/{recipes-sysrepo/netopeer2-server => recipes-extended/sysrepo}/netopeer2-server/netopeer2-server (100%) rename meta-arago-extras/{recipes-sysrepo/netopeer2-server => recipes-extended/sysrepo}/netopeer2-server/netopeer2-serverd.service (100%) rename meta-arago-extras/{recipes-sysrepo/netopeer2-server => recipes-extended/sysrepo}/netopeer2-server_git.bb (46%) delete mode 100644 meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bbappend diff --git a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/0001-Add-EST-Yang-Models.patch b/meta-arago-extras/recipes-extended/sysrepo/netopeer2-server/0001-Add-EST-Yang-Models.patch similarity index 100% rename from meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/0001-Add-EST-Yang-Models.patch rename to meta-arago-extras/recipes-extended/sysrepo/netopeer2-server/0001-Add-EST-Yang-Models.patch diff --git a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/netopeer2-server b/meta-arago-extras/recipes-extended/sysrepo/netopeer2-server/netopeer2-server similarity index 100% rename from meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/netopeer2-server rename to meta-arago-extras/recipes-extended/sysrepo/netopeer2-server/netopeer2-server diff --git a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/netopeer2-serverd.service b/meta-arago-extras/recipes-extended/sysrepo/netopeer2-server/netopeer2-serverd.service similarity index 100% rename from meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/netopeer2-serverd.service rename to meta-arago-extras/recipes-extended/sysrepo/netopeer2-server/netopeer2-serverd.service diff --git a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb b/meta-arago-extras/recipes-extended/sysrepo/netopeer2-server_git.bb similarity index 46% rename from meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb rename to meta-arago-extras/recipes-extended/sysrepo/netopeer2-server_git.bb index 89a05b2b..073aed5e 100644 --- a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb +++ b/meta-arago-extras/recipes-extended/sysrepo/netopeer2-server_git.bb @@ -1,21 +1,22 @@ -SUMMARY = "Netopeer2 is a set of tools implementing network configuration tools based on the NETCONF Protocol." -DESCRIPTION = "Netopeer2 is based on the new generation of the NETCONF and YANG libraries - libyang and libnetconf2. The Netopeer server uses sysrepo as a NETCONF datastore implementation." +SUMMARY = "Implementation of network configuration tools based on NETCONF Protocol" +DESCRIPTION = "Netopeer2 is based on the new generation of the NETCONF and YANG libraries - \ +libyang and libnetconf2. The Netopeer server uses sysrepo as a NETCONF datastore implementation." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=41daedff0b24958b2eba4f9086d782e1" -SRC_URI = "git://github.com/CESNET/Netopeer2.git;protocol=https;branch=master \ - ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', \ - 'file://netopeer2-server', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', \ - 'file://netopeer2-serverd.service', '', d)} \ - " +SRC_URI = " \ + git://github.com/CESNET/Netopeer2.git;protocol=https;branch=master \ + file://0001-Add-EST-Yang-Models.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'file://netopeer2-server', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://netopeer2-serverd.service', '', d)} \ +" PV = "2.2.35+git" SRCREV = "6d1cb61ef3ce2274a91dc9cbc51318bcd0b54697" S = "${WORKDIR}/git" -DEPENDS = "libyang libnetconf2 sysrepo systemd" +DEPENDS = "libyang libnetconf2 sysrepo sysrepo-native" RDEPENDS:${PN} += "bash curl" FILES:${PN} += "${datadir}/yang* ${datadir}/netopeer2/* ${libdir}/sysrepo-plugind/*" @@ -23,8 +24,14 @@ FILES:${PN} += "${datadir}/yang* ${datadir}/netopeer2/* ${libdir}/sysrepo-plugin inherit cmake pkgconfig inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} -# Specify any options you want to pass to cmake using EXTRA_OECMAKE: -EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String=Release -DINSTALL_MODULES=OFF -DGENERATE_HOSTKEY=OFF -DMERGE_LISTEN_CONFIG=OFF" +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DCMAKE_BUILD_TYPE:String=Release \ + -DSYSREPO_SETUP=OFF \ + -DINSTALL_MODULES=OFF \ + -DGENERATE_HOSTKEY=OFF \ + -DMERGE_LISTEN_CONFIG=OFF \ +" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "netopeer2-serverd.service" @@ -32,12 +39,11 @@ SYSTEMD_AUTO_ENABLE:${PN} = "disable" do_install:append () { install -d ${D}${sysconfdir}/netopeer2/scripts - install -o root -g root ${S}/scripts/setup.sh ${D}${sysconfdir}/netopeer2/scripts/setup.sh - install -o root -g root ${S}/scripts/merge_hostkey.sh ${D}${sysconfdir}/netopeer2/scripts/merge_hostkey.sh - install -o root -g root ${S}/scripts/merge_config.sh ${D}${sysconfdir}/netopeer2/scripts/merge_config.sh - install -d ${D}${sysconfdir}/netopeer2 - install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/scripts/setup.sh ${D}${sysconfdir}/netopeer2/scripts/setup.sh + install -m 0755 ${S}/scripts/merge_hostkey.sh ${D}${sysconfdir}/netopeer2/scripts/merge_hostkey.sh + install -m 0755 ${S}/scripts/merge_config.sh ${D}${sysconfdir}/netopeer2/scripts/merge_config.sh if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d install -m 0755 ${UNPACKDIR}/netopeer2-server ${D}${sysconfdir}/init.d/ fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then diff --git a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bbappend b/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bbappend deleted file mode 100644 index f8a9febe..00000000 --- a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-Add-EST-Yang-Models.patch" - -FILES:${PN} += "/usr/share/yang* /usr/share/netopeer2/* /usr/lib/sysrepo-plugind/*"