From 79dfb60f411cfb0c4dea1a928cc3811680330dd6 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Mon, 22 Jun 2020 14:34:20 -0400 Subject: [PATCH] Use PKG_GITREVCOUNT for package versions This update revises the cgcs-patch and patch-alarm package builds to drop the old and unneeded custom build_srpm script, in order to use the PKG_GITREVCOUNT feature for package versions. Change-Id: If541f55340565cf73213aeac511e69487e53fa11 Story: 2006166 Task: 40137 Signed-off-by: Don Penney --- cgcs-patch/LICENSE | 202 ---------------------------- cgcs-patch/PKG-INFO | 13 -- cgcs-patch/centos/build_srpm | 101 -------------- cgcs-patch/centos/build_srpm.data | 6 +- cgcs-patch/centos/cgcs-patch.spec | 116 ++++++++-------- patch-alarm/LICENSE | 202 ---------------------------- patch-alarm/PKG-INFO | 13 -- patch-alarm/centos/build_srpm | 95 ------------- patch-alarm/centos/build_srpm.data | 4 +- patch-alarm/centos/patch-alarm.spec | 20 ++- 10 files changed, 73 insertions(+), 699 deletions(-) delete mode 100644 cgcs-patch/LICENSE delete mode 100644 cgcs-patch/PKG-INFO delete mode 100755 cgcs-patch/centos/build_srpm delete mode 100644 patch-alarm/LICENSE delete mode 100644 patch-alarm/PKG-INFO delete mode 100755 patch-alarm/centos/build_srpm diff --git a/cgcs-patch/LICENSE b/cgcs-patch/LICENSE deleted file mode 100644 index d6456956..00000000 --- a/cgcs-patch/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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 - - http://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. diff --git a/cgcs-patch/PKG-INFO b/cgcs-patch/PKG-INFO deleted file mode 100644 index 835a7eff..00000000 --- a/cgcs-patch/PKG-INFO +++ /dev/null @@ -1,13 +0,0 @@ -Metadata-Version: 1.1 -Name: cgcs-patch -Version: 1.0 -Summary: TIS Platform Patching -Home-page: -Author: Windriver -Author-email: info@windriver.com -License: Apache-2.0 - -Description: TIS Platform Patching - - -Platform: UNKNOWN diff --git a/cgcs-patch/centos/build_srpm b/cgcs-patch/centos/build_srpm deleted file mode 100755 index 1766e8fd..00000000 --- a/cgcs-patch/centos/build_srpm +++ /dev/null @@ -1,101 +0,0 @@ -source "$SRC_BASE/build-tools/spec-utils" - -if [ "x$DATA" == "x" ]; then - echo "ERROR: Environment variable 'DATA' not defined." - exit 1 -fi - -if [ ! -f "$DATA" ]; then - echo "ERROR: Couldn't find '$PWD/$DATA'" - exit 1 -fi - -unset TIS_PATCH_VER # Ensure there's nothing in the env already - -source $DATA - -if [ -z "$TIS_PATCH_VER" ]; then - echo "ERROR: TIS_PATCH_VER must be defined" - exit 1 -fi - -SRC_DIR="cgcs-patch" -EXTRA_DIR="bin" - -VERSION=$(grep '^Version:' PKG-INFO | awk -F ': ' '{print $2}' | sed -e 's/^[[:space:]]*//') -TAR_NAME=$(grep '^Name:' PKG-INFO | awk -F ': ' '{print $2}' | sed -e 's/^[[:space:]]*//') -CUR_DIR=`pwd` -BUILD_DIR="$RPMBUILD_BASE" - -mkdir -p $BUILD_DIR/SRPMS - -TAR="$TAR_NAME-$VERSION.tar.gz" -TAR_PATH="$BUILD_DIR/SOURCES/$TAR" - -# copy the LICENSE for rpm spec %license directive -cp $SRC_DIR/LICENSE $BUILD_DIR/SOURCES/ - -TAR_NEEDED=0 -if [ -f $TAR_PATH ]; then - n=`find . -cnewer $TAR_PATH -and ! -path './.git*' \ - -and ! -path './build/*' \ - -and ! -path './.pc/*' \ - -and ! -path './patches/*' \ - -and ! -path "./$DISTRO/*" \ - -and ! -path './pbr-*.egg/*' \ - | wc -l` - if [ $n -gt 0 ]; then - TAR_NEEDED=1 - fi -else - TAR_NEEDED=1 -fi - -if [ $TAR_NEEDED -gt 0 ]; then - tar czvf $TAR_PATH $SRC_DIR $EXTRA_DIR \ - --exclude='cgcs-patch/cgcs_patch_id' \ - --exclude='cgcs-patch/cgcs_make_patch' \ - --exclude='.git*' \ - --exclude='build' \ - --exclude='.pc' \ - --exclude='patches' \ - --exclude="$DISTRO" \ - --exclude='pbr-*.egg' \ - --transform "s,^$SRC_DIR/LICENSE,LICENSE," \ - --transform "s,^$SRC_DIR,$TAR_NAME-$VERSION," -fi - - -for SPEC in `ls $BUILD_DIR/SPECS`; do - SPEC_PATH="$BUILD_DIR/SPECS/$SPEC" - RELEASE=`spec_find_tag Release "$SPEC_PATH" 2>> /dev/null` - if [ $? -ne 0 ]; then - echo "ERROR: 'Release' not found in '$SPEC_PATH'" - fi - NAME=`spec_find_tag Name "$SPEC_PATH" 2>> /dev/null` - if [ $? -ne 0 ]; then - echo "ERROR: 'Name' not found in '$SPEC_PATH'" - fi - SRPM="$NAME-$VERSION-$RELEASE.src.rpm" - SRPM_PATH="$BUILD_DIR/SRPMS/$SRPM" - - BUILD_NEEDED=0 - if [ -f $SRPM_PATH ]; then - n=`find . -cnewer $SRPM_PATH | wc -l` - if [ $n -gt 0 ]; then - BUILD_NEEDED=1 - fi - else - BUILD_NEEDED=1 - fi - - if [ $BUILD_NEEDED -gt 0 ]; then - echo "SPEC file: $SPEC_PATH" - echo "SRPM build directory: $BUILD_DIR" - echo "TIS_PATCH_VER: $TIS_PATCH_VER" - - sed -i -e "1 i%define tis_patch_ver $TIS_PATCH_VER" $SPEC_PATH - rpmbuild -bs $SPEC_PATH --define="%_topdir $BUILD_DIR" --define="_tis_dist .tis" - fi -done - diff --git a/cgcs-patch/centos/build_srpm.data b/cgcs-patch/centos/build_srpm.data index 7323fa4e..e22f776a 100644 --- a/cgcs-patch/centos/build_srpm.data +++ b/cgcs-patch/centos/build_srpm.data @@ -1 +1,5 @@ -TIS_PATCH_VER=28 +SRC_DIR=. +EXCLUDE_LIST_FROM_TAR="centos \ + cgcs-patch/cgcs-patch/.tox cgcs-patch/cgcs-patch/.coverage cgcs-patch/cgcs-patch/.stestr cgcs-patch/cgcs-patch/cover \ + cgcs-patch/cgcs_make_patch cgcs-patch/cgcs_patch_id" +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/cgcs-patch/centos/cgcs-patch.spec b/cgcs-patch/centos/cgcs-patch.spec index 4ed3f997..9764e9b0 100644 --- a/cgcs-patch/centos/cgcs-patch.spec +++ b/cgcs-patch/centos/cgcs-patch.spec @@ -7,7 +7,6 @@ Group: base Packager: Wind River URL: unknown Source0: %{name}-%{version}.tar.gz -Source1: LICENSE BuildRequires: python-setuptools BuildRequires: python2-pip @@ -23,12 +22,10 @@ Requires: /bin/bash %description StarlingX Platform Patching -%define pythonroot /usr/lib64/python2.7/site-packages - %define debug_package %{nil} %prep -%setup +%setup -n %{name}-%{version}/%{name} %build %{__python} setup.py build @@ -36,79 +33,78 @@ StarlingX Platform Patching %install %{__python} setup.py install --root=$RPM_BUILD_ROOT \ - --install-lib=%{pythonroot} \ + --install-lib=%{python2_sitearch} \ --prefix=/usr \ --install-data=/usr/share \ --single-version-externally-managed mkdir -p $RPM_BUILD_ROOT/wheels install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - install -m 755 -d %{buildroot}%{_sbindir} - install -m 755 -d %{buildroot}%{_sysconfdir}/bash_completion.d - install -m 755 -d %{buildroot}%{_sysconfdir}/goenabled.d - install -m 755 -d %{buildroot}%{_sysconfdir}/init.d - install -m 755 -d %{buildroot}%{_sysconfdir}/logrotate.d - install -m 755 -d %{buildroot}%{_sysconfdir}/patching - install -m 700 -d %{buildroot}%{_sysconfdir}/patching/patch-scripts - install -m 755 -d %{buildroot}%{_sysconfdir}/pmon.d - install -m 755 -d %{buildroot}%{_unitdir} +install -m 755 -d %{buildroot}%{_sbindir} +install -m 755 -d %{buildroot}%{_sysconfdir}/bash_completion.d +install -m 755 -d %{buildroot}%{_sysconfdir}/goenabled.d +install -m 755 -d %{buildroot}%{_sysconfdir}/init.d +install -m 755 -d %{buildroot}%{_sysconfdir}/logrotate.d +install -m 755 -d %{buildroot}%{_sysconfdir}/patching +install -m 700 -d %{buildroot}%{_sysconfdir}/patching/patch-scripts +install -m 755 -d %{buildroot}%{_sysconfdir}/pmon.d +install -m 755 -d %{buildroot}%{_unitdir} +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-agent \ + %{buildroot}%{_sbindir}/sw-patch-agent +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-daemon \ + %{buildroot}%{_sbindir}/sw-patch-controller-daemon +install -m 555 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch \ + %{buildroot}%{_sbindir}/sw-patch - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-agent \ - %{buildroot}%{_sbindir}/sw-patch-agent - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-controller-daemon \ - %{buildroot}%{_sbindir}/sw-patch-controller-daemon - install -m 555 ${RPM_BUILD_DIR}/bin/sw-patch \ - %{buildroot}%{_sbindir}/sw-patch +install -m 555 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/rpm-audit \ + %{buildroot}%{_sbindir}/rpm-audit - install -m 555 ${RPM_BUILD_DIR}/bin/rpm-audit \ - %{buildroot}%{_sbindir}/rpm-audit +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-daemon-init.sh \ + %{buildroot}%{_sysconfdir}/init.d/sw-patch-controller-daemon +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-agent-init.sh \ + %{buildroot}%{_sysconfdir}/init.d/sw-patch-agent - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-controller-daemon-init.sh \ - %{buildroot}%{_sysconfdir}/init.d/sw-patch-controller-daemon - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-agent-init.sh \ - %{buildroot}%{_sysconfdir}/init.d/sw-patch-agent +install -m 600 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patching.conf \ + %{buildroot}%{_sysconfdir}/patching/patching.conf +install -m 644 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/policy.json \ + %{buildroot}%{_sysconfdir}/patching/policy.json - install -m 600 ${RPM_BUILD_DIR}/bin/patching.conf \ - %{buildroot}%{_sysconfdir}/patching/patching.conf - install -m 644 ${RPM_BUILD_DIR}/bin/policy.json \ - %{buildroot}%{_sysconfdir}/patching/policy.json +install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/pmon-sw-patch-controller-daemon.conf \ + %{buildroot}%{_sysconfdir}/pmon.d/sw-patch-controller-daemon.conf +install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/pmon-sw-patch-agent.conf \ + %{buildroot}%{_sysconfdir}/pmon.d/sw-patch-agent.conf - install -m 444 ${RPM_BUILD_DIR}/bin/pmon-sw-patch-controller-daemon.conf \ - %{buildroot}%{_sysconfdir}/pmon.d/sw-patch-controller-daemon.conf - install -m 444 ${RPM_BUILD_DIR}/bin/pmon-sw-patch-agent.conf \ - %{buildroot}%{_sysconfdir}/pmon.d/sw-patch-agent.conf +install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/*.service %{buildroot}%{_unitdir} - install -m 444 ${RPM_BUILD_DIR}/bin/*.service %{buildroot}%{_unitdir} +install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch.completion %{buildroot}%{_sysconfdir}/bash_completion.d/sw-patch - install -m 444 ${RPM_BUILD_DIR}/bin/sw-patch.completion %{buildroot}%{_sysconfdir}/bash_completion.d/sw-patch +install -m 400 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patch-functions \ + %{buildroot}%{_sysconfdir}/patching/patch-functions - install -m 400 ${RPM_BUILD_DIR}/bin/patch-functions \ - %{buildroot}%{_sysconfdir}/patching/patch-functions +install -D -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patch-tmpdirs.conf \ + %{buildroot}%{_tmpfilesdir}/patch-tmpdirs.conf +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/run-patch-scripts \ + %{buildroot}%{_sbindir}/run-patch-scripts - install -D -m 444 ${RPM_BUILD_DIR}/bin/patch-tmpdirs.conf \ - %{buildroot}%{_tmpfilesdir}/patch-tmpdirs.conf - install -m 500 ${RPM_BUILD_DIR}/bin/run-patch-scripts \ - %{buildroot}%{_sbindir}/run-patch-scripts +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-daemon-restart \ + %{buildroot}%{_sbindir}/sw-patch-controller-daemon-restart +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-agent-restart \ + %{buildroot}%{_sbindir}/sw-patch-agent-restart - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-controller-daemon-restart \ - %{buildroot}%{_sbindir}/sw-patch-controller-daemon-restart - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-agent-restart \ - %{buildroot}%{_sbindir}/sw-patch-agent-restart +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-init.sh \ + %{buildroot}%{_sysconfdir}/init.d/sw-patch +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/sw-patch-controller-init.sh \ + %{buildroot}%{_sysconfdir}/init.d/sw-patch-controller - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-init.sh \ - %{buildroot}%{_sysconfdir}/init.d/sw-patch - install -m 500 ${RPM_BUILD_DIR}/bin/sw-patch-controller-init.sh \ - %{buildroot}%{_sysconfdir}/init.d/sw-patch-controller +install -m 555 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patch_check_goenabled.sh \ + %{buildroot}%{_sysconfdir}/goenabled.d/patch_check_goenabled.sh - install -m 555 ${RPM_BUILD_DIR}/bin/patch_check_goenabled.sh \ - %{buildroot}%{_sysconfdir}/goenabled.d/patch_check_goenabled.sh +install -m 444 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/patching.logrotate \ + %{buildroot}%{_sysconfdir}/logrotate.d/patching - install -m 444 ${RPM_BUILD_DIR}/bin/patching.logrotate \ - %{buildroot}%{_sysconfdir}/logrotate.d/patching - - install -m 500 ${RPM_BUILD_DIR}/bin/upgrade-start-pkg-extract \ - %{buildroot}%{_sbindir}/upgrade-start-pkg-extract +install -m 500 ${RPM_BUILD_DIR}/%{name}-%{version}/bin/upgrade-start-pkg-extract \ + %{buildroot}%{_sbindir}/upgrade-start-pkg-extract %clean rm -rf $RPM_BUILD_ROOT @@ -149,10 +145,10 @@ StarlingX Platform Patching /usr/bin/systemctl enable sw-patch.service %files -%license ../LICENSE +%license LICENSE %defattr(-,root,root,-) -%{pythonroot}/cgcs_patch -%{pythonroot}/cgcs_patch-*.egg-info +%{python2_sitearch}/cgcs_patch +%{python2_sitearch}/cgcs_patch-*.egg-info %{_sbindir}/rpm-audit %config(noreplace) %{_sysconfdir}/patching/policy.json %config(noreplace) %{_sysconfdir}/patching/patching.conf diff --git a/patch-alarm/LICENSE b/patch-alarm/LICENSE deleted file mode 100644 index d6456956..00000000 --- a/patch-alarm/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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 - - http://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. diff --git a/patch-alarm/PKG-INFO b/patch-alarm/PKG-INFO deleted file mode 100644 index 308f416e..00000000 --- a/patch-alarm/PKG-INFO +++ /dev/null @@ -1,13 +0,0 @@ -Metadata-Version: 1.1 -Name: patch-alarm -Version: 1.0 -Summary: Patch alarm management -Home-page: -Author: Windriver -Author-email: info@windriver.com -License: Apache-2.0 - -Description: Patch alarm management - - -Platform: UNKNOWN diff --git a/patch-alarm/centos/build_srpm b/patch-alarm/centos/build_srpm deleted file mode 100755 index b45b2e29..00000000 --- a/patch-alarm/centos/build_srpm +++ /dev/null @@ -1,95 +0,0 @@ -source "$SRC_BASE/build-tools/spec-utils" - -if [ "x$DATA" == "x" ]; then - echo "ERROR: Environment variable 'DATA' not defined." - exit 1 -fi - -if [ ! -f "$DATA" ]; then - echo "ERROR: Couldn't find '$PWD/$DATA'" - exit 1 -fi - -unset TIS_PATCH_VER # Ensure there's nothing in the env already - -source $DATA - -if [ -z "$TIS_PATCH_VER" ]; then - echo "ERROR: TIS_PATCH_VER must be defined" - exit 1 -fi - -SRC_DIR="patch-alarm" -EXTRA_DIR="scripts" - -VERSION=$(grep '^Version:' PKG-INFO | awk -F ': ' '{print $2}' | sed -e 's/^[[:space:]]*//') -TAR_NAME=$(grep '^Name:' PKG-INFO | awk -F ': ' '{print $2}' | sed -e 's/^[[:space:]]*//') -CUR_DIR=`pwd` -BUILD_DIR="$RPMBUILD_BASE" - -mkdir -p $BUILD_DIR/SRPMS - -TAR="$TAR_NAME-$VERSION.tar.gz" -TAR_PATH="$BUILD_DIR/SOURCES/$TAR" - -TAR_NEEDED=0 -if [ -f $TAR_PATH ]; then - n=`find . -cnewer $TAR_PATH -and ! -path './.git*' \ - -and ! -path './build/*' \ - -and ! -path './.pc/*' \ - -and ! -path './patches/*' \ - -and ! -path "./$DISTRO/*" \ - -and ! -path './pbr-*.egg/*' \ - | wc -l` - if [ $n -gt 0 ]; then - TAR_NEEDED=1 - fi -else - TAR_NEEDED=1 -fi - -if [ $TAR_NEEDED -gt 0 ]; then - tar czvf $TAR_PATH $SRC_DIR $EXTRA_DIR \ - --exclude='.git*' \ - --exclude='build' \ - --exclude='.pc' \ - --exclude='patches' \ - --exclude="$DISTRO" \ - --exclude='pbr-*.egg' \ - --transform "s,^$SRC_DIR,$TAR_NAME-$VERSION," -fi - - -for SPEC in `ls $BUILD_DIR/SPECS`; do - SPEC_PATH="$BUILD_DIR/SPECS/$SPEC" - RELEASE=`spec_find_tag Release "$SPEC_PATH" 2>> /dev/null` - if [ $? -ne 0 ]; then - echo "ERROR: 'Release' not found in '$SPEC_PATH'" - fi - NAME=`spec_find_tag Name "$SPEC_PATH" 2>> /dev/null` - if [ $? -ne 0 ]; then - echo "ERROR: 'Name' not found in '$SPEC_PATH'" - fi - SRPM="$NAME-$VERSION-$RELEASE.src.rpm" - SRPM_PATH="$BUILD_DIR/SRPMS/$SRPM" - - BUILD_NEEDED=0 - if [ -f $SRPM_PATH ]; then - n=`find . -cnewer $SRPM_PATH | wc -l` - if [ $n -gt 0 ]; then - BUILD_NEEDED=1 - fi - else - BUILD_NEEDED=1 - fi - - if [ $BUILD_NEEDED -gt 0 ]; then - echo "SPEC file: $SPEC_PATH" - echo "SRPM build directory: $BUILD_DIR" - echo "TIS_PATCH_VER: $TIS_PATCH_VER" - - sed -i -e "1 i%define tis_patch_ver $TIS_PATCH_VER" $SPEC_PATH - rpmbuild -bs $SPEC_PATH --define="%_topdir $BUILD_DIR" --define="_tis_dist .tis" - fi -done - diff --git a/patch-alarm/centos/build_srpm.data b/patch-alarm/centos/build_srpm.data index 70b4b5dc..aa8063cb 100644 --- a/patch-alarm/centos/build_srpm.data +++ b/patch-alarm/centos/build_srpm.data @@ -1 +1,3 @@ -TIS_PATCH_VER=2 +SRC_DIR=. +EXCLUDE_LIST_FROM_TAR="centos patch-alarm/.tox patch-alarm/.coverage patch-alarm/.stestr patch-alarm/cover" +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/patch-alarm/centos/patch-alarm.spec b/patch-alarm/centos/patch-alarm.spec index 0a29a08d..8c5f7703 100644 --- a/patch-alarm/centos/patch-alarm.spec +++ b/patch-alarm/centos/patch-alarm.spec @@ -17,12 +17,10 @@ Requires: python-devel Requires: /bin/bash %description -TIS Platform Patching - -%define pythonroot /usr/lib64/python2.7/site-packages +StarlingX Platform Patching Alarm Manager %prep -%setup +%setup -n %{name}-%{version}/%{name} %build %{__python} setup.py build @@ -30,20 +28,20 @@ TIS Platform Patching %install %{__python} setup.py install --root=$RPM_BUILD_ROOT \ - --install-lib=%{pythonroot} \ + --install-lib=%{python2_sitearch} \ --prefix=/usr \ --install-data=/usr/share \ --single-version-externally-managed mkdir -p $RPM_BUILD_ROOT/wheels install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - install -m 755 -d %{buildroot}%{_bindir} - install -m 755 -d %{buildroot}%{_sysconfdir}/init.d +install -m 755 -d %{buildroot}%{_bindir} +install -m 755 -d %{buildroot}%{_sysconfdir}/init.d - install -m 700 ${RPM_BUILD_DIR}/scripts/bin/patch-alarm-manager \ +install -m 700 ${RPM_BUILD_DIR}/%{name}-%{version}/scripts/bin/patch-alarm-manager \ %{buildroot}%{_bindir}/patch-alarm-manager - install -m 700 ${RPM_BUILD_DIR}/scripts/init.d/patch-alarm-manager \ +install -m 700 ${RPM_BUILD_DIR}/%{name}-%{version}/scripts/init.d/patch-alarm-manager \ %{buildroot}%{_sysconfdir}/init.d/patch-alarm-manager %clean @@ -53,8 +51,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE -%{pythonroot}/patch_alarm -%{pythonroot}/patch_alarm-*.egg-info +%{python2_sitearch}/patch_alarm +%{python2_sitearch}/patch_alarm-*.egg-info "%{_bindir}/patch-alarm-manager" "%{_sysconfdir}/init.d/patch-alarm-manager"