[meta-arago][master][PATCH 00/13] Update and cleanup sysrepo packages

[meta-arago][master][PATCH 00/13] Update and cleanup sysrepo packages

[Ryan Eatmon]

Update all of the sysrepo related packages to their latest versions and
clean them up.  The recipes were all moved under recipes-extended
instead of recipes-sysrepo, and various things caught by
yocto-check-layer were fixed.

Denys Dmytriyenko (8):
  sysrepo: move and clean up
  sysrepo-plugins-common: move and clean up
  libyang: move bbappend
  libnetconf2: move and clean up
  libredblack: move and clean up
  nw-configurator: move and clean up
  tsn-yang-models: move and clean up
  netopeer2-server: move and clean up

Ryan Eatmon (5):
  libnetconf2: Wrap libpam dependency
  libyang: Remove recipe in favor of newer upstream version
  libyang: Add BBCLASSEXTEND for native
  sysrepo: Update to version 3.3.10
  netopeer2-server: Update to version 2.2.35

 .../sysrepo/libnetconf2_git.bb                | 25 +++++++++
 .../sysrepo}/libredblack_git.bb               |  6 +--
 .../sysrepo/libyang_%.bbappend                |  1 +
 .../0001-Add-EST-Yang-Models.patch            | 10 ++--
 .../netopeer2-server/netopeer2-server         |  0
 .../netopeer2-serverd.service                 |  0
 .../sysrepo/netopeer2-server_git.bb           | 53 +++++++++++++++++++
 .../sysrepo}/nw-configurator.bb               |  6 +--
 .../nw-configurator}/nw-configurator.c        |  0
 .../0001-so-version.patch                     | 23 ++++++++
 .../sysrepo/sysrepo-plugins-common_git.bb     | 17 ++++++
 ...-Hardcode-correct-path-to-tar-binary.patch |  4 +-
 .../sysrepo/sysrepo/sysrepo                   |  0
 .../sysrepo/sysrepo/sysrepod.service          |  0
 .../sysrepo/sysrepo_git.bb                    | 46 ++++++++--------
 .../sysrepo}/tsn-yang-models_git.bb           |  2 -
 .../libnetconf2/libnetconf2_git.bb            | 24 ---------
 .../recipes-sysrepo/libyang/libyang_git.bb    | 23 --------
 .../netopeer2-server/netopeer2-server_git.bb  | 47 ----------------
 .../netopeer2-server_git.bbappend             |  5 --
 .../0001-so-version.patch                     | 15 ------
 .../sysrepo-plugins-common_git.bb             | 26 ---------
 22 files changed, 154 insertions(+), 179 deletions(-)
 create mode 100644 meta-arago-extras/recipes-extended/sysrepo/libnetconf2_git.bb
 rename meta-arago-extras/{recipes-sysrepo/libredblack => recipes-extended/sysrepo}/libredblack_git.bb (62%)
 create mode 100644 meta-arago-extras/recipes-extended/sysrepo/libyang_%.bbappend
 rename meta-arago-extras/{recipes-sysrepo/netopeer2-server => recipes-extended/sysrepo}/netopeer2-server/0001-Add-EST-Yang-Models.patch (84%)
 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%)
 create mode 100644 meta-arago-extras/recipes-extended/sysrepo/netopeer2-server_git.bb
 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%)
 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
 rename meta-arago-extras/{recipes-sysrepo => recipes-extended}/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch (88%)
 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 (50%)
 rename meta-arago-extras/{recipes-sysrepo/tsn-yang-models => recipes-extended/sysrepo}/tsn-yang-models_git.bb (96%)
 delete mode 100644 meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
 delete mode 100644 meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb
 delete mode 100644 meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb
 delete mode 100644 meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bbappend
 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

-- 
2.17.1

[meta-arago][master][PATCH 01/13] libnetconf2: Wrap libpam dependency

[Ryan Eatmon]

Check the DISTRO_FEATURES to make sure that pam is turned on before
depending on libpam.  The libpam recipe is gated behind this check and
this recipe will fail if you do not have pam enabled.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../recipes-sysrepo/libnetconf2/libnetconf2_git.bb            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
index 196b36fe..c62d3faa 100644
--- a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
@@ -11,7 +11,9 @@ SRCREV = "91cd6d75722c65de5c005d908f6d645b48cee89b"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "libssh openssl libyang libxcrypt libpam"
+DEPENDS = "libssh openssl libyang libxcrypt \
+    ${@bb.utils.contains('DISTRO_FEATURES','pam','libpam','',d)} \
+"
 
 FILES:${PN} += "${datadir}/yang/modules/libnetconf2/*"
 
-- 
2.17.1

[meta-arago][master][PATCH 02/13] libyang: Remove recipe in favor of newer upstream version

[Ryan Eatmon]

meta-openembedded has a newer version, so we no longer need to carry
this in meta-arago-extras.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../recipes-sysrepo/libyang/libyang_git.bb    | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb

diff --git a/meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb b/meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb
deleted file mode 100644
index ef5fed40..00000000
--- a/meta-arago-extras/recipes-sysrepo/libyang/libyang_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "YANG data modelling language parser and toolkit"
-DESCRIPTION = "libyang is YANG data modelling language parser and toolkit written (and providing API) in C. The library is used e.g. in libnetconf2, Netopeer2 or sysrepo projects."
-SECTION = "libs"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad"
-
-SRC_URI = "git://github.com/CESNET/libyang.git;protocol=https;branch=devel"
-
-PV = "2.1.77+git"
-SRCREV = "a804113c9bbac3e36c53221be469c1ca5af5b435"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "libpcre2"
-
-FILES:${PN} += "${datadir}/yang/modules/libyang/*"
-
-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 "
-
-BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1

[meta-arago][master][PATCH 03/13] libyang: Add BBCLASSEXTEND for native

[Ryan Eatmon]

We need to add BBCLASSEXTEND for native so that we can build
sysrepo-native for the netopeer2-server install.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../recipes-sysrepo/libnetconf2/libnetconf2_git.bb          | 6 +++---
 .../recipes-sysrepo/libyang/libyang_%.bbappend              | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend

diff --git a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
index c62d3faa..6b3f73ca 100644
--- a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=08a5578c9bab06fb2ae84284630b973f"
 
 SRC_URI = "git://github.com/CESNET/libnetconf2.git;protocol=https;branch=devel"
 
-PV = "2.1.34+git"
-SRCREV = "91cd6d75722c65de5c005d908f6d645b48cee89b"
+PV = "3.5.5+git"
+SRCREV = "4c7858c9c41f1ac04d2b15c032291e335fc0f5f5"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "libssh openssl libyang libxcrypt \
+DEPENDS = "libssh openssl libyang libxcrypt mbedtls curl \
     ${@bb.utils.contains('DISTRO_FEATURES','pam','libpam','',d)} \
 "
 
diff --git a/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend b/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
new file mode 100644
index 00000000..608377e3
--- /dev/null
+++ b/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1

[meta-arago][master][PATCH 04/13] sysrepo: Update to version 3.3.10

[Ryan Eatmon]

With the update to libyang we need to move to a newer version of
sysrepo.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 ...-Hardcode-correct-path-to-tar-binary.patch |  4 ++--
 .../recipes-sysrepo/sysrepo/sysrepo_git.bb    | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch b/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch
index c8768482..c8d22412 100644
--- a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch
+++ b/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo/0001-Hardcode-correct-path-to-tar-binary.patch
@@ -17,8 +17,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 22c95420..2ba1f44e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -402,10 +402,7 @@ check_symbol_exists(mkstemps "stdlib.h" SR_HAVE_MKSTEMPS)
- unset(CMAKE_REQUIRED_DEFINITIONS)
+@@ -558,10 +558,7 @@ target_link_libraries(sysrepo ${CMAKE_THREAD_LIBS_INIT})
+ set(CMAKE_REQUIRED_LIBRARIES pthread)
 
  # tar
 -find_program(TAR_BINARY "tar")
diff --git a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb b/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb
index b893e281..0877a65f 100644
--- a/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb
+++ b/meta-arago-extras/recipes-sysrepo/sysrepo/sysrepo_git.bb
@@ -4,21 +4,21 @@ DESCRIPTION = ""
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ef345f161efb68c3836e6f5648b2312f"
 
-SRC_URI = "git://github.com/sysrepo/sysrepo.git;protocol=https;branch=devel \
+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 = "2.2.71+git"
-SRCREV = "b828f0ab4693c613cc66efd053a146e05854d5c8"
+PV = "3.3.10+git"
+SRCREV = "ef93a1253cc97f13671759f6e7790cbf729a5ae9"
 
 S = "${WORKDIR}/git"
 
 DEPENDS = "libyang protobuf protobuf-c protobuf-c-native libredblack libev libnetconf2"
 
-FILES:${PN} += "${datadir}/yang/* ${libdir}/sysrepo-plugind/*"
+FILES:${PN} += "${datadir}/yang/* ${libdir}/sysrepo-plugind/* ${bindir}/*"
 
 inherit cmake pkgconfig python3native python3-dir
 inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
@@ -27,20 +27,18 @@ 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 "
 
-BBCLASSEXTEND = "native nativesdk"
-
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "sysrepod.service"
 SYSTEMD_AUTO_ENABLE:${PN} = "disable"
 
 RDEPENDS:${PN} += "tar"
 
-do_install:append () {
+do_install:append:class-target () {
     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 -o root -g root ${S}/modules/ietf-netconf-notifications@2012-02-06.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-notifications@2012-02-06.yang
+    install -o root -g root ${S}/modules/ietf-netconf-with-defaults@2011-06-01.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf-with-defaults@2011-06-01.yang
+    install -o root -g root ${S}/modules/ietf-netconf@2013-09-29.yang ${D}${sysconfdir}/sysrepo/yang/ietf-netconf@2013-09-29.yang
     install -d ${D}${sysconfdir}/init.d
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -m 0775 ${UNPACKDIR}/sysrepo ${D}${sysconfdir}/init.d/
@@ -52,3 +50,8 @@ do_install:append () {
         install -m 0644 ${UNPACKDIR}/sysrepod.service ${D}${systemd_system_unitdir}
     fi
 }
+
+BBCLASSEXTEND = "native"
+
+SYSROOT_DIRS:append = " ${bindir}"
+
-- 
2.17.1

[meta-arago][master][PATCH 05/13] netopeer2-server: Update to version 2.2.35

[Ryan Eatmon]

With the update to a newer libyang, we need to move to a newer version
of netopeer2-server.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../netopeer2-server/0001-Add-EST-Yang-Models.patch    | 10 +++++-----
 .../netopeer2-server/netopeer2-server_git.bb           |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/0001-Add-EST-Yang-Models.patch b/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/0001-Add-EST-Yang-Models.patch
index 983f594b..d0b24d8b 100644
--- a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/0001-Add-EST-Yang-Models.patch
+++ b/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server/0001-Add-EST-Yang-Models.patch
@@ -3,9 +3,9 @@ Upstream-Status: Inappropriate [arago specific]
 
 diff --git a/scripts/setup.sh b/scripts/setup.sh
 index 7bba711..4a98e66 100755
---- a/scripts/setup.sh
-+++ b/scripts/setup.sh
-@@ -41,6 +41,12 @@ MODULES=(
+--- a/scripts/common.sh
++++ b/scripts/common.sh
+@@ -12,6 +12,12 @@ NP2_MODULES=(
  "ietf-network-instance@2019-01-21.yang"
  "ietf-subscribed-notifications@2019-09-09.yang -e encode-xml -e replay -e subtree -e xpath"
  "ietf-yang-push@2019-09-09.yang -e on-change"
@@ -16,5 +16,5 @@ index 7bba711..4a98e66 100755
 +"ieee802-dot1q-sched@2022-08-18.yang"
 +"ieee802-dot1q-sched-bridge@2022-08-18.yang"
  )
-
- CMD_INSTALL=
+ 
+ LN2_MODULES=(
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 7905aa00..89a05b2b 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
@@ -3,19 +3,19 @@ DESCRIPTION = "Netopeer2 is based on the new generation of the NETCONF and YANG
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=41daedff0b24958b2eba4f9086d782e1"
 
-SRC_URI = "git://github.com/CESNET/Netopeer2.git;protocol=https;branch=devel \
+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)} \
           "
 
-PV = "2.1.59+git"
-SRCREV = "b81788d9a81770313a0eb7f88d4224726b3d6e15"
+PV = "2.2.35+git"
+SRCREV = "6d1cb61ef3ce2274a91dc9cbc51318bcd0b54697"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "libyang libnetconf2 sysrepo curl"
+DEPENDS = "libyang libnetconf2 sysrepo systemd"
 RDEPENDS:${PN} += "bash curl"
 
 FILES:${PN} += "${datadir}/yang* ${datadir}/netopeer2/* ${libdir}/sysrepo-plugind/*"
-- 
2.17.1

[meta-arago][master][PATCH 06/13] sysrepo: move and clean up

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* 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 <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 ...-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}"
-
-- 
2.17.1

[meta-arago][master][PATCH 07/13] sysrepo-plugins-common: move and clean up

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* 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 <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../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 <r-gunasekaran@ti.com>
+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
-}
-- 
2.17.1

[meta-arago][master][PATCH 08/13] libyang: move bbappend

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* Move into recipes-extended

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../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
-- 
2.17.1

[meta-arago][master][PATCH 09/13] libnetconf2: move and clean up

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* Move into recipes-extended
* Shorten SUMMARY, split DESCRIPTION
* Don't hardcode /usr when passing to CMake

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../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 (54%)

diff --git a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb b/meta-arago-extras/recipes-extended/sysrepo/libnetconf2_git.bb
similarity index 54%
rename from meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
rename to meta-arago-extras/recipes-extended/sysrepo/libnetconf2_git.bb
index 6b3f73ca..0d124890 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"
@@ -19,8 +20,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"
-- 
2.17.1

[meta-arago][master][PATCH 10/13] libredblack: move and clean up

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* Move into recipes-extended
* Clean unnecessary comments

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>

libredblack cleanup

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../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"
-- 
2.17.1

[meta-arago][master][PATCH 11/13] nw-configurator: move and clean up

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* 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 <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../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
-- 
2.17.1

[meta-arago][master][PATCH 12/13] tsn-yang-models: move and clean up

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* Move into recipes-extended
* Don't empty DESCRIPTION

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../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"
 
-- 
2.17.1

[meta-arago][master][PATCH 13/13] netopeer2-server: move and clean up

[Ryan Eatmon]

From: Denys Dmytriyenko <denys@konsulko.com>

* 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 <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../0001-Add-EST-Yang-Models.patch            |  0
 .../netopeer2-server/netopeer2-server         |  0
 .../netopeer2-serverd.service                 |  0
 .../sysrepo/netopeer2-server_git.bb           | 53 +++++++++++++++++++
 .../netopeer2-server/netopeer2-server_git.bb  | 47 ----------------
 .../netopeer2-server_git.bbappend             |  5 --
 6 files changed, 53 insertions(+), 52 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%)
 create mode 100644 meta-arago-extras/recipes-extended/sysrepo/netopeer2-server_git.bb
 delete mode 100644 meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb
 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-extended/sysrepo/netopeer2-server_git.bb b/meta-arago-extras/recipes-extended/sysrepo/netopeer2-server_git.bb
new file mode 100644
index 00000000..073aed5e
--- /dev/null
+++ b/meta-arago-extras/recipes-extended/sysrepo/netopeer2-server_git.bb
@@ -0,0 +1,53 @@
+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 \
+    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 sysrepo-native"
+RDEPENDS:${PN} += "bash curl"
+
+FILES:${PN} += "${datadir}/yang* ${datadir}/netopeer2/* ${libdir}/sysrepo-plugind/*"
+
+inherit cmake pkgconfig
+inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}
+
+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"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
+
+do_install:append () {
+    install -d ${D}${sysconfdir}/netopeer2/scripts
+    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
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${UNPACKDIR}/netopeer2-serverd.service ${D}${systemd_system_unitdir}
+    fi
+}
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
deleted file mode 100644
index 89a05b2b..00000000
--- a/meta-arago-extras/recipes-sysrepo/netopeer2-server/netopeer2-server_git.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-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."
-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)} \
-          "
-
-PV = "2.2.35+git"
-SRCREV = "6d1cb61ef3ce2274a91dc9cbc51318bcd0b54697"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "libyang libnetconf2 sysrepo systemd"
-RDEPENDS:${PN} += "bash curl"
-
-FILES:${PN} += "${datadir}/yang* ${datadir}/netopeer2/* ${libdir}/sysrepo-plugind/*"
-
-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"
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "netopeer2-serverd.service"
-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
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-        install -m 0755 ${UNPACKDIR}/netopeer2-server ${D}${sysconfdir}/init.d/
-    fi
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -d ${D}${systemd_system_unitdir}
-        install -m 0644 ${UNPACKDIR}/netopeer2-serverd.service ${D}${systemd_system_unitdir}
-    fi
-}
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/*"
-- 
2.17.1

Re: [meta-arago][master][PATCH 03/13] libyang: Add BBCLASSEXTEND for native

[Denys Dmytriyenko]

This patch is incorrect - it got extra stuff in it.


On Thu, Mar 13, 2025 at 05:40:19AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> We need to add BBCLASSEXTEND for native so that we can build
> sysrepo-native for the netopeer2-server install.
> 
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>  .../recipes-sysrepo/libnetconf2/libnetconf2_git.bb          | 6 +++---
>  .../recipes-sysrepo/libyang/libyang_%.bbappend              | 1 +
>  2 files changed, 4 insertions(+), 3 deletions(-)
>  create mode 100644 meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
> 
> diff --git a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
> index c62d3faa..6b3f73ca 100644
> --- a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
> +++ b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
> @@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=08a5578c9bab06fb2ae84284630b973f"
>  
>  SRC_URI = "git://github.com/CESNET/libnetconf2.git;protocol=https;branch=devel"
>  
> -PV = "2.1.34+git"
> -SRCREV = "91cd6d75722c65de5c005d908f6d645b48cee89b"
> +PV = "3.5.5+git"
> +SRCREV = "4c7858c9c41f1ac04d2b15c032291e335fc0f5f5"
>  
>  S = "${WORKDIR}/git"
>  
> -DEPENDS = "libssh openssl libyang libxcrypt \
> +DEPENDS = "libssh openssl libyang libxcrypt mbedtls curl \
>      ${@bb.utils.contains('DISTRO_FEATURES','pam','libpam','',d)} \
>  "
>  
> diff --git a/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend b/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
> new file mode 100644
> index 00000000..608377e3
> --- /dev/null
> +++ b/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
> @@ -0,0 +1 @@
> +BBCLASSEXTEND = "native nativesdk"
> -- 
> 2.17.1

Re: [meta-arago][master][PATCH 10/13] libredblack: move and clean up

[Denys Dmytriyenko]

On Thu, Mar 13, 2025 at 05:40:26AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> * Move into recipes-extended
> * Clean unnecessary comments
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>

Huh, when I squashed the 2 commits into 1, I missed some extra text below...


> libredblack cleanup
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>  .../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"
> -- 
> 2.17.1

Re: [meta-arago][master][PATCH 03/13] libyang: Add BBCLASSEXTEND for native

[Ryan Eatmon]

On 3/13/2025 1:02 PM, Denys Dmytriyenko wrote:
> This patch is incorrect - it got extra stuff in it.
> 

Got to love rebasing...  I'll fix it.


> On Thu, Mar 13, 2025 at 05:40:19AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>> We need to add BBCLASSEXTEND for native so that we can build
>> sysrepo-native for the netopeer2-server install.
>>
>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>> ---
>>   .../recipes-sysrepo/libnetconf2/libnetconf2_git.bb          | 6 +++---
>>   .../recipes-sysrepo/libyang/libyang_%.bbappend              | 1 +
>>   2 files changed, 4 insertions(+), 3 deletions(-)
>>   create mode 100644 meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
>>
>> diff --git a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
>> index c62d3faa..6b3f73ca 100644
>> --- a/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
>> +++ b/meta-arago-extras/recipes-sysrepo/libnetconf2/libnetconf2_git.bb
>> @@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=08a5578c9bab06fb2ae84284630b973f"
>>   
>>   SRC_URI = "git://github.com/CESNET/libnetconf2.git;protocol=https;branch=devel"
>>   
>> -PV = "2.1.34+git"
>> -SRCREV = "91cd6d75722c65de5c005d908f6d645b48cee89b"
>> +PV = "3.5.5+git"
>> +SRCREV = "4c7858c9c41f1ac04d2b15c032291e335fc0f5f5"
>>   
>>   S = "${WORKDIR}/git"
>>   
>> -DEPENDS = "libssh openssl libyang libxcrypt \
>> +DEPENDS = "libssh openssl libyang libxcrypt mbedtls curl \
>>       ${@bb.utils.contains('DISTRO_FEATURES','pam','libpam','',d)} \
>>   "
>>   
>> diff --git a/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend b/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
>> new file mode 100644
>> index 00000000..608377e3
>> --- /dev/null
>> +++ b/meta-arago-extras/recipes-sysrepo/libyang/libyang_%.bbappend
>> @@ -0,0 +1 @@
>> +BBCLASSEXTEND = "native nativesdk"
>> -- 
>> 2.17.1

-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

Re: [meta-arago][master][PATCH 10/13] libredblack: move and clean up

[Ryan Eatmon]

On 3/13/2025 1:12 PM, Denys Dmytriyenko wrote:
> On Thu, Mar 13, 2025 at 05:40:26AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>> From: Denys Dmytriyenko <denys@konsulko.com>
>>
>> * Move into recipes-extended
>> * Clean unnecessary comments
>>
>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> 
> Huh, when I squashed the 2 commits into 1, I missed some extra text below...

I'll fix that and send a v2.


> 
>> libredblack cleanup
>>
>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>> ---
>>   .../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"
>> -- 
>> 2.17.1

-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS