Skip to content

Commit bf5e182

Browse files
committed
packages MAINTENANCE forbid building cffi bindings for now
1 parent 8baded3 commit bf5e182

File tree

7 files changed

+6
-68
lines changed

7 files changed

+6
-68
lines changed

packages/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
set(PACKAGE "libyang")
22
set(CPP_PACKAGE "libyang-cpp")
33
set(PYTHON_PACKAGE "python3-yang")
4-
set(PYTHON_CFFI_PACKAGE "python3-libyang")
54

65
find_program(DEB_BUILDER NAMES debuild)
76
find_program(RPM_BUILDER NAMES rpmbuild)
@@ -26,8 +25,6 @@ configure_file(${PROJECT_SOURCE_DIR}/packages/debian.${CPP_PACKAGE}-dev.install
2625
# no python package for Debian because there is only SWIG 3.10 on Debian 9 :-/
2726
#configure_file(${PROJECT_SOURCE_DIR}/packages/debian.${PYTHON_PACKAGE}.install
2827
# ${PROJECT_BINARY_DIR}/build-packages/debian.${PYTHON_PACKAGE}.install COPYONLY)
29-
configure_file(${PROJECT_SOURCE_DIR}/packages/debian.${PYTHON_CFFI_PACKAGE}.install
30-
${PROJECT_BINARY_DIR}/build-packages/debian.${PYTHON_CFFI_PACKAGE}.install COPYONLY)
3128

3229
if(NOT DEB_BUILDER)
3330
message(STATUS "Missing tools (devscripts, debhelper package) for building DEB package.")

packages/debian.control.in

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,7 @@ Source: @PACKAGE@
22
Maintainer: CESNET <[email protected]>
33
Priority: extra
44
Standards-Version: 3.8.2
5-
Build-Depends:
6-
debhelper (>= 9),
7-
dh-python,
8-
make,
9-
gcc,
10-
g++,
11-
doxygen,
12-
cmake,
13-
pkg-config,
14-
libpcre3-dev,
15-
libcmocka-dev,
16-
python3 (>= 3.5),
17-
python3-cffi,
18-
python3-setuptools,
5+
Build-Depends: debhelper (>= 9), gcc
196
Homepage: https://github.com/CESNET/libyang
207

218
Package: @PACKAGE@
@@ -53,19 +40,3 @@ Depends: @CPP_PACKAGE@ (=@LIBYANG_VERSION@)
5340
Section: debug
5441
Architecture: any
5542
Description: Debug symbols of C++ bidings of libyang library.
56-
57-
Package: @PYTHON_CFFI_PACKAGE@
58-
Depends:
59-
${misc:Depends},
60-
${python3:Depends},
61-
python3-cffi,
62-
@PACKAGE@ (=@LIBYANG_VERSION@),
63-
Section: libs
64-
Architecture: any
65-
Description: CFFI bindings of libyang library to Python language.
66-
67-
Package: @PYTHON_CFFI_PACKAGE@-dbg
68-
Depends: @PYTHON_CFFI_PACKAGE@ (=@LIBYANG_VERSION@)
69-
Section: debug
70-
Architecture: any
71-
Description: Debug symbols of Python CFFI bindings of libyang library.

packages/debian.python3-libyang.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/debian.rules.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
export DH_VERBOSE=1
55

66
%:
7-
dh $@ --with python3
7+
dh $@
88

99
override_dh_strip:
1010
dh_strip -p@PACKAGE@ --dbg-package=@PACKAGE@-dbg
1111
dh_strip -p@CPP_PACKAGE@ --dbg-package=@CPP_PACKAGE@-dbg
12-
dh_strip -p@PYTHON_CFFI_PACKAGE@ --dbg-package=@PYTHON_CFFI_PACKAGE@-dbg
1312

1413
override_dh_auto_configure:
1514
cmake -DCMAKE_INSTALL_PREFIX=/usr -DFORCE_INSRC_BUILD=ON -DCMAKE_BUILD_TYPE="Package" -DENABLE_LYD_PRIV=ON \
16-
-DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF -DGEN_PYTHON_CFFI_BINDINGS=ON .
15+
-DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_BINDINGS=OFF .
1716

1817
override_dh_auto_test:
1918
ctest --output-on-failure

packages/libyang.dsc.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Binary:
77
@CPP_PACKAGE@,
88
@CPP_PACKAGE@-dev,
99
@CPP_PACKAGE@-dbg,
10-
@PYTHON_CFFI_PACKAGE@,
11-
@PYTHON_CFFI_PACKAGE@-dbg,
1210
Maintainer: CESNET <[email protected]>
1311
Version: @LIBYANG_VERSION@
1412
Architecture: any
@@ -17,7 +15,6 @@ Homepage: https://github.com/CESNET/libyang
1715
Vcs-Git: https://github.com/CESNET/libyang
1816
Build-Depends:
1917
debhelper (>= 9),
20-
dh-python,
2118
make,
2219
gcc,
2320
g++,
@@ -26,6 +23,3 @@ Build-Depends:
2623
pkg-config,
2724
libpcre3-dev,
2825
libcmocka-dev,
29-
python3 (>= 3.5),
30-
python3-cffi,
31-
python3-setuptools,

packages/libyang.spec.in

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@ BuildRequires: swig >= 3.0.12
3838

3939
%if 0%{?suse_version} + 0%{?fedora} + 0%{?centos_version} > 0
4040
BuildRequires: python3-devel
41-
BuildRequires: python3-cffi
42-
BuildRequires: python3-setuptools
4341
%else
4442
BuildRequires: python36-devel
45-
BuildRequires: python36-cffi
46-
BuildRequires: python36-setuptools
4743
%endif
4844

4945
%endif
@@ -68,17 +64,6 @@ Summary: SWIG binding to python
6864
Requires: @CPP_PACKAGE@ = %{version}-%{release}
6965
Requires: %{name} = %{version}-%{release}
7066

71-
%package -n @PYTHON_CFFI_PACKAGE@
72-
Summary: CFFI binding to python
73-
Requires: %{name} = %{version}-%{release}
74-
%if 0%{?suse_version} + 0%{?fedora} + 0%{?centos_version} > 0
75-
Requires: python3
76-
Requires: python3-cffi
77-
%else
78-
Requires: python36
79-
Requires: python36-cffi
80-
%endif
81-
8267
%description -n @CPP_PACKAGE@
8368
Bindings of libyang library to C++ language.
8469

@@ -87,9 +72,6 @@ Headers of bindings to c++ language.
8772

8873
%description -n @PYTHON_PACKAGE@
8974
SWIG bindings of libyang library to python language.
90-
91-
%description -n @PYTHON_CFFI_PACKAGE@
92-
CFFI bindings of libyang library to python language.
9375
%endif
9476

9577
%description devel
@@ -105,7 +87,7 @@ mkdir build
10587
%build
10688
cd build
10789
%if %{with_lang_bind}
108-
%define cmake_lang_bind "-DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_CFFI_BINDINGS=ON"
90+
%define cmake_lang_bind "-DGEN_LANGUAGE_BINDINGS=ON"
10991
%else
11092
%define cmake_lang_bind "-DGEN_LANGUAGE_BINDINGS=OFF"
11193
%endif
@@ -160,6 +142,7 @@ make DESTDIR=%{buildroot} install
160142
%dir %{_includedir}/libyang/
161143

162144
%if %{with_lang_bind}
145+
163146
%files -n @CPP_PACKAGE@
164147
%defattr(-,root,root)
165148
%{_libdir}/libyang-cpp.so.*
@@ -173,12 +156,8 @@ make DESTDIR=%{buildroot} install
173156

174157
%files -n @PYTHON_PACKAGE@
175158
%defattr(-,root,root)
176-
%{_libdir}/python*/site-packages/yang*
159+
%{_libdir}/python*
177160

178-
%files -n @PYTHON_CFFI_PACKAGE@
179-
%defattr(-,root,root)
180-
%{_libdir}/python3*/site-packages/libyang*
181-
%{_libdir}/python3*/site-packages/_libyang*.so
182161
%endif
183162

184163
%changelog

packages/local-deb.sh.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ cp "@PROJECT_SOURCE_DIR@/packages/debian.@[email protected]" debian/@[email protected]
1313
cp "@PROJECT_SOURCE_DIR@/packages/debian.@[email protected]" debian/@[email protected]
1414
cp "@PROJECT_SOURCE_DIR@/packages/debian.@[email protected]" debian/@[email protected]
1515
cp "@PROJECT_SOURCE_DIR@/packages/debian.@[email protected]" debian/@[email protected]
16-
cp "@PROJECT_SOURCE_DIR@/packages/debian.@[email protected]" debian/@[email protected]
1716
echo -e "@PACKAGE@ (@LIBYANG_VERSION@) stable; urgency=low\n" >debian/changelog
1817
git log -10 --pretty=format:' * %s (%aN)%n' 2>/dev/null >>debian/changelog || echo -e " * unknown changes \n" >>debian/changelog
1918
git log -1 --pretty=format:'%n -- %aN <%aE> %aD%n' >>debian/changelog 2>/dev/null || echo " -- ${USER} <${USER}@`hostname`> `date -R`" >>debian/changelog

0 commit comments

Comments
 (0)