From 59f9764947b8502cdb5a138a24f3fc42ef4d6714 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 1 Aug 2018 16:07:22 -0400 Subject: [PATCH] Relocate build-info to stx-integ/utilities/build-info Move content from stx-utils into stx-integ or stx-update Packages will be relocated to stx-update: enable-dev-patch extras stx-integ: config-files/ io-scheduler filesystem/ filesystem-scripts grub/ grubby logging/ logmgmt tools/ collector monitor-tools tools/engtools/ hostdata-collectors parsers utilities/ build-info branding (formerly wrs-branding) platform-util Change-Id: If9498ca489b0f4c7a1909fd518c5b501f6a6e5ef Story: 2002801 Task: 22687 Signed-off-by: Scott Little --- centos_pkg_dirs | 1 - middleware/recipes-common/build-info/PKG-INFO | 12 -- .../build-info/build-info-1.0/LICENSE | 202 ------------------ .../build-info/build-info-1.0/collect.sh | 104 --------- .../build-info/centos/build-info.spec | 50 ----- .../build-info/centos/build_srpm | 130 ----------- .../build-info/centos/build_srpm.data | 1 - .../build-info/release-info.inc | 12 -- 8 files changed, 512 deletions(-) delete mode 100644 middleware/recipes-common/build-info/PKG-INFO delete mode 100644 middleware/recipes-common/build-info/build-info-1.0/LICENSE delete mode 100755 middleware/recipes-common/build-info/build-info-1.0/collect.sh delete mode 100644 middleware/recipes-common/build-info/centos/build-info.spec delete mode 100755 middleware/recipes-common/build-info/centos/build_srpm delete mode 100644 middleware/recipes-common/build-info/centos/build_srpm.data delete mode 100644 middleware/recipes-common/build-info/release-info.inc diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 9065dc7..e69de29 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1 +0,0 @@ -middleware/recipes-common/build-info diff --git a/middleware/recipes-common/build-info/PKG-INFO b/middleware/recipes-common/build-info/PKG-INFO deleted file mode 100644 index 24a1927..0000000 --- a/middleware/recipes-common/build-info/PKG-INFO +++ /dev/null @@ -1,12 +0,0 @@ -Metadata-Version: 1.1 -Name: build-info -Version: 1.0 -Summary: build-info version 1.0-r3 -Home-page: -Author: Windriver -Author-email: info@windriver.com -License: Apache-2.0 - -Description: CGTS build information package - -Platform: UNKNOWN diff --git a/middleware/recipes-common/build-info/build-info-1.0/LICENSE b/middleware/recipes-common/build-info/build-info-1.0/LICENSE deleted file mode 100644 index d645695..0000000 --- a/middleware/recipes-common/build-info/build-info-1.0/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/middleware/recipes-common/build-info/build-info-1.0/collect.sh b/middleware/recipes-common/build-info/build-info-1.0/collect.sh deleted file mode 100755 index 8d06f6a..0000000 --- a/middleware/recipes-common/build-info/build-info-1.0/collect.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash - -# -# Copyright (c) 2013-2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -root="../../../../../.." -centOSBuildRoot=".." -jenkinsBuildFileName="BUILD" -jenkinsBuildFile="$root/$jenkinsBuildFileName" -jenkinsBuildFileCentOS="$centOSBuildRoot/$jenkinsBuildFileName" -releaseInfoFile="../release-info.inc" -destFile="build.info" -destH="build_info.h" - -# If Jenkins build file does not exist in the expected Rel 2 directory, -# check if it was packaged in the source RPM -if [ ! -e $jenkinsBuildFile ]; then - if [ -e $jenkinsBuildFileCentOS ]; then - jenkinsBuildFile=$jenkinsBuildFileCentOS - fi -fi - -if [ -e $releaseInfoFile ]; then - source $releaseInfoFile -fi - -if [ "${REPO}x" == "x" ]; then - REPO=`grep CONFIGURE_CMD $root/config.properties | awk ' { print $1 } ' | awk -F '"' ' { print $2 } ' | sed 's|\(.*\)\(\/.*\/.*\)$|\1|g'` -fi - -if [ -e $jenkinsBuildFile ]; then - cp $jenkinsBuildFile $destFile - source $jenkinsBuildFile -else - # PLATFORM_RELEASE should be set in release-info.inc - if [ "x${PLATFORM_RELEASE}" == "x" ]; then - SW_VERSION="Unknown" - else - SW_VERSION="${PLATFORM_RELEASE}" - fi - - BUILD_TARGET="Unknown" - BUILD_TYPE="Informal" - BUILD_ID="n/a" - JOB="n/a" - if [ "${BUILD_BY}x" == "x" ]; then - BUILD_BY="$USER" - fi - BUILD_NUMBER="n/a" - BUILD_HOST="$HOSTNAME" - if [ "${BUILD_DATE}x" == "x" ]; then - BUILD_DATE=`date "%F %T %z"` - if [ $? -ne 0 ]; then - BUILD_DATE=`date "+%F %T %z"` - fi - fi - - echo "SW_VERSION=\"$SW_VERSION\"" > $destFile - echo "BUILD_TARGET=\"$BUILD_TARGET\"" >> $destFile - echo "BUILD_TYPE=\"$BUILD_TYPE\"" >> $destFile - echo "BUILD_ID=\"$BUILD_ID\"" >> $destFile - echo "" >> $destFile - echo "JOB=\"$JOB\"" >> $destFile - echo "BUILD_BY=\"$BUILD_BY\"" >> $destFile - echo "BUILD_NUMBER=\"$BUILD_NUMBER\"" >> $destFile - echo "BUILD_HOST=\"$BUILD_HOST\"" >> $destFile - echo "BUILD_DATE=\"$BUILD_DATE\"" >> $destFile - echo "" >> $destFile - echo "BUILD_DIR=\""`bash -c "cd $root; pwd"`"\"" >> $destFile - echo "WRS_SRC_DIR=\"$REPO\"" >> $destFile - if [ "${WRS_GIT_BRANCH}x" == "x" ]; then - echo "WRS_GIT_BRANCH=\""`cd $REPO; git status -s -b | grep '##' | awk ' { printf $2 } '`"\"" >> $destFile - else - echo "WRS_GIT_BRANCH=\"$WRS_GIT_BRANCH\"" >> $destFile - fi - - echo "CGCS_SRC_DIR=\"$REPO/stx\"" >> $destFile - if [ "${CGCS_GIT_BRANCH}x" == "x" ]; then - echo "CGCS_GIT_BRANCH=\""`cd $REPO/stx/; git status -s -b | grep '##' | awk ' { printf $2 } '`"\"" >> $destFile - else - echo "CGCS_GIT_BRANCH=\"$CGCS_GIT_BRANCH\"" >> $destFile - fi - -fi - -echo "#ifndef _BUILD_INFO_H_" > $destH -echo "#define _BUILD_INFO_H_" >> $destH -echo "" >> $destH -echo "#define RELEASE_NAME \"$RELEASE_NAME\"" >> $destH -echo "#define SW_VERSION \"$SW_VERSION\"" >> $destH -echo "" >> $destH -echo "#define BUILD_TARGET \"$BUILD_TARGET\"" >> $destH -echo "#define BUILD_TYPE \"$BUILD_TYPE\"" >> $destH -echo "#define BUILD_ID \"$BUILD_ID\"" >> $destH -echo "" >> $destH -echo "#define JOB \"$JOB\"" >> $destH -echo "#define BUILD_BY \"$BUILD_BY\"" >> $destH -echo "#define BUILD_NUMBER \"$BUILD_NUMBER\"" >> $destH -echo "#define BUILD_HOST \"$BUILD_HOST\"" >> $destH -echo "#define BUILD_DATE \"$BUILD_DATE\"" >> $destH -echo "#endif /* _BUILD_INFO_H_ */" >> $destH diff --git a/middleware/recipes-common/build-info/centos/build-info.spec b/middleware/recipes-common/build-info/centos/build-info.spec deleted file mode 100644 index 18ca8cd..0000000 --- a/middleware/recipes-common/build-info/centos/build-info.spec +++ /dev/null @@ -1,50 +0,0 @@ -Summary: build-info version 1.0-r3 -Name: build-info -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -URL: unknown -Source0: %{name}-%{version}.tar.gz -Source1: LICENSE - -%description -Build Info - -%define local_etcdir /etc -%define local_incdir /usr/include - -%define debug_package %{nil} - -%package -n build-info-dev -Summary: build-info version 1.0-r3 - Development files -Group: devel - -%description -n build-info-dev -Build Info This package contains symbolic links, header files, and related items necessary for software development. - -%files -%license ../LICENSE -%defattr(-,root,root,-) -%{local_etcdir}/* - -%prep -%setup - -%build -./collect.sh - -%install -install -d -m 755 %{buildroot}%{local_etcdir} -install -m 644 build.info %{buildroot}/%{local_etcdir} -install -d -m 755 %{buildroot}%{local_incdir} -install -m 644 build_info.h %{buildroot}/%{local_incdir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -n build-info-dev -%defattr(-,root,root,-) -%{local_incdir}/* - diff --git a/middleware/recipes-common/build-info/centos/build_srpm b/middleware/recipes-common/build-info/centos/build_srpm deleted file mode 100755 index b93c548..0000000 --- a/middleware/recipes-common/build-info/centos/build_srpm +++ /dev/null @@ -1,130 +0,0 @@ -# -# Copyright (c) 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.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="/build-info-1.0" -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" - -# Additional files to include in the archive (if they exist). -EXTRA_FILES="./release-info.inc" -if [ -f $MY_WORKSPACE/BUILD ]; then - EXTRA_FILES+=" $MY_WORKSPACE/BUILD" -else - if [ -f $MY_WORKSPACE/../BUILD ]; then - EXTRA_FILES+=" $MY_WORKSPACE/../BUILD" - fi -fi - -mkdir -p $BUILD_DIR/SRPMS - -TAR_UNCOMPRESSED="$TAR_NAME-$VERSION.tar" -TAR="${TAR_UNCOMPRESSED}.gz" -COMPRESS="gzip" -TAR_PATH="$BUILD_DIR/SOURCES" - -# copy the LICENSE for rpm spec %license directive -cp .$SRC_DIR/LICENSE $BUILD_DIR/SOURCES/ - -# Check to see if our tarball needs updating -TAR_NEEDED=0 -if [ -f $TAR_PATH/$TAR ]; then - n=`find . -cnewer $TAR_PATH/$TAR -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 - - # check to see if any of our EXTRA_FILES are newer than the archive - for file in "$EXTRA_FILES"; do - if [ $file -nt $TAR_PATH/$TAR ]; then - TAR_NEEDED=1 - fi - done -else - TAR_NEEDED=1 -fi - -if [ $TAR_NEEDED -gt 0 ]; then - tar cvf $TAR_PATH/$TAR_UNCOMPRESSED .$SRC_DIR \ - --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 file in $EXTRA_FILES; do - if [ -e $file ]; then - tar rf $TAR_PATH/$TAR_UNCOMPRESSED -C $(dirname "${file}") $(basename "${file}") - fi -done - -$COMPRESS $TAR_PATH/$TAR_UNCOMPRESSED - -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/middleware/recipes-common/build-info/centos/build_srpm.data b/middleware/recipes-common/build-info/centos/build_srpm.data deleted file mode 100644 index d3f64f3..0000000 --- a/middleware/recipes-common/build-info/centos/build_srpm.data +++ /dev/null @@ -1 +0,0 @@ -TIS_PATCH_VER=3 diff --git a/middleware/recipes-common/build-info/release-info.inc b/middleware/recipes-common/build-info/release-info.inc deleted file mode 100644 index bd4346c..0000000 --- a/middleware/recipes-common/build-info/release-info.inc +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (c) 2014-2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# Inclusion file to set release variables -# -# Note: Sourced from scripts, so needs to be bash-able -# -PLATFORM_RELEASE="18.08"