From c8b018f55c8b44806e25f27ecf04236f1f06462c Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 11 Jul 2022 22:45:26 +0100 Subject: [PATCH 1/2] Do not install python3/ovtest in two packages Only install it in openvswitch-test. Closes: #1014749 --- debian/openvswitch-test.install | 1 + debian/python3-openvswitch.install | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/openvswitch-test.install b/debian/openvswitch-test.install index b3a80d86a..e6a7de3eb 100644 --- a/debian/openvswitch-test.install +++ b/debian/openvswitch-test.install @@ -2,3 +2,4 @@ usr/bin/ovs-l3ping usr/bin/ovs-test usr/share/man/man8/ovs-l3ping.8 usr/share/man/man8/ovs-test.8 +usr/share/openvswitch/python/ovstest usr/lib/python3/dist-packages/ diff --git a/debian/python3-openvswitch.install b/debian/python3-openvswitch.install index ade3af05a..979f1c265 100644 --- a/debian/python3-openvswitch.install +++ b/debian/python3-openvswitch.install @@ -1,2 +1 @@ usr/share/openvswitch/python/ovs usr/lib/python3/dist-packages/ -usr/share/openvswitch/python/ovstest usr/lib/python3/dist-packages/ -- GitLab From 3f12b17655d1646943cb659ffc5b3576ee87d997 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 12 Jul 2022 09:55:28 +0100 Subject: [PATCH 2/2] d/rules: simplify Python handling There is no binary module, so we don't need to iterate over every minor Python interpreter version, all files are installed in the same place: $ dpkg -c python3-openvswitch_2.17.2-1_all.deb drwxr-xr-x root/root 0 2022-07-05 13:02 ./ drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/ drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/ drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/ drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/ -rw-r--r-- root/root 38 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/__init__.py drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/compat/ -rw-r--r-- root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/compat/__init__.py drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/compat/sortedcontainers/ -rw-r--r-- root/root 2131 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/compat/sortedcontainers/__init__.py -rw-r--r-- root/root 22712 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/compat/sortedcontainers/sorteddict.py -rw-r--r-- root/root 76293 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/compat/sortedcontainers/sortedlist.py -rw-r--r-- root/root 19825 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/compat/sortedcontainers/sortedset.py -rw-r--r-- root/root 20710 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/daemon.py drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/ -rw-r--r-- root/root 38 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/__init__.py -rw-r--r-- root/root 4856 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/custom_index.py -rw-r--r-- root/root 21659 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/data.py -rw-r--r-- root/root 1156 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/error.py -rw-r--r-- root/root 96772 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/idl.py -rw-r--r-- root/root 3647 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/parser.py -rw-r--r-- root/root 11947 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/schema.py -rw-r--r-- root/root 23240 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/db/types.py -rw-r--r-- root/root 1329 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/dirs.py -rw-r--r-- root/root 4765 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/fatal_signal.py -rw-r--r-- root/root 1330 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/fcntl_win.py -rw-r--r-- root/root 16843 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/json.py -rw-r--r-- root/root 21087 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/jsonrpc.py -rw-r--r-- root/root 1869 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/ovsuuid.py -rw-r--r-- root/root 10282 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/poller.py -rw-r--r-- root/root 1467 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/process.py -rw-r--r-- root/root 26007 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/reconnect.py -rw-r--r-- root/root 11687 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/socket_util.py -rw-r--r-- root/root 32107 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/stream.py -rw-r--r-- root/root 2432 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/timeval.py drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/unixctl/ -rw-r--r-- root/root 3032 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/unixctl/__init__.py -rw-r--r-- root/root 1999 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/unixctl/client.py -rw-r--r-- root/root 8121 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/unixctl/server.py -rw-r--r-- root/root 3120 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/util.py -rw-r--r-- root/root 94 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/version.py -rw-r--r-- root/root 16694 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/vlog.py -rw-r--r-- root/root 9226 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs/winutils.py drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs-2.17.2.egg-info/ -rw-r--r-- root/root 678 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs-2.17.2.egg-info/PKG-INFO -rw-r--r-- root/root 1 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs-2.17.2.egg-info/dependency_links.txt -rw-r--r-- root/root 41 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs-2.17.2.egg-info/requires.txt -rw-r--r-- root/root 4 2022-07-05 13:02 ./usr/lib/python3/dist-packages/ovs-2.17.2.egg-info/top_level.txt drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/share/ drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/share/doc/ drwxr-xr-x root/root 0 2022-07-05 13:02 ./usr/share/doc/python3-openvswitch/ -rw-r--r-- root/root 38179 2022-07-05 13:02 ./usr/share/doc/python3-openvswitch/changelog.Debian.gz -rw-r--r-- root/root 36495 2022-06-30 23:04 ./usr/share/doc/python3-openvswitch/copyright --- debian/rules | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/debian/rules b/debian/rules index 71e4a0dbd..3b6b34ae7 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ else PARALLEL = endif -PYTHON3S:=$(shell py3versions -vr) DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH) override_dh_auto_configure: @@ -240,13 +239,8 @@ override_dh_auto_install: dh_auto_install --sourcedirectory=_debian execute_after_dh_install: - set -e && for pyvers in $(PYTHON3S); do \ - cd python && python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-openvswitch; cd ..; \ - mkdir -p $(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \ - install -v -D -m 644 python/ovstest/*.py \ - $(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \ - done + cd python && python3 setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python3-openvswitch override_dh_installinit: dh_installinit --restart-after-upgrade @@ -263,9 +257,6 @@ override_dh_installsystemd: override_dh_strip: dh_strip --dbgsym-migration='openvswitch-dbg (<< 2.17~)' -override_dh_python3: - dh_python3 --shebang=/usr/bin/python3 - # Helper target for creating snapshots from upstream git DATE=$(shell date +%Y%m%d) # Upstream branch to track -- GitLab