Merge remote-tracking branch 'starlingx/master' into HEAD

Change-Id: I820daa797c3ec30b44b0e40ecb5397bc27d633c8
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2019-01-31 12:05:02 -05:00
commit 9cbbe1f867
4 changed files with 45 additions and 10 deletions

View File

@ -10,19 +10,20 @@ URL: unknown
Source0: %{name}-%{version}.tar.gz
%define cgcs_sdk_deploy_dir /opt/deploy/cgcs_sdk
%global debug_package %{nil}
%description
Titanium Cloud log server installation
%prep
%setup
mv %name wrs-%{name}-%{version}
tar czf wrs-%{name}-%{version}.tgz wrs-%{name}-%{version}
%build
make NAME=%{name} VERSION=%{version}
# Install for guest-client package
%install
install -D -m 644 wrs-%{name}-%{version}.tgz %{buildroot}%{cgcs_sdk_deploy_dir}/wrs-%{name}-%{version}.tgz
make install NAME=%{name} VERSION=%{version} SDK_DEPLOY_DIR=%{buildroot}%{cgcs_sdk_deploy_dir}
%files
%{cgcs_sdk_deploy_dir}/wrs-%{name}-%{version}.tgz

View File

@ -0,0 +1,14 @@
#
# SPDX-License-Identifier: Apache-2.0
#
NAME ?= install-log-server
VERSION ?= 1.1.2
SDK_DEPLOY_DIR ?= /opt/deploy/cgcs_sdk
all:
mv $(NAME) wrs-$(NAME)-$(VERSION)
tar czf wrs-$(NAME)-$(VERSION).tgz wrs-$(NAME)-$(VERSION)
install:
install -D -m 644 wrs-$(NAME)-$(VERSION).tgz $(SDK_DEPLOY_DIR)/wrs-$(NAME)-$(VERSION).tgz

View File

@ -26,21 +26,24 @@ BuildRequires: python-fmclient-sdk
%define cgcs_sdk_deploy_dir /opt/deploy/cgcs_sdk
%define remote_client_dir /usr/share/remote-clients
%global debug_package %{nil}
%description
Remote-Client files
%prep
%setup
mv %{name} wrs-%{name}-%{version}
find %{remote_client_dir} -name "*.tgz" -exec cp '{}' wrs-%{name}-%{version}/ \;
sed -i 's/xxxVERSIONxxx/%{version}/g' wrs-%{name}-%{version}/README
tar czf wrs-%{name}-%{version}.tgz wrs-%{name}-%{version}
%build
make NAME=%{name} \
VERSION=%{version} \
REMOTE_CLIENT_DIR=%{remote_client_dir}
# Install for guest-client package
%install
install -D -m 644 wrs-%{name}-%{version}.tgz %{buildroot}%{cgcs_sdk_deploy_dir}/wrs-%{name}-%{version}.tgz
make install NAME=%{name} \
VERSION=%{version} \
SDK_DEPLOY_DIR=%{buildroot}%{cgcs_sdk_deploy_dir}
%files
%{cgcs_sdk_deploy_dir}/wrs-%{name}-%{version}.tgz

View File

@ -0,0 +1,17 @@
#
# SPDX-License-Identifier: Apache-2.0
#
NAME ?= remote-clients
VERSION ?= 2.0.6
REMOTE_CLIENT_DIR ?= /usr/share/remote-clients
SDK_DEPLOY_DIR ?= /opt/deploy/cgcs_sdk
all:
mv $(NAME) wrs-$(NAME)-$(VERSION)
find $(REMOTE_CLIENT_DIR) -name "*.tgz" -exec cp '{}' wrs-$(NAME)-$(VERSION)/ \;
sed -i 's/xxxVERSIONxxx/$(VERSION)/g' wrs-$(NAME)-$(VERSION)/README
tar czf wrs-$(NAME)-$(VERSION).tgz wrs-$(NAME)-$(VERSION)
install:
install -D -m 644 wrs-$(NAME)-$(VERSION).tgz $(SDK_DEPLOY_DIR)/wrs-$(NAME)-$(VERSION).tgz