Signed-off-by: Frode Nordahl <frode.nord...@canonical.com>
---
debian/control | 2 +-
debian/rules | 28 +++++++++++++++++++---------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index 228c13a4b..c3071a941 100644
--- a/debian/control
+++ b/debian/control
@@ -279,7 +279,7 @@ Description: Open vSwitch VTEP utilities
VTEP-configured database and a VTEP emulator.
Package: python3-openvswitch
-Architecture: all
+Architecture: linux-any
Section: python
Depends:
python3-six,
diff --git a/debian/rules b/debian/rules
index b9454fa79..8d2695278 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,16 +95,26 @@ override_dh_install:
mv $(CURDIR)/debian/openvswitch-switch/usr/sbin/ovs-vswitchd \
$(CURDIR)/debian/openvswitch-switch/usr/lib/openvswitch-switch/ovs-vswitchd
set -e && for pyvers in $(PYTHONS); do \
- cd python && python$$pyvers setup.py install
--install-layout=deb \
- --root $(CURDIR)/debian/python-openvswitch; cd ..; \
+ cd python && \
+ enable_shared=no \
+ CFLAGS=-I$(CURDIR)/debian/tmp/usr/include \
+ LDFLAGS=$(CURDIR)/debian/tmp/usr/lib/libopenvswitch.a \
+ python$$pyvers setup.py install --install-layout=deb \
+ --root $(CURDIR)/debian/python-openvswitch; \
+ cd ..; \
done
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 python/ovstest/*.py \
-
$(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest;
\
- done
+ cd python && \
+ enable_shared=no \
+ CFLAGS=-I$(CURDIR)/debian/tmp/usr/include \
+ LDFLAGS=$(CURDIR)/debian/tmp/usr/lib/libopenvswitch.a \
+ 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 python/ovstest/*.py \
+
$(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest;
\
+ done
ifneq (,$(filter i386 amd64 ppc64el arm64, $(DEB_HOST_ARCH)))
install -v -D _dpdk/vswitchd/ovs-vswitchd \
$(CURDIR)/debian/openvswitch-switch-dpdk/usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
@@ -126,7 +136,7 @@ override_dh_strip:
dh_strip --dbg-package=openvswitch-dbg
override_dh_python3:
- dh_python3 --shebang=/usr/bin/python3
+ DEB_HOST_ARCH=$(DEB_HOST_ARCH) dh_python3 --shebang=/usr/bin/python3
# Helper target for creating snapshots from upstream git
DATE=$(shell date +%Y%m%d)
--
2.36.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
