From ba472d6edea5a34c428ecd3f6133135c34394afd Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 10 Apr 2023 14:41:06 +0000 Subject: [PATCH] Adding the software-wheel debian build target The entry added to debian_stable_wheels.inc by [1] means that the wheel generation will fail because the control file does not have an entry for that wheel. The version needs to be 1.0-1 rather than 1.0.1 Adding the appropriate directives. [1] https://review.opendev.org/c/starlingx/update/+/877874/7/debian_stable_wheels.inc Closes-Bug: 2015404 Signed-off-by: Al Bailey Change-Id: I5752d72531aeb521e24d9e8661f55748ef4d0624 --- software/debian/deb_folder/changelog | 2 +- software/debian/deb_folder/control | 11 +++++++++++ software/debian/meta_data.yaml | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/software/debian/deb_folder/changelog b/software/debian/deb_folder/changelog index 3a4456cb..68bd8820 100644 --- a/software/debian/deb_folder/changelog +++ b/software/debian/deb_folder/changelog @@ -1,4 +1,4 @@ -software (1.0.1) unstable; urgency=medium +software (1.0-1) unstable; urgency=medium * Initial release. diff --git a/software/debian/deb_folder/control b/software/debian/deb_folder/control index 579a0c16..f5252a75 100644 --- a/software/debian/deb_folder/control +++ b/software/debian/deb_folder/control @@ -16,5 +16,16 @@ Rules-Requires-Root: no Package: software Architecture: all +Depends: ${python3:Depends}, ${misc:Depends} Description: StarlingX unified software deployment and management StarlingX unified software deployment and management. + + +Package: software-wheel +Architecture: all +Depends: ${python3:Depends}, ${misc:Depends}, python3-wheel +Description: StarlingX unified software deployment and management + StarlingX unified software deployment and management. + . + This is the support package for the PEP 427 wheel version of the package, + required for using pip inside a virtual environment. diff --git a/software/debian/meta_data.yaml b/software/debian/meta_data.yaml index 9ecbcd35..29aa78d0 100644 --- a/software/debian/meta_data.yaml +++ b/software/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debname: software -debver: 1.0.1 +debver: 1.0-1 src_path: . revision: dist: $STX_DIST