diff mbox series

[master/kirkstone,v3,1/2] meta-arago-extras: sysrepo: Adopt Yocto variable names

Message ID 20240212175706.27950-2-r-gunasekaran@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series Add systemd service for sysrepo and netopeer | expand

Commit Message

Ravi Gunasekaran Feb. 12, 2024, 5:57 p.m. UTC 
Use Yocto variable names instead of path value

Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com>
---

* Newly introduced in the series

 .../libnetconf2/libnetconf2_git.bb             |  2 +-
 .../recipes-sysrepo/libyang/libyang_git.bb     |  2 +-
 .../netopeer2-server/netopeer2-server_git.bb   | 16 ++++++++--------
 .../recipes-sysrepo/sysrepo/sysrepo_git.bb     | 18 +++++++++---------
 .../tsn-yang-models/tsn-yang-models_git.bb     | 16 ++++++++--------
 5 files changed, 27 insertions(+), 27 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
index a534b9ac..aaf134ea 100644
--- a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
@@ -13,7 +13,7 @@  S = "${WORKDIR}/git"
 
 DEPENDS = "libssh openssl libyang libxcrypt libpam"
 
-FILES:${PN} += "/usr/share/yang/modules/libnetconf2/*"
+FILES:${PN} += "${datadir}/yang/modules/libnetconf2/*"
 
 inherit cmake pkgconfig
 
diff --git a/meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb b/meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb
index c984a252..cd5a2afd 100644
--- a/meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb
@@ -13,7 +13,7 @@  S = "${WORKDIR}/git"
 
 DEPENDS = "libpcre2"
 
-FILES:${PN} += "/usr/share/yang/modules/libyang/*"
+FILES:${PN} += "${datadir}/yang/modules/libyang/*"
 
 inherit cmake pkgconfig
 
diff --git a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb b/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb
index e4278d23..96853ecf 100644
--- a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb
@@ -13,7 +13,7 @@  S = "${WORKDIR}/git"
 DEPENDS = "libyang libnetconf2 sysrepo curl"
 RDEPENDS:${PN} += "bash curl"
 
-FILES:${PN} += "/usr/share/yang* /usr/share/netopeer2/* /usr/lib/sysrepo-plugind/*"
+FILES:${PN} += "${datadir}/yang* ${datadir}/netopeer2/* ${libdir}/sysrepo-plugind/*"
 
 inherit cmake pkgconfig
 
@@ -21,11 +21,11 @@  inherit cmake pkgconfig
 EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String=Release -DINSTALL_MODULES=OFF -DGENERATE_HOSTKEY=OFF -DMERGE_LISTEN_CONFIG=OFF"
 
 do_install:append () {
-    install -d ${D}/etc/netopeer2/scripts
-    install -o root -g root ${S}/scripts/setup.sh ${D}/etc/netopeer2/scripts/setup.sh
-    install -o root -g root ${S}/scripts/merge_hostkey.sh ${D}/etc/netopeer2/scripts/merge_hostkey.sh
-    install -o root -g root ${S}/scripts/merge_config.sh ${D}/etc/netopeer2/scripts/merge_config.sh
-    install -d ${D}/etc/netopeer2
-    install -d ${D}/etc/init.d
-    install -m 0755 ${WORKDIR}/netopeer2-server ${D}/etc/init.d/
+    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 ${WORKDIR}/netopeer2-server ${D}${sysconfdir}/init.d/
 }
diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb b/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb
index 18da3ca3..3a77e170 100644
--- a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb
@@ -13,7 +13,7 @@  S = "${WORKDIR}/git"
 
 DEPENDS = "libyang protobuf protobuf-c protobuf-c-native libredblack libev libnetconf2"
 
-FILES:${PN} += "/usr/share/yang/* /usr/lib/sysrepo-plugind/*"
+FILES:${PN} += "${datadir}/yang/* ${libdir}/sysrepo-plugind/*"
 
 inherit cmake pkgconfig python3native python3-dir
 
@@ -23,12 +23,12 @@  EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String=Rel
 BBCLASSEXTEND = "native nativesdk"
 
 do_install:append () {
-    install -d ${D}/etc/sysrepo/data/notifications
-    install -d ${D}/etc/sysrepo/yang
-    install -o root -g root ${S}/modules/ietf-netconf-notifications.yang ${D}/etc/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang
-    install -o root -g root ${S}/modules/ietf-netconf-with-defaults.yang ${D}/etc/sysrepo/yang/ietf-netconf-with-defaults@2011-06-01.yang
-    install -o root -g root ${S}/modules/ietf-netconf.yang ${D}/etc/sysrepo/yang/ietf-netconf@2011-06-01.yang
-    install -d ${D}/etc/init.d
-    install -m 0775 ${WORKDIR}/sysrepo ${D}/etc/init.d/
-    install -d ${D}/usr/lib/sysrepo/plugins
+    install -d ${D}${sysconfdir}/sysrepo/data/notifications
+    install -d ${D}${sysconfdir}/sysrepo/yang
+    install -o root -g root ${S}/modules/ietf-netconf-notifications.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang
+    install -o root -g root ${S}/modules/ietf-netconf-with-defaults.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-with-defaults@2011-06-01.yang
+    install -o root -g root ${S}/modules/ietf-netconf.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf@2011-06-01.yang
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0775 ${WORKDIR}/sysrepo ${D}${sysconfdir}/init.d/
+    install -d ${D}${libdir}/sysrepo/plugins
 }
diff --git a/meta-arago-extras/recipes-sysrepo/tsn-yang-models/tsn-yang-models_git.bb b/meta-arago-extras/recipes-sysrepo/tsn-yang-models/tsn-yang-models_git.bb
index 47f578e5..d46176ce 100644
--- a/meta-arago-extras/recipes-sysrepo/tsn-yang-models/tsn-yang-models_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/tsn-yang-models/tsn-yang-models_git.bb
@@ -11,14 +11,14 @@  SRCREV = "d3f6ca02ec9ce7c96b55066d209d08adbe851897"
 
 S = "${WORKDIR}/git"
 
-FILES:${PN} += "/usr/share/yang/*"
+FILES:${PN} += "${datadir}/yang/*"
 
 do_install:append () {
-    install -d ${D}/usr/share/yang/modules/netopeer2
-    install -o root -g root ${S}/standard/ietf/RFC/iana-if-type.yang ${D}/usr/share/yang/modules/netopeer2/iana-if-type@2017-01-19.yang
-    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-types.yang ${D}/usr/share/yang/modules/netopeer2/ieee802-types@2022-10-31.yang
-    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-types.yang ${D}/usr/share/yang/modules/netopeer2/ieee802-dot1q-types@2022-10-31.yang
-    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-bridge.yang ${D}//usr/share/yang/modules/netopeer2/ieee802-dot1q-bridge@2022-10-31.yang
-    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-sched.yang ${D}//usr/share/yang/modules/netopeer2/ieee802-dot1q-sched@2022-08-18.yang
-    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-sched-bridge.yang ${D}//usr/share/yang/modules/netopeer2/ieee802-dot1q-sched-bridge@2022-08-18.yang
+    install -d ${D}${datadir}/yang/modules/netopeer2
+    install -o root -g root ${S}/standard/ietf/RFC/iana-if-type.yang ${D}${datadir}/yang/modules/netopeer2/iana-if-type@2017-01-19.yang
+    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-types.yang ${D}${datadir}/yang/modules/netopeer2/ieee802-types@2022-10-31.yang
+    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-types.yang ${D}${datadir}/yang/modules/netopeer2/ieee802-dot1q-types@2022-10-31.yang
+    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-bridge.yang ${D}${datadir}/yang/modules/netopeer2/ieee802-dot1q-bridge@2022-10-31.yang
+    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-sched.yang ${D}${datadir}/yang/modules/netopeer2/ieee802-dot1q-sched@2022-08-18.yang
+    install -o root -g root ${S}/standard/ieee/draft/802.1/Qcw/ieee802-dot1q-sched-bridge.yang ${D}${datadir}/yang/modules/netopeer2/ieee802-dot1q-sched-bridge@2022-08-18.yang
 }