From e7a05eb9a9db1ee58e7c4c77690e9844a8d5ddf2 Mon Sep 17 00:00:00 2001 From: Brad House Date: Wed, 19 Feb 2025 10:41:01 -0500 Subject: [PATCH] IGNORE THIS COMMIT: merge libyang3 step 6 (PR #21790) --- platform/vs/docker-sonic-vs.mk | 3 - rules/docker-bmp.mk | 1 - rules/docker-config-engine-bookworm.mk | 3 - rules/docker-config-engine-bullseye.mk | 3 - rules/docker-config-engine-buster.mk | 3 - rules/docker-macsec.mk | 2 +- rules/libyang.dep | 10 - rules/libyang.mk | 35 --- rules/sonic-utilities.mk | 5 +- rules/sonic_bgpcfgd.mk | 5 +- slave.mk | 2 +- src/libyang/.gitignore | 3 - src/libyang/Makefile | 27 -- .../patch/debian-packaging-files.patch | 233 ------------------ .../patch/large_file_support_arm32.patch | 11 - src/libyang/patch/libyang.patch | 32 --- .../patch/libyang_mgmt_framework.patch | 13 - src/libyang/patch/series | 5 - src/libyang/patch/swig.patch | 136 ---------- 19 files changed, 4 insertions(+), 528 deletions(-) delete mode 100644 rules/libyang.dep delete mode 100644 rules/libyang.mk delete mode 100644 src/libyang/.gitignore delete mode 100644 src/libyang/Makefile delete mode 100644 src/libyang/patch/debian-packaging-files.patch delete mode 100644 src/libyang/patch/large_file_support_arm32.patch delete mode 100644 src/libyang/patch/libyang.patch delete mode 100644 src/libyang/patch/libyang_mgmt_framework.patch delete mode 100644 src/libyang/patch/series delete mode 100644 src/libyang/patch/swig.patch diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk index 878163078a60..345bc725cfc1 100644 --- a/platform/vs/docker-sonic-vs.mk +++ b/platform/vs/docker-sonic-vs.mk @@ -7,9 +7,6 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SYNCD_VS) \ $(LIBTEAMDCTL) \ $(LIBTEAM_UTILS) \ $(SONIC_DEVICE_DATA) \ - $(LIBYANG) \ - $(LIBYANG_CPP) \ - $(LIBYANG_PY3) \ $(LIBYANG3) \ $(LIBYANG3_PY3) \ $(SONIC_UTILITIES_DATA) \ diff --git a/rules/docker-bmp.mk b/rules/docker-bmp.mk index 48501efcfa68..8702906bd9ea 100644 --- a/rules/docker-bmp.mk +++ b/rules/docker-bmp.mk @@ -13,7 +13,6 @@ $(DOCKER_BMP)_PYTHON_WHEELS = $(SONIC_BMPCFGD) $(DOCKER_BMP)_INSTALL_DEBS = $(LIBSWSSCOMMON) \ $(SONIC_BMPD) \ $(PYTHON3_SWSSCOMMON) \ - $(LIBYANG_PY3) \ $(LIBYANG3_PY3) $(DOCKER_BMP)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS) diff --git a/rules/docker-config-engine-bookworm.mk b/rules/docker-config-engine-bookworm.mk index 60606ab70b6c..4c4f60d87d6d 100644 --- a/rules/docker-config-engine-bookworm.mk +++ b/rules/docker-config-engine-bookworm.mk @@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BOOKWORM = docker-config-engine-bookworm.gz $(DOCKER_CONFIG_ENGINE_BOOKWORM)_PATH = $(DOCKERS_PATH)/docker-config-engine-bookworm $(DOCKER_CONFIG_ENGINE_BOOKWORM)_DEPENDS += $(LIBSWSSCOMMON) \ - $(LIBYANG) \ - $(LIBYANG_CPP) \ - $(LIBYANG_PY3) \ $(LIBYANG3) \ $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) \ diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk index 2211519c873a..5b8161c73c4c 100644 --- a/rules/docker-config-engine-bullseye.mk +++ b/rules/docker-config-engine-bullseye.mk @@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BULLSEYE = docker-config-engine-bullseye.gz $(DOCKER_CONFIG_ENGINE_BULLSEYE)_PATH = $(DOCKERS_PATH)/docker-config-engine-bullseye $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \ - $(LIBYANG) \ - $(LIBYANG_CPP) \ - $(LIBYANG_PY3) \ $(LIBYANG3) \ $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) \ diff --git a/rules/docker-config-engine-buster.mk b/rules/docker-config-engine-buster.mk index 1f9b2f533b4e..767eab08b831 100644 --- a/rules/docker-config-engine-buster.mk +++ b/rules/docker-config-engine-buster.mk @@ -4,9 +4,6 @@ DOCKER_CONFIG_ENGINE_BUSTER = docker-config-engine-buster.gz $(DOCKER_CONFIG_ENGINE_BUSTER)_PATH = $(DOCKERS_PATH)/docker-config-engine-buster $(DOCKER_CONFIG_ENGINE_BUSTER)_DEPENDS += $(LIBSWSSCOMMON) \ - $(LIBYANG) \ - $(LIBYANG_CPP) \ - $(LIBYANG_PY3) \ $(LIBYANG3) \ $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) \ diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk index f7f319cbbb95..c5dd09656166 100644 --- a/rules/docker-macsec.mk +++ b/rules/docker-macsec.mk @@ -15,7 +15,7 @@ $(DOCKER_MACSEC)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_IMAGE_ $(DOCKER_MACSEC)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM) $(DOCKER_MACSEC)_INSTALL_PYTHON_WHEELS = $(SONIC_UTILITIES_PY3) -$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3) $(LIBYANG3_PY3) +$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG3_PY3) SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC) SONIC_BOOKWORM_DOCKERS += $(DOCKER_MACSEC) diff --git a/rules/libyang.dep b/rules/libyang.dep deleted file mode 100644 index 681f0c86a067..000000000000 --- a/rules/libyang.dep +++ /dev/null @@ -1,10 +0,0 @@ - -SPATH := $($(LIBYANG)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/libyang.mk rules/libyang.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(SPATH)) - -$(LIBYANG)_CACHE_MODE := GIT_CONTENT_SHA -$(LIBYANG)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(LIBYANG)_DEP_FILES := $(DEP_FILES) - diff --git a/rules/libyang.mk b/rules/libyang.mk deleted file mode 100644 index 0819b0a54318..000000000000 --- a/rules/libyang.mk +++ /dev/null @@ -1,35 +0,0 @@ -# libyang - -LIBYANG_VERSION_BASE = 1.0 -LIBYANG_VERSION = $(LIBYANG_VERSION_BASE).73 -LIBYANG_SUBVERSION = 1 - -export LIBYANG_VERSION_BASE -export LIBYANG_VERSION -export LIBYANG_SUBVERSION - -LIBYANG = libyang_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBYANG)_SRC_PATH = $(SRC_PATH)/libyang -# introduce artifical dependency between LIBYANG and FRR -# make sure LIBYANG is compile after FRR -$(LIBYANG)_AFTER = $(FRR) -SONIC_MAKE_DEBS += $(LIBYANG) - -LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DEV))) - -LIBYANG_DBGSYM = libyang-dbgsym_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DBGSYM))) - -LIBYANG_CPP = libyang-cpp_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBYANG_CPP)_DEPENDS += $(LIBYANG) -$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_CPP))) - -LIBYANG_PY3 = python3-yang_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb -$(LIBYANG_PY3)_DEPENDS += $(LIBYANG) $(LIBYANG_CPP) -$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_PY3))) - -#$(eval $(call add_conflict_package,$(LIBYANG),$(LIBYANG3))) -$(eval $(call add_conflict_package,$(LIBYANG_DEV),$(LIBYANG3_DEV))) - -export LIBYANG LIBYANG_DBGSYM LIBYANG_DEV LIBYANG_CPP LIBYANG_PY3 diff --git a/rules/sonic-utilities.mk b/rules/sonic-utilities.mk index 1217c7cd951a..bb28e890c459 100644 --- a/rules/sonic-utilities.mk +++ b/rules/sonic-utilities.mk @@ -16,10 +16,7 @@ $(SONIC_UTILITIES_PY3)_DEPENDS += $(SONIC_PY_COMMON_PY3) \ $(SONIC_PLATFORM_COMMON_PY3) \ $(SONIC_YANG_MGMT_PY3) \ $(SONIC_YANG_MODELS_PY3) -$(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG) \ - $(LIBYANG_CPP) \ - $(LIBYANG_PY3) \ - $(LIBYANG3) \ +$(SONIC_UTILITIES_PY3)_DEBS_DEPENDS = $(LIBYANG3) \ $(LIBYANG3_PY3) \ $(LIBSWSSCOMMON) \ $(PYTHON3_SWSSCOMMON) diff --git a/rules/sonic_bgpcfgd.mk b/rules/sonic_bgpcfgd.mk index 8881fb67caf6..ab8439b9ff15 100644 --- a/rules/sonic_bgpcfgd.mk +++ b/rules/sonic_bgpcfgd.mk @@ -10,10 +10,7 @@ $(SONIC_BGPCFGD)_SRC_PATH = $(SRC_PATH)/sonic-bgpcfgd $(SONIC_BGPCFGD)_DEPENDS += $(SONIC_CONFIG_ENGINE_PY3) \ $(SONIC_YANG_MGMT_PY3) \ $(SONIC_YANG_MODELS_PY3) -$(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG) \ - $(LIBYANG_CPP) \ - $(LIBYANG_PY3) \ - $(LIBYANG3) \ +$(SONIC_BGPCFGD)_DEBS_DEPENDS += $(LIBYANG3) \ $(LIBYANG3_PY3) \ $(PYTHON3_SWSSCOMMON) $(SONIC_BGPCFGD)_PYTHON_VERSION = 3 diff --git a/slave.mk b/slave.mk index d3d2e6aa0a42..2064cd06ca76 100644 --- a/slave.mk +++ b/slave.mk @@ -1730,4 +1730,4 @@ jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \ ## To build some commonly used libs. Some submodules depend on these libs. ## It is used in component pipelines. For example: swss needs libnl, libyang -lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG) $(LIBYANG3) $(PROTOBUF) $(LIB_SONIC_DASH_API)) +lib-packages: $(addprefix $(DEBS_PATH)/,$(LIBNL3) $(LIBYANG3) $(PROTOBUF) $(LIB_SONIC_DASH_API)) diff --git a/src/libyang/.gitignore b/src/libyang/.gitignore deleted file mode 100644 index a0991ff4402b..000000000000 --- a/src/libyang/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!.gitignore -!Makefile diff --git a/src/libyang/Makefile b/src/libyang/Makefile deleted file mode 100644 index da09a8424aeb..000000000000 --- a/src/libyang/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -.ONESHELL: -SHELL = /bin/bash -.SHELLFLAGS += -e - -MAIN_TARGET = $(LIBYANG) -DERIVED_TARGETS = $(LIBYANG_DEV) $(LIBYANG_DBGSYM) $(LIBYANG_PY3) $(LIBYANG_CPP) - -$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : - # Obtaining the libyang - rm -fr ./libyang-$(LIBYANG_VERSION) - git clone https://github.com/CESNET/libyang.git libyang-$(LIBYANG_VERSION) - pushd libyang-$(LIBYANG_VERSION) - git checkout tags/v1.0-r4 -b libyang - # Apply patch series - stg init - stg import -s ../patch/series - -ifeq ($(CROSS_BUILD_ENVIRON), y) - dpkg-buildpackage -rfakeroot -b -us -uc -a$(CONFIGURED_ARCH) -Pcross,nocheck -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR) -else - dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR) -endif - popd - - mv $(DERIVED_TARGETS) $* $(DEST)/ - -$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET) diff --git a/src/libyang/patch/debian-packaging-files.patch b/src/libyang/patch/debian-packaging-files.patch deleted file mode 100644 index 5370a94aa453..000000000000 --- a/src/libyang/patch/debian-packaging-files.patch +++ /dev/null @@ -1,233 +0,0 @@ -From 99afc75d62942e1e4a4d576a880c697ecb0bab06 Mon Sep 17 00:00:00 2001 -From: Saikrishna Arcot -Date: Fri, 1 Jul 2022 10:30:48 -0700 -Subject: [PATCH] Add debian packaging files. - -Libyang does have a custom cmake target that can make these files, but -it breaks several things. Building for another architecture doesn't -cleanly work unless you happen to enable language bindings in your -initial CMake call (otherwise, it will use the default C++ compiler -instead of whatever is set in the environment variable). In addition, -objcopy at the end doesn't appear to use the target -architecture-specific version for whatever reason. - -Make things cleaner by just creating the debian files. In these files, -bump up the compat level, remove the hardcoded debug packages (dbgsym -packages are automatically generated), and rely on debhelper to do the -configure/build. - -Signed-off-by: Saikrishna Arcot ---- - debian/changelog | 23 +++++++++++++++++++++ - debian/compat | 1 + - debian/control | 37 ++++++++++++++++++++++++++++++++++ - debian/copyright | 28 +++++++++++++++++++++++++ - debian/libyang-cpp-dev.install | 3 +++ - debian/libyang-cpp.install | 1 + - debian/libyang-dev.install | 3 +++ - debian/libyang.install | 5 +++++ - debian/python3-yang.install | 1 + - debian/rules | 16 +++++++++++++++ - debian/source/format | 1 + - 11 files changed, 119 insertions(+) - create mode 100644 debian/changelog - create mode 100644 debian/compat - create mode 100644 debian/control - create mode 100644 debian/copyright - create mode 100644 debian/libyang-cpp-dev.install - create mode 100644 debian/libyang-cpp.install - create mode 100644 debian/libyang-dev.install - create mode 100644 debian/libyang.install - create mode 100644 debian/python3-yang.install - create mode 100755 debian/rules - create mode 100644 debian/source/format - -diff --git a/debian/changelog b/debian/changelog -new file mode 100644 -index 00000000..421609c7 ---- /dev/null -+++ b/debian/changelog -@@ -0,0 +1,23 @@ -+libyang (1.0.73) stable; urgency=low -+ -+ * VERSION bump to version 1.0.73 (Radek Krejci) -+ -+ * SOVERSION bump to version 1.2.2 (Radek Krejci) -+ -+ * JSON parser CHANGE respect STRICT flag and if not set, ignore unknown data (Radek Krejci) -+ -+ * VERSION bump to version 1.0.72 (Radek Krejci) -+ -+ * SOVERSION bump to version 1.2.1 (Radek Krejci) -+ -+ * schema parsers BUGFIX duplicating iffeature expression data (Radek Krejci) -+ -+ * VERSION bump to version 1.0.71 (Radek Krejci) -+ -+ * SOVERSION bump to version 1.2.0 (Radek Krejci) -+ -+ * schema parsers BUGFIX creating implicit cases when augmenting choice (Radek Krejci) -+ -+ * Merge pull request #891 from opensourcerouting/api_tracing (Michal Vasko) -+ -+ -- sarcot Fri, 1 Jul 2022 16:46:13 +0000 -diff --git a/debian/compat b/debian/compat -new file mode 100644 -index 00000000..f599e28b ---- /dev/null -+++ b/debian/compat -@@ -0,0 +1 @@ -+10 -diff --git a/debian/control b/debian/control -new file mode 100644 -index 00000000..cb182fa4 ---- /dev/null -+++ b/debian/control -@@ -0,0 +1,37 @@ -+Source: libyang -+Maintainer: CESNET -+Priority: extra -+Standards-Version: 3.8.2 -+Build-Depends: debhelper (>= 10) -+Homepage: https://github.com/CESNET/libyang -+ -+Package: libyang -+Depends: libpcre3, ${shlibs:Depends} -+Conflicts: libyang-experimental (= 1.0) -+Section: libs -+Architecture: any -+Description: Libyang is YANG data modelling language parser and toolkit written (and providing API) in C. -+ -+Package: libyang-dev -+Depends: libpcre3-dev, libyang (= ${binary:Version}) -+Section: libdevel -+Architecture: any -+Description: Headers of libyang library. -+ -+Package: libyang-cpp -+Depends: libyang (= ${binary:Version}) -+Section: libs -+Architecture: any -+Description: Bindings of libyang library to C++ language. -+ -+Package: libyang-cpp-dev -+Depends: libpcre3-dev, libyang-cpp (= ${binary:Version}) -+Section: libdevel -+Architecture: any -+Description: Headers of bindings to c++ language libyang library. -+ -+Package: python3-yang -+Depends: libyang (= ${binary:Version}), libyang-cpp (= ${binary:Version}) -+Section: libs -+Architecture: any -+Description: Bindings of libyang library to python3 language. -diff --git a/debian/copyright b/debian/copyright -new file mode 100644 -index 00000000..f7cafac5 ---- /dev/null -+++ b/debian/copyright -@@ -0,0 +1,28 @@ -+Copyright (c) 2015-2016, CESNET -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are met: -+ -+* Redistributions of source code must retain the above copyright notice, this -+ list of conditions and the following disclaimer. -+ -+* Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ -+* Neither the name of libyang nor the names of its -+ contributors may be used to endorse or promote products derived from -+ this software without specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -diff --git a/debian/libyang-cpp-dev.install b/debian/libyang-cpp-dev.install -new file mode 100644 -index 00000000..e56e41ed ---- /dev/null -+++ b/debian/libyang-cpp-dev.install -@@ -0,0 +1,3 @@ -+usr/lib/*/libyang-cpp.so -+usr/include/libyang/*.hpp -+usr/lib/*/pkgconfig/libyang-cpp.pc -diff --git a/debian/libyang-cpp.install b/debian/libyang-cpp.install -new file mode 100644 -index 00000000..2157465b ---- /dev/null -+++ b/debian/libyang-cpp.install -@@ -0,0 +1 @@ -+usr/lib/*/libyang-cpp.so.* -\ No newline at end of file -diff --git a/debian/libyang-dev.install b/debian/libyang-dev.install -new file mode 100644 -index 00000000..bb04ac28 ---- /dev/null -+++ b/debian/libyang-dev.install -@@ -0,0 +1,3 @@ -+usr/lib/*/libyang.so -+usr/lib/*/pkgconfig/libyang.pc -+usr/include/libyang/*.h -diff --git a/debian/libyang.install b/debian/libyang.install -new file mode 100644 -index 00000000..249a5291 ---- /dev/null -+++ b/debian/libyang.install -@@ -0,0 +1,5 @@ -+usr/bin/yanglint -+usr/bin/yangre -+usr/share/man/man1 -+usr/lib/*/libyang.so.* -+usr/lib/*/libyang/* -diff --git a/debian/python3-yang.install b/debian/python3-yang.install -new file mode 100644 -index 00000000..3272cd65 ---- /dev/null -+++ b/debian/python3-yang.install -@@ -0,0 +1 @@ -+usr/lib/python3/dist-packages/* -diff --git a/debian/rules b/debian/rules -new file mode 100755 -index 00000000..9308403e ---- /dev/null -+++ b/debian/rules -@@ -0,0 +1,16 @@ -+#!/usr/bin/make -f -+# -*- makefile -*- -+# Uncomment this to turn on verbose mode. -+export DH_VERBOSE=1 -+ -+%: -+ dh $@ -+ -+override_dh_auto_configure: -+ dh_auto_configure -- -DENABLE_LYD_PRIV=ON -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_VERSION=2 -+ -+override_dh_makeshlibs: -+ dh_makeshlibs -Xextensions -Xuser_types -+ -+override_dh_auto_test: -+ ctest --output-on-failure -diff --git a/debian/source/format b/debian/source/format -new file mode 100644 -index 00000000..163aaf8d ---- /dev/null -+++ b/debian/source/format -@@ -0,0 +1 @@ -+3.0 (quilt) --- -2.25.1 - diff --git a/src/libyang/patch/large_file_support_arm32.patch b/src/libyang/patch/large_file_support_arm32.patch deleted file mode 100644 index e3fb2b739055..000000000000 --- a/src/libyang/patch/large_file_support_arm32.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8635ba1..39f0741 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -436,3 +436,6 @@ endif(ENABLE_BUILD_FUZZ_TARGETS) - if(GEN_LANGUAGE_BINDINGS AND GEN_CPP_BINDINGS) - add_subdirectory(swig) - endif() -+ -+#Enable large file support for 32-bit arch -+add_definitions(-D_FILE_OFFSET_BITS=64) diff --git a/src/libyang/patch/libyang.patch b/src/libyang/patch/libyang.patch deleted file mode 100644 index 45eba825ce30..000000000000 --- a/src/libyang/patch/libyang.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa562dd3..8635ba15 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,6 +33,7 @@ set(LIBYANG_MICRO_SOVERSION 2) - set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION}) - set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION}) - -+set(CMAKE_INSTALL_PREFIX /usr) - # set default build type if not specified by user - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE debug) -diff --git a/packages/debian.rules.in b/packages/debian.rules.in -index d565819e..e92fe4a1 100644 ---- a/packages/debian.rules.in -+++ b/packages/debian.rules.in -@@ -9,10 +9,14 @@ export DH_VERBOSE=1 - override_dh_strip: - dh_strip -plibyang@PACKAGE_PART_NAME@ --dbg-package=libyang@PACKAGE_PART_NAME@-dbg - dh_strip -plibyang-cpp@PACKAGE_PART_NAME@ --dbg-package=libyang-cpp@PACKAGE_PART_NAME@-dbg -+ #dh_strip -ppython2-yang@PACKAGE_PART_NAME@ --dbg-package=python2-yang@PACKAGE_PART_NAME@-dbg - dh_strip -ppython3-yang@PACKAGE_PART_NAME@ --dbg-package=python3-yang@PACKAGE_PART_NAME@-dbg - - override_dh_auto_configure: -- cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" -DGEN_LANGUAGE_BINDINGS=ON . -+ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" -DENABLE_LYD_PRIV=ON -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_VERSION=2 . -+ -+override_dh_makeshlibs: -+ dh_makeshlibs -Xextensions -Xuser_types - - override_dh_auto_test: - ctest --output-on-failure diff --git a/src/libyang/patch/libyang_mgmt_framework.patch b/src/libyang/patch/libyang_mgmt_framework.patch deleted file mode 100644 index 03b7ea3476b7..000000000000 --- a/src/libyang/patch/libyang_mgmt_framework.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tree_data.c b/src/tree_data.c -index 04653a46..65dca211 100644 ---- a/src/tree_data.c -+++ b/src/tree_data.c -@@ -842,7 +842,7 @@ error: - return ret; - } - --int -+API int - lyd_check_mandatory_tree(struct lyd_node *root, struct ly_ctx *ctx, const struct lys_module **modules, int mod_count, - int options) - { diff --git a/src/libyang/patch/series b/src/libyang/patch/series deleted file mode 100644 index 9796e28649c5..000000000000 --- a/src/libyang/patch/series +++ /dev/null @@ -1,5 +0,0 @@ -libyang.patch -libyang_mgmt_framework.patch -swig.patch -large_file_support_arm32.patch -debian-packaging-files.patch diff --git a/src/libyang/patch/swig.patch b/src/libyang/patch/swig.patch deleted file mode 100644 index d2b4080d368d..000000000000 --- a/src/libyang/patch/swig.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt -index 4cee36ec..0baa69ab 100644 ---- a/swig/CMakeLists.txt -+++ b/swig/CMakeLists.txt -@@ -20,27 +20,34 @@ endif() - - # find Python package - if(GEN_PYTHON_BINDINGS AND SWIG_FOUND) -- message(STATUS "Python version ${GEN_PYTHON_VERSION} was selected") -- unset(PYTHON_LIBRARY CACHE) -- unset(PYTHON_EXECUTABLE CACHE) -- unset(PYTHON_INCLUDE_DIR CACHE) -- unset(PYTHON_LIBRARY_DEBUG CACHE) -- if(${GEN_PYTHON_VERSION} STREQUAL "2") -- find_package(PythonLibs 2 REQUIRED) -- find_package(PythonInterp 2 REQUIRED) -- if(NOT PYTHONLIBS_FOUND) -- message(WARNING "Did not found Python version 2.x") -- message(STATUS "Sysrepo supports Python 2.x and Python 3.x") -- endif() -- elseif(${GEN_PYTHON_VERSION} STREQUAL "3") -- find_package(PythonLibs 3 REQUIRED) -- find_package(PythonInterp 3 REQUIRED) -- if(NOT PYTHONLIBS_FOUND) -- message(WARNING "Did not found Python version 3.x") -- message(STATUS "Sysrepo supports Python 2.x and Python 3.x") -- endif() -+ if(ENABLE_STATIC) -+ message(WARNING "Can't create a static Python module") - else() -- message(WARNING "Sysrepo supports Python 2.x and Python 3.x") -+ set(GEN_PYTHON_VERSION 3) -+ foreach(CUR_PYTHON_VERSION ${GEN_PYTHON_VERSION}) -+ message(STATUS "Python version ${CUR_PYTHON_VERSION} was selected") -+ -+ unset(PYTHON_EXECUTABLE CACHE) -+ unset(PYTHON_INCLUDE_PATH CACHE) -+ unset(PYTHON_EXT_SUFFIX CACHE) -+ unset(PYTHON_MODULE_PATH CACHE) -+ set(PYTHON_EXT_SUFFIX ".so") -+ -+ find_program(PYTHON_EXECUTABLE NAMES python${CUR_PYTHON_VERSION}) -+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c -+ "from distutils.sysconfig import get_config_var; print(get_config_var('INCLUDEPY'))" -+ OUTPUT_VARIABLE PYTHON_INCLUDE_PATH -+ OUTPUT_STRIP_TRAILING_WHITESPACE ) -+ #execute_process(COMMAND ${PYTHON_EXECUTABLE} -c -+ # "from distutils.sysconfig import get_config_var; print(get_config_var('EXT_SUFFIX'))" -+ # OUTPUT_VARIABLE PYTHON_EXT_SUFFIX -+ # OUTPUT_STRIP_TRAILING_WHITESPACE ) -+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c -+ "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))" -+ OUTPUT_VARIABLE PYTHON_MODULE_PATH -+ OUTPUT_STRIP_TRAILING_WHITESPACE ) -+ add_subdirectory(python python${CUR_PYTHON_VERSION}) -+ endforeach(CUR_PYTHON_VERSION) - endif() - endif() - -@@ -99,12 +106,6 @@ if (GEN_CPP_BINDINGS) - endif() - endif() - --if(ENABLE_STATIC AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND AND (${GEN_PYTHON_VERSION} STREQUAL "2" OR ${GEN_PYTHON_VERSION} STREQUAL "3")) -- message(WARNING "Can't create a static Python module") --elseif(PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND AND (${GEN_PYTHON_VERSION} STREQUAL "2" OR ${GEN_PYTHON_VERSION} STREQUAL "3")) -- add_subdirectory(python) --endif() -- - if(NOT ENABLE_STATIC AND GEN_JAVASCRIPT_BINDINGS) - message(WARNING "Can't create Javascript bindings with a shared library, please use -DENABLE_STATIC") - elseif(ENABLE_STATIC AND GEN_JAVASCRIPT_BINDINGS) -diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 994b1234..5d18b8bf 100644 ---- a/swig/python/CMakeLists.txt -+++ b/swig/python/CMakeLists.txt -@@ -1,30 +1,38 @@ - set(PYTHON_SWIG_BINDING yang) -+set(PYTHON_SWIG_TARGET yang${CUR_PYTHON_VERSION}) - include_directories(${PYTHON_INCLUDE_PATH}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -+include_directories(${PROJECT_SOURCE_DIR}/cpp/src) - - set(CMAKE_SWIG_FLAGS "-c++") --set(CMAKE_SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}") -+set(CMAKE_SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}" "-I${PROJECT_SOURCE_DIR}/cpp/src") - set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}) - --set_source_files_properties(${PYTHON_SWIG_BINDING}.i PROPERTIES CPLUSPLUS ON PREFIX "") -+set_source_files_properties(${PYTHON_SWIG_BINDING}.i PROPERTIES CPLUSPLUS ON PREFIX "" SWIG_MODULE_NAME ${PYTHON_SWIG_BINDING}) - - if(${CMAKE_VERSION} VERSION_LESS "3.8.0") -- swig_add_module(${PYTHON_SWIG_BINDING} python ${PYTHON_SWIG_BINDING}.i) -+ swig_add_module(${PYTHON_SWIG_TARGET} python ${PYTHON_SWIG_BINDING}.i) - else() -- swig_add_library(${PYTHON_SWIG_BINDING} LANGUAGE python SOURCES ${PYTHON_SWIG_BINDING}.i) -+ swig_add_library(${PYTHON_SWIG_TARGET} LANGUAGE python SOURCES ${PYTHON_SWIG_BINDING}.i) - endif() --swig_link_libraries(${PYTHON_SWIG_BINDING} ${PYTHON_LIBRARIES} libyang-cpp) -+swig_link_libraries(${PYTHON_SWIG_TARGET} ${PYTHON_LIBRARIES} libyang-cpp) -+ -+set_target_properties(_${PYTHON_SWIG_TARGET} PROPERTIES OUTPUT_NAME "_yang") - - # Generate header with SWIG run-time functions - execute_process(COMMAND ${SWIG_EXECUTABLE} -python -external-runtime ${CMAKE_CURRENT_BINARY_DIR}/swigpyrun.h) - --file(COPY "examples" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -+add_custom_command(TARGET ${PYTHON_SWIG_TARGET}_swig_compilation POST_BUILD -+ COMMAND sed -e "'s/\\(inst =.*tp_new.*\\)Py_None, Py_None);/PyObject *tup = PyTuple_New(0); \\1tup, Py_None); Py_DECREF(tup);/'" < swigpyrun.h > swigpyrun.h.new -+ COMMAND sed -e "'s/\\(inst =.*tp_new.*\\)Py_None, Py_None);/PyObject *tup = PyTuple_New(0); \\1tup, Py_None); Py_DECREF(tup);/'" < yangPYTHON_wrap.cxx > yangPYTHON_wrap.cxx.new -+ COMMAND diff -q swigpyrun.h swigpyrun.h.new || mv swigpyrun.h.new swigpyrun.h -+ COMMAND diff -q yangPYTHON_wrap.cxx yangPYTHON_wrap.cxx.new || mv yangPYTHON_wrap.cxx.new yangPYTHON_wrap.cxx -+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -+ ) - --execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))" -- OUTPUT_VARIABLE PYTHON_MODULE_PATH -- OUTPUT_STRIP_TRAILING_WHITESPACE ) -+file(COPY "examples" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - --install( TARGETS _${PYTHON_SWIG_BINDING} DESTINATION ${PYTHON_MODULE_PATH}) -+install( TARGETS _${PYTHON_SWIG_TARGET} DESTINATION ${PYTHON_MODULE_PATH}) - install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_SWIG_BINDING}.py" DESTINATION ${PYTHON_MODULE_PATH}) - install( FILES "${CMAKE_CURRENT_BINARY_DIR}/swigpyrun.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyang) - -@@ -51,8 +59,8 @@ if(ENABLE_BUILD_TESTS) - ADD_PYTHON_TEST(test_tree_data) - ADD_PYTHON_TEST(test_tree_schema) - -- add_custom_command(TARGET ${SWIG_MODULE_${PYTHON_SWIG_BINDING}_REAL_NAME} POST_BUILD -- COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/_${PYTHON_SWIG_BINDING}.so" ${PY2_SWIG_DIR}/tests -+ add_custom_command(TARGET ${SWIG_MODULE_${PYTHON_SWIG_TARGET}_REAL_NAME} POST_BUILD -+ COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/_yang${PYTHON_EXT_SUFFIX}" ${PY2_SWIG_DIR}/tests/_yang.so - COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_SWIG_BINDING}.py" ${PY2_SWIG_DIR}/tests - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - )