Skip to content

Commit eef63d9

Browse files
packaging: fix centos8/el8 upgrade (apache#7267)
1 parent 1a4bf07 commit eef63d9

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

packaging/centos8/cloud.spec

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,12 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
387387
%clean
388388
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
389389

390-
%pre common
390+
%posttrans common
391391

392392
python_dir=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
393-
mkdir -p %{_datadir}/%{name}-common
394-
rm -f %{_datadir}/%{name}-common/python-site || true
395-
ln -s $python_dir %{_datadir}/%{name}-common/python-site
393+
if [ ! -z $python_dir ];then
394+
cp -f -r /usr/share/cloudstack-common/python-site/* $python_dir/
395+
fi
396396

397397
%preun management
398398
/usr/bin/systemctl stop cloudstack-management || true
@@ -474,7 +474,8 @@ if [ -d "%{_sysconfdir}/cloud" ] ; then
474474
mv %{_sysconfdir}/cloud %{_sysconfdir}/cloud.rpmsave
475475
fi
476476

477-
%post agent
477+
%posttrans agent
478+
478479
if [ "$1" == "2" ] ; then
479480
echo "Running %{_bindir}/%{name}-agent-upgrade to update bridge name for upgrade from CloudStack 4.0.x (and before) to CloudStack 4.1 (and later)"
480481
%{_bindir}/%{name}-agent-upgrade
@@ -499,7 +500,6 @@ fi
499500

500501
systemctl daemon-reload
501502

502-
%posttrans agent
503503
# Print help message
504504
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
505505
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
@@ -592,7 +592,6 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
592592
%dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/ipallocator
593593
%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
594594
%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
595-
#%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-catalina
596595
%{_datadir}/%{name}-management/setup/wheel/*.whl
597596

598597
%files agent

0 commit comments

Comments
 (0)