distro/pkg: update packaging for single python module

CZ-NIC · Sep 23, 2024 · 14bf41e · 14bf41e
1 parent 54710c7
commit 14bf41e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
@@ -35,17 +35,11 @@ override_dh_auto_build:
 		-Dc_args="$${CFLAGS}" \
 		-Dc_link_args="$${LDFLAGS}"
 	ninja -v -C build_deb
-	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
-		dh_auto_build --buildsystem=pybuild
-	PYBUILD_NAME=knot_resolver_build_options PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
-		dh_auto_build --buildsystem=pybuild --sourcedirectory build_deb/python
+	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" dh_auto_build
 
 override_dh_auto_install:
 	DESTDIR="$(shell pwd)/debian/tmp" ninja -v -C build_deb install
-	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
-		dh_auto_install --buildsystem=pybuild
-	PYBUILD_NAME=knot_resolver_build_options PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" \
-		dh_auto_install --buildsystem=pybuild --sourcedirectory build_deb/python
+	PYBUILD_NAME=knot_resolver PYBUILD_DESTDIR="$${PYKRES_DESTDIR}" dh_auto_install
 	install -m 644 -D etc/config/config.yaml debian/tmp/etc/knot-resolver/config.yaml
 
 override_dh_auto_test:

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
@@ -181,10 +181,6 @@ CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
 
 %{NINJA} -v -C build_rpm
 
-pushd build_rpm/python
-%py3_build
-popd
-
 %py3_build
 
 %install
@@ -216,11 +212,6 @@ mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_pkgdocdir}/
 # install knot_resolver python module
 %py3_install
 
-# install knot_resolver_build_options python module
-pushd build_rpm/python
-%py3_install
-popd
-
 install -m 644 -D etc/config/config.yaml %{buildroot}%{_sysconfdir}/knot-resolver/config.yaml
 
 %pre