From c20bff717c1c587e2c73e730ebb9b8fd1361f16d Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Mon, 7 Mar 2022 14:14:18 +0000 Subject: [PATCH] debian: Clean up sm-mgmt-tools packaging Make sure that the python is installed correctly. Test Plan PASS Build and test ISO. Story: 2009101 Task: 43644 Signed-off-by: Chuck Short Change-Id: I1bd2938b2fb861a2281fc6a3f3bf3f5408ccbb86 --- service-mgmt-tools/debian/deb_folder/control | 2 +- service-mgmt-tools/debian/deb_folder/rules | 2 -- service-mgmt-tools/debian/deb_folder/sm-tools.dirs | 2 -- service-mgmt-tools/debian/deb_folder/sm-tools.install | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 service-mgmt-tools/debian/deb_folder/sm-tools.dirs diff --git a/service-mgmt-tools/debian/deb_folder/control b/service-mgmt-tools/debian/deb_folder/control index d350db3b..c8102428 100644 --- a/service-mgmt-tools/debian/deb_folder/control +++ b/service-mgmt-tools/debian/deb_folder/control @@ -28,7 +28,7 @@ Rules-Requires-Root: no Package: sm-tools Architecture: all -Depends: python3:any, ${python3:Depends}, ${misc:Depends}, +Depends: ${python3:Depends}, ${misc:Depends}, python3-eventlet, python3-httplib2, python3-iso8601, diff --git a/service-mgmt-tools/debian/deb_folder/rules b/service-mgmt-tools/debian/deb_folder/rules index f157a932..b6ce5c97 100755 --- a/service-mgmt-tools/debian/deb_folder/rules +++ b/service-mgmt-tools/debian/deb_folder/rules @@ -7,11 +7,9 @@ export PYBUILD_NAME=sm-tools override_dh_install: python3 setup.py install -f --install-layout=deb --root=$(CURDIR)/debian/tmp - python3 setup.py bdist_wheel \ --universal \ -d $(CURDIR)/debian/sm-tools-wheels/usr/share/python3-wheels - dh_install override_dh_python3: diff --git a/service-mgmt-tools/debian/deb_folder/sm-tools.dirs b/service-mgmt-tools/debian/deb_folder/sm-tools.dirs deleted file mode 100644 index b5deb123..00000000 --- a/service-mgmt-tools/debian/deb_folder/sm-tools.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python3/dist-packages/sm_tools-1.0.0.egg-info -usr/lib/python3/dist-packages/sm_tools diff --git a/service-mgmt-tools/debian/deb_folder/sm-tools.install b/service-mgmt-tools/debian/deb_folder/sm-tools.install index 6b675870..62154e77 100644 --- a/service-mgmt-tools/debian/deb_folder/sm-tools.install +++ b/service-mgmt-tools/debian/deb_folder/sm-tools.install @@ -1,2 +1,2 @@ -usr/lib/python3/dist-packages/* +usr/lib/python3* usr/bin/*