From 2b6413891c1aa8e4e9786b4b8321805dea664c10 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 25 Jun 2018 14:56:25 -0400 Subject: [PATCH] Rename mwa-* subdirectories to match the git repo name mwa-delphia -> stx-clients mwa-pitta -> stx-config mwa-cleo -> stx-fault mwa-gplv2 -> stx-gplv2 mwa-gplv3 -> stx-gplv3 mwa-solon -> stx-ha mwa-sparta -> stx-integ mwa-beas -> stx-metal mwa-thales -> stx-nfv mwa-chilon -> stx-update mwa-perian -> stx-upstream Depends-On: https://review.openstack.org/579954 Depends-On: https://review.openstack.org/579957 Change-Id: I974a4882142a8a72aa0d7c626ea62f8874f56f19 Signed-off-by: Scott Little --- guest-client/centos/build_srpm.data | 4 ++-- guest-client/centos/guest-client.spec | 22 +++++++++----------- nova-api-proxy/centos/build_srpm.data | 3 +-- nova-api-proxy/centos/nova-api-proxy.spec | 10 ++++----- nova-api-proxy/{ => nova_api_proxy}/LICENSE | 0 nova-api-proxy/{ => nova_api_proxy}/setup.py | 0 6 files changed, 18 insertions(+), 21 deletions(-) rename nova-api-proxy/{ => nova_api_proxy}/LICENSE (100%) rename nova-api-proxy/{ => nova_api_proxy}/setup.py (100%) diff --git a/guest-client/centos/build_srpm.data b/guest-client/centos/build_srpm.data index 6d28f995..6b9c084e 100644 --- a/guest-client/centos/build_srpm.data +++ b/guest-client/centos/build_srpm.data @@ -1,3 +1,3 @@ -SRC_DIR=$CGCS_BASE/mwa-thales/guest-client -COPY_LIST="$SRC_DIR/*" +SRC_DIR="$PKG_BASE/guest-client-3.0.1" +COPY_LIST="$PKG_BASE/LICENSE" TIS_PATCH_VER=6 diff --git a/guest-client/centos/guest-client.spec b/guest-client/centos/guest-client.spec index 61e68d86..317fa7c1 100644 --- a/guest-client/centos/guest-client.spec +++ b/guest-client/centos/guest-client.spec @@ -48,33 +48,31 @@ Guest-Client SDK files #find . -name "*.tgz" #echo `pwd` # Build for guest-client package -cd guest-client-3.0.1 make clean make build sysconfdir=%{_sysconfdir} make sample make tar ARCHIVE_NAME=wrs-guest-heartbeat-%{version} find build -cd .. # Install for guest-client package %install install -m 750 -d %{buildroot}/usr install -m 750 -d %{buildroot}%{_includedir} install -m 750 -d %{buildroot}%{_includedir}/guest-client -install -m 640 -p -D %{name}-%{version}/guest_client/src/heartbeat/guest_heartbeat_msg_defs.h %{buildroot}%{_includedir}/guest-client/guest_heartbeat_msg_defs.h +install -m 640 -p -D guest_client/src/heartbeat/guest_heartbeat_msg_defs.h %{buildroot}%{_includedir}/guest-client/guest_heartbeat_msg_defs.h install -d %{buildroot}%{cgcs_sdk_deploy_dir} -install -m 640 %{name}-%{version}/build/wrs-guest-heartbeat-%{version}.tgz %{buildroot}%{cgcs_sdk_deploy_dir} +install -m 640 build/wrs-guest-heartbeat-%{version}.tgz %{buildroot}%{cgcs_sdk_deploy_dir} %if %{with systemd} -install -m 644 -p -D %{name}-%{version}/guest_client/scripts/guest-client.service %{buildroot}%{_unitdir}/guest-client.service -install -m 744 -p -D %{name}-%{version}/guest_client/scripts/guest-client.systemd %{buildroot}%{_sysconfdir}/guest-client/guest-client.systemd +install -m 644 -p -D guest_client/scripts/guest-client.service %{buildroot}%{_unitdir}/guest-client.service +install -m 744 -p -D guest_client/scripts/guest-client.systemd %{buildroot}%{_sysconfdir}/guest-client/guest-client.systemd %endif install -m 750 -d %{buildroot}%{_sysconfdir}/guest-client/heartbeat -install -m 755 -p -D %{name}-%{version}/guest_client/scripts/guest_heartbeat.conf %{buildroot}%{_sysconfdir}/guest-client/heartbeat/guest_heartbeat.conf -install -m 755 -p -D %{name}-%{version}/guest_client/scripts/sample_event_handling_script %{buildroot}%{_sysconfdir}/guest-client/heartbeat/sample_event_handling_script -install -m 755 -p -D %{name}-%{version}/guest_client/scripts/sample_health_check_script %{buildroot}%{_sysconfdir}/guest-client/heartbeat/sample_health_check_script -install -m 640 -p -D %{name}-%{version}/build/guest-client %{buildroot}/usr/local/bin/guest-client -install -m 640 -p -D %{name}-%{version}/build/libguest_common_api.so.%{version} %{buildroot}/usr/local/lib/libguest_common_api.so.%{version} -install -m 640 -p -D %{name}-%{version}/build/libguest_heartbeat_api.so.%{version} %{buildroot}/usr/local/lib/libguest_heartbeat_api.so.%{version} +install -m 755 -p -D guest_client/scripts/guest_heartbeat.conf %{buildroot}%{_sysconfdir}/guest-client/heartbeat/guest_heartbeat.conf +install -m 755 -p -D guest_client/scripts/sample_event_handling_script %{buildroot}%{_sysconfdir}/guest-client/heartbeat/sample_event_handling_script +install -m 755 -p -D guest_client/scripts/sample_health_check_script %{buildroot}%{_sysconfdir}/guest-client/heartbeat/sample_health_check_script +install -m 640 -p -D build/guest-client %{buildroot}/usr/local/bin/guest-client +install -m 640 -p -D build/libguest_common_api.so.%{version} %{buildroot}/usr/local/lib/libguest_common_api.so.%{version} +install -m 640 -p -D build/libguest_heartbeat_api.so.%{version} %{buildroot}/usr/local/lib/libguest_heartbeat_api.so.%{version} %files %defattr(755,root,root,-) diff --git a/nova-api-proxy/centos/build_srpm.data b/nova-api-proxy/centos/build_srpm.data index 3ebcc879..cc205ad3 100644 --- a/nova-api-proxy/centos/build_srpm.data +++ b/nova-api-proxy/centos/build_srpm.data @@ -1,3 +1,2 @@ -SRC_DIR="." -EXCLUDE_LIST_FROM_TAR="nova-api-proxy.bb PKG-INFO centos" +SRC_DIR="$PKG_BASE/nova_api_proxy" TIS_PATCH_VER=10 diff --git a/nova-api-proxy/centos/nova-api-proxy.spec b/nova-api-proxy/centos/nova-api-proxy.spec index f7805cb8..aaea3696 100644 --- a/nova-api-proxy/centos/nova-api-proxy.spec +++ b/nova-api-proxy/centos/nova-api-proxy.spec @@ -40,13 +40,13 @@ Nova Computer API Proxy --single-version-externally-managed install -d -m 755 %{buildroot}%{local_etc_systemd} -install -p -D -m 644 nova_api_proxy/scripts/api-proxy.service %{buildroot}%{local_etc_systemd}/api-proxy.service +install -p -D -m 644 scripts/api-proxy.service %{buildroot}%{local_etc_systemd}/api-proxy.service install -d -m 755 %{buildroot}%{local_initddir} -install -p -D -m 755 nova_api_proxy/scripts/api-proxy %{buildroot}%{local_initddir}/api-proxy +install -p -D -m 755 scripts/api-proxy %{buildroot}%{local_initddir}/api-proxy install -d -m 755 %{buildroot}%{local_proxy_conf} -install -p -D -m 700 nova_api_proxy/nova-api-proxy.conf %{buildroot}%{local_proxy_conf}/nova-api-proxy.conf -install -p -D -m 700 nova_api_proxy/api-proxy-paste.ini %{buildroot}%{local_proxy_conf}/api-proxy-paste.ini +install -p -D -m 700 nova-api-proxy.conf %{buildroot}%{local_proxy_conf}/nova-api-proxy.conf +install -p -D -m 700 api-proxy-paste.ini %{buildroot}%{local_proxy_conf}/api-proxy-paste.ini %clean rm -rf $RPM_BUILD_ROOT @@ -61,5 +61,5 @@ rm -rf $RPM_BUILD_ROOT %{local_etc_systemd}/* %config(noreplace) %{local_proxy_conf}/nova-api-proxy.conf %{local_proxy_conf}/api-proxy-paste.ini -%{pythonroot}/nova_api_proxy/* +%{pythonroot}/* %{pythonroot}/api_proxy-%{version}.0-py2.7.egg-info/* diff --git a/nova-api-proxy/LICENSE b/nova-api-proxy/nova_api_proxy/LICENSE similarity index 100% rename from nova-api-proxy/LICENSE rename to nova-api-proxy/nova_api_proxy/LICENSE diff --git a/nova-api-proxy/setup.py b/nova-api-proxy/nova_api_proxy/setup.py similarity index 100% rename from nova-api-proxy/setup.py rename to nova-api-proxy/nova_api_proxy/setup.py