From patchwork Mon Mar 17 18:37:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 59294 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 565B7C35FFC for ; Mon, 17 Mar 2025 18:37:32 +0000 (UTC) Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) by mx.groups.io with SMTP id smtpd.web11.60914.1742236647102485703 for ; Mon, 17 Mar 2025 11:37:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=C6j/Xxy1; spf=pass (domain: ti.com, ip: 198.47.23.234, mailfrom: reatmon@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 52HIbPJh2410299 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Mar 2025 13:37:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1742236646; bh=2gEvKsrvctdY1NyNgesIOIvIR81ZQ9ze9sbhsW4dmX4=; h=From:To:Subject:Date:In-Reply-To:References; b=C6j/Xxy12JBh8NSrUb1/eNaaxltmL7I2Hxip0VHtwloT5Kb1r7frlXa2wwKyxsqgz R9LzgJQ0fFHqCbrGf7apJzMK60m0F70fuG6KSIfmRAaoMvktK41sdfRCvdplXeTrlg jnfrM9s7nmCTkRRyyLPe7aUIDi3ORwQ3ODrXAQpY= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 52HIbPAW076456 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 17 Mar 2025 13:37:25 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 17 Mar 2025 13:37:25 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE104.ent.ti.com (157.170.170.34) 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; Mon, 17 Mar 2025 13:37:25 -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 52HIbPj6000474; Mon, 17 Mar 2025 13:37:25 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1tuFL3-0008Ek-CU; Mon, 17 Mar 2025 13:37:25 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-arago][scarthgap][PATCH 07/14] sysrepo: move and clean up Date: Mon, 17 Mar 2025 13:37:17 -0500 Message-ID: <20250317183724.31563-9-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250317183724.31563-1-reatmon@ti.com> References: <20250317183724.31563-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 ; Mon, 17 Mar 2025 18:37:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/16066 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 Signed-off-by: Ryan Eatmon --- ...-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 4e7aac5d..2a778f93 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}" -