This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10877

packaging: disable rust extensions again on CentOS
ClosedPublic

Authored by Mathiasdm on Jun 15 2021, 3:06 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9b8f326731ac: packaging: disable rust extensions again on CentOS
Summary

Backed out changeset eccbfa7e19c0
We're seeing (very rarely) crashes of 'hg purge' on some of our machines
(see https://bz.mercurial-scm.org/show_bug.cgi?id=6509 ).
Unfortunately, I haven't been able to find out much more about
what is going wrong.
To avoid further impact on our users and CI,
I would prefer to disable the rust extensions for now.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Mathiasdm created this revision.Jun 15 2021, 3:06 AM
Mathiasdm added a comment.Jun 15 2021, 3:09 AM

Hm, I should have submitted this for stable, my mistake. Should I resubmit?

Alphare accepted this revision.Jun 15 2021, 6:01 AM
Alphare added a subscriber: Alphare.
In D10877#166180, @Mathiasdm wrote:

Hm, I should have submitted this for stable, my mistake. Should I resubmit?

No, it's fine, I'll queue it on stable. I'm sad that this very obscure bug persists, I hope we can come back to it soon.

This revision is now accepted and ready to land.Jun 15 2021, 6:01 AM

Revision Contents
Changeset List

Diff 28561

contrib/packaging/docker/centos7

make \ make \
python3-devel \ python3-devel \
python36-docutils \ python36-docutils \
rpm-build \ rpm-build \
tar tar
# For creating repo meta data # For creating repo meta data
RUN yum install -y createrepo RUN yum install -y createrepo
# For rust extensions
RUN yum install -y cargo

contrib/packaging/docker/centos8

FROM centos:centos8 FROM centos:centos8
RUN groupadd -g %GID% build && \ RUN groupadd -g %GID% build && \
useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
RUN yum install -y \ RUN yum install -y \
gcc \ gcc \
gettext \ gettext \
make \ make \
python3-devel \ python3-devel \
python3-docutils \ python3-docutils \
rpm-build rpm-build
# For creating repo meta data # For creating repo meta data
RUN yum install -y createrepo RUN yum install -y createrepo
# For rust extensions
RUN yum install -y cargo

contrib/packaging/mercurial.spec

# these .a are not necessary and they are readonly and strip fails - kill them! # these .a are not necessary and they are readonly and strip fails - kill them!
rm -f %{buildroot}%{hgpyprefix}/lib/{,python2.*/config}/libpython2.*.a rm -f %{buildroot}%{hgpyprefix}/lib/{,python2.*/config}/libpython2.*.a
cd - cd -
cd %{docutilsname} cd %{docutilsname}
LD_LIBRARY_PATH=$PYPATH $PYPATH/python setup.py install --root="$RPM_BUILD_ROOT" LD_LIBRARY_PATH=$PYPATH $PYPATH/python setup.py install --root="$RPM_BUILD_ROOT"
cd - cd -
PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{hgpyprefix} MANDIR=%{_mandir} PURE="--rust" PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{hgpyprefix} MANDIR=%{_mandir}
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . ) ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . )
( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} ) ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} )
%else %else
make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir} PURE="--rust" make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir}
%endif %endif
install -m 755 contrib/chg/chg $RPM_BUILD_ROOT%{_bindir}/ install -m 755 contrib/chg/chg $RPM_BUILD_ROOT%{_bindir}/
install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}/ install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}/
install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}/ install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}/
bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d