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}" -