packages/uwsgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!21 修复pkgship服务启动失败

Browse Source 
From: @wu-leilei 
Reviewed-by: @wk333 
Signed-off-by: @wk333
This commit is contained in:
openeuler-ci-bot 2024-04-17 09:26:01 +00:00 committed by Gitee
commit e440fe1294
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
uwsgi.service
View File

@ -4,7 +4,7 @@ After=syslog.target
[Service] [Service]
EnvironmentFile=-/etc/sysconfig/uwsgi EnvironmentFile=-/etc/sysconfig/uwsgi
ExecStart=/usr/sbin/uwsgi --ini /etc/uwsgi.ini --pidfile /run/uwsgi/uwsgi.pid --stats /run/uwsgi/stats.sock ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi.ini --pidfile /run/uwsgi/uwsgi.pid --stats /run/uwsgi/stats.sock
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGINT KillSignal=SIGINT
Restart=always Restart=always

18
uwsgi.spec
View File

@ -65,7 +65,7 @@
Name: uwsgi Name: uwsgi
Version: 2.0.23 Version: 2.0.23
Release: 1 Release: 2
Summary: Fast, self-healing, application container server Summary: Fast, self-healing, application container server
# uwsgi is licensed under GPLv2 with a linking exception # uwsgi is licensed under GPLv2 with a linking exception
# docs are licensed under MIT # docs are licensed under MIT
@ -1020,6 +1020,7 @@ cp -p %{SOURCE5} README.openEuler
%build %build
CFLAGS="%{optflags} -Wno-error -Wno-unused-but-set-variable -fPIC" %{__python} uwsgiconfig.py --verbose --build openEuler.ini CFLAGS="%{optflags} -Wno-error -Wno-unused-but-set-variable -fPIC" %{__python} uwsgiconfig.py --verbose --build openEuler.ini
%if %{with python3} %if %{with python3}
%py3_build
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/python openEuler python%{python3_pkgversion} CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/python openEuler python%{python3_pkgversion}
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/gevent openEuler python%{python3_pkgversion}_gevent CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/gevent openEuler python%{python3_pkgversion}_gevent
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/tornado openEuler python%{python3_pkgversion}_tornado CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/tornado openEuler python%{python3_pkgversion}_tornado
@ -1111,13 +1112,12 @@ tar -C %{buildroot}%{_usrsrc}/uwsgi/%{version} --strip-components=1 -xvzf %{SOUR
cp %{SOURCE1} %{buildroot}%{_usrsrc}/uwsgi/%{version}/buildconf/ cp %{SOURCE1} %{buildroot}%{_usrsrc}/uwsgi/%{version}/buildconf/
cp docs/Changelog-%{version}.rst CHANGELOG cp docs/Changelog-%{version}.rst CHANGELOG
rm -f docs/.gitignore rm -f docs/.gitignore
echo "%{commit}, i.e. this:" >> README.Fedora echo "%{commit}, i.e. this:" >> README.openEuler
echo "https://github.com/unbit/%{docrepo}/tree/%{commit}" >> README.Fedora echo "https://github.com/unbit/%{docrepo}/tree/%{commit}" >> README.openEuler
install -D -p -m 0755 uwsgi %{buildroot}%{_sbindir}/uwsgi
install -p -m 0644 *.h %{buildroot}%{_includedir}/uwsgi install -p -m 0644 *.h %{buildroot}%{_includedir}/uwsgi
install -p -m 0755 *_plugin.so %{buildroot}%{_libdir}/uwsgi install -p -m 0755 *_plugin.so %{buildroot}%{_libdir}/uwsgi
%if %{with python3} %if %{with python3}
install -D -p -m 0644 uwsgidecorators.py %{buildroot}%{python3_sitelib}/uwsgidecorators.py %py3_install
%if %{manual_py_compile} == 1 %if %{manual_py_compile} == 1
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/uwsgidecorators.py %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/uwsgidecorators.py
%endif %endif
@ -1154,12 +1154,12 @@ exit 0
%files %files
%{_sbindir}/uwsgi %{_bindir}/uwsgi
%config(noreplace) %{_sysconfdir}/uwsgi.ini %config(noreplace) %{_sysconfdir}/uwsgi.ini
%{_unitdir}/uwsgi.service %{_unitdir}/uwsgi.service
%{_tmpfilesdir}/uwsgi.conf %{_tmpfilesdir}/uwsgi.conf
%dir %{_sysconfdir}/uwsgi.d %dir %{_sysconfdir}/uwsgi.d
%doc README README.Fedora CHANGELOG %doc README README.openEuler CHANGELOG
%license LICENSE %license LICENSE
%files -n uwsgi-devel %files -n uwsgi-devel
@ -1169,6 +1169,7 @@ exit 0
%if %{with python3} %if %{with python3}
%files -n python%{python3_pkgversion}-uwsgidecorators %files -n python%{python3_pkgversion}-uwsgidecorators
%{python3_sitelib}/uwsgidecorators.py %{python3_sitelib}/uwsgidecorators.py
%{python3_sitelib}/uWSGI-%{version}-py3.11.egg-info/*
%{python3_sitelib}/__pycache__/uwsgidecorators.cpython-%{python3_version_nodots}*.py* %{python3_sitelib}/__pycache__/uwsgidecorators.cpython-%{python3_version_nodots}*.py*
%endif %endif
@ -1541,6 +1542,9 @@ exit 0
%changelog %changelog
* Wed Apr 17 2024 wulei <wu_lei@hoperun.com> - 2.0.23-2
- Fix pkgship service startup failure
* Thu Jan 18 2024 wangkai <13474090681@163.com> - 2.0.23-1 * Thu Jan 18 2024 wangkai <13474090681@163.com> - 2.0.23-1
- Update to 2.0.23 and add plugin rpm packages - Update to 2.0.23 and add plugin rpm packages