mirror of
https://github.com/openwrt/packages.git
synced 2026-10-12 05:57:04 +04:00
sysrepo: update to 5.1.0
Jump from the 3.x series; the SONAME moves from libsysrepo.so.7 to libsysrepo.so.8. The protobuf-c IPC layer is gone in favour of shared memory, taking its two stub patches and the libprotobuf-c, libev and libredblack dependencies with it, and DEPENDS moves back to +libyang. Renamed cmake options are dealt with; PRINTED_CONTEXT_ADDRESS=0 and NOTIFD_SETUP=OFF skip a try_run() and an install hook that both run target binaries, which cannot work when cross-compiling. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
1 parent
5450e21134
commit
b9191b85ee
4 files changed
+38
-14859
No files matched your search
+8
-12
@@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=sysrepo
|
||||
PKG_VERSION:=3.7.11
|
||||
PKG_RELEASE:=4
|
||||
PKG_VERSION:=5.1.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/sysrepo/sysrepo/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=c897206797427c79c4646baa1d8abe539bbc70af884ac869e827ff9f09d7fcc8
|
||||
PKG_HASH:=e43d59320309f81c14f7f4224661253df767ebcc9a9b269a54b3577c96f406e4
|
||||
|
||||
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
@@ -29,7 +29,7 @@ define Package/libsysrepo
|
||||
CATEGORY:=Libraries
|
||||
TITLE:=YANG-based data store library
|
||||
URL:=https://www.sysrepo.org/
|
||||
DEPENDS:=+libyang-legacy $(ATOMIC64_DEPENDS) +libprotobuf-c +libev +librt +libpthread
|
||||
DEPENDS:=+libyang $(ATOMIC64_DEPENDS) +librt +libpthread
|
||||
endef
|
||||
|
||||
define Package/sysrepo
|
||||
@@ -64,15 +64,11 @@ endef
|
||||
TARGET_LDFLAGS += -Wl,--as-needed
|
||||
|
||||
CMAKE_OPTIONS += \
|
||||
-DFORCE_WSL=TRUE \
|
||||
-DENABLE_TESTS:BOOL=FALSE \
|
||||
-DBUILD_EXAMPLES:BOOL=FALSE \
|
||||
-DENABLE_EXAMPLES:BOOL=FALSE \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE="Package" \
|
||||
-DREPOSITORY_LOC:PATH=/etc/sysrepo \
|
||||
-DCALL_TARGET_BINS_DIRECTLY=OFF \
|
||||
-DGEN_LANGUAGE_BINDINGS:BOOL=TRUE \
|
||||
-DCMAKE_PREFIX_PATH=$(STAGING_DIR)/usr/lib/libyang-legacy
|
||||
-DPRINTED_CONTEXT_ADDRESS=0 \
|
||||
-DNOTIFD_SETUP:BOOL=OFF
|
||||
|
||||
define Package/libsysrepo/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
@@ -83,7 +79,7 @@ define Package/libsysrepo/install
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/modules/ietf-netconf-notifications@2012-02-06.yang $(1)/etc/sysrepo/yang/
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/modules/ietf-netconf@2013-09-29.yang $(1)/etc/sysrepo/yang/
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/modules/ietf-origin@2018-02-14.yang $(1)/etc/sysrepo/yang/
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/modules/sysrepo@2024-10-25.yang $(1)/etc/sysrepo/yang/
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/modules/sysrepo@2025-04-04.yang $(1)/etc/sysrepo/yang/
|
||||
|
||||
$(INSTALL_DIR) $(1)/etc/uci-defaults
|
||||
$(INSTALL_BIN) ./files/libsysrepo.default $(1)/etc/uci-defaults/95_libsysrepo
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,66 +0,0 @@
|
||||
--- a/src/common/sysrepo.pb-c.c
|
||||
+++ b/src/common/sysrepo.pb-c.c
|
||||
@@ -8013,7 +8013,7 @@ const ProtobufCMessageDescriptor sr__eve
|
||||
(ProtobufCMessageInit) sr__event_notif_replay_resp__init,
|
||||
NULL,NULL,NULL /* reserved[123] */
|
||||
};
|
||||
-static const ProtobufCFieldDescriptor sr__data_provide_req__field_descriptors[4] =
|
||||
+static const ProtobufCFieldDescriptor sr__data_provide_req__field_descriptors[5] =
|
||||
{
|
||||
{
|
||||
"xpath",
|
||||
@@ -8063,8 +8063,21 @@ static const ProtobufCFieldDescriptor sr
|
||||
0, /* flags */
|
||||
0,NULL,NULL /* reserved1,reserved2, etc */
|
||||
},
|
||||
+ {
|
||||
+ "original_xpath",
|
||||
+ 21,
|
||||
+ PROTOBUF_C_LABEL_REQUIRED,
|
||||
+ PROTOBUF_C_TYPE_STRING,
|
||||
+ 0, /* quantifier_offset */
|
||||
+ offsetof(Sr__DataProvideReq, original_xpath),
|
||||
+ NULL,
|
||||
+ NULL,
|
||||
+ 0, /* flags */
|
||||
+ 0,NULL,NULL /* reserved1,reserved2, etc */
|
||||
+ },
|
||||
};
|
||||
static const unsigned sr__data_provide_req__field_indices_by_name[] = {
|
||||
+ 4, /* field[4] = original_xpath */
|
||||
3, /* field[3] = request_id */
|
||||
1, /* field[1] = subscriber_address */
|
||||
2, /* field[2] = subscription_id */
|
||||
@@ -8075,7 +8088,7 @@ static const ProtobufCIntRange sr__data_
|
||||
{ 1, 0 },
|
||||
{ 10, 1 },
|
||||
{ 20, 3 },
|
||||
- { 0, 4 }
|
||||
+ { 0, 5 }
|
||||
};
|
||||
const ProtobufCMessageDescriptor sr__data_provide_req__descriptor =
|
||||
{
|
||||
@@ -8085,7 +8098,7 @@ const ProtobufCMessageDescriptor sr__dat
|
||||
"Sr__DataProvideReq",
|
||||
"sr",
|
||||
sizeof(Sr__DataProvideReq),
|
||||
- 4,
|
||||
+ 5,
|
||||
sr__data_provide_req__field_descriptors,
|
||||
sr__data_provide_req__field_indices_by_name,
|
||||
3, sr__data_provide_req__number_ranges,
|
||||
--- a/src/common/sysrepo.pb-c.h
|
||||
+++ b/src/common/sysrepo.pb-c.h
|
||||
@@ -1630,10 +1630,11 @@ struct _Sr__DataProvideReq
|
||||
char *subscriber_address;
|
||||
uint32_t subscription_id;
|
||||
uint64_t request_id;
|
||||
+ char *original_xpath;
|
||||
};
|
||||
#define SR__DATA_PROVIDE_REQ__INIT \
|
||||
{ PROTOBUF_C_MESSAGE_INIT (&sr__data_provide_req__descriptor) \
|
||||
- , NULL, NULL, 0, 0 }
|
||||
+ , NULL, NULL, 0, 0, NULL }
|
||||
|
||||
|
||||
/*
|
||||
Executable
+30
@@ -0,0 +1,30 @@
|
||||
#!/bin/sh
|
||||
|
||||
case "$1" in
|
||||
libsysrepo)
|
||||
[ -e /usr/lib/libsysrepo.so ] || {
|
||||
echo "libsysrepo.so not found" >&2
|
||||
exit 1
|
||||
}
|
||||
[ -e /usr/lib/libsysrepo.so.8 ] || {
|
||||
echo "libsysrepo.so.8 not found" >&2
|
||||
exit 1
|
||||
}
|
||||
;;
|
||||
sysrepo)
|
||||
[ -x /usr/bin/sysrepo-plugind ] || {
|
||||
echo "sysrepo-plugind not found" >&2
|
||||
exit 1
|
||||
}
|
||||
;;
|
||||
sysrepoctl)
|
||||
sysrepoctl --version | grep -F "$2"
|
||||
;;
|
||||
sysrepocfg)
|
||||
sysrepocfg --version | grep -F "$2"
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported test target: $1" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
Reference in new issue
Block a user