test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-03 12:28:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
modify acl-master rpm info add master_ctl and remove acl-tools

See merge request !5
This commit is contained in:
郑树新 2020-06-05 17:14:03 +08:00
commit 08f04bec94
2 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -124,10 +124,7 @@ clean cl:
acl_master: all_lib
@(cd app/master/daemon; make $(MAKE_ARGS); make install)
@(cd app/master/tools/lib_global; make $(MAKE_ARGS);)
@(cd app/master/tools/master_ctld; make $(MAKE_ARGS); make install)
@(cd app/master/tools/master_ctl; make $(MAKE_ARGS); make install)
@(cd app/master/tools/master_guard; make $(MAKE_ARGS); make install)
@(cd app/master/tools/master_monitor; make $(MAKE_ARGS); make install)
packinstall:
@(echo "")
@ -141,10 +138,7 @@ packinstall:
$(shell mkdir -p ./dist/master/libexec/$(RPATH))
$(shell mkdir -p ./dist/master/bin/$(RPATH))
@(cd app/master/daemon; make install)
@(cd app/master/tools/master_ctld; make install)
@(cd app/master/tools/master_ctl; make install)
@(cd app/master/tools/master_guard; make install)
@(cd app/master/tools/master_monitor; make install)
@(cd lib_fiber; make)
@echo "copying app/master/daemon/acl_master $(BIN_PATH)"
@cp -f app/master/daemon/acl_master $(BIN_PATH)

54
packaging/acl-libs.spec
View File

@ -28,15 +28,15 @@ Requires(postun): /sbin/ldconfig
%description -n acl-master
acl master framework
%package -n acl-tools
Summary: acl tools
Release: %{release_id}
License: IBM
Group: System Environment/Tools
Requires: acl-master
%description -n acl-tools
acl tools
#%package -n acl-tools
#Summary: acl tools
#Release: %{release_id}
#License: IBM
#Group: System Environment/Tools
#Requires: acl-master
#
#%description -n acl-tools
#acl tools
%prep
%setup -q
@ -80,15 +80,15 @@ if [ "$1" -ge "1" ]; then
service master masterrestart > /dev/null 2>&1 ||:
fi
%post -n acl-tools
if [ "$1" == "1" ]; then
/opt/soft/acl-master/sh/tools-ctl start
fi
%preun -n acl-tools
if [ "$1" == "0" ]; then
/opt/soft/acl-master/sh/tools-ctl stop
fi
#%post -n acl-tools
#if [ "$1" == "1" ]; then
# /opt/soft/acl-master/sh/tools-ctl start
#fi
#
#%preun -n acl-tools
#if [ "$1" == "0" ]; then
# /opt/soft/acl-master/sh/tools-ctl stop
#fi
#%postun -n acl-tools
#if [ "$1" -ge "1" ]; then
@ -109,27 +109,25 @@ fi
%files -n acl-master
%defattr(-,root,root)
/opt/soft/acl-master/bin/master_ctl
/opt/soft/acl-master/conf/main.cf
#/opt/soft/acl-master/conf/service/samples
/opt/soft/acl-master/conf/service
/opt/soft/acl-master/libexec/acl_master
/opt/soft/acl-master/sbin
# just including master.sh reload.sh start.sh stop.sh
/opt/soft/acl-master/sh/master.sh
/opt/soft/acl-master/sh/reload.sh
/opt/soft/acl-master/sh/start.sh
/opt/soft/acl-master/sh/stop.sh
/opt/soft/acl-master/sh
/opt/soft/acl-master/var
#/opt/soft/services/acl-master.json
/etc/init.d/master
%exclude /opt/soft/acl-master/conf/service/master_*
%files -n acl-tools
%defattr(-,root,root)
/opt/soft/acl-master/bin/master_ctl
/opt/soft/acl-master/sh/tools-ctl
/opt/soft/acl-master/conf/service/master_*
/opt/soft/acl-master/libexec/master_*
#%files -n acl-tools
#%defattr(-,root,root)
#/opt/soft/acl-master/bin/master_ctl
#/opt/soft/acl-master/sh/tools-ctl
#/opt/soft/acl-master/conf/service/master_*
#/opt/soft/acl-master/libexec/master_*
#/opt/soft/services/acl-tools.json
%changelog