Merge remote-tracking branch 'starlingx/master' into HEAD
Change-Id: Ib3567f6f0b97109ffda4a437e9138881eb3d394c Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little
commit
b39b350f3e
|
|
@ -1,7 +1,6 @@
|
||||||
Summary: Titanium Cloud host guest messaging agents, lib, apps
|
Summary: Titanium Cloud host guest messaging agents, lib, apps
|
||||||
Name: host-guest-comm
|
Name: host-guest-comm
|
||||||
Version: 2.0
|
Version: 2.0
|
||||||
%define patchlevel %{tis_patch_ver}
|
|
||||||
Release: %{tis_patch_ver}%{?_tis_dist}
|
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||||
|
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
|
|
@ -76,79 +75,24 @@ for software development.
|
||||||
VER=%{version}
|
VER=%{version}
|
||||||
MAJOR=`echo $VER | awk -F . '{print $1}'`
|
MAJOR=`echo $VER | awk -F . '{print $1}'`
|
||||||
MINOR=`echo $VER | awk -F . '{print $2}'`
|
MINOR=`echo $VER | awk -F . '{print $2}'`
|
||||||
PATCH=%{patchlevel}
|
PATCH=%{tis_patch_ver}
|
||||||
|
|
||||||
make all VER=${VER} MAJOR=${MAJOR} MINOR=${MINOR} PATCH=${PATCH}
|
make all VER=${VER} MAJOR=${MAJOR} MINOR=${MINOR} PATCH=${PATCH}
|
||||||
find .
|
|
||||||
find . -name "*.tgz"
|
|
||||||
|
|
||||||
%global _buildsubdir %{_builddir}/%{name}-%{version}
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
VER=%{version}
|
VER=%{version}
|
||||||
MAJOR=`echo $VER | awk -F . '{print $1}'`
|
MAJOR=`echo $VER | awk -F . '{print $1}'`
|
||||||
MINOR=`echo $VER | awk -F . '{print $2}'`
|
MINOR=`echo $VER | awk -F . '{print $2}'`
|
||||||
PATCH=%{patchlevel}
|
PATCH=%{tis_patch_ver}
|
||||||
|
make install \
|
||||||
|
DESTDIR=%{buildroot} \
|
||||||
|
SYSCONFDIR=%{buildroot}%{_sysconfdir} \
|
||||||
|
UNITDIR=%{buildroot}%{_unitdir} \
|
||||||
|
LIBDIR=%{buildroot}%{_libdir} \
|
||||||
|
SDK_DEPLOY_DIR=%{buildroot}%{cgcs_sdk_deploy_dir} \
|
||||||
|
MAJOR=${MAJOR} MINOR=${MINOR} PATCH=${PATCH}
|
||||||
|
|
||||||
install -m 750 -d %{buildroot}/usr/sbin
|
|
||||||
install -m 755 -d %{buildroot}/usr/lib64
|
|
||||||
install -m 755 -d %{buildroot}/usr/include
|
|
||||||
install -m 755 -d %{buildroot}/usr/include/cgcs
|
|
||||||
install -m 750 -d %{buildroot}%{_sysconfdir}/init.d
|
|
||||||
install -m 750 -d %{buildroot}%{_sysconfdir}/pmon.d
|
|
||||||
install -m 750 -d %{buildroot}%{_unitdir}
|
|
||||||
|
|
||||||
install -m 750 -d %{buildroot}/usr
|
|
||||||
install -m 750 -d %{buildroot}/usr/src
|
|
||||||
install -m 750 -d %{buildroot}/usr/src/debug
|
|
||||||
install -m 750 -d %{buildroot}/usr/src/debug/host-guest-comm-%{version}
|
|
||||||
|
|
||||||
|
|
||||||
install -m 644 %{_buildsubdir}/host_guest_msg_type.h %{buildroot}/usr/src/debug/host-guest-comm-%{version}/host_guest_msg_type.h
|
|
||||||
install -m 644 %{_buildsubdir}/server_group_app.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/server_group_app.c
|
|
||||||
install -m 644 %{_buildsubdir}/server_group.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/server_group.c
|
|
||||||
install -m 644 %{_buildsubdir}/guest_agent.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/guest_agent.c
|
|
||||||
install -m 644 %{_buildsubdir}/lib_host_guest_msg.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/lib_host_guest_msg.c
|
|
||||||
install -m 644 %{_buildsubdir}/host_guest_msg.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/host_guest_msg.c
|
|
||||||
install -m 644 %{_buildsubdir}/lib_guest_host_msg.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/lib_guest_host_msg.c
|
|
||||||
install -m 644 %{_buildsubdir}/host_instance_mgmt.h %{buildroot}/usr/src/debug/host-guest-comm-%{version}/host_instance_mgmt.h
|
|
||||||
install -m 644 %{_buildsubdir}/host_instance_mgmt.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/host_instance_mgmt.c
|
|
||||||
install -m 644 %{_buildsubdir}/guest_host_msg.h %{buildroot}/usr/src/debug/host-guest-comm-%{version}/guest_host_msg.h
|
|
||||||
install -m 644 %{_buildsubdir}/host_guest_msg.h %{buildroot}/usr/src/debug/host-guest-comm-%{version}/host_guest_msg.h
|
|
||||||
install -m 644 %{_buildsubdir}/host_agent.c %{buildroot}/usr/src/debug/host-guest-comm-%{version}/host_agent.c
|
|
||||||
install -m 644 %{_buildsubdir}/server_group.h %{buildroot}/usr/src/debug/host-guest-comm-%{version}/server_group.h
|
|
||||||
|
|
||||||
install -m 750 %{_buildsubdir}/scripts/host_agent %{buildroot}%{_sysconfdir}/init.d/host_agent
|
|
||||||
install -m 640 %{_buildsubdir}/scripts/host_agent.service %{buildroot}%{_unitdir}/host_agent.service
|
|
||||||
install -m 644 %{_buildsubdir}/scripts/guest-agent.service %{buildroot}%{_unitdir}/guest-agent.service
|
|
||||||
install -m 640 %{_buildsubdir}/scripts/host_agent.conf %{buildroot}%{_sysconfdir}/pmon.d/host_agent.conf
|
|
||||||
install -m 750 %{_buildsubdir}/bin/host_agent %{buildroot}/usr/sbin/host_agent
|
|
||||||
install -m 750 %{_buildsubdir}/bin/guest_agent %{buildroot}/usr/sbin/guest_agent
|
|
||||||
install -m 750 %{_buildsubdir}/bin/server_group_app %{buildroot}/usr/sbin/server_group_app
|
|
||||||
install -m 644 %{_buildsubdir}/guest_host_msg.h %{buildroot}/usr/include/cgcs/guest_host_msg.h
|
|
||||||
install -m 644 %{_buildsubdir}/host_guest_msg.h %{buildroot}/usr/include/cgcs/host_guest_msg.h
|
|
||||||
|
|
||||||
# Deploy to the SDK deployment directory
|
|
||||||
|
|
||||||
find .
|
|
||||||
install -d %{buildroot}%{cgcs_sdk_deploy_dir}
|
|
||||||
install -m 644 sdk/wrs-server-group-%{version}.%{patchlevel}.tgz %{buildroot}%{cgcs_sdk_deploy_dir}/wrs-server-group-%{version}.%{patchlevel}.tgz
|
|
||||||
|
|
||||||
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/lib/libguesthostmsg.so.${MAJOR}.${MINOR}.${PATCH} %{buildroot}%{_libdir}/libguesthostmsg.so.${MAJOR}.${MINOR}.${PATCH}
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libguesthostmsg.so.$MAJOR.$MINOR.${PATCH} libguesthostmsg.so.$MAJOR.${MINOR}
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libguesthostmsg.so.$MAJOR.$MINOR.${PATCH} libguesthostmsg.so.$MAJOR
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libguesthostmsg.so.$MAJOR.$MINOR.${PATCH} libguesthostmsg.so
|
|
||||||
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/lib/libhostguestmsg.so.${MAJOR}.${MINOR}.${PATCH} %{buildroot}%{_libdir}/libhostguestmsg.so.${MAJOR}.${MINOR}.${PATCH}
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libhostguestmsg.so.$MAJOR.$MINOR.${PATCH} libhostguestmsg.so.$MAJOR.${MINOR}
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libhostguestmsg.so.$MAJOR.$MINOR.${PATCH} libhostguestmsg.so.$MAJOR
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libhostguestmsg.so.$MAJOR.$MINOR.${PATCH} libhostguestmsg.so
|
|
||||||
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/lib/libservergroup.so.${MAJOR}.${MINOR}.${PATCH} %{buildroot}%{_libdir}/libservergroup.so.${MAJOR}.${MINOR}.${PATCH}
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libservergroup.so.$MAJOR.$MINOR.${PATCH} libservergroup.so.$MAJOR.${MINOR}
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libservergroup.so.$MAJOR.$MINOR.${PATCH} libservergroup.so.$MAJOR
|
|
||||||
cd %{buildroot}%{_libdir} ; ln -s libservergroup.so.$MAJOR.$MINOR.${PATCH} libservergroup.so
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/usr/bin/systemctl enable host_agent.service
|
/usr/bin/systemctl enable host_agent.service
|
||||||
|
|
@ -159,7 +103,7 @@ cd %{buildroot}%{_libdir} ; ln -s libservergroup.so.$MAJOR.$MINOR.${PATCH} libse
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
/usr/lib64/libhostguestmsg.so.2.0.%{patchlevel}
|
/usr/lib64/libhostguestmsg.so.2.0.%{tis_patch_ver}
|
||||||
/usr/lib64/libhostguestmsg.so.2.0
|
/usr/lib64/libhostguestmsg.so.2.0
|
||||||
/usr/lib64/libhostguestmsg.so.2
|
/usr/lib64/libhostguestmsg.so.2
|
||||||
/usr/sbin/host_agent
|
/usr/sbin/host_agent
|
||||||
|
|
@ -170,10 +114,10 @@ cd %{buildroot}%{_libdir} ; ln -s libservergroup.so.$MAJOR.$MINOR.${PATCH} libse
|
||||||
%files -n guest-host-comm
|
%files -n guest-host-comm
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
/usr/lib64/libguesthostmsg.so.2.0.%{patchlevel}
|
/usr/lib64/libguesthostmsg.so.2.0.%{tis_patch_ver}
|
||||||
/usr/lib64/libguesthostmsg.so.2.0
|
/usr/lib64/libguesthostmsg.so.2.0
|
||||||
/usr/lib64/libguesthostmsg.so.2
|
/usr/lib64/libguesthostmsg.so.2
|
||||||
/usr/lib64/libservergroup.so.2.0.%{patchlevel}
|
/usr/lib64/libservergroup.so.2.0.%{tis_patch_ver}
|
||||||
/usr/lib64/libservergroup.so.2.0
|
/usr/lib64/libservergroup.so.2.0
|
||||||
/usr/lib64/libservergroup.so.2
|
/usr/lib64/libservergroup.so.2
|
||||||
/usr/sbin/server_group_app
|
/usr/sbin/server_group_app
|
||||||
|
|
@ -191,11 +135,11 @@ cd %{buildroot}%{_libdir} ; ln -s libservergroup.so.$MAJOR.$MINOR.${PATCH} libse
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
/usr/include/cgcs/guest_host_msg.h
|
/usr/include/cgcs/guest_host_msg.h
|
||||||
/usr/lib64/libguesthostmsg.so.2.0.%{patchlevel}
|
/usr/lib64/libguesthostmsg.so.2.0.%{tis_patch_ver}
|
||||||
/usr/lib64/libguesthostmsg.so.2.0
|
/usr/lib64/libguesthostmsg.so.2.0
|
||||||
/usr/lib64/libguesthostmsg.so.2
|
/usr/lib64/libguesthostmsg.so.2
|
||||||
/usr/lib64/libguesthostmsg.so
|
/usr/lib64/libguesthostmsg.so
|
||||||
/usr/lib64/libservergroup.so.2.0.%{patchlevel}
|
/usr/lib64/libservergroup.so.2.0.%{tis_patch_ver}
|
||||||
/usr/lib64/libservergroup.so.2.0
|
/usr/lib64/libservergroup.so.2.0
|
||||||
/usr/lib64/libservergroup.so.2
|
/usr/lib64/libservergroup.so.2
|
||||||
/usr/lib64/libservergroup.so
|
/usr/lib64/libservergroup.so
|
||||||
|
|
@ -221,10 +165,10 @@ cd %{buildroot}%{_libdir} ; ln -s libservergroup.so.$MAJOR.$MINOR.${PATCH} libse
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
/usr/include/cgcs/host_guest_msg.h
|
/usr/include/cgcs/host_guest_msg.h
|
||||||
/usr/lib64/libhostguestmsg.so.2.0.%{patchlevel}
|
/usr/lib64/libhostguestmsg.so.2.0.%{tis_patch_ver}
|
||||||
/usr/lib64/libhostguestmsg.so.2.0
|
/usr/lib64/libhostguestmsg.so.2.0
|
||||||
/usr/lib64/libhostguestmsg.so.2
|
/usr/lib64/libhostguestmsg.so.2
|
||||||
/usr/lib64/libhostguestmsg.so
|
/usr/lib64/libhostguestmsg.so
|
||||||
|
|
||||||
%files -n %{name}-cgts-sdk
|
%files -n %{name}-cgts-sdk
|
||||||
%{cgcs_sdk_deploy_dir}/wrs-server-group-%{version}.%{patchlevel}.tgz
|
%{cgcs_sdk_deploy_dir}/wrs-server-group-%{version}.%{tis_patch_ver}.tgz
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,16 @@
|
||||||
# Import the Makefile that we give to the customer so we eat our own dogfood
|
# Import the Makefile that we give to the customer so we eat our own dogfood
|
||||||
include Makefile.sdk
|
include Makefile.sdk
|
||||||
|
|
||||||
|
DESTDIR ?= /
|
||||||
|
SYSCONFDIR ?= /etc
|
||||||
|
UNITDIR ?= /usr/lib/systemd/system
|
||||||
|
LIBDIR ?= /usr/lib64
|
||||||
|
SDK_DEPLOY_DIR ?= /opt/deploy/cgcs_sdk
|
||||||
|
MAJOR ?= 2
|
||||||
|
MINOR ?= 0
|
||||||
|
VERSION ?= $(MAJOR).$(MINOR)
|
||||||
|
PATCH ?= 0
|
||||||
|
|
||||||
# This needs to be extended from what the customer will build.
|
# This needs to be extended from what the customer will build.
|
||||||
EXECS += host_agent
|
EXECS += host_agent
|
||||||
BINEXECS=$(addprefix $(BINDIR)/, $(EXECS))
|
BINEXECS=$(addprefix $(BINDIR)/, $(EXECS))
|
||||||
|
|
@ -54,7 +64,7 @@ LIBDEPS:=$(patsubst %,$(LIBDIR)/lib%.so,$(LIBS))
|
||||||
EXPORT_SDK := wrs-server-group-$(MAJOR).$(MINOR).$(PATCH)
|
EXPORT_SDK := wrs-server-group-$(MAJOR).$(MINOR).$(PATCH)
|
||||||
|
|
||||||
# Add the host build as a dependency to the SDK build
|
# Add the host build as a dependency to the SDK build
|
||||||
all: host_all
|
all: host_all
|
||||||
host_all: $(BINEXECS) $(LIBDEPS) sdk/$(EXPORT_SDK).tgz
|
host_all: $(BINEXECS) $(LIBDEPS) sdk/$(EXPORT_SDK).tgz
|
||||||
|
|
||||||
OBJS = $(HOST_AGENT_OBJ)
|
OBJS = $(HOST_AGENT_OBJ)
|
||||||
|
|
@ -101,6 +111,64 @@ $(LIBHOSTGUESTMSG_DEP): $(LIBHOSTGUESTMSG_OBJ)
|
||||||
$(BINDIR)/host_agent: $(HOST_AGENT_OBJ)
|
$(BINDIR)/host_agent: $(HOST_AGENT_OBJ)
|
||||||
$(CC) -o $@ $^ $(LDFLAGS) -lrt -ljson-c
|
$(CC) -o $@ $^ $(LDFLAGS) -lrt -ljson-c
|
||||||
|
|
||||||
|
install:
|
||||||
|
install -m 750 -d $(DESTDIR)/usr/sbin
|
||||||
|
install -m 755 -d $(DESTDIR)/usr/lib64
|
||||||
|
install -m 755 -d $(DESTDIR)/usr/include
|
||||||
|
install -m 755 -d $(DESTDIR)/usr/include/cgcs
|
||||||
|
install -m 750 -d $(SYSCONFDIR)/init.d
|
||||||
|
install -m 750 -d $(SYSCONFDIR)/pmon.d
|
||||||
|
install -m 750 -d $(UNITDIR)
|
||||||
|
|
||||||
|
install -m 750 -d $(DESTDIR)/usr
|
||||||
|
install -m 750 -d $(DESTDIR)/usr/src
|
||||||
|
install -m 750 -d $(DESTDIR)/usr/src/debug
|
||||||
|
install -m 750 -d $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)
|
||||||
|
|
||||||
|
install -m 644 host_guest_msg_type.h $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/host_guest_msg_type.h
|
||||||
|
install -m 644 server_group_app.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/server_group_app.c
|
||||||
|
install -m 644 server_group.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/server_group.c
|
||||||
|
install -m 644 guest_agent.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/guest_agent.c
|
||||||
|
install -m 644 lib_host_guest_msg.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/lib_host_guest_msg.c
|
||||||
|
install -m 644 host_guest_msg.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/host_guest_msg.c
|
||||||
|
install -m 644 lib_guest_host_msg.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/lib_guest_host_msg.c
|
||||||
|
install -m 644 host_instance_mgmt.h $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/host_instance_mgmt.h
|
||||||
|
install -m 644 host_instance_mgmt.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/host_instance_mgmt.c
|
||||||
|
install -m 644 guest_host_msg.h $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/guest_host_msg.h
|
||||||
|
install -m 644 host_guest_msg.h $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/host_guest_msg.h
|
||||||
|
install -m 644 host_agent.c $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/host_agent.c
|
||||||
|
install -m 644 server_group.h $(DESTDIR)/usr/src/debug/host-guest-comm-$(VERSION)/server_group.h
|
||||||
|
|
||||||
|
install -m 750 scripts/host_agent $(SYSCONFDIR)/init.d/host_agent
|
||||||
|
install -m 640 scripts/host_agent.service $(UNITDIR)/host_agent.service
|
||||||
|
install -m 644 scripts/guest-agent.service $(UNITDIR)/guest-agent.service
|
||||||
|
install -m 640 scripts/host_agent.conf $(SYSCONFDIR)/pmon.d/host_agent.conf
|
||||||
|
install -m 750 bin/host_agent $(DESTDIR)/usr/sbin/host_agent
|
||||||
|
install -m 750 bin/guest_agent $(DESTDIR)/usr/sbin/guest_agent
|
||||||
|
install -m 750 bin/server_group_app $(DESTDIR)/usr/sbin/server_group_app
|
||||||
|
install -m 644 guest_host_msg.h $(DESTDIR)/usr/include/cgcs/guest_host_msg.h
|
||||||
|
install -m 644 host_guest_msg.h $(DESTDIR)/usr/include/cgcs/host_guest_msg.h
|
||||||
|
|
||||||
|
# Deploy to the SDK deployment directory
|
||||||
|
|
||||||
|
install -d $(SDK_DEPLOY_DIR)
|
||||||
|
install -m 644 sdk/wrs-server-group-$(VERSION).$(PATCH).tgz $(SDK_DEPLOY_DIR)/wrs-server-group-$(VERSION).$(PATCH).tgz
|
||||||
|
|
||||||
|
install -m 755 -p -D lib/libguesthostmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libguesthostmsg.so.$(MAJOR).$(MINOR).$(PATCH)
|
||||||
|
ln -s libguesthostmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libguesthostmsg.so.$(MAJOR).$(MINOR)
|
||||||
|
ln -s libguesthostmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libguesthostmsg.so.$(MAJOR)
|
||||||
|
ln -s libguesthostmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libguesthostmsg.so
|
||||||
|
|
||||||
|
install -m 755 -p -D lib/libhostguestmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libhostguestmsg.so.$(MAJOR).$(MINOR).$(PATCH)
|
||||||
|
ln -s libhostguestmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libhostguestmsg.so.$(MAJOR).$(MINOR)
|
||||||
|
ln -s libhostguestmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libhostguestmsg.so.$(MAJOR)
|
||||||
|
ln -s libhostguestmsg.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libhostguestmsg.so
|
||||||
|
|
||||||
|
install -m 755 -p -D lib/libservergroup.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libservergroup.so.$(MAJOR).$(MINOR).$(PATCH)
|
||||||
|
ln -s libservergroup.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libservergroup.so.$(MAJOR).$(MINOR)
|
||||||
|
ln -s libservergroup.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libservergroup.so.$(MAJOR)
|
||||||
|
ln -s libservergroup.so.$(MAJOR).$(MINOR).$(PATCH) $(LIBDIR)/libservergroup.so
|
||||||
|
|
||||||
# Add the host clean as a dependency to the SDK stuff
|
# Add the host clean as a dependency to the SDK stuff
|
||||||
clean: host_clean
|
clean: host_clean
|
||||||
host_clean:
|
host_clean:
|
||||||
|
|
|
||||||
|
|
@ -107,13 +107,7 @@ Requires: libpthread.so.0()(64bit)
|
||||||
Maintenance Guest Server assists in VM guest
|
Maintenance Guest Server assists in VM guest
|
||||||
heartbeat control and failure reporting at the worker level.
|
heartbeat control and failure reporting at the worker level.
|
||||||
|
|
||||||
%define local_dir /usr/local
|
%define local_bindir /usr/local/bin
|
||||||
%define local_bindir %{local_dir}/bin
|
|
||||||
%define local_sbindir %{local_dir}/sbin
|
|
||||||
%define local_etc_pmond %{_sysconfdir}/pmon.d
|
|
||||||
%define local_etc_servicesd %{_sysconfdir}/services.d
|
|
||||||
%define local_etc_logrotated %{_sysconfdir}/logrotate.d
|
|
||||||
%define ocf_resourced /usr/lib/ocf/resource.d
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
|
|
@ -125,60 +119,14 @@ MAJOR=$(echo $VER | awk -F . '{print $1}')
|
||||||
MINOR=$(echo $VER | awk -F . '{print $2}')
|
MINOR=$(echo $VER | awk -F . '{print $2}')
|
||||||
make MAJOR=$MAJOR MINOR=$MINOR %{?_smp_mflags} build
|
make MAJOR=$MAJOR MINOR=$MINOR %{?_smp_mflags} build
|
||||||
|
|
||||||
%global _buildsubdir %{_builddir}/%{name}-%{version}
|
|
||||||
|
|
||||||
# install mtce-guestAgent and mtce-guestServer package
|
# install mtce-guestAgent and mtce-guestServer package
|
||||||
%install
|
%install
|
||||||
VER=%{version}
|
make install \
|
||||||
MAJOR=$(echo $VER | awk -F . '{print $1}')
|
DESTDIR=%{buildroot} \
|
||||||
MINOR=$(echo $VER | awk -F . '{print $2}')
|
PREFIX=%{buildroot}/usr/local \
|
||||||
|
SYSCONFDIR=%{buildroot}%{_sysconfdir} \
|
||||||
install -m 755 -d %{buildroot}%{_sysconfdir}
|
LOCALBINDIR=%{buildroot}%{local_bindir} \
|
||||||
install -m 755 -d %{buildroot}/usr
|
UNITDIR=%{buildroot}%{_unitdir}
|
||||||
install -m 755 -d %{buildroot}/%{_bindir}
|
|
||||||
install -m 755 -d %{buildroot}/usr/local
|
|
||||||
install -m 755 -d %{buildroot}%{local_bindir}
|
|
||||||
install -m 755 -d %{buildroot}/usr/local/sbin
|
|
||||||
install -m 755 -d %{buildroot}/%{_sbindir}
|
|
||||||
install -m 755 -d %{buildroot}/lib
|
|
||||||
install -m 755 -d %{buildroot}%{_sysconfdir}/mtc
|
|
||||||
install -m 755 -d %{buildroot}%{_sysconfdir}/mtc/tmp
|
|
||||||
|
|
||||||
# resource agent stuff
|
|
||||||
install -m 755 -d %{buildroot}/usr/lib
|
|
||||||
install -m 755 -d %{buildroot}/usr/lib/ocf
|
|
||||||
install -m 755 -d %{buildroot}/usr/lib/ocf/resource.d
|
|
||||||
install -m 755 -d %{buildroot}/usr/lib/ocf/resource.d/platform
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/scripts/guestAgent.ocf %{buildroot}/usr/lib/ocf/resource.d/platform/guestAgent
|
|
||||||
|
|
||||||
# config files
|
|
||||||
install -m 644 -p -D %{_buildsubdir}/scripts/guest.ini %{buildroot}%{_sysconfdir}/mtc/guestAgent.ini
|
|
||||||
install -m 644 -p -D %{_buildsubdir}/scripts/guest.ini %{buildroot}%{_sysconfdir}/mtc/guestServer.ini
|
|
||||||
|
|
||||||
# binaries
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/guestServer %{buildroot}/%{local_bindir}/guestServer
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/guestAgent %{buildroot}/%{local_bindir}/guestAgent
|
|
||||||
|
|
||||||
# init script files
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/scripts/guestServer %{buildroot}%{_sysconfdir}/init.d/guestServer
|
|
||||||
install -m 755 -p -D %{_buildsubdir}/scripts/guestAgent %{buildroot}%{_sysconfdir}/init.d/guestAgent
|
|
||||||
|
|
||||||
# systemd service files
|
|
||||||
install -m 644 -p -D %{_buildsubdir}/scripts/guestServer.service %{buildroot}%{_unitdir}/guestServer.service
|
|
||||||
install -m 644 -p -D %{_buildsubdir}/scripts/guestAgent.service %{buildroot}%{_unitdir}/guestAgent.service
|
|
||||||
|
|
||||||
# process monitor config files
|
|
||||||
install -m 755 -d %{buildroot}%{local_etc_pmond}
|
|
||||||
install -m 644 -p -D %{_buildsubdir}/scripts/guestServer.pmon %{buildroot}%{local_etc_pmond}/guestServer.conf
|
|
||||||
|
|
||||||
# log rotation
|
|
||||||
install -m 755 -d %{buildroot}%{_sysconfdir}/logrotate.d
|
|
||||||
install -m 644 -p -D %{_buildsubdir}/scripts/guestAgent.logrotate %{buildroot}%{local_etc_logrotated}/guestAgent.logrotate
|
|
||||||
install -m 644 -p -D %{_buildsubdir}/scripts/guestServer.logrotate %{buildroot}%{local_etc_logrotated}/guestServer.logrotate
|
|
||||||
|
|
||||||
# volatile directores
|
|
||||||
install -m 755 -d %{buildroot}/var
|
|
||||||
install -m 755 -d %{buildroot}/var/run
|
|
||||||
|
|
||||||
# enable all services in systemd
|
# enable all services in systemd
|
||||||
%post -n mtce-guestServer
|
%post -n mtce-guestServer
|
||||||
|
|
@ -196,8 +144,8 @@ install -m 755 -d %{buildroot}/var/run
|
||||||
%{_sysconfdir}/mtc/guestAgent.ini
|
%{_sysconfdir}/mtc/guestAgent.ini
|
||||||
|
|
||||||
%{_unitdir}/guestAgent.service
|
%{_unitdir}/guestAgent.service
|
||||||
%{local_etc_logrotated}/guestAgent.logrotate
|
%{_sysconfdir}/logrotate.d/guestAgent.logrotate
|
||||||
%{ocf_resourced}/platform/guestAgent
|
/usr/lib/ocf/resource.d/platform/guestAgent
|
||||||
|
|
||||||
%{_sysconfdir}/init.d/guestAgent
|
%{_sysconfdir}/init.d/guestAgent
|
||||||
%{local_bindir}/guestAgent
|
%{local_bindir}/guestAgent
|
||||||
|
|
@ -213,10 +161,9 @@ install -m 755 -d %{buildroot}/var/run
|
||||||
# config files - non-modifiable
|
# config files - non-modifiable
|
||||||
%{_sysconfdir}/mtc/guestServer.ini
|
%{_sysconfdir}/mtc/guestServer.ini
|
||||||
|
|
||||||
%{local_etc_pmond}/guestServer.conf
|
%{_sysconfdir}/pmon.d/guestServer.conf
|
||||||
%{local_etc_logrotated}/guestServer.logrotate
|
%{_sysconfdir}/logrotate.d/guestServer.logrotate
|
||||||
%{_unitdir}/guestServer.service
|
%{_unitdir}/guestServer.service
|
||||||
|
|
||||||
%{_sysconfdir}/init.d/guestServer
|
%{_sysconfdir}/init.d/guestServer
|
||||||
%{local_bindir}/guestServer
|
%{local_bindir}/guestServer
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,12 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
|
DESTDIR ?= /
|
||||||
|
PREFIX ?= /usr/local
|
||||||
|
LOCALBINDIR ?= /usr/local/bin
|
||||||
|
SYSCONFDIR ?= /etc
|
||||||
|
UNITDIR ?= /var/lib/systemd/system
|
||||||
|
|
||||||
SRCS = guestClass.cpp guestInstClass.cpp \
|
SRCS = guestClass.cpp guestInstClass.cpp \
|
||||||
guestSvrFsm.cpp guestSvrHdlr.cpp \
|
guestSvrFsm.cpp guestSvrHdlr.cpp \
|
||||||
guestServer.cpp guestAgent.cpp \
|
guestServer.cpp guestAgent.cpp \
|
||||||
|
|
@ -31,6 +37,49 @@ build: $(OBJS)
|
||||||
.cpp.o:
|
.cpp.o:
|
||||||
$(CXX) $(INCLUDES) $(CCPFLAGS) $(EXTRACCFLAGS) -c $< -o $@
|
$(CXX) $(INCLUDES) $(CCPFLAGS) $(EXTRACCFLAGS) -c $< -o $@
|
||||||
|
|
||||||
|
install:
|
||||||
|
install -m 755 -d $(SYSCONFDIR)
|
||||||
|
install -m 755 -d $(PREFIX)
|
||||||
|
install -m 755 -d $(LOCALBINDIR)
|
||||||
|
install -m 755 -d $(SYSCONFDIR)/mtc
|
||||||
|
install -m 755 -d $(SYSCONFDIR)/mtc/tmp
|
||||||
|
|
||||||
|
# resource agent stuff
|
||||||
|
install -m 755 -d $(DESTDIR)/usr/lib
|
||||||
|
install -m 755 -d $(DESTDIR)/usr/lib/ocf
|
||||||
|
install -m 755 -d $(DESTDIR)/usr/lib/ocf/resource.d
|
||||||
|
install -m 755 -d $(DESTDIR)/usr/lib/ocf/resource.d/platform
|
||||||
|
install -m 755 -p -D scripts/guestAgent.ocf $(DESTDIR)/usr/lib/ocf/resource.d/platform/guestAgent
|
||||||
|
|
||||||
|
# config files
|
||||||
|
install -m 644 -p -D scripts/guest.ini $(SYSCONFDIR)/mtc/guestAgent.ini
|
||||||
|
install -m 644 -p -D scripts/guest.ini $(SYSCONFDIR)/mtc/guestServer.ini
|
||||||
|
|
||||||
|
# binaries
|
||||||
|
install -m 755 -p -D guestServer $(LOCALBINDIR)/guestServer
|
||||||
|
install -m 755 -p -D guestAgent $(LOCALBINDIR)/guestAgent
|
||||||
|
|
||||||
|
# init script files
|
||||||
|
install -m 755 -p -D scripts/guestServer $(SYSCONFDIR)/init.d/guestServer
|
||||||
|
install -m 755 -p -D scripts/guestAgent $(SYSCONFDIR)/init.d/guestAgent
|
||||||
|
|
||||||
|
# systemd service files
|
||||||
|
install -m 644 -p -D scripts/guestServer.service $(UNITDIR)/guestServer.service
|
||||||
|
install -m 644 -p -D scripts/guestAgent.service $(UNITDIR)/guestAgent.service
|
||||||
|
|
||||||
|
# process monitor config files
|
||||||
|
install -m 755 -d $(SYSCONFDIR)/pmon.d
|
||||||
|
install -m 644 -p -D scripts/guestServer.pmon $(SYSCONFDIR)/pmon.d/guestServer.conf
|
||||||
|
|
||||||
|
# log rotation
|
||||||
|
install -m 755 -d $(SYSCONFDIR)/logrotate.d
|
||||||
|
install -m 644 -p -D scripts/guestAgent.logrotate $(SYSCONFDIR)/logrotate.d/guestAgent.logrotate
|
||||||
|
install -m 644 -p -D scripts/guestServer.logrotate $(SYSCONFDIR)/logrotate.d/guestServer.logrotate
|
||||||
|
|
||||||
|
# volatile directores
|
||||||
|
install -m 755 -d $(DESTDIR)/var
|
||||||
|
install -m 755 -d $(DESTDIR)/var/run
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm -v -f $(OBJ) guestAgent guestServer *.o *.a
|
@rm -v -f $(OBJ) guestAgent guestServer *.o *.a
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue