diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 2dee0375..83c56529 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,3 +1,5 @@ fm-api python-fmclient fm-common +fm-mgr +fm-rest-api diff --git a/fm-mgr/debian/control b/fm-mgr/debian/control deleted file mode 100644 index 76889975..00000000 --- a/fm-mgr/debian/control +++ /dev/null @@ -1,14 +0,0 @@ -Source: fm-mgr -Priority: optional -Maintainer: StarlingX team -Build-Depends: debhelper (>=9), - uuid-dev, - libsystemd-dev, - fm-common-dev -Standards-Version: 3.9.6 - -Package: fm-mgr -Architecture: any -Pre-Depends: ${misc:Depends}, - ${shlibs:Depends} -Description: This package contains StarlingX fm-mgr project. diff --git a/fm-mgr/debian/deb_folder/changelog b/fm-mgr/debian/deb_folder/changelog new file mode 100644 index 00000000..dd1d130b --- /dev/null +++ b/fm-mgr/debian/deb_folder/changelog @@ -0,0 +1,5 @@ +fm-mgr (1.0-1) unstable; urgency=medium + + * Initial release. + + -- Tracey Bogue Fri, 17 Sep 2021 14:52:21 +0000 diff --git a/fm-mgr/debian/deb_folder/control b/fm-mgr/debian/deb_folder/control new file mode 100644 index 00000000..c4df5294 --- /dev/null +++ b/fm-mgr/debian/deb_folder/control @@ -0,0 +1,15 @@ +Source: fm-mgr +Priority: optional +Section: libs +Maintainer: StarlingX Developers +Build-Depends: debhelper-compat (= 13) +Build-Depends-Indep: uuid-dev, libsystemd-dev, fm-common-dev +Standards-Version: 4.5.1 +Rules-Requires-Root: no + +Package: fm-mgr +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: StarlingX Fault Manager + This package contains StarlingX fm-mgr project. diff --git a/fm-mgr/debian/deb_folder/copyright b/fm-mgr/debian/deb_folder/copyright new file mode 100644 index 00000000..ff499d80 --- /dev/null +++ b/fm-mgr/debian/deb_folder/copyright @@ -0,0 +1,41 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: fm-mgr +Source: https://opendev.org/starlingx/fault + +Files: * +Copyright: (c) 2013-2021 Wind River Systems, Inc +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + https://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +Files: debian/* +Copyright: 2021 Wind River Systems, Inc +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + https://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/fm-mgr/debian/deb_folder/fm-mgr.install b/fm-mgr/debian/deb_folder/fm-mgr.install new file mode 100644 index 00000000..bb823ba8 --- /dev/null +++ b/fm-mgr/debian/deb_folder/fm-mgr.install @@ -0,0 +1,4 @@ +usr/bin/fmManager +etc/init.d/fminit +etc/logrotate.d/fm.logrotate +usr/lib/systemd/system/fminit.service lib/systemd/system diff --git a/fm-mgr/debian/deb_folder/rules b/fm-mgr/debian/deb_folder/rules new file mode 100755 index 00000000..6bee34a0 --- /dev/null +++ b/fm-mgr/debian/deb_folder/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f +#export DH_VERBOSE = 1 + +export ROOT=debian/tmp + +%: + dh $@ + +override_dh_auto_install: + make DESTDIR=${ROOT} \ + BINDIR=/usr/bin \ + LIBDIR=/usr/lib \ + SYSCONFDIR=/etc \ + install diff --git a/fm-mgr/debian/deb_folder/source/format b/fm-mgr/debian/deb_folder/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/fm-mgr/debian/deb_folder/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/fm-mgr/debian/meta_data.yaml b/fm-mgr/debian/meta_data.yaml new file mode 100644 index 00000000..bc80059a --- /dev/null +++ b/fm-mgr/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: fm-mgr +debver: 1.0 +src_path: sources +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/fm-mgr/debian/rules b/fm-mgr/debian/rules deleted file mode 100644 index 5cb837a1..00000000 --- a/fm-mgr/debian/rules +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ - -override_dh_usrlocal: diff --git a/fm-mgr/sources/fminit b/fm-mgr/sources/fminit index f6719b63..2101dbef 100755 --- a/fm-mgr/sources/fminit +++ b/fm-mgr/sources/fminit @@ -10,8 +10,8 @@ # ### BEGIN INIT INFO # Provides: fminit -# Required-Start: -# Required-Stop: +# Required-Start: $local_fs +# Required-Stop: $local_fs # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Fault Manager @@ -104,7 +104,7 @@ case "$1" in $0 restart ;; - *) + force-reload | *) echo "usage: $0 { start | stop | status | restart | condrestart | status }" ;; esac diff --git a/fm-rest-api/debian/control b/fm-rest-api/debian/control deleted file mode 100644 index 585bafe5..00000000 --- a/fm-rest-api/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: fm-rest-api -Priority: optional -Maintainer: StarlingX team -Build-Depends: python-setuptools, - python-all, - debhelper, - dh-python, - fm-common-dev -Standards-Version: 3.9.6 - -Package: fm-rest-api -Architecture: all -Depends: ${misc:Depends}, - ${python:Depends} -Description: This package contains the fm-rest-api project. diff --git a/fm-rest-api/debian/deb_folder/changelog b/fm-rest-api/debian/deb_folder/changelog new file mode 100644 index 00000000..984f3280 --- /dev/null +++ b/fm-rest-api/debian/deb_folder/changelog @@ -0,0 +1,5 @@ +fm-rest-api (1.0-1) unstable; urgency=medium + + * Initial release. + + -- Tracey Bogue Mon, 20 Sep 2021 09:57:21 +0000 diff --git a/fm-rest-api/debian/deb_folder/control b/fm-rest-api/debian/deb_folder/control new file mode 100644 index 00000000..0f5028df --- /dev/null +++ b/fm-rest-api/debian/deb_folder/control @@ -0,0 +1,36 @@ +Source: fm-rest-api +Priority: optional +Section: libs +Maintainer: StarlingX Developers +Build-Depends: debhelper-compat (= 13), + dh-python, + python3-all, + python3-dev, + python3-fm-api, + python3-keystoneauth1, + python3-keystonemiddleware, + python3-oslo.config, + python3-oslo.db, + python3-oslo.log, + python3-oslo.messaging, + python3-oslo.middleware, + python3-oslo.policy, + python3-oslo.versionedobjects, + python3-pecan, + python3-setuptools, + python3-sqlalchemy, + python3-wsme, + tsconfig +Standards-Version: 4.5.1 +Rules-Requires-Root: no + +Package: fm-rest-api +Section: libs +Architecture: any +Depends: ${python3:Depends}, + ${misc:Depends}, + python3-eventlet, + python3-webob, + python3-paste +Description: Fault Management Openstack REST API + This package contains the Openstack REST API for fault management. diff --git a/fm-rest-api/debian/deb_folder/copyright b/fm-rest-api/debian/deb_folder/copyright new file mode 100644 index 00000000..e53caf12 --- /dev/null +++ b/fm-rest-api/debian/deb_folder/copyright @@ -0,0 +1,41 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: fm-rest-api +Source: https://opendev.org/starlingx/fault + +Files: * +Copyright: (c) 2013-2021 Wind River Systems, Inc +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + https://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +Files: debian/* +Copyright: 2021 Wind River Systems, Inc +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + https://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/fm-rest-api/debian/deb_folder/fm-rest-api.install b/fm-rest-api/debian/deb_folder/fm-rest-api.install new file mode 100644 index 00000000..09c18af6 --- /dev/null +++ b/fm-rest-api/debian/deb_folder/fm-rest-api.install @@ -0,0 +1,4 @@ +etc/fm/fm.conf +etc/pmon.d/fm-api.conf +etc/init.d +lib/systemd/system diff --git a/fm-rest-api/debian/deb_folder/rules b/fm-rest-api/debian/deb_folder/rules new file mode 100755 index 00000000..d7952159 --- /dev/null +++ b/fm-rest-api/debian/deb_folder/rules @@ -0,0 +1,34 @@ +#!/usr/bin/make -f +#export DH_VERBOSE = 1 + +export PYBUILD_NAME=fm-rest-api +export ROOT=debian/tmp +export FMCONFDIR=$(ROOT)/etc/fm +export PMONDDIR=$(ROOT)/etc/pmon.d +export INITDIR=$(ROOT)/etc/init.d +export UNITDIR=$(ROOT)/lib/systemd/system + +%: + dh $@ --with=python3 --buildsystem=pybuild + +override_dh_auto_install: + install -d -m 755 $(UNITDIR) + install -p -D -m 644 scripts/fm-api.service $(UNITDIR)/fm-api.service + install -d -m 755 $(INITDIR) + install -p -D -m 755 scripts/fm-api $(INITDIR)/fm-api + install -d -m 755 $(PMONDDIR) + install -p -D -m 644 fm-api-pmond.conf $(PMONDDIR)/fm-api.conf + oslo-config-generator --config-file fm/config-generator.conf --output-file fm.conf.sample + install -d -m 755 $(FMCONFDIR) + install -p -D -m 600 fm.conf.sample $(FMCONFDIR)/fm.conf + dh_auto_install + + +override_dh_fixperms: + dh_fixperms -Xfm.conf + +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) +override_dh_auto_test: + # (tbogue) FIXME + PYTHONDIR=$(CURDIR) stestr run || true +endif diff --git a/fm-rest-api/debian/deb_folder/source/format b/fm-rest-api/debian/deb_folder/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/fm-rest-api/debian/deb_folder/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/fm-rest-api/debian/meta_data.yaml b/fm-rest-api/debian/meta_data.yaml new file mode 100644 index 00000000..66350ac7 --- /dev/null +++ b/fm-rest-api/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: fm-rest-api +debver: 1.0 +src_path: fm +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/fm-rest-api/debian/rules b/fm-rest-api/debian/rules deleted file mode 100644 index b54cfd7e..00000000 --- a/fm-rest-api/debian/rules +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/make -f - -export PYBUILD_INSTALL_ARGS=--install-data=/usr/share --prefix=/usr - -%: - dh $@ --with python2 --buildsystem=pybuild -